You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by bs...@apache.org on 2019/08/30 23:26:08 UTC
[geode] 01/02: GEODE-7090 Remove dependency on DataSerializer from
membership classes
This is an automated email from the ASF dual-hosted git repository.
bschuchardt pushed a commit to branch feature/GEODE-7090
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 10e088574e5a7f68b48d9e9ec02101789725c92d
Author: Bruce Schuchardt <bs...@pivotal.io>
AuthorDate: Fri Aug 30 08:46:47 2019 -0700
GEODE-7090 Remove dependency on DataSerializer from membership classes
DataSerializableFixedID is used by most internal classes for
serialization. Membership, in particular, was constrained in its
implementation to use only "fixed" serialization identifiers because our
other serialization mechanisms (DataSerialiable, PDX) are dependent on
membership and messaging.
This PR moves serialization of DataSerializableFixedID to a new
sub-project, geode-serialization in support of also separating
membership into its own sub-project.
Many files are touched by this PR. The vast majority are due to a
change in the serialization interface that introduces a new parameter in
DataSerializableFixedID's toData and fromData methods. This parameter
gives access to the serializer and to the Version of the
source/destination. This parameter was added to begin moving from a
"static" based serialization service to an instance based service.
Serialization code concerning "DSFID"s has been moved from
InternalDataSerializer to the new class DSFIDSerialzerImpl.
InternalDataSerializer holds on to an instance of this class and
delegates DSFID serialization to it.
InternalDataSerializer also effects registration of Geode's DSFID
classes with this serializer. Membership "Services" handles
registration of its own DSFID classes with the service, as do other
sub-projects like geode-web.
HeapDataOutputStream has been used by most of our serialization code to
provide a DataOutput for our toData methods. Over the years this class
has accumulated a lot of adornments for PDX serialization that aren't
appropriate for a geode-serialization sub-project. Consequently I've
moved much of its code into a superclass, BufferDataOutputStream, that
provides most of its functionality w/o needing to reference other geode-
core classes.
Version.java has been repackaged in this PR, moving it into a
"serialization" package. This affected some rolling-upgrade and
backward-compatibility tests that were referring to
Version.CURRENT_ORDINAL. These have been modified to get the "current
version ordinal" from VersionManager.
Finally, InternalDataSerializer injects a serializer into the new
sub-project that provideds an API for handling other types of
serializable objects like PDX. This serializer is available in the
DataSerializableFixedID toData/fromData context parameter and is used by
membership services when serializing Geode DistributionMessages.
I don't think most of the files deserve scrutiny. The primary files
affected are InternalDataSerializer and DSFIDFactory. Aside from that,
does the new SerializationContext API make sense? Could it be improved?
---
.../src/test/resources/expected-pom.xml | 8 +-
geode-assembly/build.gradle | 2 +
geode-core/build.gradle | 3 +
.../geode/ClusterCommunicationsDUnitTest.java | 23 +-
.../distributed/DistributedMemberDUnitTest.java | 3 +-
...lusterDistributionManagerForAdminDUnitTest.java | 9 +-
.../geode/distributed/internal/DateMessage.java | 13 +-
.../TcpServerBackwardCompatDUnitTest.java | 9 +-
...ackwardCompatibilitySerializationDUnitTest.java | 75 +-
.../geode/internal/cache/GIIDeltaDUnitTest.java | 2 +-
.../cache/TransactionsWithDeltaDUnitTest.java | 88 +-
.../control/RebalanceOperationDistributedTest.java | 6 +-
.../PersistentRVVRecoveryDUnitTest.java | 5 +-
.../PersistentRecoveryOrderDUnitTest.java | 3 +-
.../geode/pdx/PDXAsyncEventQueueDUnitTest.java | 2 +-
.../geode/pdx/PdxAttributesDistributedTest.java | 2 +-
.../apache/geode/pdx/PdxClientServerDUnitTest.java | 2 +-
.../security/ClientAuthenticationTestCase.java | 3 +-
.../cache/client/ClientCacheFactoryJUnitTest.java | 10 +-
.../ResultsDataSerializabilityJUnitTest.java | 2 +-
.../gms/fd/GMSHealthMonitorJUnitTest.java | 7 +-
.../gms/locator/GMSLocatorIntegrationTest.java | 25 +
.../locator/GMSLocatorRecoveryIntegrationTest.java | 20 +-
.../gms/membership/GMSJoinLeaveJUnitTest.java | 2 +-
.../gms/messenger/JGroupsMessengerJUnitTest.java | 98 +-
.../cache/CompactOfflineDiskStoreJUnitTest.java | 2 +-
.../cache/FilterProfileConcurrencyTest.java | 2 +-
...FOEvictionAlgoMemoryEnabledRegionJUnitTest.java | 4 +-
.../cache/ha/HARegionQueueIntegrationTest.java | 2 +-
.../cache/tier/sockets/CacheClientProxyTest.java | 2 +-
.../sockets/ServerConnectionIntegrationTest.java | 2 +-
.../offheap/OffHeapValidationJUnitTest.java | 2 +-
.../geode/pdx/AutoSerializableJUnitTest.java | 2 +-
.../org/apache/geode/pdx/ByteSourceJUnitTest.java | 2 +-
.../geode/pdx/PdxInstanceFactoryJUnitTest.java | 2 +-
.../org/apache/geode/pdx/PdxInstanceJUnitTest.java | 2 +-
.../apache/geode/pdx/PdxSerializableJUnitTest.java | 4 +-
.../apache/geode/codeAnalysis/excludedClasses.txt | 2 +-
.../codeAnalysis/sanctionedDataSerializables.txt | 1516 ++++++++++----------
.../internal/InternalDataSerializerBenchmark.java | 3 +
.../src/main/java/org/apache/geode/CopyHelper.java | 2 +-
.../main/java/org/apache/geode/DataSerializer.java | 4 +-
.../internal/SystemMemberCacheEventProcessor.java | 11 +-
.../admin/jmx/internal/StatAlertNotification.java | 14 +-
.../org/apache/geode/cache/AttributesFactory.java | 5 +-
.../org/apache/geode/cache/EvictionAttributes.java | 3 +-
.../geode/cache/client/internal/AbstractOp.java | 4 +-
.../cache/client/internal/AuthenticateUserOp.java | 4 +-
.../client/internal/CacheServerLoadMessage.java | 11 +-
.../client/internal/ClientSideHandshakeImpl.java | 11 +-
.../client/internal/ExecuteFunctionNoAckOp.java | 2 +-
.../cache/client/internal/ExecuteFunctionOp.java | 2 +-
.../internal/ExecuteRegionFunctionNoAckOp.java | 2 +-
.../client/internal/ExecuteRegionFunctionOp.java | 2 +-
.../internal/ExecuteRegionFunctionSingleHopOp.java | 2 +-
.../geode/cache/client/internal/GetAllOp.java | 2 +-
.../geode/cache/client/internal/KeySetOp.java | 2 +-
.../cache/client/internal/ProxyCacheCloseOp.java | 2 +-
.../geode/cache/client/internal/PutAllOp.java | 2 +-
.../apache/geode/cache/client/internal/PutOp.java | 2 +-
.../geode/cache/client/internal/QueryOp.java | 2 +-
.../cache/client/internal/RegisterInterestOp.java | 2 +-
.../geode/cache/client/internal/RemoveAllOp.java | 2 +-
.../internal/locator/ClientConnectionRequest.java | 13 +-
.../internal/locator/ClientConnectionResponse.java | 9 +-
.../internal/locator/ClientReplacementRequest.java | 13 +-
.../internal/locator/GetAllServersRequest.java | 13 +-
.../internal/locator/GetAllServersResponse.java | 9 +-
.../internal/locator/LocatorListRequest.java | 2 +-
.../internal/locator/LocatorListResponse.java | 9 +-
.../internal/locator/LocatorStatusRequest.java | 4 +-
.../internal/locator/LocatorStatusResponse.java | 9 +-
.../internal/locator/QueueConnectionRequest.java | 13 +-
.../internal/locator/QueueConnectionResponse.java | 9 +-
.../internal/locator/ServerLocationRequest.java | 11 +-
.../internal/locator/ServerLocationResponse.java | 4 +-
.../apache/geode/cache/query/internal/CqEntry.java | 11 +-
.../internal/CumulativeNonDistinctResults.java | 13 +-
.../cache/query/internal/LinkedResultSet.java | 11 +-
.../cache/query/internal/LinkedStructSet.java | 11 +-
.../cache/query/internal/NWayMergeResults.java | 13 +-
.../geode/cache/query/internal/NullToken.java | 11 +-
.../cache/query/internal/PRQueryTraceInfo.java | 11 +-
.../geode/cache/query/internal/ResultsBag.java | 11 +-
.../query/internal/ResultsCollectionWrapper.java | 11 +-
.../geode/cache/query/internal/ResultsSet.java | 11 +-
.../cache/query/internal/SortedResultSet.java | 11 +-
.../cache/query/internal/SortedStructSet.java | 11 +-
.../geode/cache/query/internal/StructBag.java | 11 +-
.../geode/cache/query/internal/StructImpl.java | 11 +-
.../geode/cache/query/internal/StructSet.java | 11 +-
.../geode/cache/query/internal/Undefined.java | 11 +-
.../query/internal/index/IndexCreationData.java | 11 +-
.../query/internal/types/CollectionTypeImpl.java | 11 +-
.../cache/query/internal/types/MapTypeImpl.java | 11 +-
.../cache/query/internal/types/ObjectTypeImpl.java | 19 +-
.../cache/query/internal/types/StructTypeImpl.java | 11 +-
.../apache/geode/cache/wan/EventSequenceID.java | 2 +-
.../internal/ClusterDistributionManager.java | 2 +-
.../distributed/internal/DistributionAdvisor.java | 11 +-
.../distributed/internal/DistributionManager.java | 2 +-
.../distributed/internal/DistributionMessage.java | 11 +-
.../internal/HighPriorityAckedMessage.java | 11 +-
.../internal/InternalDistributedSystem.java | 7 -
.../internal/LonerDistributionManager.java | 2 +-
.../geode/distributed/internal/ReplyMessage.java | 11 +-
.../distributed/internal/ReplyProcessor21.java | 10 +-
.../distributed/internal/SerialAckedMessage.java | 11 +-
.../geode/distributed/internal/ServerLocator.java | 2 +-
.../distributed/internal/ShutdownMessage.java | 11 +-
.../geode/distributed/internal/StartupMessage.java | 15 +-
.../internal/StartupResponseMessage.java | 13 +-
.../StartupResponseWithVersionMessage.java | 13 +-
.../internal/WaitForViewInstallation.java | 13 +-
.../internal/locks/DLockQueryProcessor.java | 21 +-
.../locks/DLockRecoverGrantorProcessor.java | 21 +-
.../internal/locks/DLockReleaseProcessor.java | 21 +-
.../internal/locks/DLockRemoteToken.java | 11 +-
.../internal/locks/DLockRequestProcessor.java | 21 +-
.../distributed/internal/locks/DLockService.java | 11 +-
.../internal/locks/DeposeGrantorProcessor.java | 11 +-
.../internal/locks/ElderInitProcessor.java | 21 +-
.../internal/locks/GrantorRequestProcessor.java | 21 +-
.../locks/NonGrantorDestroyedProcessor.java | 21 +-
.../membership/InternalDistributedMember.java | 43 +-
.../distributed/internal/membership/NetMember.java | 2 +-
.../membership/adapter/GMSMemberAdapter.java | 2 +-
.../membership/adapter/GMSMemberFactory.java | 6 +-
.../membership/adapter/GMSMembershipManager.java | 4 +-
.../membership/adapter/GMSMessageAdapter.java | 2 +-
.../membership/adapter/LocalViewMessage.java | 7 +-
.../internal/membership/gms/GMSMember.java | 74 +-
.../internal/membership/gms/GMSMembershipView.java | 60 +-
.../internal/membership/gms/GMSUtil.java | 70 +-
.../internal/membership/gms/Services.java | 68 +-
.../membership/gms/fd/GMSHealthMonitor.java | 4 +-
.../membership/gms/interfaces/Manager.java | 2 +-
.../gms/locator/FindCoordinatorRequest.java | 27 +-
.../gms/locator/FindCoordinatorResponse.java | 38 +-
.../membership/gms/locator/GMSLocator.java | 45 +-
.../membership/gms/locator/GetViewRequest.java | 11 +-
.../membership/gms/locator/GetViewResponse.java | 16 +-
.../membership/gms/membership/GMSJoinLeave.java | 11 +-
.../gms/messages/AbstractGMSMessage.java | 2 +-
.../gms/messages/FinalCheckPassedMessage.java | 13 +-
.../membership/gms/messages/HeartbeatMessage.java | 9 +-
.../gms/messages/HeartbeatRequestMessage.java | 13 +-
.../gms/messages/InstallViewMessage.java | 18 +-
.../gms/messages/JoinRequestMessage.java | 22 +-
.../gms/messages/JoinResponseMessage.java | 31 +-
.../gms/messages/LeaveRequestMessage.java | 19 +-
.../gms/messages/NetworkPartitionMessage.java | 9 +-
.../gms/messages/RemoveMemberMessage.java | 19 +-
.../gms/messages/SuspectMembersMessage.java | 17 +-
.../membership/gms/messages/ViewAckMessage.java | 14 +-
.../membership/gms/messenger/GMSPingPonger.java | 8 +-
.../membership/gms/messenger/JGroupsMessenger.java | 80 +-
.../internal/streaming/StreamingOperation.java | 23 +-
.../distributed/internal/tcpserver/TcpClient.java | 12 +-
.../distributed/internal/tcpserver/TcpServer.java | 22 +-
.../internal/tcpserver/VersionResponse.java | 2 +-
.../org/apache/geode/internal/DSFIDFactory.java | 1037 +++++++------
.../apache/geode/internal/ExternalizableDSFID.java | 13 +-
.../geode/internal/HeapDataOutputStream.java | 1035 +------------
.../geode/internal/InternalDataSerializer.java | 254 ++--
.../geode/internal/InternalInstantiator.java | 25 +-
.../org/apache/geode/internal/SystemAdmin.java | 7 +-
.../geode/internal/VersionedDataSerializable.java | 1 +
.../geode/internal/VersionedObjectInput.java | 3 +
.../geode/internal/VersionedObjectOutput.java | 3 +
.../internal/admin/ClientMembershipMessage.java | 14 +-
.../admin/remote/AddHealthListenerRequest.java | 11 +-
.../admin/remote/AddHealthListenerResponse.java | 11 +-
.../admin/remote/AddStatListenerRequest.java | 11 +-
.../admin/remote/AddStatListenerResponse.java | 11 +-
.../remote/AdminConsoleDisconnectMessage.java | 11 +-
.../internal/admin/remote/AdminConsoleMessage.java | 11 +-
.../admin/remote/AdminFailureResponse.java | 11 +-
.../geode/internal/admin/remote/AdminRequest.java | 11 +-
.../geode/internal/admin/remote/AdminResponse.java | 11 +-
.../admin/remote/AlertLevelChangeMessage.java | 11 +-
.../admin/remote/AlertListenerMessage.java | 11 +-
.../admin/remote/AlertsNotificationMessage.java | 11 +-
.../admin/remote/AppCacheSnapshotMessage.java | 11 +-
.../internal/admin/remote/BridgeServerRequest.java | 11 +-
.../admin/remote/BridgeServerResponse.java | 11 +-
.../internal/admin/remote/CacheConfigRequest.java | 11 +-
.../internal/admin/remote/CacheConfigResponse.java | 11 +-
.../internal/admin/remote/CacheInfoRequest.java | 11 +-
.../internal/admin/remote/CacheInfoResponse.java | 11 +-
.../admin/remote/CancelStatListenerRequest.java | 11 +-
.../admin/remote/CancelStatListenerResponse.java | 11 +-
.../internal/admin/remote/CancellationMessage.java | 11 +-
.../admin/remote/ChangeRefreshIntervalMessage.java | 11 +-
.../internal/admin/remote/ClientHealthStats.java | 27 +-
.../internal/admin/remote/CompactRequest.java | 11 +-
.../internal/admin/remote/CompactResponse.java | 11 +-
.../internal/admin/remote/DestroyEntryMessage.java | 11 +-
.../admin/remote/DestroyRegionMessage.java | 11 +-
.../admin/remote/DurableClientInfoRequest.java | 13 +-
.../admin/remote/DurableClientInfoResponse.java | 11 +-
.../admin/remote/FetchDistLockInfoRequest.java | 11 +-
.../admin/remote/FetchDistLockInfoResponse.java | 11 +-
.../admin/remote/FetchHealthDiagnosisRequest.java | 11 +-
.../admin/remote/FetchHealthDiagnosisResponse.java | 11 +-
.../internal/admin/remote/FetchHostRequest.java | 11 +-
.../internal/admin/remote/FetchHostResponse.java | 11 +-
.../remote/FetchResourceAttributesRequest.java | 11 +-
.../remote/FetchResourceAttributesResponse.java | 11 +-
.../internal/admin/remote/FetchStatsRequest.java | 11 +-
.../internal/admin/remote/FetchStatsResponse.java | 11 +-
.../internal/admin/remote/FetchSysCfgRequest.java | 11 +-
.../internal/admin/remote/FetchSysCfgResponse.java | 11 +-
.../admin/remote/FlushAppCacheSnapshotMessage.java | 11 +-
.../admin/remote/HealthListenerMessage.java | 11 +-
.../internal/admin/remote/LicenseInfoRequest.java | 11 +-
.../internal/admin/remote/LicenseInfoResponse.java | 11 +-
.../admin/remote/MissingPersistentIDsRequest.java | 6 +-
.../admin/remote/MissingPersistentIDsResponse.java | 11 +-
.../admin/remote/ObjectDetailsRequest.java | 11 +-
.../admin/remote/ObjectDetailsResponse.java | 11 +-
.../internal/admin/remote/ObjectNamesRequest.java | 11 +-
.../internal/admin/remote/ObjectNamesResponse.java | 11 +-
.../remote/PrepareRevokePersistentIDRequest.java | 11 +-
.../admin/remote/RefreshMemberSnapshotRequest.java | 11 +-
.../remote/RefreshMemberSnapshotResponse.java | 11 +-
.../internal/admin/remote/RegionAdminMessage.java | 11 +-
.../internal/admin/remote/RegionAdminRequest.java | 11 +-
.../admin/remote/RegionAttributesRequest.java | 11 +-
.../admin/remote/RegionAttributesResponse.java | 11 +-
.../geode/internal/admin/remote/RegionRequest.java | 11 +-
.../internal/admin/remote/RegionResponse.java | 11 +-
.../internal/admin/remote/RegionSizeRequest.java | 11 +-
.../internal/admin/remote/RegionSizeResponse.java | 11 +-
.../admin/remote/RegionStatisticsRequest.java | 11 +-
.../admin/remote/RegionStatisticsResponse.java | 11 +-
.../admin/remote/RegionSubRegionSizeRequest.java | 11 +-
.../admin/remote/RegionSubRegionsSizeResponse.java | 11 +-
.../admin/remote/RemoveHealthListenerRequest.java | 11 +-
.../admin/remote/RemoveHealthListenerResponse.java | 11 +-
.../admin/remote/ResetHealthStatusRequest.java | 11 +-
.../admin/remote/ResetHealthStatusResponse.java | 11 +-
.../admin/remote/RevokePersistentIDRequest.java | 11 +-
.../internal/admin/remote/RootRegionRequest.java | 11 +-
.../internal/admin/remote/RootRegionResponse.java | 11 +-
.../remote/ShutdownAllGatewayHubsRequest.java | 11 +-
.../internal/admin/remote/ShutdownAllRequest.java | 11 +-
.../internal/admin/remote/ShutdownAllResponse.java | 11 +-
.../admin/remote/SnapshotResultMessage.java | 11 +-
.../remote/StatAlertsManagerAssignMessage.java | 11 +-
.../internal/admin/remote/StatListenerMessage.java | 11 +-
.../internal/admin/remote/StoreSysCfgRequest.java | 11 +-
.../internal/admin/remote/StoreSysCfgResponse.java | 11 +-
.../internal/admin/remote/SubRegionRequest.java | 11 +-
.../internal/admin/remote/SubRegionResponse.java | 11 +-
.../internal/admin/remote/TailLogRequest.java | 11 +-
.../internal/admin/remote/TailLogResponse.java | 11 +-
.../admin/remote/UpdateAlertDefinitionMessage.java | 11 +-
.../internal/admin/remote/VersionInfoRequest.java | 11 +-
.../internal/admin/remote/VersionInfoResponse.java | 11 +-
.../statalerts/GaugeThresholdDecoratorImpl.java | 11 +-
.../statalerts/NumberThresholdDecoratorImpl.java | 11 +-
.../geode/internal/cache/AbstractRegion.java | 9 +-
.../internal/cache/AbstractUpdateOperation.java | 13 +-
.../cache/AddCacheServerProfileMessage.java | 11 +-
.../apache/geode/internal/cache/BucketAdvisor.java | 21 +-
.../apache/geode/internal/cache/BucketRegion.java | 2 +-
.../internal/cache/CacheDistributionAdvisor.java | 13 +-
.../geode/internal/cache/CacheServerAdvisor.java | 11 +-
.../cache/CachedDeserializableFactory.java | 2 +-
.../internal/cache/ClientRegionEventImpl.java | 11 +-
.../geode/internal/cache/CloseCacheMessage.java | 11 +-
.../geode/internal/cache/ControllerAdvisor.java | 11 +-
.../internal/cache/CreateRegionProcessor.java | 21 +-
.../geode/internal/cache/DestroyOperation.java | 21 +-
.../cache/DestroyPartitionedRegionMessage.java | 23 +-
.../internal/cache/DestroyRegionOperation.java | 21 +-
.../apache/geode/internal/cache/DiskInitFile.java | 2 +-
.../apache/geode/internal/cache/DiskStoreImpl.java | 2 +-
.../geode/internal/cache/DistTXCommitMessage.java | 23 +-
.../internal/cache/DistTXPrecommitMessage.java | 33 +-
.../internal/cache/DistTXRollbackMessage.java | 23 +-
.../internal/cache/DistributedCacheOperation.java | 7 +-
.../internal/cache/DistributedClearOperation.java | 21 +-
.../internal/cache/DistributedPutAllOperation.java | 33 +-
.../DistributedRegionFunctionStreamingMessage.java | 11 +-
.../cache/DistributedRemoveAllOperation.java | 24 +-
.../cache/DistributedTombstoneOperation.java | 15 +-
.../geode/internal/cache/EntryEventImpl.java | 13 +-
.../org/apache/geode/internal/cache/EventID.java | 22 +-
.../geode/internal/cache/EventStateHelper.java | 15 +-
.../internal/cache/EvictionAttributesImpl.java | 3 +-
...xpireDisconnectedClientTransactionsMessage.java | 9 +-
.../apache/geode/internal/cache/FilterProfile.java | 23 +-
.../geode/internal/cache/FilterRoutingInfo.java | 10 +-
.../internal/cache/FindDurableQueueProcessor.java | 21 +-
.../geode/internal/cache/FindRemoteTXMessage.java | 21 +-
.../internal/cache/FindVersionTagOperation.java | 21 +-
.../cache/FunctionStreamingReplyMessage.java | 11 +-
.../geode/internal/cache/GemFireCacheImpl.java | 4 +-
.../apache/geode/internal/cache/GridAdvisor.java | 11 +-
.../org/apache/geode/internal/cache/HARegion.java | 11 +-
.../internal/cache/InitialImageFlowControl.java | 13 +-
.../internal/cache/InitialImageOperation.java | 113 +-
.../geode/internal/cache/InvalidateOperation.java | 21 +-
.../cache/InvalidatePartitionedRegionMessage.java | 31 +-
.../internal/cache/InvalidateRegionOperation.java | 11 +-
.../internal/cache/JtaAfterCompletionMessage.java | 11 +-
.../cache/LatestLastAccessTimeMessage.java | 11 +-
.../cache/LatestLastAccessTimeOperation.java | 2 +-
.../apache/geode/internal/cache/LocalRegion.java | 2 +-
.../cache/MemberFunctionStreamingMessage.java | 13 +-
.../java/org/apache/geode/internal/cache/Node.java | 11 +-
.../geode/internal/cache/NonLocalRegionEntry.java | 4 +-
.../org/apache/geode/internal/cache/Oplog.java | 13 +-
.../geode/internal/cache/PRQueryProcessor.java | 11 +-
.../internal/cache/PartitionRegionConfig.java | 9 +-
.../geode/internal/cache/PartitionedRegion.java | 2 +-
.../cache/PartitionedRegionQueryEvaluator.java | 2 +-
.../cache/PreferBytesCachedDeserializable.java | 13 +-
.../geode/internal/cache/ProxyRegionMap.java | 4 +-
.../apache/geode/internal/cache/RegionEntry.java | 4 +-
.../geode/internal/cache/RegionEventImpl.java | 11 +-
.../internal/cache/ReleaseClearLockMessage.java | 11 +-
.../cache/RemoveCacheServerProfileMessage.java | 11 +-
.../apache/geode/internal/cache/RoleEventImpl.java | 14 +-
.../cache/SearchLoadAndWriteProcessor.java | 81 +-
.../geode/internal/cache/ServerPingMessage.java | 13 +-
.../geode/internal/cache/StateFlushOperation.java | 31 +-
.../cache/StoreAllCachedDeserializable.java | 13 +-
.../geode/internal/cache/TXCommitMessage.java | 37 +-
.../apache/geode/internal/cache/TXEntryState.java | 11 +-
.../java/org/apache/geode/internal/cache/TXId.java | 9 +-
.../org/apache/geode/internal/cache/TXMessage.java | 11 +-
.../internal/cache/TXRegionLockRequestImpl.java | 2 +-
.../internal/cache/TXRemoteCommitMessage.java | 13 +-
.../org/apache/geode/internal/cache/Token.java | 43 +-
.../internal/cache/UpdateAttributesProcessor.java | 31 +-
.../cache/UpdateEntryVersionOperation.java | 11 +-
.../geode/internal/cache/UpdateOperation.java | 21 +-
.../internal/cache/VMCachedDeserializable.java | 13 +-
.../geode/internal/cache/ValidatingDiskRegion.java | 4 +-
.../internal/cache/ValueComparisonHelper.java | 2 +-
.../internal/cache/backup/BackupResponse.java | 11 +-
.../cache/backup/PrepareBackupRequest.java | 11 +-
.../CompressedCachedDeserializable.java | 15 +-
.../SnappyCompressedCachedDeserializable.java | 2 +-
.../internal/cache/control/ResourceAdvisor.java | 21 +-
.../entries/AbstractOplogDiskRegionEntry.java | 4 +-
.../cache/entries/AbstractRegionEntry.java | 4 +-
.../geode/internal/cache/entries/DiskEntry.java | 4 +-
.../PartitionedRegionFunctionResultSender.java | 2 +-
.../geode/internal/cache/ha/HARegionQueue.java | 19 +-
.../internal/cache/ha/QueueRemovalMessage.java | 11 +-
.../geode/internal/cache/ha/ThreadIdentifier.java | 2 +-
.../geode/internal/cache/locks/TXLockBatch.java | 11 +-
.../geode/internal/cache/locks/TXLockIdImpl.java | 21 +-
.../locks/TXLockUpdateParticipantsMessage.java | 21 +-
.../cache/locks/TXOriginatorRecoveryProcessor.java | 21 +-
.../AllBucketProfilesUpdateMessage.java | 11 +-
.../partitioned/BecomePrimaryBucketMessage.java | 25 +-
.../cache/partitioned/BucketBackupMessage.java | 11 +-
.../cache/partitioned/BucketCountLoadProbe.java | 11 +-
.../partitioned/BucketProfileUpdateMessage.java | 11 +-
.../cache/partitioned/BucketSizeMessage.java | 21 +-
.../cache/partitioned/ContainsKeyValueMessage.java | 21 +-
.../cache/partitioned/CreateBucketMessage.java | 25 +-
.../partitioned/DeposePrimaryBucketMessage.java | 25 +-
.../internal/cache/partitioned/DestroyMessage.java | 21 +-
.../DestroyRegionOnDataStoreMessage.java | 11 +-
.../internal/cache/partitioned/DumpB2NRegion.java | 21 +-
.../cache/partitioned/DumpBucketsMessage.java | 11 +-
.../partitioned/EndBucketCreationMessage.java | 13 +-
.../cache/partitioned/FetchBulkEntriesMessage.java | 23 +-
.../cache/partitioned/FetchEntriesMessage.java | 23 +-
.../cache/partitioned/FetchEntryMessage.java | 25 +-
.../cache/partitioned/FetchKeysMessage.java | 23 +-
.../partitioned/FetchPartitionDetailsMessage.java | 25 +-
.../internal/cache/partitioned/FlushMessage.java | 11 +-
.../internal/cache/partitioned/GetMessage.java | 23 +-
.../cache/partitioned/IdentityRequestMessage.java | 21 +-
.../cache/partitioned/IdentityUpdateMessage.java | 11 +-
.../cache/partitioned/IndexCreationMsg.java | 23 +-
.../cache/partitioned/InterestEventMessage.java | 21 +-
.../cache/partitioned/InvalidateMessage.java | 11 +-
.../internal/cache/partitioned/LoadProbe.java | 3 +-
.../partitioned/ManageBackupBucketMessage.java | 25 +-
.../cache/partitioned/ManageBucketMessage.java | 25 +-
.../cache/partitioned/MoveBucketMessage.java | 25 +-
.../cache/partitioned/PRSanityCheckMessage.java | 11 +-
.../cache/partitioned/PRTombstoneMessage.java | 15 +-
.../partitioned/PRUpdateEntryVersionMessage.java | 13 +-
.../cache/partitioned/PartitionMessage.java | 18 +-
.../PartitionedRegionFunctionStreamingMessage.java | 13 +-
.../cache/partitioned/PrimaryRequestMessage.java | 21 +-
.../cache/partitioned/PutAllPRMessage.java | 25 +-
.../internal/cache/partitioned/PutMessage.java | 21 +-
.../internal/cache/partitioned/QueryMessage.java | 13 +-
.../internal/cache/partitioned/RegionAdvisor.java | 11 +-
.../cache/partitioned/RemoveAllPRMessage.java | 25 +-
.../cache/partitioned/RemoveBucketMessage.java | 25 +-
.../cache/partitioned/RemoveIndexesMessage.java | 21 +-
.../internal/cache/partitioned/SizeMessage.java | 21 +-
.../cache/partitioned/SizedBasedLoadProbe.java | 11 +-
.../internal/cache/persistence/BytesAndBits.java | 2 +-
.../cache/persistence/DiskInitFileInterpreter.java | 2 +-
.../cache/persistence/DiskInitFileParser.java | 8 +-
.../internal/cache/persistence/DiskStoreID.java | 9 +-
.../cache/persistence/MembershipFlushRequest.java | 11 +-
.../cache/persistence/MembershipViewRequest.java | 21 +-
.../persistence/PersistentStateQueryMessage.java | 21 +-
.../PrepareNewPersistentMemberMessage.java | 11 +-
.../persistence/RemovePersistentMemberMessage.java | 11 +-
.../internal/cache/snapshot/FlowController.java | 21 +-
.../cache/snapshot/RegionSnapshotServiceImpl.java | 2 +-
.../internal/cache/snapshot/SnapshotPacket.java | 17 +-
.../geode/internal/cache/tier/ConnectionProxy.java | 2 +-
.../internal/cache/tier/ServerSideHandshake.java | 2 +-
.../internal/cache/tier/sockets/AcceptorImpl.java | 2 +-
.../geode/internal/cache/tier/sockets/AuthIds.java | 2 +-
.../internal/cache/tier/sockets/BaseCommand.java | 2 +-
.../cache/tier/sockets/BaseCommandQuery.java | 2 +-
.../cache/tier/sockets/CacheClientNotifier.java | 2 +-
.../cache/tier/sockets/CacheClientProxy.java | 4 +-
.../cache/tier/sockets/CacheClientUpdater.java | 4 +-
.../cache/tier/sockets/CacheServerHelper.java | 2 +-
.../cache/tier/sockets/ChunkedMessage.java | 2 +-
.../tier/sockets/ClientDataSerializerMessage.java | 13 +-
.../tier/sockets/ClientDenylistProcessor.java | 11 +-
.../cache/tier/sockets/ClientHealthMonitor.java | 2 +-
.../tier/sockets/ClientInstantiatorMessage.java | 13 +-
.../tier/sockets/ClientInterestMessageImpl.java | 15 +-
.../tier/sockets/ClientMarkerMessageImpl.java | 9 +-
.../internal/cache/tier/sockets/ClientMessage.java | 2 +-
.../cache/tier/sockets/ClientPingMessageImpl.java | 9 +-
.../tier/sockets/ClientProxyMembershipID.java | 14 +-
.../tier/sockets/ClientRegistrationMetadata.java | 20 +-
.../cache/tier/sockets/ClientTombstoneMessage.java | 9 +-
.../tier/sockets/ClientUpdateMessageImpl.java | 13 +-
.../cache/tier/sockets/CommandInitializer.java | 2 +-
.../internal/cache/tier/sockets/EncryptorImpl.java | 4 +-
.../cache/tier/sockets/HAEventWrapper.java | 13 +-
.../internal/cache/tier/sockets/Handshake.java | 2 +-
.../tier/sockets/InterestResultPolicyImpl.java | 11 +-
.../geode/internal/cache/tier/sockets/Message.java | 2 +-
.../cache/tier/sockets/ObjectPartList.java | 11 +-
.../cache/tier/sockets/ObjectPartList651.java | 9 +-
.../tier/sockets/OldClientSupportService.java | 2 +-
.../geode/internal/cache/tier/sockets/Part.java | 4 +-
.../sockets/RemoveClientFromDenylistMessage.java | 11 +-
.../tier/sockets/SerializedObjectPartList.java | 9 +-
.../cache/tier/sockets/ServerConnection.java | 4 +-
.../sockets/ServerInterestRegistrationMessage.java | 11 +-
.../tier/sockets/ServerSideHandshakeFactory.java | 10 +-
.../tier/sockets/ServerSideHandshakeImpl.java | 19 +-
.../cache/tier/sockets/SocketMessageWriter.java | 2 +-
.../cache/tier/sockets/VersionedObjectList.java | 39 +-
.../tier/sockets/command/CloseConnection.java | 2 +-
.../tier/sockets/command/ExecuteFunction66.java | 2 +-
.../sockets/command/ExecuteRegionFunction66.java | 2 +-
.../command/ExecuteRegionFunctionSingleHop.java | 2 +-
.../sockets/command/GatewayReceiverCommand.java | 2 +-
.../cache/tier/sockets/command/GetAll70.java | 2 +-
.../internal/cache/tier/sockets/command/Put65.java | 2 +-
.../cache/tier/sockets/command/PutAll70.java | 2 +-
.../tier/sockets/command/RegisterInterest61.java | 2 +-
.../sockets/command/RegisterInterestList66.java | 2 +-
.../geode/internal/cache/tx/DistTxEntryEvent.java | 11 +-
.../internal/cache/tx/RemoteClearMessage.java | 21 +-
.../cache/tx/RemoteContainsKeyValueMessage.java | 21 +-
.../internal/cache/tx/RemoteDestroyMessage.java | 21 +-
.../internal/cache/tx/RemoteFetchEntryMessage.java | 21 +-
.../internal/cache/tx/RemoteFetchKeysMessage.java | 21 +-
.../cache/tx/RemoteFetchVersionMessage.java | 21 +-
.../geode/internal/cache/tx/RemoteGetMessage.java | 23 +-
.../internal/cache/tx/RemoteInvalidateMessage.java | 11 +-
.../internal/cache/tx/RemoteOperationMessage.java | 16 +-
.../internal/cache/tx/RemotePutAllMessage.java | 25 +-
.../geode/internal/cache/tx/RemotePutMessage.java | 21 +-
.../internal/cache/tx/RemoteRemoveAllMessage.java | 25 +-
.../geode/internal/cache/tx/RemoteSizeMessage.java | 25 +-
.../internal/cache/versions/DiskVersionTag.java | 6 +-
.../internal/cache/versions/RVVException.java | 2 +-
.../cache/versions/RegionVersionVector.java | 16 +-
.../internal/cache/versions/VMVersionTag.java | 2 +-
.../internal/cache/versions/VersionSource.java | 2 +-
.../geode/internal/cache/versions/VersionTag.java | 9 +-
.../internal/cache/wan/GatewaySenderAdvisor.java | 23 +-
.../wan/GatewaySenderEventCallbackArgument.java | 11 +-
.../internal/cache/wan/GatewaySenderEventImpl.java | 27 +-
...aySenderQueueEntrySynchronizationOperation.java | 21 +-
.../wan/parallel/ParallelQueueRemovalMessage.java | 11 +-
.../cache/wan/serial/BatchDestroyOperation.java | 11 +-
.../org/apache/geode/internal/logging/Banner.java | 2 +-
.../internal/offheap/AbstractStoredObject.java | 4 +-
.../apache/geode/internal/offheap/DataType.java | 22 +-
.../internal/offheap/OffHeapRegionEntryHelper.java | 2 +-
.../internal/offheap/OffHeapStoredObject.java | 2 +-
.../geode/internal/sequencelog/io/GraphReader.java | 2 +-
.../org/apache/geode/internal/tcp/Connection.java | 5 +-
.../apache/geode/internal/tcp/MsgDestreamer.java | 7 +-
.../apache/geode/internal/tcp/MsgOutputStream.java | 4 +-
.../org/apache/geode/internal/tcp/MsgReader.java | 2 +-
.../org/apache/geode/internal/tcp/MsgStreamer.java | 5 +-
.../tcp/VersionedByteBufferInputStream.java | 4 +-
.../geode/internal/tcp/VersionedMsgStreamer.java | 4 +-
.../org/apache/geode/internal/util/BlobHelper.java | 6 +-
.../apache/geode/management/cli/GfshCommand.java | 2 +-
.../management/internal/FederationComponent.java | 14 +-
.../management/internal/JmxManagerAdvisor.java | 21 +-
.../internal/JmxManagerLocatorRequest.java | 11 +-
.../internal/JmxManagerLocatorResponse.java | 11 +-
.../management/internal/ManagerStartupMessage.java | 11 +-
.../internal/beans/CacheServerBridge.java | 2 +-
.../geode/management/internal/cli/CliUtil.java | 2 +-
.../internal/cli/commands/ConnectCommand.java | 6 -
.../cli/commands/CreateGatewaySenderCommand.java | 2 +-
.../internal/cli/functions/CliFunctionResult.java | 27 +-
.../internal/configuration/domain/XmlEntity.java | 2 +-
.../messages/ConfigurationResponse.java | 11 +-
.../internal/messages/CompactRequest.java | 11 +-
.../internal/messages/CompactResponse.java | 11 +-
.../main/java/org/apache/geode/pdx/FieldType.java | 26 +-
.../geode/pdx/internal/CheckTypeRegistryState.java | 11 +-
.../java/org/apache/geode/pdx/internal/EnumId.java | 11 +-
.../org/apache/geode/pdx/internal/EnumInfo.java | 11 +-
.../org/apache/geode/pdx/internal/PdxField.java | 2 +-
.../apache/geode/pdx/internal/PdxInstanceEnum.java | 4 +-
.../apache/geode/pdx/internal/PdxInstanceImpl.java | 2 +-
.../apache/geode/pdx/internal/PdxOutputStream.java | 2 +-
.../apache/geode/pdx/internal/PdxReaderImpl.java | 2 +-
.../org/apache/geode/pdx/internal/PdxString.java | 2 +-
.../org/apache/geode/pdx/internal/PdxType.java | 2 +-
.../apache/geode/pdx/internal/PdxWriterImpl.java | 2 +-
.../apache/geode/pdx/internal/json/PdxToJSON.java | 5 +-
.../sanctioned-geode-core-serializables.txt | 11 +-
.../java/org/apache/geode/DataSerializerTest.java | 2 +-
.../locator/LocatorStatusResponseJUnitTest.java | 4 +-
.../cache/execute/FunctionAdapterJUnitTest.java | 7 +-
.../cache/query/internal/ResultsBagJUnitTest.java | 2 +-
.../ResultsBagLimitBehaviourJUnitTest.java | 4 +-
.../MembershipDependenciesJUnitTest.java | 31 +-
.../membership/gms/GMSMemberJUnitTest.java | 16 +-
.../geode/internal/DataSerializableJUnitTest.java | 6 +-
.../internal/HeapDataOutputStreamJUnitTest.java | 4 +-
.../geode/internal/HeapDataOutputStreamTest.java | 7 +-
.../internal/InternalDataSerializerJUnitTest.java | 1 +
...lDataSerializerSerializationAcceptlistTest.java | 1 +
.../internal/ThreadLocalByteArrayCacheTest.java | 2 +
.../alerting/AlertListenerMessageFactoryTest.java | 2 +-
.../internal/cache/AbstractRegionMapTest.java | 2 +-
...eDisconnectedClientTransactionsMessageTest.java | 2 +-
.../geode/internal/cache/FilterInfoTest.java | 4 +-
.../cache/ha/EventIdOptimizationJUnitTest.java | 13 +-
.../cache/ha/ThreadIdentifierJUnitTest.java | 2 +-
.../partitioned/FetchEntriesMessageJUnitTest.java | 2 +-
.../partitioned/PutPutReplyMessageJUnitTest.java | 4 +-
.../partitioned/RemotePutMessageJUnitTest.java | 2 +-
.../tier/sockets/CommandInitializerJUnitTest.java} | 21 +-
.../cache/tier/sockets/MessageJUnitTest.java | 2 +-
.../cache/tier/sockets/ServerConnectionTest.java | 2 +-
.../tier/sockets/command/ContainsKey66Test.java | 2 +-
.../tier/sockets/command/CreateRegionTest.java | 2 +-
.../cache/tier/sockets/command/Destroy65Test.java | 2 +-
.../tier/sockets/command/DestroyRegionTest.java | 2 +-
.../cache/tier/sockets/command/DestroyTest.java | 2 +-
.../cache/tier/sockets/command/Get70Test.java | 2 +-
.../cache/tier/sockets/command/InvalidateTest.java | 2 +-
.../cache/tier/sockets/command/Put61Test.java | 2 +-
.../cache/tier/sockets/command/Put65Test.java | 2 +-
.../cache/tier/sockets/command/PutTest.java | 2 +-
.../sockets/command/RegisterInterest61Test.java | 2 +-
.../command/RegisterInterestList61Test.java | 2 +-
.../command/RegisterInterestList66Test.java | 2 +-
.../sockets/command/RegisterInterestListTest.java | 2 +-
.../cache/tier/sockets/command/RequestTest.java | 2 +-
.../sockets/command/UnregisterInterestTest.java | 2 +-
.../internal/cache/tx/RemotePutAllMessageTest.java | 4 +-
.../cache/tx/RemotePutReplyMessageJUnitTest.java | 4 +-
.../cache/tx/RemoteRemoveAllMessageTest.java | 4 +-
.../cache/versions/RegionVersionVectorTest.java | 2 +-
.../offheap/AbstractStoredObjectTestBase.java | 2 +-
.../geode/internal/offheap/DataTypeJUnitTest.java | 45 +-
.../internal/offheap/MemoryBlockNodeJUnitTest.java | 2 +-
.../offheap/OffHeapRegionEntryHelperJUnitTest.java | 2 +-
.../offheap/OffHeapStoredObjectJUnitTest.java | 4 +-
.../offheap/TinyStoredObjectJUnitTest.java | 2 +-
.../geode/internal/size/ObjectTraverserPerf.java | 2 +-
.../apache/geode/internal/util/BlobHelperTest.java | 4 +-
.../commands/CreateGatewaySenderCommandTest.java | 2 +-
.../org/apache/geode/pdx/internal/EnumIdTest.java | 6 +-
.../apache/geode/pdx/internal/EnumInfoTest.java | 6 +-
.../test/version/VersionManagerJUnitTest.java | 0
geode-core/src/test/resources/expected-pom.xml | 5 +
.../internal/cache/TxCommitMessageBCTestBase.java | 5 +-
.../RollingUpgrade2DUnitTestBase.java | 29 +-
.../rollingupgrade/RollingUpgradeDUnitTest.java | 4 +-
.../RollingUpgradeNonHAFunction.java | 7 +-
.../rollingupgrade/RollingUpgradeTracePRQuery.java | 7 +-
.../RollingUpgradeVerifyXmlEntity.java | 7 +-
.../geode/security/FilterPostAuthorization.java | 2 +-
.../geode/security/FilterPreAuthorization.java | 2 +-
.../query/cq/internal/CqServiceFactoryImpl.java | 2 +-
.../cache/query/cq/internal/ops/CreateCQOp.java | 2 +-
.../query/cq/internal/ops/GetDurableCQsOp.java | 2 +-
.../tier/sockets/ClientServerMiscBCDUnitTest.java | 3 +-
.../geode/cache30/MultiVMRegionTestCase.java | 2 +-
.../security/ClientAuthorizationTestCase.java | 3 +-
.../apache/geode/security/SecurityTestUtil.java | 4 +-
.../apache/geode/security/SecurityTestUtils.java | 6 +-
.../apache/geode/test/dunit/internal/ChildVM.java | 5 +-
.../dunit/internal/JUnit4DistributedTestCase.java | 6 +-
.../AnalyzeSerializablesJUnitTestBase.java | 2 +-
.../geode/codeAnalysis/CompiledClassUtils.java | 2 +-
.../geode/codeAnalysis/decode/CompiledClass.java | 2 +-
.../internal/cache/eviction/LRUTestEntry.java | 4 +-
.../org/apache/geode/pdx/NonDelegatingLoader.java | 2 +-
.../apache/geode/test/version/VersionManager.java | 45 +
.../codeAnalysis/sanctionedDataSerializables.txt | 22 +-
.../lucene/internal/DestroyLuceneIndexMessage.java | 11 +-
.../internal/LuceneIndexCreationProfile.java | 2 +-
.../lucene/internal/LuceneResultStructImpl.java | 11 +-
.../cache/lucene/internal/LuceneServiceImpl.java | 46 +-
.../cache/lucene/internal/StringQueryProvider.java | 11 +-
.../internal/cli/LuceneDestroyIndexCommand.java | 2 +-
.../lucene/internal/distributed/EntryScore.java | 11 +-
.../distributed/LuceneFunctionContext.java | 11 +-
.../internal/distributed/LuceneQueryFunction.java | 2 +-
.../lucene/internal/distributed/TopEntries.java | 11 +-
.../internal/distributed/TopEntriesCollector.java | 11 +-
.../distributed/TopEntriesCollectorManager.java | 11 +-
.../WaitUntilFlushedFunctionContext.java | 11 +-
.../cache/lucene/internal/filesystem/ChunkKey.java | 11 +-
.../cache/lucene/internal/filesystem/File.java | 11 +-
.../cache/lucene/internal/results/PageResults.java | 11 +-
.../LuceneIndexCreationProfileJUnitTest.java | 2 +-
.../internal/cli/LuceneIndexCommandsJUnitTest.java | 2 +-
.../LuceneQueryFunctionContextJUnitTest.java | 2 +-
.../internal/results/PageEntryJUnitTest.java | 4 +-
.../internal/results/PageResultsJUnitTest.java | 8 +-
.../LuceneSearchWithRollingUpgradeDUnit.java | 2 +-
.../apache/geode/OldClientSupportDUnitTest.java | 8 +-
.../gemstone/gemfire/OldClientSupportProvider.java | 4 +-
geode-serialization/build.gradle | 76 +
.../AbstractSerializationContext.java | 49 +
.../serialization/BufferDataOutputStream.java | 718 +++------
.../serialization}/ByteArrayDataInput.java | 11 +-
.../geode/internal/serialization}/DSCODE.java | 9 +-
.../serialization}/DSFIDNotFoundException.java | 4 +-
.../internal/serialization/DSFIDSerializer.java | 37 +-
.../serialization/DSFIDSerializerImpl.java | 372 +++++
.../serialization}/DataSerializableFixedID.java | 52 +-
.../serialization/DeserializationContextImpl.java | 21 +-
.../internal/serialization}/DscodeHelper.java | 3 +-
.../serialization/SerializationContext.java | 19 +-
.../serialization/SerializationContextImpl.java | 22 +-
.../serialization}/SerializationVersions.java | 2 +-
.../internal/serialization/SerializerPlugin.java | 28 +-
.../serialization/StaticSerialization.java | 377 +++++
.../serialization}/ThreadLocalByteArrayCache.java | 2 +-
.../UnsupportedSerializationVersionException.java | 26 +-
.../geode/internal/serialization}/Version.java | 25 +-
.../serialization}/VersionedDataInputStream.java | 3 +-
.../serialization}/VersionedDataOutputStream.java | 5 +-
.../serialization}/VersionedDataStream.java | 14 +-
.../BufferDataOutputStreamJUnitTest.java | 49 +-
.../serialization}/ByteArrayDataInputTest.java | 10 +-
.../geode/internal/serialization}/DSCODETest.java | 3 +-
.../SerializationDependenciesJUnitTest.java | 45 +
.../internal/serialization}/VersionJUnitTest.java | 26 +-
.../src/test/resources/expected-pom.xml | 34 +-
geode-unsafe/src/test/resources/expected-pom.xml | 4 +-
.../codeAnalysis/sanctionedDataSerializables.txt | 4 +-
.../internal/locator/wan/LocatorJoinMessage.java | 13 +-
.../locator/wan/RemoteLocatorJoinRequest.java | 11 +-
.../locator/wan/RemoteLocatorJoinResponse.java | 11 +-
.../locator/wan/RemoteLocatorPingRequest.java | 11 +-
.../locator/wan/RemoteLocatorPingResponse.java | 11 +-
.../internal/locator/wan/RemoteLocatorRequest.java | 11 +-
.../locator/wan/RemoteLocatorResponse.java | 11 +-
.../internal/locator/wan/WANFactoryImpl.java | 25 +-
.../RemoteParallelGatewaySenderEventProcessor.java | 2 +-
.../geode/rest/internal/web/util/JSONUtils.java | 13 +-
settings.gradle | 1 +
684 files changed, 7237 insertions(+), 6077 deletions(-)
diff --git a/boms/geode-all-bom/src/test/resources/expected-pom.xml b/boms/geode-all-bom/src/test/resources/expected-pom.xml
index 39d6189..569cf27 100644
--- a/boms/geode-all-bom/src/test/resources/expected-pom.xml
+++ b/boms/geode-all-bom/src/test/resources/expected-pom.xml
@@ -873,8 +873,14 @@
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
+ <artifactId>geode-serialization</artifactId>
+ <version>1.11.0-SNAPSHOT</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geode</groupId>
<artifactId>geode-unsafe</artifactId>
- <version>1.10.0-SNAPSHOT</version>
+ <version>1.11.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
diff --git a/geode-assembly/build.gradle b/geode-assembly/build.gradle
index 22fc171..ba1c5e8 100755
--- a/geode-assembly/build.gradle
+++ b/geode-assembly/build.gradle
@@ -29,6 +29,7 @@ import java.nio.file.Paths
def dependentProjectNames = [
':geode-common',
':geode-connectors',
+ ':geode-serialization',
':geode-core',
':geode-cq',
':geode-lucene',
@@ -167,6 +168,7 @@ dependencies {
geodeArchives project(':geode-protobuf-messages')
geodeArchives project(':geode-rebalancer')
geodeArchives project(':geode-redis')
+ geodeArchives project(':geode-serialization')
geodeArchives project(':geode-wan')
geodeArchives project(':geode-web')
geodeArchives project(':geode-web-api')
diff --git a/geode-core/build.gradle b/geode-core/build.gradle
index 7a63f42..192c036 100755
--- a/geode-core/build.gradle
+++ b/geode-core/build.gradle
@@ -332,6 +332,8 @@ dependencies {
//probably does not belong in this project
api(project(':geode-common'))
api(project(':geode-unsafe'))
+
+ api(project(':geode-serialization'))
//geode-management currently has pieces of the public API
//copied into it, so it is an API dependency
@@ -362,6 +364,7 @@ dependencies {
testRuntime('commons-io:commons-io')
testRuntime('commons-validator:commons-validator')
testRuntime('com.pholser:junit-quickcheck-generators')
+ testRuntime(project(':geode-old-versions'))
integrationTestCompile(project(':geode-junit')) {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/ClusterCommunicationsDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/ClusterCommunicationsDUnitTest.java
index 046d656..461fcf4 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/ClusterCommunicationsDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/ClusterCommunicationsDUnitTest.java
@@ -29,7 +29,7 @@ import static org.apache.geode.distributed.ConfigurationProperties.SSL_REQUIRE_A
import static org.apache.geode.distributed.ConfigurationProperties.SSL_TRUSTSTORE;
import static org.apache.geode.distributed.ConfigurationProperties.SSL_TRUSTSTORE_PASSWORD;
import static org.apache.geode.distributed.ConfigurationProperties.USE_CLUSTER_CONFIGURATION;
-import static org.apache.geode.internal.DataSerializableFixedID.SERIAL_ACKED_MESSAGE;
+import static org.apache.geode.internal.serialization.DataSerializableFixedID.SERIAL_ACKED_MESSAGE;
import static org.apache.geode.test.awaitility.GeodeAwaitility.await;
import static org.apache.geode.test.awaitility.GeodeAwaitility.getTimeout;
import static org.apache.geode.test.dunit.IgnoredException.addIgnoredException;
@@ -77,8 +77,9 @@ import org.apache.geode.distributed.internal.ReplyMessage;
import org.apache.geode.distributed.internal.SerialAckedMessage;
import org.apache.geode.distributed.internal.membership.gms.membership.GMSJoinLeave;
import org.apache.geode.internal.AvailablePortHelper;
-import org.apache.geode.internal.DSFIDFactory;
+import org.apache.geode.internal.InternalDataSerializer;
import org.apache.geode.internal.cache.DirectReplyMessage;
+import org.apache.geode.internal.serialization.SerializationContext;
import org.apache.geode.test.dunit.DistributedTestUtils;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.VM;
@@ -172,8 +173,9 @@ public class ClusterCommunicationsDUnitTest implements Serializable {
@Test
public void receiveBigResponse() {
- invokeInEveryVM(() -> DSFIDFactory.registerDSFID(SERIAL_ACKED_MESSAGE,
- SerialAckedMessageWithBigReply.class));
+ invokeInEveryVM(
+ () -> InternalDataSerializer.getDSFIDSerializer().registerDSFID(SERIAL_ACKED_MESSAGE,
+ SerialAckedMessageWithBigReply.class));
try {
int locatorPort = createLocator(getVM(0));
for (int i = 1; i <= NUM_SERVERS; i++) {
@@ -190,7 +192,8 @@ public class ClusterCommunicationsDUnitTest implements Serializable {
});
} finally {
invokeInEveryVM(
- () -> DSFIDFactory.registerDSFID(SERIAL_ACKED_MESSAGE, SerialAckedMessage.class));
+ () -> InternalDataSerializer.getDSFIDSerializer().registerDSFID(SERIAL_ACKED_MESSAGE,
+ SerialAckedMessage.class));
}
}
@@ -393,14 +396,16 @@ public class ClusterCommunicationsDUnitTest implements Serializable {
}
@Override
- public void toData(DataOutput out) throws IOException {
- super.toData(out);
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
+ super.toData(out, context);
out.writeInt(processorId);
}
@Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
- super.fromData(in);
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
+ super.fromData(in, context);
processorId = in.readInt();
}
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/DistributedMemberDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/DistributedMemberDUnitTest.java
index 1282433..b5c3303 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/DistributedMemberDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/distributed/DistributedMemberDUnitTest.java
@@ -53,7 +53,6 @@ import org.apache.geode.distributed.internal.membership.adapter.GMSMembershipMan
import org.apache.geode.distributed.internal.membership.gms.GMSMember;
import org.apache.geode.distributed.internal.membership.gms.MembershipManagerHelper;
import org.apache.geode.internal.HeapDataOutputStream;
-import org.apache.geode.internal.Version;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.SerializableRunnable;
@@ -270,7 +269,7 @@ public class DistributedMemberDUnitTest extends JUnit4DistributedTestCase {
assertEquals(gmsMember,
((GMSMemberAdapter) internalDistributedMember.getNetMember()).getGmsMember());
gmsMember.setName(null);
- HeapDataOutputStream outputStream = new HeapDataOutputStream(100, Version.CURRENT);
+ HeapDataOutputStream outputStream = new HeapDataOutputStream(100);
new InternalDistributedMember(new GMSMemberAdapter(gmsMember)).writeEssentialData(outputStream);
DataInputStream dataInputStream =
new DataInputStream(new ByteArrayInputStream(outputStream.toByteArray()));
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ClusterDistributionManagerForAdminDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ClusterDistributionManagerForAdminDUnitTest.java
index 789cab1..95fb020 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ClusterDistributionManagerForAdminDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ClusterDistributionManagerForAdminDUnitTest.java
@@ -236,17 +236,16 @@ public class ClusterDistributionManagerForAdminDUnitTest extends CacheTestCase
}
private void populateCache() {
- AttributesFactory attributesFactory = new AttributesFactory();
- attributesFactory.setScope(Scope.DISTRIBUTED_NO_ACK);
-
- RegionAttributes regionAttributes = attributesFactory.create();
-
for (int i = 0; i < Host.getHostCount(); i++) {
Host host = Host.getHost(i);
for (int j = 0; j < host.getVMCount(); j++) {
VM vm = host.getVM(j);
vm.invoke(() -> {
+ AttributesFactory attributesFactory = new AttributesFactory();
+ attributesFactory.setScope(Scope.DISTRIBUTED_NO_ACK);
+
+ RegionAttributes regionAttributes = attributesFactory.create();
createRegion("cdm-testSubRegion1", regionAttributes);
createRegion("cdm-testSubRegion2", regionAttributes);
createRegion("cdm-testSubRegion3", regionAttributes);
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/DateMessage.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/DateMessage.java
index 7296baa..7e02216 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/DateMessage.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/DateMessage.java
@@ -23,7 +23,8 @@ import java.util.Date;
import org.apache.geode.DataSerializer;
import org.apache.geode.internal.Assert;
-import org.apache.geode.internal.Version;
+import org.apache.geode.internal.serialization.SerializationContext;
+import org.apache.geode.internal.serialization.Version;
/**
* This message simply contains a date
@@ -78,15 +79,17 @@ public class DateMessage extends SerialDistributionMessage {
}
@Override
- public void toData(DataOutput out) throws IOException {
- super.toData(out);
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
+ super.toData(out, context);
DataSerializer.writeObject(this.date, out);
}
@Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
- super.fromData(in);
+ super.fromData(in, context);
this.date = (Date) DataSerializer.readObject(in);
}
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/tcpserver/TcpServerBackwardCompatDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/tcpserver/TcpServerBackwardCompatDUnitTest.java
index 3d07897..7314d27 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/tcpserver/TcpServerBackwardCompatDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/tcpserver/TcpServerBackwardCompatDUnitTest.java
@@ -33,12 +33,13 @@ import org.apache.geode.distributed.internal.membership.gms.GMSMember;
import org.apache.geode.distributed.internal.membership.gms.locator.FindCoordinatorRequest;
import org.apache.geode.distributed.internal.membership.gms.locator.FindCoordinatorResponse;
import org.apache.geode.internal.AvailablePortHelper;
-import org.apache.geode.internal.Version;
import org.apache.geode.internal.net.SocketCreator;
+import org.apache.geode.internal.serialization.Version;
import org.apache.geode.test.dunit.Invoke;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.MembershipTest;
+import org.apache.geode.test.version.VersionManager;
/**
* This tests the rolling upgrade for locators with different GOSSIPVERSION.
@@ -95,7 +96,7 @@ public class TcpServerBackwardCompatDUnitTest extends JUnit4DistributedTestCase
locator0.invoke("Starting first locator on port " + port0, () -> {
try {
TcpServer.getGossipVersionMapForTestOnly().put(TcpServer.TESTVERSION - 100,
- Version.CURRENT_ORDINAL);
+ VersionManager.getInstance().getCurrentVersionOrdinal());
Locator.startLocatorAndDS(port0, logFile0, props);
} catch (IOException e) {
@@ -107,7 +108,7 @@ public class TcpServerBackwardCompatDUnitTest extends JUnit4DistributedTestCase
member.invoke("Start a member", () -> {
disconnectFromDS();
TcpServer.getGossipVersionMapForTestOnly().put(TcpServer.TESTVERSION - 100,
- Version.CURRENT_ORDINAL);
+ VersionManager.getInstance().getCurrentVersionOrdinal());
InternalDistributedSystem.connect(props);
});
@@ -130,7 +131,7 @@ public class TcpServerBackwardCompatDUnitTest extends JUnit4DistributedTestCase
TcpServer.TESTVERSION -= 100;
TcpServer.OLDTESTVERSION -= 100;
TcpServer.getGossipVersionMapForTestOnly().put(TcpServer.TESTVERSION,
- Version.CURRENT_ORDINAL);
+ VersionManager.getInstance().getCurrentVersionOrdinal());
TcpServer.getGossipVersionMapForTestOnly().put(TcpServer.OLDTESTVERSION,
Version.GFE_57.ordinal());
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/BackwardCompatibilitySerializationDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/BackwardCompatibilitySerializationDUnitTest.java
index 4c82444..0fc62bc 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/BackwardCompatibilitySerializationDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/BackwardCompatibilitySerializationDUnitTest.java
@@ -32,8 +32,16 @@ import java.util.ArrayList;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.DataSerializable;
import org.apache.geode.cache.Cache;
import org.apache.geode.internal.cache.DistributedPutAllOperation.EntryVersionsList;
+import org.apache.geode.internal.serialization.DSFIDSerializerImpl;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.SerializationContext;
+import org.apache.geode.internal.serialization.SerializationVersions;
+import org.apache.geode.internal.serialization.Version;
+import org.apache.geode.internal.serialization.VersionedDataInputStream;
+import org.apache.geode.internal.serialization.VersionedDataOutputStream;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.SerializationTest;
@@ -66,14 +74,16 @@ public class BackwardCompatibilitySerializationDUnitTest extends JUnit4CacheTest
public final void postSetUp() {
baos = new ByteArrayOutputStream();
// register TestMessage using an existing dsfid
- DSFIDFactory.registerDSFID(DataSerializableFixedID.PUTALL_VERSIONS_LIST, TestMessage.class);
+ InternalDataSerializer.getDSFIDSerializer()
+ .registerDSFID(DataSerializableFixedID.PUTALL_VERSIONS_LIST, TestMessage.class);
}
@Override
public final void preTearDownCacheTestCase() {
resetFlags();
// reset the class mapped to the dsfid
- DSFIDFactory.registerDSFID(DataSerializableFixedID.PUTALL_VERSIONS_LIST,
+ InternalDataSerializer.getDSFIDSerializer().registerDSFID(
+ DataSerializableFixedID.PUTALL_VERSIONS_LIST,
EntryVersionsList.class);
this.baos = null;
this.bais = null;
@@ -116,7 +126,8 @@ public class BackwardCompatibilitySerializationDUnitTest extends JUnit4CacheTest
InternalDataSerializer.writeDSFID(msg, new DataOutputStream(baos));
this.bais = new ByteArrayInputStream(baos.toByteArray());
- DataInputStream dis = new VersionedDataInputStream(new DataInputStream(bais), Version.GFE_701);
+ DataInputStream dis =
+ new VersionedDataInputStream(new DataInputStream(bais), Version.GFE_701);
Object o = InternalDataSerializer.basicReadObject(dis);
assertTrue(o instanceof TestMessage);
assertTrue(fromDataCalled);
@@ -132,7 +143,8 @@ public class BackwardCompatibilitySerializationDUnitTest extends JUnit4CacheTest
InternalDataSerializer.writeDSFID(msg, new DataOutputStream(baos));
this.bais = new ByteArrayInputStream(baos.toByteArray());
- DataInputStream dis = new VersionedDataInputStream(new DataInputStream(bais), Version.GFE_56);
+ DataInputStream dis =
+ new VersionedDataInputStream(new DataInputStream(bais), Version.GFE_56);
Object o = InternalDataSerializer.basicReadObject(dis);
assertTrue(o instanceof TestMessage);
assertTrue(fromDataPre66Called);
@@ -164,7 +176,8 @@ public class BackwardCompatibilitySerializationDUnitTest extends JUnit4CacheTest
constdsfids.add(new Short(DataSerializableFixedID.TOKEN_TOMBSTONE).intValue());
for (int i = 0; i < 256; i++) {
- Constructor<?> cons = DSFIDFactory.getDsfidmap()[i];
+ Constructor<?> cons =
+ ((DSFIDSerializerImpl) InternalDataSerializer.getDSFIDSerializer()).getDsfidmap()[i];
if (!constdsfids.contains(i - Byte.MAX_VALUE - 1) && cons != null) {
Object ds = cons.newInstance((Object[]) null);
checkSupportForRollingUpgrade(ds);
@@ -173,7 +186,8 @@ public class BackwardCompatibilitySerializationDUnitTest extends JUnit4CacheTest
// some msgs require distributed system
Cache c = getCache();
- for (Object o : DSFIDFactory.getDsfidmap2().values()) {
+ for (Object o : ((DSFIDSerializerImpl) InternalDataSerializer.getDSFIDSerializer())
+ .getDsfidmap2().values()) {
Constructor<?> cons = (Constructor<?>) o;
if (cons != null) {
DataSerializableFixedID ds = (DataSerializableFixedID) cons.newInstance((Object[]) null);
@@ -190,14 +204,29 @@ public class BackwardCompatibilitySerializationDUnitTest extends JUnit4CacheTest
}
if (versions != null && versions.length > 0) {
for (int i = 0; i < versions.length; i++) {
- try {
- ds.getClass().getMethod("toDataPre_" + versions[i].getMethodSuffix(),
- new Class[] {DataOutput.class});
-
- ds.getClass().getMethod("fromDataPre_" + versions[i].getMethodSuffix(),
- new Class[] {DataInput.class});
- } catch (NoSuchMethodException e) {
- fail("toDataPreXXX or fromDataPreXXX for previous versions not found " + e.getMessage());
+ if (ds instanceof DataSerializableFixedID) {
+ try {
+ ds.getClass().getMethod("toDataPre_" + versions[i].getMethodSuffix(),
+ new Class[] {DataOutput.class, SerializationContext.class});
+
+ ds.getClass().getMethod("fromDataPre_" + versions[i].getMethodSuffix(),
+ new Class[] {DataInput.class, SerializationContext.class});
+ } catch (NoSuchMethodException e) {
+ fail(
+ "toDataPreXXX or fromDataPreXXX for previous versions not found " + e.getMessage());
+ }
+ }
+ if (ds instanceof DataSerializable) {
+ try {
+ ds.getClass().getMethod("toDataPre_" + versions[i].getMethodSuffix(),
+ new Class[] {DataOutput.class});
+
+ ds.getClass().getMethod("fromDataPre_" + versions[i].getMethodSuffix(),
+ new Class[] {DataInput.class});
+ } catch (NoSuchMethodException e) {
+ fail(
+ "toDataPreXXX or fromDataPreXXX for previous versions not found " + e.getMessage());
+ }
}
}
} else {
@@ -237,28 +266,34 @@ public class BackwardCompatibilitySerializationDUnitTest extends JUnit4CacheTest
}
@Override
- public void toData(DataOutput out) throws IOException {
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
toDataCalled = true;
}
- public void toDataPre_GFE_6_6_0_0(DataOutput out) throws IOException {
+ public void toDataPre_GFE_6_6_0_0(DataOutput out, SerializationContext context)
+ throws IOException {
toDataPre66Called = true;
}
- public void toDataPre_GFE_7_0_0_0(DataOutput out) throws IOException {
+ public void toDataPre_GFE_7_0_0_0(DataOutput out, SerializationContext context)
+ throws IOException {
toDataPre70called = true;
}
@Override
- public void fromData(DataInput in) throws IOException {
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException {
fromDataCalled = true;
}
- public void fromDataPre_GFE_6_6_0_0(DataInput out) throws IOException {
+ public void fromDataPre_GFE_6_6_0_0(DataInput out, SerializationContext context)
+ throws IOException {
fromDataPre66Called = true;
}
- public void fromDataPre_GFE_7_0_0_0(DataInput out) throws IOException {
+ public void fromDataPre_GFE_7_0_0_0(DataInput out, SerializationContext context)
+ throws IOException {
fromDataPre70Called = true;
}
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/GIIDeltaDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/GIIDeltaDUnitTest.java
index aec149e..93d9c7c 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/GIIDeltaDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/GIIDeltaDUnitTest.java
@@ -51,7 +51,6 @@ import org.apache.geode.distributed.internal.DistributionMessage;
import org.apache.geode.distributed.internal.DistributionMessageObserver;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.HeapDataOutputStream;
-import org.apache.geode.internal.Version;
import org.apache.geode.internal.cache.DestroyOperation.DestroyMessage;
import org.apache.geode.internal.cache.DistributedTombstoneOperation.TombstoneMessage;
import org.apache.geode.internal.cache.InitialImageOperation.GIITestHook;
@@ -62,6 +61,7 @@ import org.apache.geode.internal.cache.entries.DiskEntry;
import org.apache.geode.internal.cache.persistence.DiskStoreID;
import org.apache.geode.internal.cache.versions.RegionVersionVector;
import org.apache.geode.internal.cache.versions.VersionTag;
+import org.apache.geode.internal.serialization.Version;
import org.apache.geode.test.awaitility.GeodeAwaitility;
import org.apache.geode.test.dunit.Assert;
import org.apache.geode.test.dunit.AsyncInvocation;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/TransactionsWithDeltaDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/TransactionsWithDeltaDUnitTest.java
index dfb3c22..8ab7fad 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/TransactionsWithDeltaDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/TransactionsWithDeltaDUnitTest.java
@@ -249,19 +249,6 @@ public class TransactionsWithDeltaDUnitTest extends JUnit4CacheTestCase {
@Test
public void testTxWithCloning() {
- AttributesFactory af = new AttributesFactory();
- af.setDataPolicy(DataPolicy.REPLICATE);
- af.setScope(Scope.DISTRIBUTED_ACK);
- af.setCloningEnabled(true);
- basicTest(af.create());
- }
-
- @Test
- public void testExceptionThrown() {
- AttributesFactory af = new AttributesFactory();
- af.setDataPolicy(DataPolicy.REPLICATE);
- af.setScope(Scope.DISTRIBUTED_ACK);
- final RegionAttributes attr = af.create();
Host host = Host.getHost(0);
VM vm1 = host.getVM(0);
VM vm2 = host.getVM(1);
@@ -270,7 +257,11 @@ public class TransactionsWithDeltaDUnitTest extends JUnit4CacheTestCase {
SerializableCallable createRegion = new SerializableCallable() {
@Override
public Object call() throws Exception {
- getCache().createRegion(regionName, attr);
+ AttributesFactory af = new AttributesFactory();
+ af.setDataPolicy(DataPolicy.REPLICATE);
+ af.setScope(Scope.DISTRIBUTED_ACK);
+ af.setCloningEnabled(true);
+ getCache().createRegion(regionName, af.create());
return null;
}
};
@@ -288,18 +279,41 @@ public class TransactionsWithDeltaDUnitTest extends JUnit4CacheTestCase {
r.put(key, cust);
mgr.begin();
cust.setName("");
+ r.put(key, cust);
+ return null;
+ }
+ });
+
+ vm2.invoke(new SerializableCallable() {
+ @Override
+ public Object call() throws Exception {
+ Region<String, Customer> r = getCache().getRegion(regionName);
+ Customer c = r.get(key);
+ c.setName("cust1updated");
+ r.put(key, c);
+ return null;
+ }
+ });
+
+ vm1.invoke(new SerializableCallable() {
+ @Override
+ public Object call() throws Exception {
+ TXManagerImpl mgr = getGemfireCache().getTxManager();
+ Region r = getCache().getRegion(regionName);
+ assertNotNull(mgr.getTXState());
try {
- r.put(key, cust);
- fail("exception not thrown");
- } catch (UnsupportedOperationInTransactionException expected) {
+ mgr.commit();
+ fail("expected CommitConflict not thrown");
+ } catch (CommitConflictException e) {
+ // expected
}
- mgr.rollback();
return null;
}
});
}
- private void basicTest(final RegionAttributes regionAttr) {
+ @Test
+ public void testExceptionThrown() {
Host host = Host.getHost(0);
VM vm1 = host.getVM(0);
VM vm2 = host.getVM(1);
@@ -308,7 +322,11 @@ public class TransactionsWithDeltaDUnitTest extends JUnit4CacheTestCase {
SerializableCallable createRegion = new SerializableCallable() {
@Override
public Object call() throws Exception {
- getCache().createRegion(regionName, regionAttr);
+ AttributesFactory af = new AttributesFactory();
+ af.setDataPolicy(DataPolicy.REPLICATE);
+ af.setScope(Scope.DISTRIBUTED_ACK);
+ final RegionAttributes attr = af.create();
+ getCache().createRegion(regionName, attr);
return null;
}
};
@@ -326,34 +344,12 @@ public class TransactionsWithDeltaDUnitTest extends JUnit4CacheTestCase {
r.put(key, cust);
mgr.begin();
cust.setName("");
- r.put(key, cust);
- return null;
- }
- });
-
- vm2.invoke(new SerializableCallable() {
- @Override
- public Object call() throws Exception {
- Region<String, Customer> r = getCache().getRegion(regionName);
- Customer c = r.get(key);
- c.setName("cust1updated");
- r.put(key, c);
- return null;
- }
- });
-
- vm1.invoke(new SerializableCallable() {
- @Override
- public Object call() throws Exception {
- TXManagerImpl mgr = getGemfireCache().getTxManager();
- Region r = getCache().getRegion(regionName);
- assertNotNull(mgr.getTXState());
try {
- mgr.commit();
- fail("expected CommitConflict not thrown");
- } catch (CommitConflictException e) {
- // expected
+ r.put(key, cust);
+ fail("exception not thrown");
+ } catch (UnsupportedOperationInTransactionException expected) {
}
+ mgr.rollback();
return null;
}
});
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/control/RebalanceOperationDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/control/RebalanceOperationDistributedTest.java
index 656b4a5..1d105d9 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/control/RebalanceOperationDistributedTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/control/RebalanceOperationDistributedTest.java
@@ -101,6 +101,7 @@ import org.apache.geode.internal.cache.PartitionedRegionDataStore;
import org.apache.geode.internal.cache.SignalBounceOnRequestImageMessageObserver;
import org.apache.geode.internal.cache.control.InternalResourceManager.ResourceObserverAdapter;
import org.apache.geode.internal.cache.partitioned.BucketCountLoadProbe;
+import org.apache.geode.internal.cache.partitioned.LoadProbe;
import org.apache.geode.test.awaitility.GeodeAwaitility;
import org.apache.geode.test.dunit.AsyncInvocation;
import org.apache.geode.test.dunit.SerializableRunnable;
@@ -2104,7 +2105,10 @@ public class RebalanceOperationDistributedTest extends CacheTestCase {
// Cache is closed so loadProbeToRestore does not need to be restored
vm0.invoke(
- () -> getCache().getInternalResourceManager().setLoadProbe(new BucketCountLoadProbe()));
+ () -> {
+ LoadProbe ignored =
+ getCache().getInternalResourceManager().setLoadProbe(new BucketCountLoadProbe());
+ });
// Create the region in only 1 VM
vm0.invoke(() -> createPartitionedRegion("region1", 0, new NullReturningLoader()));
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/persistence/PersistentRVVRecoveryDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/persistence/PersistentRVVRecoveryDUnitTest.java
index ab72680..9ccf33b 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/persistence/PersistentRVVRecoveryDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/persistence/PersistentRVVRecoveryDUnitTest.java
@@ -62,7 +62,6 @@ import org.apache.geode.distributed.internal.ClusterDistributionManager;
import org.apache.geode.distributed.internal.DistributionMessage;
import org.apache.geode.distributed.internal.DistributionMessageObserver;
import org.apache.geode.internal.HeapDataOutputStream;
-import org.apache.geode.internal.Version;
import org.apache.geode.internal.cache.CacheObserverAdapter;
import org.apache.geode.internal.cache.CacheObserverHolder;
import org.apache.geode.internal.cache.DiskRegion;
@@ -854,7 +853,7 @@ public class PersistentRVVRecoveryDUnitTest extends PersistentReplicatedTestBase
RegionVersionVector rvv = region.getVersionVector();
rvv = rvv.getCloneForTransmission();
- HeapDataOutputStream hdos = new HeapDataOutputStream(Version.CURRENT);
+ HeapDataOutputStream hdos = new HeapDataOutputStream(2048);
// Using gemfire serialization because RegionVersionVector is not java serializable
DataSerializer.writeObject(rvv, hdos);
@@ -871,7 +870,7 @@ public class PersistentRVVRecoveryDUnitTest extends PersistentReplicatedTestBase
RegionVersionVector rvv = region.getDiskRegion().getRegionVersionVector();
rvv = rvv.getCloneForTransmission();
- HeapDataOutputStream hdos = new HeapDataOutputStream(Version.CURRENT);
+ HeapDataOutputStream hdos = new HeapDataOutputStream(2048);
// Using gemfire serialization because RegionVersionVector is not java serializable
DataSerializer.writeObject(rvv, hdos);
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/persistence/PersistentRecoveryOrderDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/persistence/PersistentRecoveryOrderDUnitTest.java
index b8f03c0..9817e11 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/persistence/PersistentRecoveryOrderDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/persistence/PersistentRecoveryOrderDUnitTest.java
@@ -72,7 +72,6 @@ import org.apache.geode.distributed.internal.DistributionMessage;
import org.apache.geode.distributed.internal.DistributionMessageObserver;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.internal.HeapDataOutputStream;
-import org.apache.geode.internal.Version;
import org.apache.geode.internal.cache.AbstractUpdateOperation.AbstractUpdateMessage;
import org.apache.geode.internal.cache.DestroyRegionOperation.DestroyRegionMessage;
import org.apache.geode.internal.cache.DiskRegion;
@@ -1188,7 +1187,7 @@ public class PersistentRecoveryOrderDUnitTest extends PersistentReplicatedTestBa
RegionVersionVector regionVersionVector = region.getVersionVector();
regionVersionVector = regionVersionVector.getCloneForTransmission();
- HeapDataOutputStream outputStream = new HeapDataOutputStream(Version.CURRENT);
+ HeapDataOutputStream outputStream = new HeapDataOutputStream(2048);
// Using gemfire serialization because RegionVersionVector is not java serializable
DataSerializer.writeObject(regionVersionVector, outputStream);
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/pdx/PDXAsyncEventQueueDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/pdx/PDXAsyncEventQueueDUnitTest.java
index b27d490..1809cbf 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/pdx/PDXAsyncEventQueueDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/pdx/PDXAsyncEventQueueDUnitTest.java
@@ -30,7 +30,7 @@ import org.apache.geode.cache.asyncqueue.AsyncEvent;
import org.apache.geode.cache.asyncqueue.AsyncEventListener;
import org.apache.geode.cache.asyncqueue.AsyncEventQueue;
import org.apache.geode.internal.HeapDataOutputStream;
-import org.apache.geode.internal.Version;
+import org.apache.geode.internal.serialization.Version;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.VM;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/pdx/PdxAttributesDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/pdx/PdxAttributesDistributedTest.java
index 8075486..bd0ab5c 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/pdx/PdxAttributesDistributedTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/pdx/PdxAttributesDistributedTest.java
@@ -45,8 +45,8 @@ import org.apache.geode.cache.client.PoolManager;
import org.apache.geode.distributed.ConfigurationProperties;
import org.apache.geode.internal.AvailablePortHelper;
import org.apache.geode.internal.HeapDataOutputStream;
-import org.apache.geode.internal.Version;
import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.serialization.Version;
import org.apache.geode.pdx.SimpleClass.SimpleEnum;
import org.apache.geode.pdx.internal.EnumId;
import org.apache.geode.pdx.internal.EnumInfo;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/pdx/PdxClientServerDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/pdx/PdxClientServerDUnitTest.java
index 0e2f637..78ad24c 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/pdx/PdxClientServerDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/pdx/PdxClientServerDUnitTest.java
@@ -48,7 +48,7 @@ import org.apache.geode.cache.server.CacheServer;
import org.apache.geode.internal.AvailablePortHelper;
import org.apache.geode.internal.HeapDataOutputStream;
import org.apache.geode.internal.PdxSerializerObject;
-import org.apache.geode.internal.Version;
+import org.apache.geode.internal.serialization.Version;
import org.apache.geode.pdx.internal.AutoSerializableManager;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.Invoke;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/security/ClientAuthenticationTestCase.java b/geode-core/src/distributedTest/java/org/apache/geode/security/ClientAuthenticationTestCase.java
index 4f2b3d8..9bc3b71 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/security/ClientAuthenticationTestCase.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/security/ClientAuthenticationTestCase.java
@@ -62,7 +62,6 @@ import org.apache.geode.cache.client.internal.ExecutablePool;
import org.apache.geode.cache.client.internal.RegisterDataSerializersOp;
import org.apache.geode.internal.HeapDataOutputStream;
import org.apache.geode.internal.InternalDataSerializer;
-import org.apache.geode.internal.Version;
import org.apache.geode.internal.cache.EventID;
import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
import org.apache.geode.security.generator.CredentialGenerator;
@@ -281,7 +280,7 @@ public abstract class ClientAuthenticationTestCase extends JUnit4DistributedTest
// Try to register a PDX type with the server
client1.invoke("register a PDX type", () -> {
- HeapDataOutputStream outputStream = new HeapDataOutputStream(100, Version.CURRENT);
+ HeapDataOutputStream outputStream = new HeapDataOutputStream(new byte[100]);
try {
DataSerializer.writeObject(new Employee(106l, "David", "Copperfield"), outputStream);
throw new Error("operation should have been rejected");
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/client/ClientCacheFactoryJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/client/ClientCacheFactoryJUnitTest.java
index f35b79f..da17d61 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/client/ClientCacheFactoryJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/client/ClientCacheFactoryJUnitTest.java
@@ -59,12 +59,12 @@ import org.apache.geode.distributed.internal.membership.InternalDistributedMembe
import org.apache.geode.distributed.internal.membership.adapter.GMSMemberAdapter;
import org.apache.geode.distributed.internal.membership.gms.GMSMember;
import org.apache.geode.internal.HeapDataOutputStream;
-import org.apache.geode.internal.Version;
-import org.apache.geode.internal.VersionedDataInputStream;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
import org.apache.geode.internal.cache.xmlcache.CacheXmlGenerator;
import org.apache.geode.internal.cache.xmlcache.ClientCacheCreation;
+import org.apache.geode.internal.serialization.Version;
+import org.apache.geode.internal.serialization.VersionedDataInputStream;
import org.apache.geode.pdx.ReflectionBasedAutoSerializer;
import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
@@ -355,7 +355,8 @@ public class ClientCacheFactoryJUnitTest {
DataSerializer.writeObject(clientID, out);
DataInputStream in =
- new VersionedDataInputStream(new ByteArrayInputStream(out.toByteArray()), Version.CURRENT);
+ new VersionedDataInputStream(new ByteArrayInputStream(out.toByteArray()),
+ Version.CURRENT);
ClientProxyMembershipID newID = DataSerializer.readObject(in);
InternalDistributedMember newMemberID =
(InternalDistributedMember) newID.getDistributedMember();
@@ -372,7 +373,8 @@ public class ClientCacheFactoryJUnitTest {
out = new HeapDataOutputStream(Version.CURRENT);
DataSerializer.writeObject(clientID, out);
- in = new VersionedDataInputStream(new ByteArrayInputStream(out.toByteArray()), Version.CURRENT);
+ in = new VersionedDataInputStream(new ByteArrayInputStream(out.toByteArray()),
+ Version.CURRENT);
newID = DataSerializer.readObject(in);
newMemberID = (InternalDistributedMember) newID.getDistributedMember();
assertThat(newMemberID.getVersionObject()).isEqualTo(Version.CURRENT);
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/ResultsDataSerializabilityJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/ResultsDataSerializabilityJUnitTest.java
index 3539bc6..7ec2bc1 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/ResultsDataSerializabilityJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/ResultsDataSerializabilityJUnitTest.java
@@ -54,7 +54,7 @@ import org.apache.geode.cache.query.internal.types.CollectionTypeImpl;
import org.apache.geode.cache.query.internal.types.MapTypeImpl;
import org.apache.geode.cache.query.internal.types.ObjectTypeImpl;
import org.apache.geode.cache.query.internal.types.StructTypeImpl;
-import org.apache.geode.internal.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
import org.apache.geode.test.junit.categories.OQLQueryTest;
/**
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java
index 7936a4b..2b4f6aa 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java
@@ -90,8 +90,9 @@ import org.apache.geode.distributed.internal.membership.gms.messages.HeartbeatRe
import org.apache.geode.distributed.internal.membership.gms.messages.SuspectMembersMessage;
import org.apache.geode.distributed.internal.membership.gms.messages.SuspectRequest;
import org.apache.geode.internal.HeapDataOutputStream;
-import org.apache.geode.internal.Version;
+import org.apache.geode.internal.InternalDataSerializer;
import org.apache.geode.internal.net.SocketCreatorFactory;
+import org.apache.geode.internal.serialization.Version;
import org.apache.geode.test.junit.categories.MembershipTest;
@Category({MembershipTest.class})
@@ -115,6 +116,10 @@ public class GMSHealthMonitorJUnitTest {
@Before
public void initMocks() throws UnknownHostException {
+ // ensure that Geode's serialization and version are initialized
+ Version currentVersion = Version.CURRENT;
+ InternalDataSerializer.getDSFIDSerializer();
+
// System.setProperty("gemfire.bind-address", "localhost");
mockDistConfig = mock(DistributionConfig.class);
mockConfig = mock(ServiceConfig.class);
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/locator/GMSLocatorIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/locator/GMSLocatorIntegrationTest.java
index cc7ebf7..f80f616 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/locator/GMSLocatorIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/locator/GMSLocatorIntegrationTest.java
@@ -18,6 +18,7 @@ package org.apache.geode.distributed.internal.membership.gms.locator;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
import org.junit.Before;
import org.junit.Rule;
@@ -25,8 +26,15 @@ import org.junit.Test;
import org.junit.rules.TemporaryFolder;
import org.apache.geode.distributed.internal.LocatorStats;
+import org.apache.geode.distributed.internal.membership.gms.GMSMember;
import org.apache.geode.distributed.internal.membership.gms.GMSMembershipView;
+import org.apache.geode.distributed.internal.membership.gms.Services;
+import org.apache.geode.distributed.internal.membership.gms.interfaces.JoinLeave;
+import org.apache.geode.distributed.internal.membership.gms.interfaces.Messenger;
import org.apache.geode.distributed.internal.tcpserver.TcpServer;
+import org.apache.geode.internal.serialization.DSFIDSerializer;
+import org.apache.geode.internal.serialization.DSFIDSerializerImpl;
+import org.apache.geode.internal.serialization.Version;
public class GMSLocatorIntegrationTest {
@@ -36,14 +44,31 @@ public class GMSLocatorIntegrationTest {
private TcpServer tcpServer;
private GMSMembershipView view;
private GMSLocator gmsLocator;
+ Services services;
+ private JoinLeave joinLeave;
+ private Messenger messenger;
@Before
public void setUp() {
tcpServer = mock(TcpServer.class);
view = new GMSMembershipView();
+ services = mock(Services.class);
+ DSFIDSerializer serializer = new DSFIDSerializerImpl();
+ Services.registerSerializables(serializer);
+ when(services.getSerializer()).thenReturn(serializer);
+ Version current = Version.CURRENT; // force Version static initialization to set
+ // Version
+
+ joinLeave = mock(JoinLeave.class);
+ when(services.getJoinLeave()).thenReturn(joinLeave);
+ messenger = mock(Messenger.class);
+ when(services.getMessenger()).thenReturn(messenger);
+ when(messenger.getMemberID()).thenReturn(new GMSMember("localhost", 8080));
+
gmsLocator =
new GMSLocator(null, null, false, false, new LocatorStats(), "",
temporaryFolder.getRoot().toPath());
+ gmsLocator.setServices(services);
}
@Test
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/locator/GMSLocatorRecoveryIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/locator/GMSLocatorRecoveryIntegrationTest.java
index 618c568..53de745 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/locator/GMSLocatorRecoveryIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/locator/GMSLocatorRecoveryIntegrationTest.java
@@ -24,6 +24,8 @@ import static org.assertj.core.api.Assertions.catchThrowable;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
+import java.io.DataOutput;
+import java.io.DataOutputStream;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
@@ -53,10 +55,13 @@ import org.apache.geode.distributed.internal.membership.MembershipManager;
import org.apache.geode.distributed.internal.membership.adapter.GMSMemberAdapter;
import org.apache.geode.distributed.internal.membership.adapter.auth.GMSAuthenticator;
import org.apache.geode.distributed.internal.membership.gms.GMSMembershipView;
+import org.apache.geode.distributed.internal.membership.gms.Services;
import org.apache.geode.internal.AvailablePortHelper;
-import org.apache.geode.internal.Version;
+import org.apache.geode.internal.InternalDataSerializer;
import org.apache.geode.internal.admin.remote.RemoteTransportConfig;
import org.apache.geode.internal.net.SocketCreator;
+import org.apache.geode.internal.serialization.DSFIDSerializer;
+import org.apache.geode.internal.serialization.Version;
import org.apache.geode.test.junit.categories.MembershipTest;
@Category(MembershipTest.class)
@@ -72,14 +77,20 @@ public class GMSLocatorRecoveryIntegrationTest {
private GMSLocator gmsLocator;
private MembershipManager membershipManager;
private Locator locator;
+ private DSFIDSerializer serializer;
@Before
public void setUp() throws Exception {
+ serializer = InternalDataSerializer.getDSFIDSerializer();
+ Services.registerSerializables(serializer);
+ Version current = Version.CURRENT; // force version initialization
+
stateFile = new File(temporaryFolder.getRoot(), getClass().getSimpleName() + "_locator.dat");
gmsLocator = new GMSLocator(null, null, false, false, new LocatorStats(), "",
temporaryFolder.getRoot().toPath());
gmsLocator.setViewFile(stateFile);
+
}
@After
@@ -193,11 +204,14 @@ public class GMSLocatorRecoveryIntegrationTest {
private void populateStateFile(File file, int fileStamp, int ordinal, Object object)
throws IOException {
- try (ObjectOutputStream oos = new ObjectOutputStream(new FileOutputStream(file))) {
+ try (FileOutputStream fileStream = new FileOutputStream(file);
+ ObjectOutputStream oos = new ObjectOutputStream(fileStream)) {
oos.writeInt(fileStamp);
oos.writeInt(ordinal);
- DataSerializer.writeObject(object, oos);
oos.flush();
+ DataOutput dataOutput = new DataOutputStream(fileStream);
+ DataSerializer.writeObject(object, dataOutput);
+ fileStream.flush();
}
}
}
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java
index 28a2c6c..0a94b93 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java
@@ -79,7 +79,7 @@ import org.apache.geode.distributed.internal.membership.gms.messages.LeaveReques
import org.apache.geode.distributed.internal.membership.gms.messages.NetworkPartitionMessage;
import org.apache.geode.distributed.internal.membership.gms.messages.RemoveMemberMessage;
import org.apache.geode.distributed.internal.membership.gms.messages.ViewAckMessage;
-import org.apache.geode.internal.Version;
+import org.apache.geode.internal.serialization.Version;
import org.apache.geode.security.AuthenticationFailedException;
import org.apache.geode.test.junit.categories.MembershipTest;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGroupsMessengerJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGroupsMessengerJUnitTest.java
index 602bccb..daba82f 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGroupsMessengerJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGroupsMessengerJUnitTest.java
@@ -41,6 +41,7 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import java.io.ByteArrayInputStream;
+import java.io.DataInput;
import java.io.DataInputStream;
import java.io.DataOutput;
import java.io.IOException;
@@ -91,10 +92,14 @@ import org.apache.geode.distributed.internal.membership.gms.messages.JoinRespons
import org.apache.geode.distributed.internal.membership.gms.messages.LeaveRequestMessage;
import org.apache.geode.distributed.internal.membership.gms.messenger.JGroupsMessenger.JGroupsReceiver;
import org.apache.geode.internal.AvailablePortHelper;
-import org.apache.geode.internal.DataSerializableFixedID;
-import org.apache.geode.internal.HeapDataOutputStream;
-import org.apache.geode.internal.Version;
import org.apache.geode.internal.admin.remote.RemoteTransportConfig;
+import org.apache.geode.internal.serialization.BufferDataOutputStream;
+import org.apache.geode.internal.serialization.DSFIDSerializer;
+import org.apache.geode.internal.serialization.DSFIDSerializerImpl;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.SerializationContext;
+import org.apache.geode.internal.serialization.StaticSerialization;
+import org.apache.geode.internal.serialization.Version;
import org.apache.geode.test.junit.categories.MembershipTest;
@Category({MembershipTest.class})
@@ -159,6 +164,11 @@ public class JGroupsMessengerJUnitTest {
when(services.getHealthMonitor()).thenReturn(healthMonitor);
when(services.getManager()).thenReturn(manager);
when(services.getJoinLeave()).thenReturn(joinLeave);
+ DSFIDSerializer serializer = new DSFIDSerializerImpl();
+ Services.registerSerializables(serializer);
+ when(services.getSerializer()).thenReturn(serializer);
+ Version current = Version.CURRENT; // force Version static initialization to set
+ // Version
when(services.getStatistics()).thenReturn(mock(DistributionStats.class));
@@ -251,13 +261,14 @@ public class JGroupsMessengerJUnitTest {
@Test
public void testMemberWeightIsSerialized() throws Exception {
- HeapDataOutputStream out = new HeapDataOutputStream(500, Version.CURRENT);
+ BufferDataOutputStream out =
+ new BufferDataOutputStream(500, Version.getCurrentVersion());
GMSMember mbr = createAddress(8888);
mbr.setMemberWeight((byte) 40);
- mbr.toData(out);
+ mbr.toData(out, null);
DataInputStream in = new DataInputStream(new ByteArrayInputStream(out.toByteArray()));
mbr = new GMSMember();
- mbr.fromData(in);
+ mbr.fromData(in, null);
assertEquals(40, mbr.getMemberWeight());
}
@@ -276,7 +287,8 @@ public class JGroupsMessengerJUnitTest {
// for code coverage we need to test with both a SerializationException and
// an IOException. The former is wrapped in a GemfireIOException while the
// latter is not
- doThrow(new SerializationException("")).when(msg).toData(any(DataOutput.class));
+ doThrow(new SerializationException("")).when(msg).toData(any(DataOutput.class),
+ any(SerializationContext.class));
try {
messenger.send(msg);
fail("expected a failure");
@@ -286,7 +298,8 @@ public class JGroupsMessengerJUnitTest {
if (enableMcast) {
verify(msg, atLeastOnce()).registerProcessor();
}
- doThrow(new IOException()).when(msg).toData(any(DataOutput.class));
+ doThrow(new IOException()).when(msg).toData(any(DataOutput.class),
+ any(SerializationContext.class));
try {
messenger.send(msg);
fail("expected a failure");
@@ -421,7 +434,7 @@ public class JGroupsMessengerJUnitTest {
if (enableMcast) {
verify(msg, atLeastOnce()).registerProcessor();
}
- verify(msg).toData(isA(DataOutput.class));
+ verify(msg).toData(isA(DataOutput.class), any(SerializationContext.class));
assertTrue("expected 1 message but found " + interceptor.collectedMessages,
interceptor.collectedMessages.size() == 1);
assertTrue(interceptor.collectedMessages.get(0).isFlagSet(Message.Flag.NO_RELIABILITY));
@@ -453,7 +466,7 @@ public class JGroupsMessengerJUnitTest {
JoinRequestMessage msg = new JoinRequestMessage(messenger.localAddress, sender, null, -1, 0);
Message jmsg = messenger.createJGMessage(msg, messenger.jgAddress, messenger.localAddress,
- Version.CURRENT_ORDINAL);
+ Version.getCurrentVersion().ordinal());
interceptor.up(new Event(Event.MSG, jmsg));
verify(mh, times(1)).processMessage(any(JoinRequestMessage.class));
@@ -461,7 +474,7 @@ public class JGroupsMessengerJUnitTest {
LeaveRequestMessage lmsg = new LeaveRequestMessage(messenger.localAddress, sender, "testing");
when(joinLeave.getMemberID(any())).thenReturn(sender);
jmsg = messenger.createJGMessage(lmsg, messenger.jgAddress, messenger.localAddress,
- Version.CURRENT_ORDINAL);
+ Version.getCurrentVersion().ordinal());
interceptor.up(new Event(Event.MSG, jmsg));
verify(manager).processMessage(any(LeaveRequestMessage.class));
@@ -484,6 +497,38 @@ public class JGroupsMessengerJUnitTest {
doTestBigMessageIsFragmented(false, true);
}
+ public static class ByteHolder implements DataSerializableFixedID {
+ static final int DSFID = 123456;
+ private byte[] payload;
+
+ @Override
+ public int getDSFID() {
+ return DSFID;
+ }
+
+ public ByteHolder(byte[] payload) {
+ this.payload = payload;
+ }
+
+ public ByteHolder() {}
+
+ @Override
+ public void toData(DataOutput out, SerializationContext context) throws IOException {
+ StaticSerialization.writeByteArray(payload, out);
+ }
+
+ @Override
+ public void fromData(DataInput in, SerializationContext context)
+ throws IOException, ClassNotFoundException {
+ payload = StaticSerialization.readByteArray(in);
+ }
+
+ @Override
+ public Version[] getSerializationVersions() {
+ return null;
+ }
+ }
+
public void doTestBigMessageIsFragmented(boolean mcastEnabled, boolean broadcastMessage)
throws Exception {
initMocks(mcastEnabled);
@@ -497,8 +542,11 @@ public class JGroupsMessengerJUnitTest {
// send a big message and expect fragmentation
GMSMember recipient = broadcastMessage ? null : messenger.localAddress;
+ services.getSerializer().registerDSFID(ByteHolder.DSFID, ByteHolder.class);
JoinRequestMessage msg = new JoinRequestMessage(recipient, sender,
- new byte[(int) (services.getConfig().getDistributionConfig().getUdpFragmentSize() * (1.5))],
+ new ByteHolder(
+ new byte[(int) (services.getConfig().getDistributionConfig().getUdpFragmentSize()
+ * (1.2))]),
-1, 0);
msg.setMulticast(broadcastMessage);
@@ -841,7 +889,7 @@ public class JGroupsMessengerJUnitTest {
// a message is ignored during manager shutdown
msg = messenger.createJGMessage(dmsg, new JGAddress(other),
- recipients.get(0), Version.CURRENT_ORDINAL);
+ recipients.get(0), Version.getCurrentVersion().ordinal());
when(manager.shutdownInProgress()).thenReturn(Boolean.TRUE);
receiver.receive(msg);
verify(manager, never()).processMessage(isA(GMSMessage.class));
@@ -959,9 +1007,10 @@ public class JGroupsMessengerJUnitTest {
recipients.add(otherMbr);
gfmsg.setRecipients(recipients);
- short version = Version.CURRENT_ORDINAL;
+ short version = Version.getCurrentVersion().ordinal();
- HeapDataOutputStream out = new HeapDataOutputStream(Version.CURRENT);
+ BufferDataOutputStream out =
+ new BufferDataOutputStream(Version.getCurrentVersion());
messenger.writeEncryptedMessage(gfmsg, otherMbr, version, out);
@@ -999,9 +1048,10 @@ public class JGroupsMessengerJUnitTest {
recipients.add(otherMbr);
gfmsg.setRecipients(recipients);
- short version = Version.CURRENT_ORDINAL;
+ short version = Version.getCurrentVersion().ordinal();
- HeapDataOutputStream out = new HeapDataOutputStream(Version.CURRENT);
+ BufferDataOutputStream out =
+ new BufferDataOutputStream(Version.getCurrentVersion());
messenger.writeEncryptedMessage(gfmsg, otherMbr, version, out);
@@ -1035,9 +1085,10 @@ public class JGroupsMessengerJUnitTest {
JoinRequestMessage gfmsg =
new JoinRequestMessage(otherMbr, messenger.getMemberID(), null, 9789, 1);
- short version = Version.CURRENT_ORDINAL;
+ short version = Version.getCurrentVersion().ordinal();
- HeapDataOutputStream out = new HeapDataOutputStream(Version.CURRENT);
+ BufferDataOutputStream out =
+ new BufferDataOutputStream(Version.getCurrentVersion());
messenger.writeEncryptedMessage(gfmsg, otherMbr, version, out);
@@ -1071,9 +1122,10 @@ public class JGroupsMessengerJUnitTest {
JoinResponseMessage gfmsg =
new JoinResponseMessage(otherMbr, messenger.getClusterSecretKey(), 1);
- short version = Version.CURRENT_ORDINAL;
+ short version = Version.getCurrentVersion().ordinal();
- HeapDataOutputStream out = new HeapDataOutputStream(Version.CURRENT);
+ BufferDataOutputStream out =
+ new BufferDataOutputStream(Version.getCurrentVersion());
messenger.writeEncryptedMessage(gfmsg, otherMbr, version, out);
@@ -1092,7 +1144,7 @@ public class JGroupsMessengerJUnitTest {
InstallViewMessage installViewMessage = new InstallViewMessage(v, null, true);
- out = new HeapDataOutputStream(Version.CURRENT);
+ out = new BufferDataOutputStream(Version.getCurrentVersion());
messenger.writeEncryptedMessage(installViewMessage, otherMbr, version, out);
@@ -1113,7 +1165,7 @@ public class JGroupsMessengerJUnitTest {
GMSMember gms = new GMSMember("localhost", port);
gms.setUUID(UUID.randomUUID());
gms.setVmKind(GMSMember.NORMAL_DM_TYPE);
- gms.setVersionOrdinal(Version.CURRENT_ORDINAL);
+ gms.setVersionOrdinal(Version.getCurrentVersion().ordinal());
return gms;
}
}
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/CompactOfflineDiskStoreJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/CompactOfflineDiskStoreJUnitTest.java
index 7128a42..35574ad 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/CompactOfflineDiskStoreJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/CompactOfflineDiskStoreJUnitTest.java
@@ -40,8 +40,8 @@ import org.apache.geode.cache.Region;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.HeapDataOutputStream;
import org.apache.geode.internal.InternalDataSerializer;
-import org.apache.geode.internal.Version;
import org.apache.geode.internal.cache.versions.RegionVersionHolder;
+import org.apache.geode.internal.serialization.Version;
/**
* Tests offline compaction
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/FilterProfileConcurrencyTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/FilterProfileConcurrencyTest.java
index 4dd73a7..c95d9e6 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/FilterProfileConcurrencyTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/FilterProfileConcurrencyTest.java
@@ -28,8 +28,8 @@ import org.junit.runner.RunWith;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.distributed.internal.membership.MemberAttributes;
-import org.apache.geode.internal.Version;
import org.apache.geode.internal.cache.tier.InterestType;
+import org.apache.geode.internal.serialization.Version;
import org.apache.geode.internal.util.BlobHelper;
import org.apache.geode.test.concurrency.ConcurrentTestRunner;
import org.apache.geode.test.concurrency.ParallelExecutor;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/LIFOEvictionAlgoMemoryEnabledRegionJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/LIFOEvictionAlgoMemoryEnabledRegionJUnitTest.java
index 7fa5f8d..7aefd52 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/LIFOEvictionAlgoMemoryEnabledRegionJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/LIFOEvictionAlgoMemoryEnabledRegionJUnitTest.java
@@ -49,9 +49,7 @@ import org.apache.geode.cache.Scope;
import org.apache.geode.cache.TimeoutException;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.distributed.internal.DistributionManager;
-import org.apache.geode.internal.ByteArrayDataInput;
import org.apache.geode.internal.InternalStatisticsDisabledException;
-import org.apache.geode.internal.Version;
import org.apache.geode.internal.cache.DistributedRegion.DiskPosition;
import org.apache.geode.internal.cache.InitialImageOperation.Entry;
import org.apache.geode.internal.cache.eviction.EvictableEntry;
@@ -63,6 +61,8 @@ import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+import org.apache.geode.internal.serialization.ByteArrayDataInput;
+import org.apache.geode.internal.serialization.Version;
/**
* This is a test verifies region is LIFO enabled by MEMORY verifies correct stats updating and
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ha/HARegionQueueIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ha/HARegionQueueIntegrationTest.java
index cc9daa4..cc2e3a8 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ha/HARegionQueueIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ha/HARegionQueueIntegrationTest.java
@@ -59,7 +59,6 @@ import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.cache.Scope;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.internal.Version;
import org.apache.geode.internal.cache.CacheServerImpl;
import org.apache.geode.internal.cache.CachedDeserializable;
import org.apache.geode.internal.cache.EnumListenerEvent;
@@ -79,6 +78,7 @@ import org.apache.geode.internal.cache.tier.sockets.ClientUpdateMessageImpl;
import org.apache.geode.internal.cache.tier.sockets.ConnectionListener;
import org.apache.geode.internal.cache.tier.sockets.HAEventWrapper;
import org.apache.geode.internal.concurrent.ConcurrentHashSet;
+import org.apache.geode.internal.serialization.Version;
import org.apache.geode.internal.statistics.StatisticsClock;
import org.apache.geode.internal.util.BlobHelper;
import org.apache.geode.internal.util.concurrent.StoppableReentrantReadWriteLock;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxyTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxyTest.java
index f0b7f89..4f65e38 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxyTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxyTest.java
@@ -33,9 +33,9 @@ import org.junit.Rule;
import org.junit.Test;
import org.apache.geode.distributed.DistributedMember;
-import org.apache.geode.internal.Version;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.net.SocketCloser;
+import org.apache.geode.internal.serialization.Version;
import org.apache.geode.internal.statistics.StatisticsClock;
import org.apache.geode.test.junit.rules.ExecutorServiceRule;
import org.apache.geode.test.junit.rules.ServerStarterRule;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/ServerConnectionIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/ServerConnectionIntegrationTest.java
index b8708e4..94e4de4 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/ServerConnectionIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/ServerConnectionIntegrationTest.java
@@ -36,7 +36,6 @@ import org.mockito.junit.MockitoJUnit;
import org.mockito.junit.MockitoRule;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.internal.Version;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.TXManagerImpl;
import org.apache.geode.internal.cache.tier.Acceptor;
@@ -45,6 +44,7 @@ import org.apache.geode.internal.cache.tier.CommunicationMode;
import org.apache.geode.internal.cache.tier.MessageType;
import org.apache.geode.internal.cache.tier.ServerSideHandshake;
import org.apache.geode.internal.security.SecurityService;
+import org.apache.geode.internal.serialization.Version;
import org.apache.geode.test.junit.categories.ClientServerTest;
@Category(ClientServerTest.class)
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/offheap/OffHeapValidationJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/offheap/OffHeapValidationJUnitTest.java
index 6468a11..dba0ab1 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/offheap/OffHeapValidationJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/offheap/OffHeapValidationJUnitTest.java
@@ -58,9 +58,9 @@ import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.compression.SnappyCompressor;
import org.apache.geode.distributed.ConfigurationProperties;
import org.apache.geode.internal.HeapDataOutputStream;
-import org.apache.geode.internal.Version;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.LocalRegion;
+import org.apache.geode.internal.serialization.Version;
import org.apache.geode.test.junit.categories.OffHeapTest;
/**
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/pdx/AutoSerializableJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/pdx/AutoSerializableJUnitTest.java
index 0aad954..cb8bfc2 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/pdx/AutoSerializableJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/pdx/AutoSerializableJUnitTest.java
@@ -54,8 +54,8 @@ import org.apache.geode.SerializationException;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.internal.HeapDataOutputStream;
import org.apache.geode.internal.PdxSerializerObject;
-import org.apache.geode.internal.Version;
import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.serialization.Version;
import org.apache.geode.pdx.internal.AutoSerializableManager;
import org.apache.geode.pdx.internal.PdxField;
import org.apache.geode.pdx.internal.PdxInstanceImpl;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/pdx/ByteSourceJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/pdx/ByteSourceJUnitTest.java
index 981e882..03f15f4 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/pdx/ByteSourceJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/pdx/ByteSourceJUnitTest.java
@@ -33,7 +33,7 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.internal.HeapDataOutputStream;
-import org.apache.geode.internal.Version;
+import org.apache.geode.internal.serialization.Version;
import org.apache.geode.internal.tcp.ByteBufferInputStream.ByteSource;
import org.apache.geode.internal.tcp.ByteBufferInputStream.ByteSourceFactory;
import org.apache.geode.test.junit.categories.SerializationTest;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/pdx/PdxInstanceFactoryJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/pdx/PdxInstanceFactoryJUnitTest.java
index a94aa58..c1249f4 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/pdx/PdxInstanceFactoryJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/pdx/PdxInstanceFactoryJUnitTest.java
@@ -51,8 +51,8 @@ import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.internal.HeapDataOutputStream;
-import org.apache.geode.internal.Version;
import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.serialization.Version;
import org.apache.geode.internal.tcp.ByteBufferInputStream.ByteSourceFactory;
import org.apache.geode.pdx.internal.PdxField;
import org.apache.geode.pdx.internal.PdxInstanceEnum;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/pdx/PdxInstanceJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/pdx/PdxInstanceJUnitTest.java
index f4d6343..d3f13f0 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/pdx/PdxInstanceJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/pdx/PdxInstanceJUnitTest.java
@@ -38,8 +38,8 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.DataSerializer;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.internal.HeapDataOutputStream;
-import org.apache.geode.internal.Version;
import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.serialization.Version;
import org.apache.geode.pdx.internal.EnumInfo.PdxInstanceEnumInfo;
import org.apache.geode.pdx.internal.PdxInstanceFactoryImpl;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/pdx/PdxSerializableJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/pdx/PdxSerializableJUnitTest.java
index c5864c0..85a0c5f 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/pdx/PdxSerializableJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/pdx/PdxSerializableJUnitTest.java
@@ -54,12 +54,12 @@ import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.DiskStoreFactory;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionShortcut;
-import org.apache.geode.internal.DSCODE;
import org.apache.geode.internal.HeapDataOutputStream;
import org.apache.geode.internal.PdxSerializerObject;
import org.apache.geode.internal.SystemAdmin;
-import org.apache.geode.internal.Version;
import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.serialization.DSCODE;
+import org.apache.geode.internal.serialization.Version;
import org.apache.geode.internal.tcp.ByteBufferInputStream.ByteSourceFactory;
import org.apache.geode.internal.util.ArrayUtils;
import org.apache.geode.pdx.internal.DataSize;
diff --git a/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/excludedClasses.txt b/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/excludedClasses.txt
index 5a8deb1..86b00c6 100644
--- a/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/excludedClasses.txt
+++ b/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/excludedClasses.txt
@@ -14,7 +14,6 @@ org/apache/geode/distributed/internal/membership/adapter/GMSMembershipManager$Bo
org/apache/geode/distributed/internal/tcpserver/LocatorCancelException
org/apache/geode/internal/AbstractConfig$SortedProperties
org/apache/geode/internal/AvailablePort$Keeper
-org/apache/geode/internal/DSCODE
org/apache/geode/internal/ExitCode
org/apache/geode/internal/JarDeployer
org/apache/geode/internal/ObjIdConcurrentMap
@@ -57,6 +56,7 @@ org/apache/geode/internal/process/ProcessStreamReader$ReadingMode
org/apache/geode/internal/process/ProcessType
org/apache/geode/internal/process/UnableToControlProcessException
org/apache/geode/internal/security/shiro/GeodeAuthenticationToken
+org/apache/geode/internal/serialization/DSCODE
org/apache/geode/internal/shared/NativeErrorException
org/apache/geode/internal/shared/OSType
org/apache/geode/internal/shared/OSType$1
diff --git a/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt b/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
index f1ccb48..3bb0491 100644
--- a/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
+++ b/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
@@ -3,8 +3,8 @@ fromData,62
toData,30
org/apache/geode/admin/internal/SystemMemberCacheEventProcessor$SystemMemberCacheMessage,2
-fromData,27
-toData,27
+fromData,28
+toData,28
org/apache/geode/admin/jmx/internal/StatAlertNotification,2
fromData,39
@@ -23,24 +23,24 @@ fromData,14
toData,14
org/apache/geode/cache/client/internal/CacheServerLoadMessage,2
-fromData,52
-toData,30
+fromData,53
+toData,31
org/apache/geode/cache/client/internal/locator/ClientConnectionRequest,2
-fromData,14
-toData,14
+fromData,15
+toData,15
org/apache/geode/cache/client/internal/locator/ClientConnectionResponse,2
fromData,35
toData,31
org/apache/geode/cache/client/internal/locator/ClientReplacementRequest,2
-fromData,25
-toData,14
+fromData,26
+toData,15
org/apache/geode/cache/client/internal/locator/GetAllServersRequest,2
-fromData,6
-toData,6
+fromData,7
+toData,7
org/apache/geode/cache/client/internal/locator/GetAllServersResponse,2
fromData,31
@@ -55,8 +55,8 @@ fromData,56
toData,56
org/apache/geode/cache/client/internal/locator/QueueConnectionRequest,2
-fromData,40
-toData,40
+fromData,41
+toData,41
org/apache/geode/cache/client/internal/locator/QueueConnectionResponse,2
fromData,41
@@ -71,20 +71,20 @@ fromData,17
toData,17
org/apache/geode/cache/query/internal/CumulativeNonDistinctResults,2
-fromData,126
-toData,125
+fromData,128
+toData,129
org/apache/geode/cache/query/internal/LinkedResultSet,2
-fromData,40
+fromData,42
toData,46
org/apache/geode/cache/query/internal/LinkedStructSet,2
-fromData,68
-toData,66
+fromData,70
+toData,68
org/apache/geode/cache/query/internal/NWayMergeResults,2
-fromData,134
-toData,133
+fromData,136
+toData,137
org/apache/geode/cache/query/internal/NullToken,2
fromData,1
@@ -95,35 +95,35 @@ fromData,29
toData,29
org/apache/geode/cache/query/internal/ResultsBag,2
-fromData,106
-toData,116
+fromData,108
+toData,119
org/apache/geode/cache/query/internal/ResultsCollectionWrapper,2
fromData,55
toData,60
org/apache/geode/cache/query/internal/ResultsSet,2
-fromData,49
-toData,70
+fromData,52
+toData,73
org/apache/geode/cache/query/internal/SortedResultSet,2
-fromData,40
+fromData,42
toData,46
org/apache/geode/cache/query/internal/SortedStructSet,2
-fromData,57
-toData,64
+fromData,59
+toData,66
org/apache/geode/cache/query/internal/StructBag,2
-fromData,16
-toData,16
+fromData,17
+toData,17
org/apache/geode/cache/query/internal/StructImpl,2
-fromData,72
+fromData,74
toData,17
org/apache/geode/cache/query/internal/StructSet,2
-fromData,58
+fromData,60
toData,46
org/apache/geode/cache/query/internal/Undefined,2
@@ -131,24 +131,24 @@ fromData,1
toData,1
org/apache/geode/cache/query/internal/index/IndexCreationData,2
-fromData,106
+fromData,108
toData,122
org/apache/geode/cache/query/internal/types/CollectionTypeImpl,2
-fromData,17
-toData,14
+fromData,18
+toData,15
org/apache/geode/cache/query/internal/types/MapTypeImpl,2
-fromData,17
-toData,14
+fromData,18
+toData,15
org/apache/geode/cache/query/internal/types/ObjectTypeImpl,2
fromData,9
toData,9
org/apache/geode/cache/query/internal/types/StructTypeImpl,2
-fromData,28
-toData,22
+fromData,29
+toData,23
org/apache/geode/cache/server/ServerLoad,2
fromData,41
@@ -167,196 +167,196 @@ fromData,1
toData,1
org/apache/geode/distributed/internal/HighPriorityAckedMessage,2
-fromData,51
-toData,47
+fromData,52
+toData,48
org/apache/geode/distributed/internal/ReplyMessage,2
-fromData,101
-toData,132
+fromData,102
+toData,133
org/apache/geode/distributed/internal/SerialAckedMessage,2
-fromData,27
-toData,24
+fromData,28
+toData,25
org/apache/geode/distributed/internal/ServerLocation,2
fromData,19
toData,19
org/apache/geode/distributed/internal/ShutdownMessage,2
-fromData,27
-toData,24
+fromData,28
+toData,25
org/apache/geode/distributed/internal/StartupMessage,2
-fromData,291
-toData,318
+fromData,296
+toData,333
org/apache/geode/distributed/internal/StartupResponseMessage,2
-fromData,220
-toData,170
+fromData,231
+toData,171
org/apache/geode/distributed/internal/StartupResponseWithVersionMessage,2
-fromData,43
-toData,43
+fromData,44
+toData,44
org/apache/geode/distributed/internal/WaitForViewInstallation,2
-fromData,26
-toData,26
+fromData,27
+toData,27
org/apache/geode/distributed/internal/locks/DLockQueryProcessor$DLockQueryMessage,2
-fromData,42
-toData,42
+fromData,43
+toData,43
org/apache/geode/distributed/internal/locks/DLockQueryProcessor$DLockQueryReplyMessage,2
-fromData,74
-toData,83
+fromData,75
+toData,84
org/apache/geode/distributed/internal/locks/DLockRecoverGrantorProcessor$DLockRecoverGrantorMessage,2
-fromData,55
-toData,52
+fromData,56
+toData,53
org/apache/geode/distributed/internal/locks/DLockRecoverGrantorProcessor$DLockRecoverGrantorReplyMessage,2
-fromData,30
-toData,24
+fromData,31
+toData,25
org/apache/geode/distributed/internal/locks/DLockReleaseProcessor$DLockReleaseMessage,2
-fromData,52
-toData,52
+fromData,53
+toData,53
org/apache/geode/distributed/internal/locks/DLockReleaseProcessor$DLockReleaseReplyMessage,2
-fromData,24
-toData,24
+fromData,25
+toData,25
org/apache/geode/distributed/internal/locks/DLockRemoteToken,2
fromData,10
toData,53
org/apache/geode/distributed/internal/locks/DLockRequestProcessor$DLockRequestMessage,2
-fromData,134
-toData,134
+fromData,135
+toData,135
org/apache/geode/distributed/internal/locks/DLockRequestProcessor$DLockResponseMessage,2
-fromData,72
-toData,72
+fromData,73
+toData,73
org/apache/geode/distributed/internal/locks/DLockService$SuspendLockingToken,2
fromData,1
toData,1
org/apache/geode/distributed/internal/locks/DeposeGrantorProcessor$DeposeGrantorMessage,2
-fromData,55
-toData,52
+fromData,56
+toData,53
org/apache/geode/distributed/internal/locks/ElderInitProcessor$ElderInitMessage,2
-fromData,16
-toData,16
+fromData,17
+toData,17
org/apache/geode/distributed/internal/locks/ElderInitProcessor$ElderInitReplyMessage,2
-fromData,38
-toData,38
+fromData,39
+toData,39
org/apache/geode/distributed/internal/locks/GrantorRequestProcessor$GrantorInfoReplyMessage,2
-fromData,47
-toData,44
+fromData,48
+toData,45
org/apache/geode/distributed/internal/locks/GrantorRequestProcessor$GrantorRequestMessage,2
-fromData,73
-toData,70
+fromData,74
+toData,71
org/apache/geode/distributed/internal/locks/NonGrantorDestroyedProcessor$NonGrantorDestroyedMessage,2
-fromData,24
-toData,24
+fromData,25
+toData,25
org/apache/geode/distributed/internal/locks/NonGrantorDestroyedProcessor$NonGrantorDestroyedReplyMessage,2
-fromData,16
-toData,16
+fromData,17
+toData,17
org/apache/geode/distributed/internal/membership/InternalDistributedMember,6
-fromData,38
-fromDataPre_GFE_7_1_0_0,277
-fromDataPre_GFE_9_0_0_0,277
-toData,34
-toDataPre_GFE_7_1_0_0,276
-toDataPre_GFE_9_0_0_0,271
+fromData,39
+fromDataPre_GFE_7_1_0_0,279
+fromDataPre_GFE_9_0_0_0,279
+toData,35
+toDataPre_GFE_7_1_0_0,278
+toDataPre_GFE_9_0_0_0,274
org/apache/geode/distributed/internal/membership/adapter/LocalViewMessage,2
fromData,8
toData,8
org/apache/geode/distributed/internal/membership/gms/GMSMember,2
-fromData,196
-toData,213
+fromData,200
+toData,215
org/apache/geode/distributed/internal/membership/gms/GMSMembershipView,2
-fromData,106
-toData,60
+fromData,111
+toData,65
org/apache/geode/distributed/internal/membership/gms/locator/FindCoordinatorRequest,2
-fromData,91
-toData,114
+fromData,95
+toData,118
org/apache/geode/distributed/internal/membership/gms/locator/FindCoordinatorResponse,2
-fromData,99
-toData,89
+fromData,110
+toData,100
org/apache/geode/distributed/internal/membership/gms/locator/GetViewRequest,2
fromData,1
toData,1
org/apache/geode/distributed/internal/membership/gms/locator/GetViewResponse,2
-fromData,12
-toData,9
+fromData,20
+toData,17
org/apache/geode/distributed/internal/membership/gms/messages/FinalCheckPassedMessage,2
-fromData,9
-toData,9
+fromData,10
+toData,10
org/apache/geode/distributed/internal/membership/gms/messages/HeartbeatMessage,2
fromData,11
toData,11
org/apache/geode/distributed/internal/membership/gms/messages/HeartbeatRequestMessage,2
-fromData,19
-toData,19
+fromData,20
+toData,20
org/apache/geode/distributed/internal/membership/gms/messages/InstallViewMessage,2
-fromData,44
-toData,40
+fromData,65
+toData,61
org/apache/geode/distributed/internal/membership/gms/messages/JoinRequestMessage,2
-fromData,42
-toData,42
+fromData,58
+toData,58
org/apache/geode/distributed/internal/membership/gms/messages/JoinResponseMessage,2
-fromData,44
-toData,41
+fromData,53
+toData,50
org/apache/geode/distributed/internal/membership/gms/messages/LeaveRequestMessage,2
-fromData,17
-toData,17
+fromData,18
+toData,18
org/apache/geode/distributed/internal/membership/gms/messages/NetworkPartitionMessage,2
fromData,1
toData,1
org/apache/geode/distributed/internal/membership/gms/messages/RemoveMemberMessage,2
-fromData,17
-toData,17
+fromData,18
+toData,18
org/apache/geode/distributed/internal/membership/gms/messages/SuspectMembersMessage,2
-fromData,50
-toData,81
+fromData,53
+toData,85
org/apache/geode/distributed/internal/membership/gms/messages/ViewAckMessage,2
-fromData,32
-toData,29
+fromData,40
+toData,37
org/apache/geode/distributed/internal/streaming/StreamingOperation$RequestStreamingMessage,2
-fromData,16
-toData,16
+fromData,17
+toData,17
org/apache/geode/distributed/internal/streaming/StreamingOperation$StreamingReplyMessage,2
-fromData,422
-toData,85
+fromData,425
+toData,86
org/apache/geode/distributed/internal/tcpserver/InfoRequest,2
fromData,1
@@ -387,295 +387,295 @@ fromData,8
toData,8
org/apache/geode/internal/InternalDataSerializer$RegistrationMessage,2
-fromData,39
-toData,32
+fromData,40
+toData,33
org/apache/geode/internal/InternalInstantiator$RegistrationContextMessage,2
-fromData,14
-toData,14
+fromData,15
+toData,15
org/apache/geode/internal/InternalInstantiator$RegistrationMessage,2
-fromData,123
-toData,46
+fromData,124
+toData,47
org/apache/geode/internal/ManagerInfo,2
fromData,61
toData,74
org/apache/geode/internal/admin/ClientMembershipMessage,2
-fromData,32
-toData,32
+fromData,33
+toData,33
org/apache/geode/internal/admin/remote/AddHealthListenerRequest,2
-fromData,17
-toData,14
+fromData,18
+toData,15
org/apache/geode/internal/admin/remote/AddHealthListenerResponse,2
-fromData,16
-toData,16
+fromData,17
+toData,17
org/apache/geode/internal/admin/remote/AddStatListenerRequest,2
-fromData,26
-toData,26
+fromData,27
+toData,27
org/apache/geode/internal/admin/remote/AddStatListenerResponse,2
-fromData,16
-toData,16
+fromData,17
+toData,17
org/apache/geode/internal/admin/remote/AdminConsoleDisconnectMessage,2
-fromData,34
-toData,34
+fromData,35
+toData,35
org/apache/geode/internal/admin/remote/AdminConsoleMessage,2
-fromData,16
-toData,16
+fromData,17
+toData,17
org/apache/geode/internal/admin/remote/AdminFailureResponse,2
-fromData,17
-toData,14
+fromData,18
+toData,15
org/apache/geode/internal/admin/remote/AdminRequest,2
-fromData,24
-toData,24
+fromData,25
+toData,25
org/apache/geode/internal/admin/remote/AdminResponse,2
-fromData,16
-toData,16
+fromData,17
+toData,17
org/apache/geode/internal/admin/remote/AlertLevelChangeMessage,2
-fromData,16
-toData,16
+fromData,17
+toData,17
org/apache/geode/internal/admin/remote/AlertListenerMessage,2
-fromData,69
-toData,66
+fromData,70
+toData,67
org/apache/geode/internal/admin/remote/AlertsNotificationMessage,2
-fromData,20
-toData,14
+fromData,21
+toData,15
org/apache/geode/internal/admin/remote/AppCacheSnapshotMessage,2
-fromData,16
-toData,16
+fromData,17
+toData,17
org/apache/geode/internal/admin/remote/BridgeServerRequest,2
-fromData,47
-toData,44
+fromData,48
+toData,45
org/apache/geode/internal/admin/remote/BridgeServerResponse,2
-fromData,28
-toData,22
+fromData,29
+toData,23
org/apache/geode/internal/admin/remote/CacheConfigRequest,2
-fromData,36
-toData,36
+fromData,37
+toData,37
org/apache/geode/internal/admin/remote/CacheConfigResponse,2
-fromData,28
-toData,22
+fromData,29
+toData,23
org/apache/geode/internal/admin/remote/CacheInfoRequest,2
-fromData,6
-toData,6
+fromData,7
+toData,7
org/apache/geode/internal/admin/remote/CacheInfoResponse,2
-fromData,17
-toData,14
+fromData,18
+toData,15
org/apache/geode/internal/admin/remote/CancelStatListenerRequest,2
-fromData,16
-toData,16
+fromData,17
+toData,17
org/apache/geode/internal/admin/remote/CancelStatListenerResponse,2
-fromData,6
-toData,6
+fromData,7
+toData,7
org/apache/geode/internal/admin/remote/CancellationMessage,2
-fromData,16
-toData,16
+fromData,17
+toData,17
org/apache/geode/internal/admin/remote/ChangeRefreshIntervalMessage,2
-fromData,16
-toData,16
+fromData,17
+toData,17
org/apache/geode/internal/admin/remote/ClientHealthStats,6
fromData,73
-fromDataPre_GEODE_1_9_0_0,14
+fromDataPre_GEODE_1_9_0_0,15
fromDataPre_GFE_8_0_0_0,68
toData,73
-toDataPre_GEODE_1_9_0_0,14
+toDataPre_GEODE_1_9_0_0,15
toDataPre_GFE_8_0_0_0,68
org/apache/geode/internal/admin/remote/CompactRequest,2
-fromData,6
-toData,6
+fromData,7
+toData,7
org/apache/geode/internal/admin/remote/CompactResponse,2
-fromData,14
-toData,14
+fromData,15
+toData,15
org/apache/geode/internal/admin/remote/DestroyEntryMessage,2
-fromData,25
-toData,22
+fromData,26
+toData,23
org/apache/geode/internal/admin/remote/DestroyRegionMessage,2
-fromData,17
-toData,14
+fromData,18
+toData,15
org/apache/geode/internal/admin/remote/DurableClientInfoRequest,2
-fromData,28
-toData,24
+fromData,29
+toData,25
org/apache/geode/internal/admin/remote/DurableClientInfoResponse,2
-fromData,16
-toData,16
+fromData,17
+toData,17
org/apache/geode/internal/admin/remote/FetchDistLockInfoRequest,2
-fromData,6
-toData,6
+fromData,7
+toData,7
org/apache/geode/internal/admin/remote/FetchDistLockInfoResponse,2
-fromData,20
-toData,14
+fromData,21
+toData,15
org/apache/geode/internal/admin/remote/FetchHealthDiagnosisRequest,2
-fromData,27
-toData,24
+fromData,30
+toData,25
org/apache/geode/internal/admin/remote/FetchHealthDiagnosisResponse,2
-fromData,14
-toData,14
+fromData,15
+toData,15
org/apache/geode/internal/admin/remote/FetchHostRequest,2
-fromData,6
-toData,6
+fromData,7
+toData,7
org/apache/geode/internal/admin/remote/FetchHostResponse,2
-fromData,67
-toData,58
+fromData,68
+toData,59
org/apache/geode/internal/admin/remote/FetchResourceAttributesRequest,2
-fromData,16
-toData,16
+fromData,17
+toData,17
org/apache/geode/internal/admin/remote/FetchResourceAttributesResponse,2
-fromData,20
-toData,14
+fromData,21
+toData,15
org/apache/geode/internal/admin/remote/FetchStatsRequest,2
-fromData,14
-toData,14
+fromData,15
+toData,15
org/apache/geode/internal/admin/remote/FetchStatsResponse,2
-fromData,20
-toData,14
+fromData,21
+toData,15
org/apache/geode/internal/admin/remote/FetchSysCfgRequest,2
-fromData,6
-toData,6
+fromData,7
+toData,7
org/apache/geode/internal/admin/remote/FetchSysCfgResponse,2
-fromData,17
-toData,14
+fromData,18
+toData,15
org/apache/geode/internal/admin/remote/FlushAppCacheSnapshotMessage,2
-fromData,6
-toData,6
+fromData,7
+toData,7
org/apache/geode/internal/admin/remote/HealthListenerMessage,2
-fromData,27
-toData,24
+fromData,28
+toData,25
org/apache/geode/internal/admin/remote/LicenseInfoRequest,2
-fromData,6
-toData,6
+fromData,7
+toData,7
org/apache/geode/internal/admin/remote/LicenseInfoResponse,2
-fromData,17
-toData,14
+fromData,18
+toData,15
org/apache/geode/internal/admin/remote/MissingPersistentIDsRequest,1
-fromData,6
+fromData,7
org/apache/geode/internal/admin/remote/MissingPersistentIDsResponse,2
-fromData,124
-toData,110
+fromData,129
+toData,115
org/apache/geode/internal/admin/remote/ObjectDetailsRequest,2
-fromData,24
-toData,24
+fromData,25
+toData,25
org/apache/geode/internal/admin/remote/ObjectDetailsResponse,2
-fromData,33
-toData,30
+fromData,34
+toData,31
org/apache/geode/internal/admin/remote/ObjectNamesRequest,2
-fromData,6
-toData,6
+fromData,7
+toData,7
org/apache/geode/internal/admin/remote/ObjectNamesResponse,2
-fromData,17
-toData,14
+fromData,18
+toData,15
org/apache/geode/internal/admin/remote/PrepareRevokePersistentIDRequest,2
-fromData,35
-toData,24
+fromData,36
+toData,25
org/apache/geode/internal/admin/remote/RefreshMemberSnapshotRequest,2
-fromData,6
-toData,6
+fromData,7
+toData,7
org/apache/geode/internal/admin/remote/RefreshMemberSnapshotResponse,2
-fromData,17
-toData,14
+fromData,18
+toData,15
org/apache/geode/internal/admin/remote/RegionAdminMessage,2
-fromData,14
-toData,14
+fromData,15
+toData,15
org/apache/geode/internal/admin/remote/RegionAdminRequest,2
-fromData,14
-toData,14
+fromData,15
+toData,15
org/apache/geode/internal/admin/remote/RegionAttributesRequest,2
-fromData,6
-toData,6
+fromData,7
+toData,7
org/apache/geode/internal/admin/remote/RegionAttributesResponse,2
-fromData,17
-toData,14
+fromData,18
+toData,15
org/apache/geode/internal/admin/remote/RegionRequest,2
-fromData,57
-toData,50
+fromData,58
+toData,51
org/apache/geode/internal/admin/remote/RegionResponse,2
-fromData,33
-toData,30
+fromData,34
+toData,31
org/apache/geode/internal/admin/remote/RegionSizeRequest,2
-fromData,6
-toData,6
+fromData,7
+toData,7
org/apache/geode/internal/admin/remote/RegionSizeResponse,2
-fromData,26
-toData,26
+fromData,27
+toData,27
org/apache/geode/internal/admin/remote/RegionStatisticsRequest,2
-fromData,6
-toData,6
+fromData,7
+toData,7
org/apache/geode/internal/admin/remote/RegionStatisticsResponse,2
-fromData,17
-toData,14
+fromData,18
+toData,15
org/apache/geode/internal/admin/remote/RegionSubRegionSizeRequest,2
-fromData,6
-toData,6
+fromData,7
+toData,7
org/apache/geode/internal/admin/remote/RegionSubRegionsSizeResponse,2
-fromData,27
-toData,24
+fromData,28
+toData,25
org/apache/geode/internal/admin/remote/RemoteBridgeServer,2
fromData,217
@@ -718,92 +718,92 @@ fromData,45
toData,45
org/apache/geode/internal/admin/remote/RemoveHealthListenerRequest,2
-fromData,16
-toData,16
+fromData,17
+toData,17
org/apache/geode/internal/admin/remote/RemoveHealthListenerResponse,2
-fromData,6
-toData,6
+fromData,7
+toData,7
org/apache/geode/internal/admin/remote/ResetHealthStatusRequest,2
-fromData,16
-toData,16
+fromData,17
+toData,17
org/apache/geode/internal/admin/remote/ResetHealthStatusResponse,2
-fromData,6
-toData,6
+fromData,7
+toData,7
org/apache/geode/internal/admin/remote/RevokePersistentIDRequest,2
-fromData,25
-toData,14
+fromData,26
+toData,15
org/apache/geode/internal/admin/remote/RootRegionRequest,2
-fromData,6
-toData,6
+fromData,7
+toData,7
org/apache/geode/internal/admin/remote/RootRegionResponse,2
-fromData,28
-toData,22
+fromData,29
+toData,23
org/apache/geode/internal/admin/remote/ShutdownAllGatewayHubsRequest,2
-fromData,16
-toData,16
+fromData,17
+toData,17
org/apache/geode/internal/admin/remote/ShutdownAllRequest,2
-fromData,6
-toData,6
+fromData,7
+toData,7
org/apache/geode/internal/admin/remote/ShutdownAllResponse,2
-fromData,16
-toData,16
+fromData,17
+toData,17
org/apache/geode/internal/admin/remote/SnapshotResultMessage,2
-fromData,27
-toData,24
+fromData,28
+toData,25
org/apache/geode/internal/admin/remote/StatAlertsManagerAssignMessage,2
-fromData,30
-toData,24
+fromData,31
+toData,25
org/apache/geode/internal/admin/remote/StatListenerMessage,2
-fromData,86
-toData,66
+fromData,87
+toData,67
org/apache/geode/internal/admin/remote/StoreSysCfgRequest,2
-fromData,17
-toData,14
+fromData,18
+toData,15
org/apache/geode/internal/admin/remote/StoreSysCfgResponse,2
-fromData,6
-toData,6
+fromData,7
+toData,7
org/apache/geode/internal/admin/remote/SubRegionRequest,2
-fromData,6
-toData,6
+fromData,7
+toData,7
org/apache/geode/internal/admin/remote/SubRegionResponse,2
-fromData,34
-toData,22
+fromData,35
+toData,23
org/apache/geode/internal/admin/remote/TailLogRequest,2
-fromData,6
-toData,6
+fromData,7
+toData,7
org/apache/geode/internal/admin/remote/TailLogResponse,2
-fromData,22
-toData,22
+fromData,23
+toData,23
org/apache/geode/internal/admin/remote/UpdateAlertDefinitionMessage,2
-fromData,30
-toData,24
+fromData,31
+toData,25
org/apache/geode/internal/admin/remote/VersionInfoRequest,2
-fromData,6
-toData,6
+fromData,7
+toData,7
org/apache/geode/internal/admin/remote/VersionInfoResponse,2
-fromData,14
-toData,14
+fromData,15
+toData,15
org/apache/geode/internal/admin/statalerts/BaseDecoratorImpl,2
fromData,12
@@ -842,20 +842,20 @@ fromData,11
toData,6
org/apache/geode/internal/cache/AbstractUpdateOperation$AbstractUpdateMessage,2
-fromData,16
-toData,16
+fromData,17
+toData,17
org/apache/geode/internal/cache/AddCacheServerProfileMessage,2
-fromData,16
-toData,16
+fromData,17
+toData,17
org/apache/geode/internal/cache/BucketAdvisor$BucketProfile,2
-fromData,36
-toData,36
+fromData,37
+toData,37
org/apache/geode/internal/cache/BucketAdvisor$ServerBucketProfile,2
-fromData,22
-toData,22
+fromData,23
+toData,23
org/apache/geode/internal/cache/BucketServerLocation,2
fromData,39
@@ -866,128 +866,128 @@ fromData,93
toData,91
org/apache/geode/internal/cache/CacheDistributionAdvisor$CacheProfile,2
-fromData,113
-toData,101
+fromData,114
+toData,102
org/apache/geode/internal/cache/CacheServerAdvisor$CacheServerProfile,2
-fromData,53
-toData,42
+fromData,54
+toData,43
org/apache/geode/internal/cache/ClientRegionEventImpl,2
-fromData,14
-toData,14
+fromData,15
+toData,15
org/apache/geode/internal/cache/CloseCacheMessage,2
-fromData,16
-toData,16
+fromData,17
+toData,17
org/apache/geode/internal/cache/ControllerAdvisor$ControllerProfile,2
-fromData,6
-toData,6
+fromData,7
+toData,7
org/apache/geode/internal/cache/CreateRegionProcessor$CreateRegionMessage,2
-fromData,45
-toData,42
+fromData,46
+toData,43
org/apache/geode/internal/cache/CreateRegionProcessor$CreateRegionReplyMessage,2
-fromData,161
-toData,195
+fromData,164
+toData,199
org/apache/geode/internal/cache/DestroyOperation$DestroyMessage,2
-fromData,45
-toData,118
+fromData,46
+toData,121
org/apache/geode/internal/cache/DestroyOperation$DestroyWithContextMessage,2
-fromData,14
-toData,14
+fromData,15
+toData,15
org/apache/geode/internal/cache/DestroyPartitionedRegionMessage,4
-fromData,17
-fromDataPre_GEODE_1_9_0_0,76
-toData,14
-toDataPre_GEODE_1_9_0_0,77
+fromData,18
+fromDataPre_GEODE_1_9_0_0,80
+toData,15
+toDataPre_GEODE_1_9_0_0,78
org/apache/geode/internal/cache/DestroyRegionOperation$DestroyRegionMessage,2
-fromData,41
-toData,38
+fromData,42
+toData,39
org/apache/geode/internal/cache/DestroyRegionOperation$DestroyRegionWithContextMessage,2
-fromData,14
-toData,14
+fromData,15
+toData,15
org/apache/geode/internal/cache/DistTXCommitMessage,2
-fromData,14
-toData,14
+fromData,15
+toData,15
org/apache/geode/internal/cache/DistTXCommitMessage$DistTXCommitReplyMessage,2
-fromData,17
-toData,14
+fromData,18
+toData,15
org/apache/geode/internal/cache/DistTXPrecommitMessage,2
-fromData,14
-toData,14
+fromData,15
+toData,15
org/apache/geode/internal/cache/DistTXPrecommitMessage$DistTXPrecommitReplyMessage,2
-fromData,17
-toData,14
+fromData,18
+toData,15
org/apache/geode/internal/cache/DistTXPrecommitMessage$DistTxPrecommitResponse,2
fromData,17
toData,17
org/apache/geode/internal/cache/DistTXRollbackMessage,2
-fromData,6
-toData,6
+fromData,7
+toData,7
org/apache/geode/internal/cache/DistTXRollbackMessage$DistTXRollbackReplyMessage,2
-fromData,14
-toData,14
+fromData,15
+toData,15
org/apache/geode/internal/cache/DistributedCacheOperation$CacheOperationMessage,2
-fromData,291
-toData,202
+fromData,293
+toData,206
org/apache/geode/internal/cache/DistributedClearOperation$ClearRegionMessage,2
-fromData,53
-toData,43
+fromData,54
+toData,44
org/apache/geode/internal/cache/DistributedClearOperation$ClearRegionWithContextMessage,2
-fromData,14
-toData,14
+fromData,15
+toData,15
org/apache/geode/internal/cache/DistributedPutAllOperation$EntryVersionsList,2
fromData,272
-toData,289
+toData,292
org/apache/geode/internal/cache/DistributedPutAllOperation$PutAllEntryData,1
toData,229
org/apache/geode/internal/cache/DistributedPutAllOperation$PutAllMessage,2
-fromData,197
-toData,165
+fromData,200
+toData,171
org/apache/geode/internal/cache/DistributedRegionFunctionStreamingMessage,2
-fromData,171
-toData,173
+fromData,177
+toData,174
org/apache/geode/internal/cache/DistributedRemoveAllOperation$RemoveAllEntryData,1
toData,136
org/apache/geode/internal/cache/DistributedRemoveAllOperation$RemoveAllMessage,2
-fromData,197
-toData,165
+fromData,200
+toData,171
org/apache/geode/internal/cache/DistributedTombstoneOperation$TombstoneMessage,2
-fromData,125
-toData,227
+fromData,128
+toData,231
org/apache/geode/internal/cache/DynamicRegionAttributes,2
fromData,17
toData,17
org/apache/geode/internal/cache/EntryEventImpl,2
-fromData,219
-toData,284
+fromData,221
+toData,294
org/apache/geode/internal/cache/EntrySnapshot,2
fromData,50
@@ -996,7 +996,7 @@ toData,22
org/apache/geode/internal/cache/EventID,4
fromData,53
fromDataPre_GFE_8_0_0_0,33
-toData,97
+toData,99
toDataPre_GFE_8_0_0_0,24
org/apache/geode/internal/cache/EvictionAttributesImpl,2
@@ -1008,12 +1008,12 @@ fromData,9
toData,12
org/apache/geode/internal/cache/FilterProfile,2
-fromData,194
-toData,205
+fromData,197
+toData,207
org/apache/geode/internal/cache/FilterProfile$OperationMessage,2
-fromData,129
-toData,133
+fromData,130
+toData,134
org/apache/geode/internal/cache/FilterRoutingInfo,4
fromData,88
@@ -1028,122 +1028,122 @@ toData,247
toDataPre_GFE_8_0_0_0,213
org/apache/geode/internal/cache/FindDurableQueueProcessor$FindDurableQueueMessage,2
-fromData,24
-toData,24
+fromData,25
+toData,25
org/apache/geode/internal/cache/FindDurableQueueProcessor$FindDurableQueueReply,2
-fromData,14
-toData,14
+fromData,15
+toData,15
org/apache/geode/internal/cache/FindRemoteTXMessage,2
-fromData,27
-toData,24
+fromData,28
+toData,25
org/apache/geode/internal/cache/FindRemoteTXMessage$FindRemoteTXMessageReply,2
-fromData,46
-toData,66
+fromData,47
+toData,67
org/apache/geode/internal/cache/FindVersionTagOperation$FindVersionTagMessage,2
-fromData,55
-toData,44
+fromData,56
+toData,45
org/apache/geode/internal/cache/FindVersionTagOperation$VersionTagReply,2
-fromData,17
-toData,14
+fromData,18
+toData,15
org/apache/geode/internal/cache/FixedPartitionAttributesImpl,2
fromData,39
toData,39
org/apache/geode/internal/cache/FunctionStreamingReplyMessage,2
-fromData,64
-toData,90
+fromData,68
+toData,94
org/apache/geode/internal/cache/GridAdvisor$GridProfile,2
-fromData,26
-toData,22
+fromData,27
+toData,23
org/apache/geode/internal/cache/HARegion$HARegionAdvisor$HAProfile,2
-fromData,43
-toData,41
+fromData,44
+toData,42
org/apache/geode/internal/cache/InitialImageFlowControl$FlowControlPermitMessage,2
-fromData,16
-toData,16
+fromData,17
+toData,17
org/apache/geode/internal/cache/InitialImageOperation$Entry,2
fromData,89
toData,101
org/apache/geode/internal/cache/InitialImageOperation$FilterInfoMessage,2
-fromData,230
-toData,284
+fromData,231
+toData,285
org/apache/geode/internal/cache/InitialImageOperation$ImageReplyMessage,2
-fromData,224
-toData,234
+fromData,229
+toData,238
org/apache/geode/internal/cache/InitialImageOperation$InitialImageVersionedEntryList,2
-fromData,406
-toData,396
+fromData,414
+toData,399
org/apache/geode/internal/cache/InitialImageOperation$RVVReplyMessage,2
-fromData,33
-toData,51
+fromData,36
+toData,53
org/apache/geode/internal/cache/InitialImageOperation$RegionStateMessage,2
-fromData,66
-toData,101
+fromData,69
+toData,102
org/apache/geode/internal/cache/InitialImageOperation$RequestFilterInfoMessage,2
-fromData,24
-toData,24
+fromData,25
+toData,25
org/apache/geode/internal/cache/InitialImageOperation$RequestImageMessage,2
-fromData,98
-toData,86
+fromData,99
+toData,87
org/apache/geode/internal/cache/InitialImageOperation$RequestRVVMessage,2
-fromData,34
-toData,34
+fromData,35
+toData,35
org/apache/geode/internal/cache/InitialImageOperation$RequestSyncMessage,2
-fromData,73
-toData,77
+fromData,77
+toData,80
org/apache/geode/internal/cache/InterestRegistrationEventImpl,2
fromData,33
toData,36
org/apache/geode/internal/cache/InvalidateOperation$InvalidateMessage,2
-fromData,25
-toData,22
+fromData,26
+toData,23
org/apache/geode/internal/cache/InvalidateOperation$InvalidateWithContextMessage,2
-fromData,14
-toData,14
+fromData,15
+toData,15
org/apache/geode/internal/cache/InvalidatePartitionedRegionMessage,4
-fromData,17
-fromDataPre_GEODE_1_9_0_0,14
-toData,14
-toDataPre_GEODE_1_9_0_0,14
+fromData,31
+fromDataPre_GEODE_1_9_0_0,28
+toData,23
+toDataPre_GEODE_1_9_0_0,15
org/apache/geode/internal/cache/InvalidateRegionOperation$InvalidateRegionMessage,2
-fromData,17
-toData,14
+fromData,18
+toData,15
org/apache/geode/internal/cache/JtaAfterCompletionMessage,2
-fromData,26
-toData,26
+fromData,27
+toData,27
org/apache/geode/internal/cache/LatestLastAccessTimeMessage,2
-fromData,30
-toData,30
+fromData,31
+toData,31
org/apache/geode/internal/cache/MemberFunctionStreamingMessage,2
-fromData,163
-toData,162
+fromData,169
+toData,163
org/apache/geode/internal/cache/Node,2
fromData,60
@@ -1185,72 +1185,72 @@ fromData,48
toData,51
org/apache/geode/internal/cache/ReleaseClearLockMessage,2
-fromData,24
-toData,24
+fromData,25
+toData,25
org/apache/geode/internal/cache/RemoveCacheServerProfileMessage,2
-fromData,16
-toData,16
+fromData,17
+toData,17
org/apache/geode/internal/cache/RoleEventImpl,2
-fromData,63
-toData,72
+fromData,67
+toData,75
org/apache/geode/internal/cache/SearchLoadAndWriteProcessor$NetLoadReplyMessage,2
-fromData,63
-toData,91
+fromData,64
+toData,92
org/apache/geode/internal/cache/SearchLoadAndWriteProcessor$NetLoadRequestMessage,2
-fromData,72
-toData,72
+fromData,73
+toData,73
org/apache/geode/internal/cache/SearchLoadAndWriteProcessor$NetSearchReplyMessage,2
-fromData,131
-toData,145
+fromData,134
+toData,146
org/apache/geode/internal/cache/SearchLoadAndWriteProcessor$NetSearchRequestMessage,2
-fromData,97
-toData,131
+fromData,98
+toData,132
org/apache/geode/internal/cache/SearchLoadAndWriteProcessor$NetWriteReplyMessage,2
-fromData,47
-toData,44
+fromData,48
+toData,45
org/apache/geode/internal/cache/SearchLoadAndWriteProcessor$NetWriteRequestMessage,2
-fromData,57
-toData,54
+fromData,58
+toData,55
org/apache/geode/internal/cache/SearchLoadAndWriteProcessor$QueryMessage,2
-fromData,114
-toData,145
+fromData,115
+toData,146
org/apache/geode/internal/cache/SearchLoadAndWriteProcessor$ResponseMessage,2
-fromData,83
-toData,80
+fromData,84
+toData,81
org/apache/geode/internal/cache/ServerPingMessage,2
-fromData,16
-toData,16
+fromData,17
+toData,17
org/apache/geode/internal/cache/StateFlushOperation$StateMarkerMessage,2
-fromData,62
-toData,59
+fromData,63
+toData,60
org/apache/geode/internal/cache/StateFlushOperation$StateStabilizationMessage,2
-fromData,45
-toData,42
+fromData,46
+toData,43
org/apache/geode/internal/cache/StateFlushOperation$StateStabilizedMessage,2
-fromData,17
-toData,14
+fromData,18
+toData,15
org/apache/geode/internal/cache/StoreAllCachedDeserializable,2
fromData,20
toData,9
org/apache/geode/internal/cache/TXCommitMessage,2
-fromData,236
-toData,316
+fromData,238
+toData,323
org/apache/geode/internal/cache/TXCommitMessage$CommitProcessForLockIdMessage,2
fromData,26
@@ -1265,8 +1265,8 @@ fromData,19
toData,19
org/apache/geode/internal/cache/TXCommitMessage$CommitProcessQueryReplyMessage,2
-fromData,16
-toData,16
+fromData,17
+toData,17
org/apache/geode/internal/cache/TXCommitMessage$RegionCommit,2
fromData,164
@@ -1285,16 +1285,16 @@ fromData,19
toData,19
org/apache/geode/internal/cache/TXMessage,2
-fromData,37
-toData,34
+fromData,38
+toData,35
org/apache/geode/internal/cache/TXRegionLockRequestImpl,2
fromData,97
toData,55
org/apache/geode/internal/cache/TXRemoteCommitMessage$TXRemoteCommitReplyMessage,2
-fromData,17
-toData,14
+fromData,18
+toData,15
org/apache/geode/internal/cache/Token$Destroyed,2
fromData,1
@@ -1321,28 +1321,28 @@ fromData,1
toData,1
org/apache/geode/internal/cache/UpdateAttributesProcessor$ProfileReplyMessage,2
-fromData,17
-toData,14
+fromData,18
+toData,15
org/apache/geode/internal/cache/UpdateAttributesProcessor$ProfilesReplyMessage,2
-fromData,62
-toData,59
+fromData,66
+toData,63
org/apache/geode/internal/cache/UpdateAttributesProcessor$UpdateAttributesMessage,2
-fromData,62
-toData,52
+fromData,63
+toData,53
org/apache/geode/internal/cache/UpdateEntryVersionOperation$UpdateEntryVersionMessage,2
-fromData,45
-toData,118
+fromData,46
+toData,121
org/apache/geode/internal/cache/UpdateOperation$UpdateMessage,2
-fromData,144
-toData,237
+fromData,147
+toData,245
org/apache/geode/internal/cache/UpdateOperation$UpdateWithContextMessage,2
-fromData,14
-toData,14
+fromData,15
+toData,15
org/apache/geode/internal/cache/VMCachedDeserializable,2
fromData,17
@@ -1353,12 +1353,12 @@ fromData,9
toData,9
org/apache/geode/internal/cache/backup/BackupResponse,2
-fromData,14
-toData,14
+fromData,15
+toData,15
org/apache/geode/internal/cache/backup/PrepareBackupRequest,2
-fromData,14
-toData,14
+fromData,15
+toData,15
org/apache/geode/internal/cache/compression/CompressedCachedDeserializable,2
fromData,18
@@ -1371,12 +1371,12 @@ org/apache/geode/internal/cache/control/MemoryThresholds$MemoryState,1
toData,12
org/apache/geode/internal/cache/control/ResourceAdvisor$ResourceManagerProfile,2
-fromData,66
-toData,99
+fromData,67
+toData,100
org/apache/geode/internal/cache/control/ResourceAdvisor$ResourceProfileMessage,2
-fromData,84
-toData,71
+fromData,88
+toData,72
org/apache/geode/internal/cache/event/EventSequenceNumberHolder,2
fromData,22
@@ -1387,236 +1387,236 @@ fromData,95
toData,73
org/apache/geode/internal/cache/ha/HARegionQueue$DispatchedAndCurrentEvents,2
-fromData,35
-toData,35
+fromData,37
+toData,37
org/apache/geode/internal/cache/ha/QueueRemovalMessage,2
-fromData,115
-toData,121
+fromData,119
+toData,125
org/apache/geode/internal/cache/ha/ThreadIdentifier,2
fromData,19
toData,19
org/apache/geode/internal/cache/locks/TXLockBatch,2
-fromData,67
-toData,86
+fromData,69
+toData,88
org/apache/geode/internal/cache/locks/TXLockIdImpl,2
fromData,22
toData,19
org/apache/geode/internal/cache/locks/TXLockUpdateParticipantsMessage,2
-fromData,40
-toData,40
+fromData,41
+toData,41
org/apache/geode/internal/cache/locks/TXLockUpdateParticipantsMessage$TXLockUpdateParticipantsReplyMessage,2
-fromData,6
-toData,6
+fromData,7
+toData,7
org/apache/geode/internal/cache/locks/TXOriginatorRecoveryProcessor$TXOriginatorRecoveryMessage,2
-fromData,27
-toData,24
+fromData,28
+toData,25
org/apache/geode/internal/cache/locks/TXOriginatorRecoveryProcessor$TXOriginatorRecoveryReplyMessage,2
-fromData,6
-toData,6
+fromData,7
+toData,7
org/apache/geode/internal/cache/partitioned/AllBucketProfilesUpdateMessage,2
-fromData,37
-toData,34
+fromData,38
+toData,35
org/apache/geode/internal/cache/partitioned/BecomePrimaryBucketMessage,2
-fromData,26
-toData,26
+fromData,27
+toData,27
org/apache/geode/internal/cache/partitioned/BecomePrimaryBucketMessage$BecomePrimaryBucketReplyMessage,2
-fromData,16
-toData,16
+fromData,17
+toData,17
org/apache/geode/internal/cache/partitioned/BucketBackupMessage,2
-fromData,16
-toData,16
+fromData,17
+toData,17
org/apache/geode/internal/cache/partitioned/BucketCountLoadProbe,2
fromData,1
toData,1
org/apache/geode/internal/cache/partitioned/BucketProfileUpdateMessage,2
-fromData,47
-toData,44
+fromData,48
+toData,45
org/apache/geode/internal/cache/partitioned/BucketSizeMessage,2
-fromData,16
-toData,16
+fromData,17
+toData,17
org/apache/geode/internal/cache/partitioned/BucketSizeMessage$BucketSizeReplyMessage,2
-fromData,26
-toData,26
+fromData,27
+toData,27
org/apache/geode/internal/cache/partitioned/ColocatedRegionDetails,2
fromData,81
toData,133
org/apache/geode/internal/cache/partitioned/ContainsKeyValueMessage,2
-fromData,37
-toData,37
+fromData,38
+toData,38
org/apache/geode/internal/cache/partitioned/ContainsKeyValueMessage$ContainsKeyValueReplyMessage,2
-fromData,16
-toData,16
+fromData,17
+toData,17
org/apache/geode/internal/cache/partitioned/CreateBucketMessage,2
-fromData,26
-toData,26
+fromData,27
+toData,27
org/apache/geode/internal/cache/partitioned/CreateBucketMessage$CreateBucketReplyMessage,2
-fromData,36
-toData,39
+fromData,37
+toData,40
org/apache/geode/internal/cache/partitioned/DeposePrimaryBucketMessage,2
-fromData,16
-toData,16
+fromData,17
+toData,17
org/apache/geode/internal/cache/partitioned/DeposePrimaryBucketMessage$DeposePrimaryBucketReplyMessage,2
-fromData,6
-toData,6
+fromData,7
+toData,7
org/apache/geode/internal/cache/partitioned/DestroyMessage,2
-fromData,134
-toData,100
+fromData,135
+toData,101
org/apache/geode/internal/cache/partitioned/DestroyMessage$DestroyReplyMessage,2
-fromData,52
-toData,60
+fromData,55
+toData,61
org/apache/geode/internal/cache/partitioned/DestroyRegionOnDataStoreMessage,2
-fromData,14
-toData,14
+fromData,15
+toData,15
org/apache/geode/internal/cache/partitioned/DumpB2NRegion,2
-fromData,26
-toData,26
+fromData,27
+toData,27
org/apache/geode/internal/cache/partitioned/DumpB2NRegion$DumpB2NReplyMessage,2
-fromData,17
-toData,14
+fromData,18
+toData,15
org/apache/geode/internal/cache/partitioned/DumpBucketsMessage,2
-fromData,26
-toData,26
+fromData,27
+toData,27
org/apache/geode/internal/cache/partitioned/EndBucketCreationMessage,2
-fromData,35
-toData,24
+fromData,36
+toData,25
org/apache/geode/internal/cache/partitioned/FetchBulkEntriesMessage,2
-fromData,67
-toData,67
+fromData,68
+toData,68
org/apache/geode/internal/cache/partitioned/FetchBulkEntriesMessage$FetchBulkEntriesReplyMessage,2
-fromData,40
-toData,40
+fromData,41
+toData,41
org/apache/geode/internal/cache/partitioned/FetchEntriesMessage,2
-fromData,16
-toData,16
+fromData,17
+toData,17
org/apache/geode/internal/cache/partitioned/FetchEntriesMessage$FetchEntriesReplyMessage,2
-fromData,74
-toData,74
+fromData,75
+toData,75
org/apache/geode/internal/cache/partitioned/FetchEntryMessage,2
-fromData,14
-toData,14
+fromData,15
+toData,15
org/apache/geode/internal/cache/partitioned/FetchEntryMessage$FetchEntryReplyMessage,2
-fromData,58
-toData,38
+fromData,62
+toData,39
org/apache/geode/internal/cache/partitioned/FetchKeysMessage,2
-fromData,47
-toData,47
+fromData,48
+toData,48
org/apache/geode/internal/cache/partitioned/FetchKeysMessage$FetchKeysReplyMessage,2
-fromData,54
-toData,54
+fromData,55
+toData,55
org/apache/geode/internal/cache/partitioned/FetchPartitionDetailsMessage,2
-fromData,37
-toData,34
+fromData,38
+toData,35
org/apache/geode/internal/cache/partitioned/FetchPartitionDetailsMessage$FetchPartitionDetailsReplyMessage,2
-fromData,97
-toData,120
+fromData,98
+toData,121
org/apache/geode/internal/cache/partitioned/FlushMessage,2
-fromData,36
-toData,36
+fromData,37
+toData,37
org/apache/geode/internal/cache/partitioned/GetMessage,2
-fromData,43
-toData,40
+fromData,44
+toData,41
org/apache/geode/internal/cache/partitioned/GetMessage$GetReplyMessage,2
-fromData,77
-toData,89
+fromData,80
+toData,94
org/apache/geode/internal/cache/partitioned/IdentityRequestMessage,2
-fromData,16
-toData,16
+fromData,17
+toData,17
org/apache/geode/internal/cache/partitioned/IdentityRequestMessage$IdentityReplyMessage,2
-fromData,26
-toData,26
+fromData,27
+toData,27
org/apache/geode/internal/cache/partitioned/IdentityUpdateMessage,2
-fromData,26
-toData,26
+fromData,27
+toData,27
org/apache/geode/internal/cache/partitioned/IndexCreationMsg,2
-fromData,14
-toData,14
+fromData,15
+toData,15
org/apache/geode/internal/cache/partitioned/IndexCreationMsg$IndexCreationReplyMsg,2
-fromData,47
-toData,44
+fromData,48
+toData,45
org/apache/geode/internal/cache/partitioned/InterestEventMessage,2
-fromData,17
-toData,14
+fromData,18
+toData,15
org/apache/geode/internal/cache/partitioned/InterestEventMessage$InterestEventReplyMessage,2
-fromData,16
-toData,16
+fromData,17
+toData,17
org/apache/geode/internal/cache/partitioned/InvalidateMessage$InvalidateReplyMessage,2
-fromData,17
-toData,14
+fromData,18
+toData,15
org/apache/geode/internal/cache/partitioned/ManageBackupBucketMessage,2
-fromData,76
-toData,79
+fromData,77
+toData,80
org/apache/geode/internal/cache/partitioned/ManageBackupBucketMessage$ManageBackupBucketReplyMessage,2
-fromData,26
-toData,26
+fromData,27
+toData,27
org/apache/geode/internal/cache/partitioned/ManageBucketMessage,2
-fromData,36
-toData,36
+fromData,37
+toData,37
org/apache/geode/internal/cache/partitioned/ManageBucketMessage$ManageBucketReplyMessage,2
-fromData,26
-toData,26
+fromData,27
+toData,27
org/apache/geode/internal/cache/partitioned/MoveBucketMessage,2
-fromData,27
-toData,24
+fromData,28
+toData,25
org/apache/geode/internal/cache/partitioned/MoveBucketMessage$MoveBucketReplyMessage,2
-fromData,16
-toData,16
+fromData,17
+toData,17
org/apache/geode/internal/cache/partitioned/OfflineMemberDetails$1,2
fromData,1
@@ -1631,92 +1631,92 @@ fromData,10
toData,27
org/apache/geode/internal/cache/partitioned/PRSanityCheckMessage,2
-fromData,14
-toData,14
+fromData,15
+toData,15
org/apache/geode/internal/cache/partitioned/PRTombstoneMessage,2
-fromData,63
-toData,63
+fromData,66
+toData,66
org/apache/geode/internal/cache/partitioned/PRUpdateEntryVersionMessage,2
-fromData,49
-toData,43
+fromData,50
+toData,44
org/apache/geode/internal/cache/partitioned/PartitionMessage,2
-fromData,58
-toData,104
+fromData,59
+toData,105
org/apache/geode/internal/cache/partitioned/PartitionedRegionFunctionStreamingMessage,2
-fromData,17
-toData,14
+fromData,18
+toData,15
org/apache/geode/internal/cache/partitioned/PrimaryRequestMessage,2
-fromData,16
-toData,16
+fromData,17
+toData,17
org/apache/geode/internal/cache/partitioned/PrimaryRequestMessage$PrimaryRequestReplyMessage,2
-fromData,16
-toData,16
+fromData,17
+toData,17
org/apache/geode/internal/cache/partitioned/PutAllPRMessage,2
-fromData,183
-toData,194
+fromData,186
+toData,200
org/apache/geode/internal/cache/partitioned/PutAllPRMessage$PutAllReplyMessage,2
-fromData,27
-toData,24
+fromData,28
+toData,25
org/apache/geode/internal/cache/partitioned/PutMessage,2
-fromData,225
-toData,379
+fromData,226
+toData,393
org/apache/geode/internal/cache/partitioned/PutMessage$PutReplyMessage,2
-fromData,48
-toData,54
+fromData,49
+toData,55
org/apache/geode/internal/cache/partitioned/QueryMessage,2
-fromData,63
-toData,63
+fromData,64
+toData,64
org/apache/geode/internal/cache/partitioned/RegionAdvisor$BucketProfileAndId,2
fromData,61
toData,29
org/apache/geode/internal/cache/partitioned/RegionAdvisor$PartitionProfile,2
-fromData,53
-toData,34
+fromData,54
+toData,35
org/apache/geode/internal/cache/partitioned/RemoveAllPRMessage,2
-fromData,190
-toData,194
+fromData,193
+toData,200
org/apache/geode/internal/cache/partitioned/RemoveAllPRMessage$RemoveAllReplyMessage,2
-fromData,27
-toData,24
+fromData,28
+toData,25
org/apache/geode/internal/cache/partitioned/RemoveBucketMessage,2
-fromData,26
-toData,26
+fromData,27
+toData,27
org/apache/geode/internal/cache/partitioned/RemoveBucketMessage$RemoveBucketReplyMessage,2
-fromData,16
-toData,16
+fromData,17
+toData,17
org/apache/geode/internal/cache/partitioned/RemoveIndexesMessage,2
-fromData,33
-toData,33
+fromData,34
+toData,34
org/apache/geode/internal/cache/partitioned/RemoveIndexesMessage$RemoveIndexesReplyMessage,2
-fromData,36
-toData,36
+fromData,37
+toData,37
org/apache/geode/internal/cache/partitioned/SizeMessage,2
-fromData,14
-toData,14
+fromData,15
+toData,15
org/apache/geode/internal/cache/partitioned/SizeMessage$SizeReplyMessage,2
-fromData,17
-toData,14
+fromData,18
+toData,15
org/apache/geode/internal/cache/partitioned/SizedBasedLoadProbe,2
fromData,1
@@ -1727,16 +1727,16 @@ fromData,21
toData,21
org/apache/geode/internal/cache/persistence/MembershipFlushRequest,2
-fromData,24
-toData,24
+fromData,25
+toData,25
org/apache/geode/internal/cache/persistence/MembershipViewRequest,2
-fromData,34
-toData,34
+fromData,35
+toData,35
org/apache/geode/internal/cache/persistence/MembershipViewRequest$MembershipViewReplyMessage,2
-fromData,36
-toData,38
+fromData,37
+toData,39
org/apache/geode/internal/cache/persistence/PersistentMemberID,2
fromData,74
@@ -1754,52 +1754,52 @@ fromData,202
toData,177
org/apache/geode/internal/cache/persistence/PersistentStateQueryMessage,2
-fromData,84
-toData,90
+fromData,87
+toData,91
org/apache/geode/internal/cache/persistence/PersistentStateQueryMessage$PersistentStateQueryReplyMessage,2
-fromData,144
-toData,184
+fromData,147
+toData,185
org/apache/geode/internal/cache/persistence/PrepareNewPersistentMemberMessage,2
-fromData,73
-toData,65
+fromData,74
+toData,66
org/apache/geode/internal/cache/persistence/RemovePersistentMemberMessage,2
-fromData,84
-toData,90
+fromData,87
+toData,91
org/apache/geode/internal/cache/snapshot/ExportedRegistry,2
fromData,106
toData,143
org/apache/geode/internal/cache/snapshot/FlowController$FlowControlAbortMessage,2
-fromData,16
-toData,16
+fromData,17
+toData,17
org/apache/geode/internal/cache/snapshot/FlowController$FlowControlAckMessage,2
-fromData,24
-toData,24
+fromData,25
+toData,25
org/apache/geode/internal/cache/snapshot/SnapshotPacket,2
-fromData,79
-toData,71
+fromData,82
+toData,73
org/apache/geode/internal/cache/snapshot/SnapshotPacket$SnapshotRecord,2
fromData,17
toData,17
org/apache/geode/internal/cache/tier/sockets/ClientDataSerializerMessage,2
-fromData,71
-toData,66
+fromData,74
+toData,69
org/apache/geode/internal/cache/tier/sockets/ClientDenylistProcessor$ClientDenylistMessage,2
-fromData,24
-toData,24
+fromData,25
+toData,25
org/apache/geode/internal/cache/tier/sockets/ClientInstantiatorMessage,2
-fromData,71
-toData,66
+fromData,74
+toData,69
org/apache/geode/internal/cache/tier/sockets/ClientInterestMessageImpl,2
fromData,68
@@ -1822,11 +1822,11 @@ fromData,63
toData,59
org/apache/geode/internal/cache/tier/sockets/ClientUpdateMessageImpl,2
-fromData,172
-toData,196
+fromData,175
+toData,198
org/apache/geode/internal/cache/tier/sockets/HAEventWrapper,2
-fromData,440
+fromData,444
toData,90
org/apache/geode/internal/cache/tier/sockets/InterestResultPolicyImpl,2
@@ -1834,135 +1834,135 @@ fromData,8
toData,11
org/apache/geode/internal/cache/tier/sockets/ObjectPartList,2
-fromData,130
-toData,180
+fromData,132
+toData,185
org/apache/geode/internal/cache/tier/sockets/ObjectPartList651,2
-fromData,145
-toData,202
+fromData,149
+toData,207
org/apache/geode/internal/cache/tier/sockets/RemoveClientFromDenylistMessage,2
-fromData,14
-toData,14
+fromData,15
+toData,15
org/apache/geode/internal/cache/tier/sockets/SerializedObjectPartList,2
-fromData,145
-toData,209
+fromData,149
+toData,214
org/apache/geode/internal/cache/tier/sockets/ServerInterestRegistrationMessage,2
-fromData,54
-toData,32
+fromData,55
+toData,33
org/apache/geode/internal/cache/tier/sockets/VersionedObjectList,4
-fromData,542
-fromDataPre_GFE_8_0_0_0,6
-toDataPre_GFE_8_0_0_0,10
+fromData,550
+fromDataPre_GFE_8_0_0_0,7
+toDataPre_GFE_8_0_0_0,11
toData,623
org/apache/geode/internal/cache/tier/sockets/VersionedObjectList$Chunker,3
fromData,10
toData,40
-toDataPre_GFE_8_0_0_0,20
+toDataPre_GFE_8_0_0_0,21
org/apache/geode/internal/cache/tx/DistTxEntryEvent,2
-fromData,100
+fromData,102
toData,123
org/apache/geode/internal/cache/tx/RemoteClearMessage,2
-fromData,13
-toData,18
+fromData,14
+toData,19
org/apache/geode/internal/cache/tx/RemoteClearMessage$RemoteClearReplyMessage,2
-fromData,6
-toData,6
+fromData,7
+toData,7
org/apache/geode/internal/cache/tx/RemoteContainsKeyValueMessage,2
-fromData,33
-toData,14
+fromData,34
+toData,15
org/apache/geode/internal/cache/tx/RemoteContainsKeyValueMessage$RemoteContainsKeyValueReplyMessage,2
-fromData,16
-toData,16
+fromData,17
+toData,17
org/apache/geode/internal/cache/tx/RemoteDestroyMessage,2
-fromData,131
-toData,135
+fromData,132
+toData,136
org/apache/geode/internal/cache/tx/RemoteDestroyMessage$DestroyReplyMessage,2
-fromData,52
-toData,57
+fromData,55
+toData,58
org/apache/geode/internal/cache/tx/RemoteFetchEntryMessage,2
-fromData,14
-toData,14
+fromData,15
+toData,15
org/apache/geode/internal/cache/tx/RemoteFetchEntryMessage$FetchEntryReplyMessage,2
-fromData,30
-toData,38
+fromData,31
+toData,39
org/apache/geode/internal/cache/tx/RemoteFetchKeysMessage,2
-fromData,6
-toData,6
+fromData,7
+toData,7
org/apache/geode/internal/cache/tx/RemoteFetchKeysMessage$RemoteFetchKeysReplyMessage,2
-fromData,54
-toData,54
+fromData,55
+toData,55
org/apache/geode/internal/cache/tx/RemoteFetchVersionMessage,2
-fromData,14
-toData,14
+fromData,15
+toData,15
org/apache/geode/internal/cache/tx/RemoteFetchVersionMessage$FetchVersionReplyMessage,2
-fromData,17
-toData,14
+fromData,18
+toData,15
org/apache/geode/internal/cache/tx/RemoteGetMessage,2
-fromData,33
-toData,30
+fromData,34
+toData,31
org/apache/geode/internal/cache/tx/RemoteGetMessage$GetReplyMessage,2
-fromData,48
-toData,32
+fromData,49
+toData,33
org/apache/geode/internal/cache/tx/RemoteInvalidateMessage$InvalidateReplyMessage,2
-fromData,52
-toData,57
+fromData,55
+toData,58
org/apache/geode/internal/cache/tx/RemoteOperationMessage,2
-fromData,43
-toData,103
+fromData,44
+toData,104
org/apache/geode/internal/cache/tx/RemotePutAllMessage,2
-fromData,223
-toData,173
+fromData,226
+toData,179
org/apache/geode/internal/cache/tx/RemotePutAllMessage$PutAllReplyMessage,2
-fromData,17
-toData,14
+fromData,18
+toData,15
org/apache/geode/internal/cache/tx/RemotePutMessage,2
-fromData,223
-toData,252
+fromData,224
+toData,255
org/apache/geode/internal/cache/tx/RemotePutMessage$PutReplyMessage,2
-fromData,81
-toData,94
+fromData,84
+toData,95
org/apache/geode/internal/cache/tx/RemoteRemoveAllMessage,2
-fromData,203
-toData,173
+fromData,206
+toData,179
org/apache/geode/internal/cache/tx/RemoteRemoveAllMessage$RemoveAllReplyMessage,2
-fromData,17
-toData,14
+fromData,18
+toData,15
org/apache/geode/internal/cache/tx/RemoteSizeMessage,2
-fromData,18
-toData,18
+fromData,19
+toData,19
org/apache/geode/internal/cache/tx/RemoteSizeMessage$SizeReplyMessage,2
-fromData,16
-toData,16
+fromData,17
+toData,17
org/apache/geode/internal/cache/versions/RVVException,2
fromData,1
@@ -1981,27 +1981,27 @@ toData,93
fromData,71
org/apache/geode/internal/cache/versions/RegionVersionVector,2
-fromData,212
-toData,239
+fromData,214
+toData,245
org/apache/geode/internal/cache/versions/VersionTag,2
fromData,189
toData,259
org/apache/geode/internal/cache/wan/GatewaySenderAdvisor$GatewaySenderProfile,4
-fromData,282
-fromDataPre_GFE_8_0_0_0,187
-toData,270
-toDataPre_GFE_8_0_0_0,235
+fromData,283
+fromDataPre_GFE_8_0_0_0,188
+toData,271
+toDataPre_GFE_8_0_0_0,236
org/apache/geode/internal/cache/wan/GatewaySenderEventCallbackArgument,2
-fromData,63
-toData,87
+fromData,65
+toData,89
org/apache/geode/internal/cache/wan/GatewaySenderEventImpl,4
-fromData,30
+fromData,31
fromDataPre_GEODE_1_9_0_0,183
-toData,17
+toData,18
toDataPre_GEODE_1_9_0_0,134
org/apache/geode/internal/cache/wan/GatewaySenderQueueEntrySynchronizationOperation$GatewaySenderQueueEntrySynchronizationEntry,2
@@ -2009,16 +2009,16 @@ fromData,20
toData,17
org/apache/geode/internal/cache/wan/GatewaySenderQueueEntrySynchronizationOperation$GatewaySenderQueueEntrySynchronizationMessage,2
-fromData,32
-toData,35
+fromData,33
+toData,36
org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessage,2
-fromData,14
-toData,14
+fromData,15
+toData,15
org/apache/geode/internal/cache/wan/serial/BatchDestroyOperation$DestroyMessage,2
-fromData,45
-toData,40
+fromData,46
+toData,41
org/apache/geode/internal/modules/util/RegionConfiguration,2
fromData,77
@@ -2033,12 +2033,12 @@ fromData,33
toData,36
org/apache/geode/management/internal/JmxManagerAdvisor$JmxManagerProfile,2
-fromData,46
-toData,81
+fromData,47
+toData,84
org/apache/geode/management/internal/JmxManagerAdvisor$JmxManagerProfileMessage,2
-fromData,27
-toData,24
+fromData,28
+toData,25
org/apache/geode/management/internal/JmxManagerLocatorRequest,2
fromData,1
@@ -2049,14 +2049,14 @@ fromData,36
toData,33
org/apache/geode/management/internal/ManagerStartupMessage,2
-fromData,16
-toData,16
+fromData,17
+toData,17
org/apache/geode/management/internal/cli/functions/CliFunctionResult,6
-fromData,19
+fromData,20
fromDataPre_GEODE_1_6_0_0,70
fromDataPre_GFE_8_0_0_0,31
-toData,14
+toData,15
toDataPre_GEODE_1_6_0_0,49
toDataPre_GFE_8_0_0_0,25
@@ -2087,16 +2087,16 @@ fromData,22
toData,20
org/apache/geode/management/internal/messages/CompactRequest,2
-fromData,14
-toData,14
+fromData,15
+toData,15
org/apache/geode/management/internal/messages/CompactResponse,2
-fromData,17
-toData,14
+fromData,18
+toData,15
org/apache/geode/pdx/internal/CheckTypeRegistryState,2
-fromData,16
-toData,16
+fromData,17
+toData,17
org/apache/geode/pdx/internal/EnumId,2
fromData,11
diff --git a/geode-core/src/jmh/java/org/apache/geode/internal/InternalDataSerializerBenchmark.java b/geode-core/src/jmh/java/org/apache/geode/internal/InternalDataSerializerBenchmark.java
index 1417a50..9f1476e 100644
--- a/geode-core/src/jmh/java/org/apache/geode/internal/InternalDataSerializerBenchmark.java
+++ b/geode-core/src/jmh/java/org/apache/geode/internal/InternalDataSerializerBenchmark.java
@@ -33,6 +33,9 @@ import org.openjdk.jmh.annotations.State;
import org.openjdk.jmh.annotations.Warmup;
import org.apache.geode.DataSerializer;
+import org.apache.geode.internal.serialization.ByteArrayDataInput;
+import org.apache.geode.internal.serialization.DSCODE;
+import org.apache.geode.internal.serialization.Version;
/**
diff --git a/geode-core/src/main/java/org/apache/geode/CopyHelper.java b/geode-core/src/main/java/org/apache/geode/CopyHelper.java
index 822d09d..cfd0b9b 100644
--- a/geode-core/src/main/java/org/apache/geode/CopyHelper.java
+++ b/geode-core/src/main/java/org/apache/geode/CopyHelper.java
@@ -24,9 +24,9 @@ import java.math.BigInteger;
import java.util.UUID;
import org.apache.geode.internal.HeapDataOutputStream;
-import org.apache.geode.internal.Version;
import org.apache.geode.internal.cache.CachedDeserializable;
import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.serialization.Version;
import org.apache.geode.pdx.PdxInstance;
import org.apache.geode.pdx.WritablePdxInstance;
import org.apache.geode.pdx.internal.PdxUnreadData;
diff --git a/geode-core/src/main/java/org/apache/geode/DataSerializer.java b/geode-core/src/main/java/org/apache/geode/DataSerializer.java
index 3fd91fc..b5e635e 100644
--- a/geode-core/src/main/java/org/apache/geode/DataSerializer.java
+++ b/geode-core/src/main/java/org/apache/geode/DataSerializer.java
@@ -52,11 +52,9 @@ import org.apache.geode.annotations.internal.MakeNotStatic;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.Region;
-import org.apache.geode.internal.DSCODE;
import org.apache.geode.internal.HeapDataOutputStream;
import org.apache.geode.internal.InternalDataSerializer;
import org.apache.geode.internal.ObjToByteArraySerializer;
-import org.apache.geode.internal.Version;
import org.apache.geode.internal.cache.CachedDeserializable;
import org.apache.geode.internal.cache.EventID;
import org.apache.geode.internal.cache.GemFireCacheImpl;
@@ -65,6 +63,8 @@ import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LogMarker;
import org.apache.geode.internal.offheap.StoredObject;
+import org.apache.geode.internal.serialization.DSCODE;
+import org.apache.geode.internal.serialization.Version;
import org.apache.geode.pdx.PdxInstance;
/**
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberCacheEventProcessor.java b/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberCacheEventProcessor.java
index c7b8171..66d629e 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberCacheEventProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberCacheEventProcessor.java
@@ -34,6 +34,7 @@ import org.apache.geode.distributed.internal.ClusterDistributionManager;
import org.apache.geode.distributed.internal.HighPriorityDistributionMessage;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.serialization.SerializationContext;
/**
* This class processes the message to be delivered to admin node. [This needs to be redesigned and
@@ -118,15 +119,17 @@ public class SystemMemberCacheEventProcessor {
}
@Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
- super.fromData(in);
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
+ super.fromData(in, context);
this.regionPath = DataSerializer.readString(in);
this.op = Operation.fromOrdinal(in.readByte());
}
@Override
- public void toData(DataOutput out) throws IOException {
- super.toData(out);
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
+ super.toData(out, context);
DataSerializer.writeString(this.regionPath, out);
out.writeByte(this.op.ordinal);
}
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/StatAlertNotification.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/StatAlertNotification.java
index 3511568..e5d39a6 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/StatAlertNotification.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/StatAlertNotification.java
@@ -19,12 +19,12 @@ import java.io.DataOutput;
import java.io.IOException;
import java.io.Serializable;
-import org.apache.geode.DataSerializable;
import org.apache.geode.DataSerializer;
-import org.apache.geode.internal.DataSerializableFixedID;
-import org.apache.geode.internal.Version;
import org.apache.geode.internal.admin.StatAlert;
import org.apache.geode.internal.admin.StatAlertDefinition;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.SerializationContext;
+import org.apache.geode.internal.serialization.Version;
/**
* Notification to be sent to clients (e.g GFMon2.0 ). It incorporates
@@ -35,7 +35,7 @@ import org.apache.geode.internal.admin.StatAlertDefinition;
* @since GemFire 5.7
*/
public class StatAlertNotification extends StatAlert
- implements Serializable, DataSerializable, DataSerializableFixedID {
+ implements Serializable, DataSerializableFixedID {
private static final long serialVersionUID = -1634729103430107871L;
private String memberId;
@@ -125,7 +125,8 @@ public class StatAlertNotification extends StatAlert
}
@Override
- public void toData(DataOutput out) throws IOException {
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
// Do not modify StatAlert to allow 57 cacheservers to function with 57+ agent
// However, update of a new StatAlertDefn on 57 server from 57+ agent not covered with this
DataSerializer.writePrimitiveInt(this.getDefinitionId(), out);
@@ -136,7 +137,8 @@ public class StatAlertNotification extends StatAlert
}
@Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
// Do not modify StatAlert to allow 57 cacheservers to function with 57+ agent
// However, update of a new StatAlertDefn on 57 server from 57+ agent not covered with this
this.setDefinitionId(DataSerializer.readPrimitiveInt(in));
diff --git a/geode-core/src/main/java/org/apache/geode/cache/AttributesFactory.java b/geode-core/src/main/java/org/apache/geode/cache/AttributesFactory.java
index c9ff9e2..6ec5a29 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/AttributesFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/AttributesFactory.java
@@ -15,7 +15,6 @@
package org.apache.geode.cache;
import java.io.File;
-import java.io.Serializable;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -1490,10 +1489,10 @@ public class AttributesFactory<K, V> {
}
private static class RegionAttributesImpl<K, V> extends UserSpecifiedRegionAttributes<K, V>
- implements Cloneable, Serializable {
+ implements Cloneable {
public Set<String> gatewaySenderIds;
public Set<String> asyncEventQueueIds;
- private static final long serialVersionUID = -3663000883567530374L;
+ // private static final long serialVersionUID = -3663000883567530374L;
ArrayList<CacheListener<K, V>> cacheListeners;
CacheLoader<K, V> cacheLoader;
diff --git a/geode-core/src/main/java/org/apache/geode/cache/EvictionAttributes.java b/geode-core/src/main/java/org/apache/geode/cache/EvictionAttributes.java
index fee97fb..fdbf642 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/EvictionAttributes.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/EvictionAttributes.java
@@ -17,7 +17,6 @@ package org.apache.geode.cache;
import java.util.Optional;
-import org.apache.geode.DataSerializable;
import org.apache.geode.cache.configuration.EnumActionDestroyOverflow;
import org.apache.geode.cache.configuration.RegionAttributesType;
import org.apache.geode.cache.control.ResourceManager;
@@ -38,7 +37,7 @@ import org.apache.geode.internal.cache.EvictionAttributesImpl;
* @since GemFire 5.0
*/
@SuppressWarnings("serial")
-public abstract class EvictionAttributes implements DataSerializable {
+public abstract class EvictionAttributes {
/**
* The default maximum for {@linkplain EvictionAlgorithm#LRU_ENTRY entry LRU}. Currently
* <code>900</code> entries.
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/AbstractOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/AbstractOp.java
index 785f2a1..d9e7fd4 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/AbstractOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/AbstractOp.java
@@ -22,9 +22,7 @@ import org.apache.logging.log4j.Logger;
import org.apache.geode.InternalGemFireError;
import org.apache.geode.cache.client.ServerConnectivityException;
import org.apache.geode.cache.client.ServerOperationException;
-import org.apache.geode.internal.ByteArrayDataInput;
import org.apache.geode.internal.HeapDataOutputStream;
-import org.apache.geode.internal.Version;
import org.apache.geode.internal.cache.PutAllPartialResultException;
import org.apache.geode.internal.cache.TXManagerImpl;
import org.apache.geode.internal.cache.tier.MessageType;
@@ -34,6 +32,8 @@ import org.apache.geode.internal.cache.tier.sockets.Part;
import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LogMarker;
+import org.apache.geode.internal.serialization.ByteArrayDataInput;
+import org.apache.geode.internal.serialization.Version;
/**
* Represents an operation that can be performed in a client by sending a message to a server.
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/AuthenticateUserOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/AuthenticateUserOp.java
index 333b68e..aa6e630 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/AuthenticateUserOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/AuthenticateUserOp.java
@@ -27,15 +27,15 @@ import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.ServerLocation;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.internal.ByteArrayDataInput;
import org.apache.geode.internal.HeapDataOutputStream;
-import org.apache.geode.internal.Version;
import org.apache.geode.internal.cache.tier.MessageType;
import org.apache.geode.internal.cache.tier.sockets.Handshake;
import org.apache.geode.internal.cache.tier.sockets.Message;
import org.apache.geode.internal.cache.tier.sockets.Part;
import org.apache.geode.internal.cache.tier.sockets.command.PutUserCredentials;
import org.apache.geode.internal.logging.InternalLogWriter;
+import org.apache.geode.internal.serialization.ByteArrayDataInput;
+import org.apache.geode.internal.serialization.Version;
import org.apache.geode.security.AuthenticationFailedException;
import org.apache.geode.security.AuthenticationRequiredException;
import org.apache.geode.security.NotAuthorizedException;
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/CacheServerLoadMessage.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/CacheServerLoadMessage.java
index d271e40..25bcbda 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/CacheServerLoadMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/CacheServerLoadMessage.java
@@ -29,6 +29,7 @@ import org.apache.geode.distributed.internal.SerialDistributionMessage;
import org.apache.geode.distributed.internal.ServerLocation;
import org.apache.geode.distributed.internal.ServerLocator;
import org.apache.geode.internal.InternalDataSerializer;
+import org.apache.geode.internal.serialization.SerializationContext;
/**
* A message from a server to a locator to update the locator with new load information from the
@@ -78,8 +79,9 @@ public class CacheServerLoadMessage extends SerialDistributionMessage {
}
@Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
- super.fromData(in);
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
+ super.fromData(in, context);
load = new ServerLoad();
InternalDataSerializer.invokeFromData(load, in);
location = new ServerLocation();
@@ -88,8 +90,9 @@ public class CacheServerLoadMessage extends SerialDistributionMessage {
}
@Override
- public void toData(DataOutput out) throws IOException {
- super.toData(out);
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
+ super.toData(out, context);
InternalDataSerializer.invokeToData(load, out);
InternalDataSerializer.invokeToData(location, out);
DataSerializer.writeArrayList(this.clientIds, out);
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientSideHandshakeImpl.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientSideHandshakeImpl.java
index 6a25c0d..bc1e3d7 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientSideHandshakeImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientSideHandshakeImpl.java
@@ -49,13 +49,9 @@ import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.LonerDistributionManager;
import org.apache.geode.distributed.internal.ServerLocation;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.internal.ByteArrayDataInput;
import org.apache.geode.internal.HeapDataOutputStream;
import org.apache.geode.internal.InternalDataSerializer;
import org.apache.geode.internal.InternalInstantiator;
-import org.apache.geode.internal.Version;
-import org.apache.geode.internal.VersionedDataInputStream;
-import org.apache.geode.internal.VersionedDataOutputStream;
import org.apache.geode.internal.cache.tier.ClientSideHandshake;
import org.apache.geode.internal.cache.tier.CommunicationMode;
import org.apache.geode.internal.cache.tier.Encryptor;
@@ -64,6 +60,10 @@ import org.apache.geode.internal.cache.tier.sockets.EncryptorImpl;
import org.apache.geode.internal.cache.tier.sockets.Handshake;
import org.apache.geode.internal.cache.tier.sockets.ServerQueueStatus;
import org.apache.geode.internal.security.SecurityService;
+import org.apache.geode.internal.serialization.ByteArrayDataInput;
+import org.apache.geode.internal.serialization.Version;
+import org.apache.geode.internal.serialization.VersionedDataInputStream;
+import org.apache.geode.internal.serialization.VersionedDataOutputStream;
import org.apache.geode.security.AuthenticationFailedException;
import org.apache.geode.security.AuthenticationRequiredException;
import org.apache.geode.security.GemFireSecurityException;
@@ -234,7 +234,8 @@ public class ClientSideHandshakeImpl extends Handshake implements ClientSideHand
// Read delta-propagation property value from server.
// [sumedh] Static variable below? Client can connect to different
// DSes with different values of this. It shoule be a member variable.
- if (!communicationMode.isWAN() && currentClientVersion.compareTo(Version.GFE_61) >= 0) {
+ if (!communicationMode.isWAN() && currentClientVersion.compareTo(
+ Version.GFE_61) >= 0) {
((InternalDistributedSystem) system).setDeltaEnabledOnServer(dis.readBoolean());
}
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteFunctionNoAckOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteFunctionNoAckOp.java
index 42fce07..1961683 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteFunctionNoAckOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteFunctionNoAckOp.java
@@ -24,13 +24,13 @@ import org.apache.geode.InternalGemFireError;
import org.apache.geode.cache.execute.Function;
import org.apache.geode.cache.execute.FunctionException;
import org.apache.geode.distributed.internal.ServerLocation;
-import org.apache.geode.internal.Version;
import org.apache.geode.internal.cache.execute.AbstractExecution;
import org.apache.geode.internal.cache.execute.MemberMappedArgument;
import org.apache.geode.internal.cache.tier.MessageType;
import org.apache.geode.internal.cache.tier.sockets.Message;
import org.apache.geode.internal.cache.tier.sockets.Part;
import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.serialization.Version;
/**
* Does a Execution of function on server (possibly without region/cache) It does not get the resulf
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteFunctionOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteFunctionOp.java
index 847ca63..09f926c 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteFunctionOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteFunctionOp.java
@@ -32,7 +32,6 @@ import org.apache.geode.cache.execute.FunctionException;
import org.apache.geode.cache.execute.ResultCollector;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.internal.ServerLocation;
-import org.apache.geode.internal.Version;
import org.apache.geode.internal.cache.execute.AbstractExecution;
import org.apache.geode.internal.cache.execute.FunctionStats;
import org.apache.geode.internal.cache.execute.InternalFunctionException;
@@ -43,6 +42,7 @@ import org.apache.geode.internal.cache.tier.sockets.ChunkedMessage;
import org.apache.geode.internal.cache.tier.sockets.Message;
import org.apache.geode.internal.cache.tier.sockets.Part;
import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.serialization.Version;
/**
* Executes the function on server (possibly without region/cache).<br>
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteRegionFunctionNoAckOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteRegionFunctionNoAckOp.java
index 7c90e69..3f7848e 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteRegionFunctionNoAckOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteRegionFunctionNoAckOp.java
@@ -21,7 +21,6 @@ import org.apache.logging.log4j.Logger;
import org.apache.geode.InternalGemFireError;
import org.apache.geode.cache.execute.Function;
import org.apache.geode.cache.execute.FunctionException;
-import org.apache.geode.internal.Version;
import org.apache.geode.internal.cache.execute.AbstractExecution;
import org.apache.geode.internal.cache.execute.MemberMappedArgument;
import org.apache.geode.internal.cache.execute.ServerRegionFunctionExecutor;
@@ -29,6 +28,7 @@ import org.apache.geode.internal.cache.tier.MessageType;
import org.apache.geode.internal.cache.tier.sockets.Message;
import org.apache.geode.internal.cache.tier.sockets.Part;
import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.serialization.Version;
/**
* Does a Execution of function on server region It does not get the resul from the server (follows
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteRegionFunctionOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteRegionFunctionOp.java
index c3bbc70..eba38a6 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteRegionFunctionOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteRegionFunctionOp.java
@@ -36,7 +36,6 @@ import org.apache.geode.cache.execute.FunctionException;
import org.apache.geode.cache.execute.FunctionInvocationTargetException;
import org.apache.geode.cache.execute.ResultCollector;
import org.apache.geode.distributed.DistributedMember;
-import org.apache.geode.internal.Version;
import org.apache.geode.internal.cache.execute.AbstractExecution;
import org.apache.geode.internal.cache.execute.BucketMovedException;
import org.apache.geode.internal.cache.execute.FunctionStats;
@@ -49,6 +48,7 @@ import org.apache.geode.internal.cache.tier.sockets.ChunkedMessage;
import org.apache.geode.internal.cache.tier.sockets.Message;
import org.apache.geode.internal.cache.tier.sockets.Part;
import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.serialization.Version;
/**
* Does a Execution of function on server region.<br>
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteRegionFunctionSingleHopOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteRegionFunctionSingleHopOp.java
index fd72d66..eb162829 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteRegionFunctionSingleHopOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteRegionFunctionSingleHopOp.java
@@ -36,7 +36,6 @@ import org.apache.geode.cache.execute.FunctionInvocationTargetException;
import org.apache.geode.cache.execute.ResultCollector;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.internal.ServerLocation;
-import org.apache.geode.internal.Version;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.execute.AbstractExecution;
@@ -51,6 +50,7 @@ import org.apache.geode.internal.cache.tier.sockets.ChunkedMessage;
import org.apache.geode.internal.cache.tier.sockets.Message;
import org.apache.geode.internal.cache.tier.sockets.Part;
import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.serialization.Version;
/**
* @since GemFire 6.5
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetAllOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetAllOp.java
index 7dad297..ea66c23 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetAllOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetAllOp.java
@@ -26,7 +26,6 @@ import org.apache.geode.cache.Region;
import org.apache.geode.cache.client.ServerConnectivityException;
import org.apache.geode.cache.client.ServerOperationException;
import org.apache.geode.distributed.internal.ServerLocation;
-import org.apache.geode.internal.Version;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.tier.MessageType;
import org.apache.geode.internal.cache.tier.sockets.ChunkedMessage;
@@ -34,6 +33,7 @@ import org.apache.geode.internal.cache.tier.sockets.Message;
import org.apache.geode.internal.cache.tier.sockets.Part;
import org.apache.geode.internal.cache.tier.sockets.VersionedObjectList;
import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.serialization.Version;
/**
* Does a region getAll on a server
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/KeySetOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/KeySetOp.java
index edcce48..dee67b1 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/KeySetOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/KeySetOp.java
@@ -20,11 +20,11 @@ import java.util.Set;
import org.apache.geode.InternalGemFireError;
import org.apache.geode.cache.client.ServerOperationException;
-import org.apache.geode.internal.Version;
import org.apache.geode.internal.cache.tier.MessageType;
import org.apache.geode.internal.cache.tier.sockets.ChunkedMessage;
import org.apache.geode.internal.cache.tier.sockets.Message;
import org.apache.geode.internal.cache.tier.sockets.Part;
+import org.apache.geode.internal.serialization.Version;
/**
* Does a region keySet on a server
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ProxyCacheCloseOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ProxyCacheCloseOp.java
index f257b90..b86b517 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ProxyCacheCloseOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ProxyCacheCloseOp.java
@@ -21,10 +21,10 @@ import org.apache.geode.cache.client.ServerConnectivityException;
import org.apache.geode.cache.client.ServerOperationException;
import org.apache.geode.distributed.internal.ServerLocation;
import org.apache.geode.internal.HeapDataOutputStream;
-import org.apache.geode.internal.Version;
import org.apache.geode.internal.cache.tier.MessageType;
import org.apache.geode.internal.cache.tier.sockets.Message;
import org.apache.geode.internal.cache.tier.sockets.Part;
+import org.apache.geode.internal.serialization.Version;
public class ProxyCacheCloseOp {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/PutAllOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/PutAllOp.java
index e2cadab..d24d866 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/PutAllOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/PutAllOp.java
@@ -31,7 +31,6 @@ import org.apache.geode.cache.DataPolicy;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.client.ServerOperationException;
import org.apache.geode.distributed.internal.ServerLocation;
-import org.apache.geode.internal.Version;
import org.apache.geode.internal.cache.CachedDeserializable;
import org.apache.geode.internal.cache.EventID;
import org.apache.geode.internal.cache.LocalRegion;
@@ -43,6 +42,7 @@ import org.apache.geode.internal.cache.tier.sockets.Message;
import org.apache.geode.internal.cache.tier.sockets.Part;
import org.apache.geode.internal.cache.tier.sockets.VersionedObjectList;
import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.serialization.Version;
/**
* Does a region putAll on a server
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/PutOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/PutOp.java
index 57b25bd..4c1fc8b 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/PutOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/PutOp.java
@@ -27,7 +27,6 @@ import org.apache.geode.cache.client.ServerConnectivityException;
import org.apache.geode.cache.client.ServerOperationException;
import org.apache.geode.distributed.internal.ServerLocation;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.internal.ByteArrayDataInput;
import org.apache.geode.internal.cache.CachedDeserializable;
import org.apache.geode.internal.cache.EntryEventImpl;
import org.apache.geode.internal.cache.LocalRegion;
@@ -36,6 +35,7 @@ import org.apache.geode.internal.cache.tier.sockets.Message;
import org.apache.geode.internal.cache.tier.sockets.Part;
import org.apache.geode.internal.cache.versions.VersionTag;
import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.serialization.ByteArrayDataInput;
/**
* Does a region put (or create) on a server
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/QueryOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/QueryOp.java
index b69b745..c7dc14d 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/QueryOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/QueryOp.java
@@ -25,12 +25,12 @@ import org.apache.geode.cache.query.internal.types.StructTypeImpl;
import org.apache.geode.cache.query.internal.types.TypeUtils;
import org.apache.geode.cache.query.types.CollectionType;
import org.apache.geode.cache.query.types.ObjectType;
-import org.apache.geode.internal.Version;
import org.apache.geode.internal.cache.tier.MessageType;
import org.apache.geode.internal.cache.tier.sockets.ChunkedMessage;
import org.apache.geode.internal.cache.tier.sockets.Message;
import org.apache.geode.internal.cache.tier.sockets.ObjectPartList;
import org.apache.geode.internal.cache.tier.sockets.Part;
+import org.apache.geode.internal.serialization.Version;
/**
* Does a region query on a server
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/RegisterInterestOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/RegisterInterestOp.java
index 10ffa0c..9352fe2 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/RegisterInterestOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/RegisterInterestOp.java
@@ -21,7 +21,6 @@ import org.apache.geode.InternalGemFireError;
import org.apache.geode.cache.InterestResultPolicy;
import org.apache.geode.cache.client.ServerOperationException;
import org.apache.geode.distributed.internal.ServerLocation;
-import org.apache.geode.internal.Version;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.tier.InterestType;
@@ -30,6 +29,7 @@ import org.apache.geode.internal.cache.tier.sockets.ChunkedMessage;
import org.apache.geode.internal.cache.tier.sockets.Message;
import org.apache.geode.internal.cache.tier.sockets.Part;
import org.apache.geode.internal.cache.tier.sockets.VersionedObjectList;
+import org.apache.geode.internal.serialization.Version;
/**
* Does a region registerInterest on a server
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/RemoveAllOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/RemoveAllOp.java
index 4f3c58b..4a72a4d 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/RemoveAllOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/RemoveAllOp.java
@@ -30,7 +30,6 @@ import org.apache.geode.cache.DataPolicy;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.client.ServerOperationException;
import org.apache.geode.distributed.internal.ServerLocation;
-import org.apache.geode.internal.Version;
import org.apache.geode.internal.cache.EventID;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.PutAllPartialResultException;
@@ -41,6 +40,7 @@ import org.apache.geode.internal.cache.tier.sockets.Message;
import org.apache.geode.internal.cache.tier.sockets.Part;
import org.apache.geode.internal.cache.tier.sockets.VersionedObjectList;
import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.serialization.Version;
/**
* Does a region removeAll on a server
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/ClientConnectionRequest.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/ClientConnectionRequest.java
index 7ed4617..b3e3b2a 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/ClientConnectionRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/ClientConnectionRequest.java
@@ -21,7 +21,8 @@ import java.io.IOException;
import java.util.Set;
import org.apache.geode.distributed.internal.ServerLocation;
-import org.apache.geode.internal.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.SerializationContext;
/**
* A request from a client to the locator asking for a server to connect to for client to server
@@ -41,14 +42,16 @@ public class ClientConnectionRequest extends ServerLocationRequest {
}
@Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
- super.fromData(in);
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
+ super.fromData(in, context);
this.excludedServers = SerializationHelper.readServerLocationSet(in);
}
@Override
- public void toData(DataOutput out) throws IOException {
- super.toData(out);
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
+ super.toData(out, context);
SerializationHelper.writeServerLocationSet(this.excludedServers, out);
}
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/ClientConnectionResponse.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/ClientConnectionResponse.java
index ce0b717..5f305d7 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/ClientConnectionResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/ClientConnectionResponse.java
@@ -20,7 +20,8 @@ import java.io.IOException;
import org.apache.geode.DataSerializer;
import org.apache.geode.distributed.internal.ServerLocation;
-import org.apache.geode.internal.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.SerializationContext;
/**
* A response from a locator to a client Indicating which server to connect to for client to server
@@ -46,7 +47,8 @@ public class ClientConnectionResponse extends ServerLocationResponse {
}
@Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
this.serverFound = DataSerializer.readPrimitiveBoolean(in);
if (this.serverFound) {
server = new ServerLocation();
@@ -55,7 +57,8 @@ public class ClientConnectionResponse extends ServerLocationResponse {
}
@Override
- public void toData(DataOutput out) throws IOException {
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
boolean serverFound = server != null;
DataSerializer.writePrimitiveBoolean(serverFound, out);
if (serverFound) {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/ClientReplacementRequest.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/ClientReplacementRequest.java
index aef7f06..7c3a8ef 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/ClientReplacementRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/ClientReplacementRequest.java
@@ -20,8 +20,9 @@ import java.io.IOException;
import java.util.Set;
import org.apache.geode.distributed.internal.ServerLocation;
-import org.apache.geode.internal.DataSerializableFixedID;
import org.apache.geode.internal.InternalDataSerializer;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.SerializationContext;
/**
* A request from a client to the locator asking for a server to connect to for client to server
@@ -42,15 +43,17 @@ public class ClientReplacementRequest extends ClientConnectionRequest {
}
@Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
- super.fromData(in);
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
+ super.fromData(in, context);
this.currentServer = new ServerLocation();
InternalDataSerializer.invokeFromData(this.currentServer, in);
}
@Override
- public void toData(DataOutput out) throws IOException {
- super.toData(out);
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
+ super.toData(out, context);
InternalDataSerializer.invokeToData(this.currentServer, out);
}
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/GetAllServersRequest.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/GetAllServersRequest.java
index 882fc11..a718040 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/GetAllServersRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/GetAllServersRequest.java
@@ -18,7 +18,8 @@ import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
-import org.apache.geode.internal.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.SerializationContext;
public class GetAllServersRequest extends ServerLocationRequest {
@@ -31,13 +32,15 @@ public class GetAllServersRequest extends ServerLocationRequest {
}
@Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
- super.fromData(in);
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
+ super.fromData(in, context);
}
@Override
- public void toData(DataOutput out) throws IOException {
- super.toData(out);
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
+ super.toData(out, context);
}
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/GetAllServersResponse.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/GetAllServersResponse.java
index c827938..4b5299f 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/GetAllServersResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/GetAllServersResponse.java
@@ -20,7 +20,8 @@ import java.io.IOException;
import java.util.ArrayList;
import org.apache.geode.distributed.internal.ServerLocation;
-import org.apache.geode.internal.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.SerializationContext;
public class GetAllServersResponse extends ServerLocationResponse {
@@ -41,7 +42,8 @@ public class GetAllServersResponse extends ServerLocationResponse {
}
@Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
this.servers = SerializationHelper.readServerLocationList(in);
if (this.servers != null && !this.servers.isEmpty()) {
this.serversFound = true;
@@ -49,7 +51,8 @@ public class GetAllServersResponse extends ServerLocationResponse {
}
@Override
- public void toData(DataOutput out) throws IOException {
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
SerializationHelper.writeServerLocationList(servers, out);
}
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/LocatorListRequest.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/LocatorListRequest.java
index 8c1a819..9b96ecd 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/LocatorListRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/LocatorListRequest.java
@@ -14,7 +14,7 @@
*/
package org.apache.geode.cache.client.internal.locator;
-import org.apache.geode.internal.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
public class LocatorListRequest extends ServerLocationRequest {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/LocatorListResponse.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/LocatorListResponse.java
index d53a1d2..51f6c8d 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/LocatorListResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/LocatorListResponse.java
@@ -20,7 +20,8 @@ import java.io.IOException;
import java.util.List;
import org.apache.geode.distributed.internal.ServerLocation;
-import org.apache.geode.internal.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.SerializationContext;
public class LocatorListResponse extends ServerLocationResponse {
/** ArrayList of ServerLocations for controllers */
@@ -40,7 +41,8 @@ public class LocatorListResponse extends ServerLocationResponse {
}
@Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
this.controllers = SerializationHelper.readServerLocationList(in);
this.isBalanced = in.readBoolean();
if (this.controllers != null && !this.controllers.isEmpty()) {
@@ -49,7 +51,8 @@ public class LocatorListResponse extends ServerLocationResponse {
}
@Override
- public void toData(DataOutput out) throws IOException {
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
SerializationHelper.writeServerLocationList(this.controllers, out);
out.writeBoolean(isBalanced);
}
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/LocatorStatusRequest.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/LocatorStatusRequest.java
index 2e70576..ce500dc 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/LocatorStatusRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/LocatorStatusRequest.java
@@ -15,14 +15,14 @@
package org.apache.geode.cache.client.internal.locator;
-import org.apache.geode.internal.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
/**
* The LocatorStatusRequest class...
* </p>
*
* @see org.apache.geode.cache.client.internal.locator.ServerLocationRequest
- * @see org.apache.geode.internal.DataSerializableFixedID
+ * @see DataSerializableFixedID
* @since GemFire 7.0
*/
public class LocatorStatusRequest extends ServerLocationRequest {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/LocatorStatusResponse.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/LocatorStatusResponse.java
index e972a67..17b6e69 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/LocatorStatusResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/LocatorStatusResponse.java
@@ -24,12 +24,13 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import org.apache.geode.internal.DataSerializableFixedID;
import org.apache.geode.internal.GemFireVersion;
import org.apache.geode.internal.lang.ObjectUtils;
import org.apache.geode.internal.lang.StringUtils;
import org.apache.geode.internal.process.PidUnavailableException;
import org.apache.geode.internal.process.ProcessUtils;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.SerializationContext;
import org.apache.geode.internal.util.ArgumentRedactor;
/**
@@ -138,7 +139,8 @@ public class LocatorStatusResponse extends ServerLocationResponse {
}
@Override
- public void fromData(final DataInput in) throws IOException, ClassNotFoundException {
+ public void fromData(final DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
readPid(in);
readUptime(in);
readWorkingDirectory(in);
@@ -204,7 +206,8 @@ public class LocatorStatusResponse extends ServerLocationResponse {
}
@Override
- public void toData(final DataOutput out) throws IOException {
+ public void toData(final DataOutput out,
+ SerializationContext context) throws IOException {
writePid(out);
writeUptime(out);
writeWorkingDirectory(out);
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/QueueConnectionRequest.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/QueueConnectionRequest.java
index 14dbffe..2e60b10 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/QueueConnectionRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/QueueConnectionRequest.java
@@ -20,8 +20,9 @@ import java.io.IOException;
import java.util.Set;
import org.apache.geode.DataSerializer;
-import org.apache.geode.internal.DataSerializableFixedID;
import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.SerializationContext;
/**
* A request from a client to locator asking for a server to host a queue. If the durable client Id
@@ -48,8 +49,9 @@ public class QueueConnectionRequest extends ServerLocationRequest {
}
@Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
- super.fromData(in);
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
+ super.fromData(in, context);
proxyId = ClientProxyMembershipID.readCanonicalized(in);
redundantCopies = DataSerializer.readPrimitiveInt(in);
@@ -58,8 +60,9 @@ public class QueueConnectionRequest extends ServerLocationRequest {
}
@Override
- public void toData(DataOutput out) throws IOException {
- super.toData(out);
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
+ super.toData(out, context);
DataSerializer.writeObject(proxyId, out);
DataSerializer.writePrimitiveInt(redundantCopies, out);
SerializationHelper.writeServerLocationSet(this.excludedServers, out);
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/QueueConnectionResponse.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/QueueConnectionResponse.java
index b719f44..b130cda 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/QueueConnectionResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/QueueConnectionResponse.java
@@ -21,7 +21,8 @@ import java.util.List;
import org.apache.geode.DataSerializer;
import org.apache.geode.distributed.internal.ServerLocation;
-import org.apache.geode.internal.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.SerializationContext;
/**
* A response from locator to client indicating the servers to use to host the clients queue. The
@@ -45,7 +46,8 @@ public class QueueConnectionResponse extends ServerLocationResponse {
}
@Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
durableQueueFound = DataSerializer.readPrimitiveBoolean(in);
servers = SerializationHelper.readServerLocationList(in);
if (this.servers != null && !this.servers.isEmpty()) {
@@ -54,7 +56,8 @@ public class QueueConnectionResponse extends ServerLocationResponse {
}
@Override
- public void toData(DataOutput out) throws IOException {
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
DataSerializer.writePrimitiveBoolean(durableQueueFound, out);
SerializationHelper.writeServerLocationList(servers, out);
}
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/ServerLocationRequest.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/ServerLocationRequest.java
index 6340f74..87916b7 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/ServerLocationRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/ServerLocationRequest.java
@@ -19,8 +19,9 @@ import java.io.DataOutput;
import java.io.IOException;
import org.apache.geode.DataSerializer;
-import org.apache.geode.internal.DataSerializableFixedID;
-import org.apache.geode.internal.Version;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.SerializationContext;
+import org.apache.geode.internal.serialization.Version;
public abstract class ServerLocationRequest implements DataSerializableFixedID {
@@ -37,12 +38,14 @@ public abstract class ServerLocationRequest implements DataSerializableFixedID {
}
@Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
serverGroup = DataSerializer.readString(in);
}
@Override
- public void toData(DataOutput out) throws IOException {
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
DataSerializer.writeString(serverGroup, out);
}
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/ServerLocationResponse.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/ServerLocationResponse.java
index f7ac45b..47bc3d7 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/ServerLocationResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/ServerLocationResponse.java
@@ -14,8 +14,8 @@
*/
package org.apache.geode.cache.client.internal.locator;
-import org.apache.geode.internal.DataSerializableFixedID;
-import org.apache.geode.internal.Version;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.Version;
public abstract class ServerLocationResponse implements DataSerializableFixedID {
public abstract boolean hasResult();
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CqEntry.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CqEntry.java
index 9a87c99..a1510e7 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CqEntry.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CqEntry.java
@@ -20,8 +20,9 @@ import java.io.DataOutput;
import java.io.IOException;
import org.apache.geode.DataSerializer;
-import org.apache.geode.internal.DataSerializableFixedID;
-import org.apache.geode.internal.Version;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.SerializationContext;
+import org.apache.geode.internal.serialization.Version;
/**
@@ -90,7 +91,8 @@ public class CqEntry implements DataSerializableFixedID {
/* DataSerializableFixedID methods ---------------------------------------- */
@Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
this.key = DataSerializer.readObject(in);
this.value = DataSerializer.readObject(in);
}
@@ -102,7 +104,8 @@ public class CqEntry implements DataSerializableFixedID {
}
@Override
- public void toData(DataOutput out) throws IOException {
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
DataSerializer.writeObject(this.key, out);
DataSerializer.writeObject(this.value, out);
}
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CumulativeNonDistinctResults.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CumulativeNonDistinctResults.java
index fc65a63..d8c6c54 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CumulativeNonDistinctResults.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CumulativeNonDistinctResults.java
@@ -34,10 +34,11 @@ import org.apache.geode.cache.query.internal.utils.LimitIterator;
import org.apache.geode.cache.query.internal.utils.PDXUtils;
import org.apache.geode.cache.query.types.CollectionType;
import org.apache.geode.cache.query.types.ObjectType;
-import org.apache.geode.internal.DataSerializableFixedID;
import org.apache.geode.internal.HeapDataOutputStream;
-import org.apache.geode.internal.HeapDataOutputStream.LongUpdater;
-import org.apache.geode.internal.Version;
+import org.apache.geode.internal.serialization.BufferDataOutputStream.LongUpdater;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.SerializationContext;
+import org.apache.geode.internal.serialization.Version;
/**
* This is used as a wrapper over all the results of PR which are of non distinct type
@@ -277,7 +278,8 @@ public class CumulativeNonDistinctResults<E> implements SelectResults<E>, DataSe
}
@Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
ObjectType elementType = (ObjectType) DataSerializer.readObject(in);
this.collectionType = new CollectionTypeImpl(CumulativeNonDistinctResults.class, elementType);
boolean isStruct = elementType.isStructType();
@@ -306,7 +308,8 @@ public class CumulativeNonDistinctResults<E> implements SelectResults<E>, DataSe
// instead
// of struct
@Override
- public void toData(DataOutput out) throws IOException {
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
boolean isStruct = this.collectionType.getElementType().isStructType();
DataSerializer.writeObject(this.collectionType.getElementType(), out);
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/LinkedResultSet.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/LinkedResultSet.java
index 8725ced..b4b28c4 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/LinkedResultSet.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/LinkedResultSet.java
@@ -32,8 +32,9 @@ import org.apache.geode.cache.query.internal.types.CollectionTypeImpl;
import org.apache.geode.cache.query.types.CollectionType;
import org.apache.geode.cache.query.types.ObjectType;
import org.apache.geode.cache.query.types.StructType;
-import org.apache.geode.internal.DataSerializableFixedID;
-import org.apache.geode.internal.Version;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.SerializationContext;
+import org.apache.geode.internal.serialization.Version;
public class LinkedResultSet extends java.util.LinkedHashSet
implements Ordered, SelectResults, DataSerializableFixedID {
@@ -111,7 +112,8 @@ public class LinkedResultSet extends java.util.LinkedHashSet
}
@Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
int size = in.readInt();
this.elementType = (ObjectType) DataSerializer.readObject(in);
for (int j = size; j > 0; j--) {
@@ -120,7 +122,8 @@ public class LinkedResultSet extends java.util.LinkedHashSet
}
@Override
- public void toData(DataOutput out) throws IOException {
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
// how do we serialize the comparator?
out.writeInt(this.size());
DataSerializer.writeObject(this.elementType, out);
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/LinkedStructSet.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/LinkedStructSet.java
index d52931c..3348190 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/LinkedStructSet.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/LinkedStructSet.java
@@ -31,8 +31,9 @@ import org.apache.geode.cache.query.internal.types.CollectionTypeImpl;
import org.apache.geode.cache.query.internal.types.StructTypeImpl;
import org.apache.geode.cache.query.types.CollectionType;
import org.apache.geode.cache.query.types.ObjectType;
-import org.apache.geode.internal.DataSerializableFixedID;
-import org.apache.geode.internal.Version;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.SerializationContext;
+import org.apache.geode.internal.serialization.Version;
public class LinkedStructSet extends LinkedHashSet<Struct>
implements SelectResults<Struct>, Ordered, DataSerializableFixedID {
@@ -169,7 +170,8 @@ public class LinkedStructSet extends LinkedHashSet<Struct>
}
@Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
this.modifiable = in.readBoolean();
int size = in.readInt();
this.structType = (StructTypeImpl) DataSerializer.readObject(in);
@@ -185,7 +187,8 @@ public class LinkedStructSet extends LinkedHashSet<Struct>
}
@Override
- public void toData(DataOutput out) throws IOException {
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
// how do we serialize the comparator?
out.writeBoolean(this.modifiable);
out.writeInt(this.size());
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/NWayMergeResults.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/NWayMergeResults.java
index db54692..a885c00 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/NWayMergeResults.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/NWayMergeResults.java
@@ -35,10 +35,11 @@ import org.apache.geode.cache.query.internal.types.StructTypeImpl;
import org.apache.geode.cache.query.internal.utils.LimitIterator;
import org.apache.geode.cache.query.types.CollectionType;
import org.apache.geode.cache.query.types.ObjectType;
-import org.apache.geode.internal.DataSerializableFixedID;
import org.apache.geode.internal.HeapDataOutputStream;
-import org.apache.geode.internal.HeapDataOutputStream.LongUpdater;
-import org.apache.geode.internal.Version;
+import org.apache.geode.internal.serialization.BufferDataOutputStream.LongUpdater;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.SerializationContext;
+import org.apache.geode.internal.serialization.Version;
/**
* The n - way merge results returns a sorted results on the cumulative sorted results for
@@ -436,7 +437,8 @@ public class NWayMergeResults<E> implements SelectResults<E>, Ordered, DataSeria
}
@Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
ObjectType elementType = (ObjectType) DataSerializer.readObject(in);
this.collectionType = new CollectionTypeImpl(NWayMergeResults.class, elementType);
boolean isStruct = elementType.isStructType();
@@ -465,7 +467,8 @@ public class NWayMergeResults<E> implements SelectResults<E>, Ordered, DataSeria
// instead
// of struct
@Override
- public void toData(DataOutput out) throws IOException {
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
boolean isStruct = this.collectionType.getElementType().isStructType();
DataSerializer.writeObject(this.collectionType.getElementType(), out);
DataSerializer.writePrimitiveBoolean(this.isDistinct, out);
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/NullToken.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/NullToken.java
index c1a6f98..031e0fc 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/NullToken.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/NullToken.java
@@ -20,8 +20,9 @@ import java.io.IOException;
import org.apache.geode.cache.query.QueryService;
import org.apache.geode.cache.query.internal.index.IndexManager;
-import org.apache.geode.internal.DataSerializableFixedID;
-import org.apache.geode.internal.Version;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.SerializationContext;
+import org.apache.geode.internal.serialization.Version;
/**
* A Token representing null.
@@ -64,12 +65,14 @@ public class NullToken implements DataSerializableFixedID, Comparable {
}
@Override
- public void toData(DataOutput out) throws IOException {
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
}
@Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {}
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {}
@Override
public Version[] getSerializationVersions() {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/PRQueryTraceInfo.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/PRQueryTraceInfo.java
index aaa0833..27c05b2 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/PRQueryTraceInfo.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/PRQueryTraceInfo.java
@@ -23,8 +23,9 @@ import java.util.Iterator;
import org.apache.geode.DataSerializer;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.internal.DataSerializableFixedID;
-import org.apache.geode.internal.Version;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.SerializationContext;
+import org.apache.geode.internal.serialization.Version;
public class PRQueryTraceInfo implements DataSerializableFixedID {
@@ -38,14 +39,16 @@ public class PRQueryTraceInfo implements DataSerializableFixedID {
public PRQueryTraceInfo() {}
@Override
- public void toData(DataOutput out) throws IOException {
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
out.writeFloat(timeInMillis);
out.writeInt(numResults);
DataSerializer.writeString(indexesUsed, out);
}
@Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
timeInMillis = in.readFloat();
numResults = in.readInt();
indexesUsed = DataSerializer.readString(in);
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/ResultsBag.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/ResultsBag.java
index 89f18bd..77beb4d 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/ResultsBag.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/ResultsBag.java
@@ -24,9 +24,10 @@ import org.apache.geode.DataSerializer;
import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.cache.query.internal.ObjectIntHashMap.Entry;
import org.apache.geode.cache.query.types.ObjectType;
-import org.apache.geode.internal.DataSerializableFixedID;
-import org.apache.geode.internal.Version;
import org.apache.geode.internal.cache.CachePerfStats;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.SerializationContext;
+import org.apache.geode.internal.serialization.Version;
public class ResultsBag extends Bag implements DataSerializableFixedID {
@@ -135,7 +136,8 @@ public class ResultsBag extends Bag implements DataSerializableFixedID {
}
@Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
this.elementType = (ObjectType) DataSerializer.readObject(in);
this.size = in.readInt();
assert this.size >= 0 : this.size;
@@ -159,7 +161,8 @@ public class ResultsBag extends Bag implements DataSerializableFixedID {
}
@Override
- public void toData(DataOutput out) throws IOException {
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
DataSerializer.writeObject(this.elementType, out);
out.writeInt(this.size());
this.writeNumNulls(out);
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/ResultsCollectionWrapper.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/ResultsCollectionWrapper.java
index 4a24a3c..fcdf1fc 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/ResultsCollectionWrapper.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/ResultsCollectionWrapper.java
@@ -36,10 +36,11 @@ import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.cache.query.internal.types.CollectionTypeImpl;
import org.apache.geode.cache.query.types.CollectionType;
import org.apache.geode.cache.query.types.ObjectType;
-import org.apache.geode.internal.DataSerializableFixedID;
import org.apache.geode.internal.InternalDataSerializer;
-import org.apache.geode.internal.Version;
import org.apache.geode.internal.cache.EntriesSet;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.SerializationContext;
+import org.apache.geode.internal.serialization.Version;
/**
* Implementation of SelectResults that wraps an existing java.util.Collection and optionally adds a
@@ -540,7 +541,8 @@ public class ResultsCollectionWrapper implements SelectResults, DataSerializable
* @throws IOException A problem occurs while writing to <code>out</code>
*/
@Override
- public void toData(DataOutput out) throws IOException {
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
// special case when wrapping a ResultsBag.SetView
boolean isBagSetView = this.base instanceof Bag.SetView;
out.writeBoolean(isBagSetView);
@@ -560,7 +562,8 @@ public class ResultsCollectionWrapper implements SelectResults, DataSerializable
* @throws ClassNotFoundException A class could not be loaded while reading from <code>in</code>
*/
@Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
boolean isBagSetView = in.readBoolean();
if (isBagSetView) {
this.base = (Set) InternalDataSerializer.readSet(in);
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/ResultsSet.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/ResultsSet.java
index 5e8f873..c8b30a1 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/ResultsSet.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/ResultsSet.java
@@ -33,9 +33,10 @@ import org.apache.geode.cache.query.types.CollectionType;
import org.apache.geode.cache.query.types.ObjectType;
import org.apache.geode.cache.query.types.StructType;
import org.apache.geode.internal.Assert;
-import org.apache.geode.internal.DataSerializableFixedID;
import org.apache.geode.internal.InternalDataSerializer;
-import org.apache.geode.internal.Version;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.SerializationContext;
+import org.apache.geode.internal.serialization.Version;
// @todo probably should assert element type when elements added
/**
@@ -140,7 +141,8 @@ public class ResultsSet extends HashSet implements SelectResults, DataSerializab
}
@Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
int size = in.readInt();
ObjectTypeImpl clt = new ObjectTypeImpl();
InternalDataSerializer.invokeFromData(clt, in);
@@ -151,7 +153,8 @@ public class ResultsSet extends HashSet implements SelectResults, DataSerializab
}
@Override
- public void toData(DataOutput out) throws IOException {
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
out.writeInt(size());
ObjectTypeImpl ctImpl = (ObjectTypeImpl) this.getCollectionType().getElementType();
Assert.assertTrue(ctImpl != null, "ctImpl can not be null");
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/SortedResultSet.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/SortedResultSet.java
index 4b0046a..4e7c498 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/SortedResultSet.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/SortedResultSet.java
@@ -32,8 +32,9 @@ import org.apache.geode.cache.query.internal.types.CollectionTypeImpl;
import org.apache.geode.cache.query.types.CollectionType;
import org.apache.geode.cache.query.types.ObjectType;
import org.apache.geode.cache.query.types.StructType;
-import org.apache.geode.internal.DataSerializableFixedID;
-import org.apache.geode.internal.Version;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.SerializationContext;
+import org.apache.geode.internal.serialization.Version;
/**
* Implementation of SelectResults that extends TreeSet This is the sorted version of ResultSet used
@@ -125,7 +126,8 @@ public class SortedResultSet extends TreeSet
}
@Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
int size = in.readInt();
this.elementType = (ObjectType) DataSerializer.readObject(in);
for (int j = size; j > 0; j--) {
@@ -134,7 +136,8 @@ public class SortedResultSet extends TreeSet
}
@Override
- public void toData(DataOutput out) throws IOException {
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
// how do we serialize the comparator?
out.writeInt(this.size());
DataSerializer.writeObject(this.elementType, out);
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/SortedStructSet.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/SortedStructSet.java
index d8b522a..5abb3d0 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/SortedStructSet.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/SortedStructSet.java
@@ -32,8 +32,9 @@ import org.apache.geode.cache.query.internal.types.CollectionTypeImpl;
import org.apache.geode.cache.query.internal.types.StructTypeImpl;
import org.apache.geode.cache.query.types.CollectionType;
import org.apache.geode.cache.query.types.ObjectType;
-import org.apache.geode.internal.DataSerializableFixedID;
-import org.apache.geode.internal.Version;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.SerializationContext;
+import org.apache.geode.internal.serialization.Version;
/**
* A TreeSet constrained to contain Structs of all the same type. To conserve on objects, we store
@@ -368,7 +369,8 @@ public class SortedStructSet extends TreeSet
}
@Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
this.modifiable = in.readBoolean();
int size = in.readInt();
this.structType = (StructTypeImpl) DataSerializer.readObject(in);
@@ -379,7 +381,8 @@ public class SortedStructSet extends TreeSet
}
@Override
- public void toData(DataOutput out) throws IOException {
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
// how do we serialize the comparator?
out.writeBoolean(this.modifiable);
out.writeInt(this.size());
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/StructBag.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/StructBag.java
index 417bbc7..d066981 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/StructBag.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/StructBag.java
@@ -31,6 +31,7 @@ import org.apache.geode.cache.query.types.CollectionType;
import org.apache.geode.cache.query.types.ObjectType;
import org.apache.geode.cache.query.types.StructType;
import org.apache.geode.internal.cache.CachePerfStats;
+import org.apache.geode.internal.serialization.SerializationContext;
/**
* A Bag constrained to contain Structs of all the same type. To conserve on objects, we store the
@@ -450,14 +451,16 @@ public class StructBag extends ResultsBag implements StructFields {
}
@Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
- super.fromData(in);
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
+ super.fromData(in, context);
this.modifiable = in.readBoolean();
}
@Override
- public void toData(DataOutput out) throws IOException {
- super.toData(out);
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
+ super.toData(out, context);
out.writeBoolean(this.modifiable);
}
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/StructImpl.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/StructImpl.java
index 7e48c2d..5b343d4 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/StructImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/StructImpl.java
@@ -26,8 +26,9 @@ import org.apache.geode.cache.query.Struct;
import org.apache.geode.cache.query.internal.types.StructTypeImpl;
import org.apache.geode.cache.query.types.ObjectType;
import org.apache.geode.cache.query.types.StructType;
-import org.apache.geode.internal.DataSerializableFixedID;
-import org.apache.geode.internal.Version;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.SerializationContext;
+import org.apache.geode.internal.serialization.Version;
import org.apache.geode.pdx.PdxInstance;
import org.apache.geode.pdx.internal.PdxString;
@@ -167,7 +168,8 @@ public class StructImpl implements Struct, DataSerializableFixedID, Serializable
}
@Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
this.type = (StructTypeImpl) DataSerializer.readObject(in);
this.values = DataSerializer.readObjectArray(in);
if (this.values != null) {
@@ -181,7 +183,8 @@ public class StructImpl implements Struct, DataSerializableFixedID, Serializable
}
@Override
- public void toData(DataOutput out) throws IOException {
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
DataSerializer.writeObject(this.type, out);
DataSerializer.writeObjectArray(this.values, out);
}
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/StructSet.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/StructSet.java
index c998152..7379689 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/StructSet.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/StructSet.java
@@ -36,8 +36,9 @@ import org.apache.geode.cache.query.internal.types.StructTypeImpl;
import org.apache.geode.cache.query.types.CollectionType;
import org.apache.geode.cache.query.types.ObjectType;
import org.apache.geode.cache.query.types.StructType;
-import org.apache.geode.internal.DataSerializableFixedID;
-import org.apache.geode.internal.Version;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.SerializationContext;
+import org.apache.geode.internal.serialization.Version;
/**
* A Set constrained to contain Structs of all the same type. To conserve on objects, we store the
@@ -455,7 +456,8 @@ public class StructSet /* extends ObjectOpenCustomHashSet */ implements Set, Sel
}
@Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
this.contents = new ObjectOpenCustomHashSet(new ObjectArrayHashingStrategy());
int size = in.readInt();
this.structType = (StructTypeImpl) DataSerializer.readObject(in);
@@ -465,7 +467,8 @@ public class StructSet /* extends ObjectOpenCustomHashSet */ implements Set, Sel
}
@Override
- public void toData(DataOutput out) throws IOException {
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
out.writeInt(this.size());
DataSerializer.writeObject(this.structType, out);
for (Iterator i = this.iterator(); i.hasNext();) {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/Undefined.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/Undefined.java
index ab69172..94fa9e4 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/Undefined.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/Undefined.java
@@ -21,8 +21,9 @@ import java.io.IOException;
import java.io.Serializable;
import org.apache.geode.cache.query.QueryService;
-import org.apache.geode.internal.DataSerializableFixedID;
-import org.apache.geode.internal.Version;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.SerializationContext;
+import org.apache.geode.internal.serialization.Version;
/**
* An UNDEFINED value is the result of accessing an attribute of a null-valued attribute. If you
@@ -57,13 +58,15 @@ public class Undefined implements DataSerializableFixedID, Comparable, Serializa
}
@Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
// Serialized simply as a one-byte class id, as a class well known to
// DataSerializer
}
@Override
- public void toData(DataOutput out) throws IOException {}
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {}
@Override
public int compareTo(Object o) {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexCreationData.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexCreationData.java
index 711e1bd..8bb28c1 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexCreationData.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexCreationData.java
@@ -24,8 +24,9 @@ import java.io.DataOutput;
import java.io.IOException;
import org.apache.geode.cache.query.IndexType;
-import org.apache.geode.internal.DataSerializableFixedID;
-import org.apache.geode.internal.Version;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.SerializationContext;
+import org.apache.geode.internal.serialization.Version;
/**
*
@@ -113,7 +114,8 @@ public class IndexCreationData implements DataSerializableFixedID {
}
@Override
- public void toData(DataOutput out) throws IOException {
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
out.writeUTF(this.name);
out.writeUTF(this.expression);
out.writeUTF(this.fromClause);
@@ -137,7 +139,8 @@ public class IndexCreationData implements DataSerializableFixedID {
}
@Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
this.name = in.readUTF();
this.expression = in.readUTF();
this.fromClause = in.readUTF();
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/CollectionTypeImpl.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/CollectionTypeImpl.java
index 9710f05..4f53d13f 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/CollectionTypeImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/CollectionTypeImpl.java
@@ -35,6 +35,7 @@ import org.apache.geode.cache.query.internal.SortedStructSet;
import org.apache.geode.cache.query.internal.StructSet;
import org.apache.geode.cache.query.types.CollectionType;
import org.apache.geode.cache.query.types.ObjectType;
+import org.apache.geode.internal.serialization.SerializationContext;
/**
* Implementation of CollectionType
@@ -121,14 +122,16 @@ public class CollectionTypeImpl extends ObjectTypeImpl implements CollectionType
}
@Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
- super.fromData(in);
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
+ super.fromData(in, context);
this.elementType = (ObjectType) DataSerializer.readObject(in);
}
@Override
- public void toData(DataOutput out) throws IOException {
- super.toData(out);
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
+ super.toData(out, context);
DataSerializer.writeObject(this.elementType, out);
}
}
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/MapTypeImpl.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/MapTypeImpl.java
index 7fff4f2..af2503a 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/MapTypeImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/MapTypeImpl.java
@@ -23,6 +23,7 @@ import org.apache.geode.DataSerializer;
import org.apache.geode.cache.query.types.MapType;
import org.apache.geode.cache.query.types.ObjectType;
import org.apache.geode.cache.query.types.StructType;
+import org.apache.geode.internal.serialization.SerializationContext;
/**
@@ -90,14 +91,16 @@ public class MapTypeImpl extends CollectionTypeImpl implements MapType {
}
@Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
- super.fromData(in);
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
+ super.fromData(in, context);
this.keyType = (ObjectType) DataSerializer.readObject(in);
}
@Override
- public void toData(DataOutput out) throws IOException {
- super.toData(out);
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
+ super.toData(out, context);
DataSerializer.writeObject(this.keyType, out);
}
}
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/ObjectTypeImpl.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/ObjectTypeImpl.java
index 18edb5d..9e401ae 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/ObjectTypeImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/ObjectTypeImpl.java
@@ -21,9 +21,10 @@ import java.io.IOException;
import org.apache.geode.DataSerializer;
import org.apache.geode.cache.query.types.ObjectType;
-import org.apache.geode.internal.DataSerializableFixedID;
import org.apache.geode.internal.InternalDataSerializer;
-import org.apache.geode.internal.Version;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.SerializationContext;
+import org.apache.geode.internal.serialization.Version;
/**
* Implementation of ObjectType
@@ -98,12 +99,24 @@ public class ObjectTypeImpl implements ObjectType, DataSerializableFixedID {
}
@Override
+ public void toData(DataOutput out) throws IOException {
+ toData(out, null);
+ }
+
+ @Override
public void fromData(DataInput in) throws IOException, ClassNotFoundException {
+ fromData(in, null);
+ }
+
+ @Override
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
this.clazz = DataSerializer.readClass(in);
}
@Override
- public void toData(DataOutput out) throws IOException {
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
DataSerializer.writeClass(this.clazz, out);
}
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/StructTypeImpl.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/StructTypeImpl.java
index c873c8c..62ba177 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/StructTypeImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/StructTypeImpl.java
@@ -25,6 +25,7 @@ import org.apache.geode.cache.query.Struct;
import org.apache.geode.cache.query.internal.StructImpl;
import org.apache.geode.cache.query.types.ObjectType;
import org.apache.geode.cache.query.types.StructType;
+import org.apache.geode.internal.serialization.SerializationContext;
/**
* Implementation of StructType
@@ -156,15 +157,17 @@ public class StructTypeImpl extends ObjectTypeImpl implements StructType {
}
@Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
- super.fromData(in);
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
+ super.fromData(in, context);
this.fieldNames = DataSerializer.readStringArray(in);
this.fieldTypes = (ObjectType[]) DataSerializer.readObjectArray(in);
}
@Override
- public void toData(DataOutput out) throws IOException {
- super.toData(out);
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
+ super.toData(out, context);
DataSerializer.writeStringArray(this.fieldNames, out);
DataSerializer.writeObjectArray(fieldTypes, out);
}
diff --git a/geode-core/src/main/java/org/apache/geode/cache/wan/EventSequenceID.java b/geode-core/src/main/java/org/apache/geode/cache/wan/EventSequenceID.java
index 8400376..3e25abe 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/wan/EventSequenceID.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/wan/EventSequenceID.java
@@ -17,7 +17,7 @@ package org.apache.geode.cache.wan;
import java.util.Arrays;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.internal.ByteArrayDataInput;
+import org.apache.geode.internal.serialization.ByteArrayDataInput;
/**
* This class wraps 1) DistributedMembershipID 2) ThreadID 3) SequenceID attributes which are used
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/ClusterDistributionManager.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/ClusterDistributionManager.java
index 3e56bf1..0e451db 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/ClusterDistributionManager.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/ClusterDistributionManager.java
@@ -72,7 +72,6 @@ import org.apache.geode.distributed.internal.membership.gms.messages.ViewAckMess
import org.apache.geode.internal.Assert;
import org.apache.geode.internal.NanoTimer;
import org.apache.geode.internal.OSProcess;
-import org.apache.geode.internal.Version;
import org.apache.geode.internal.admin.remote.AdminConsoleDisconnectMessage;
import org.apache.geode.internal.admin.remote.RemoteGfManagerAgent;
import org.apache.geode.internal.admin.remote.RemoteTransportConfig;
@@ -89,6 +88,7 @@ import org.apache.geode.internal.monitoring.ThreadsMonitoringImpl;
import org.apache.geode.internal.monitoring.ThreadsMonitoringImplDummy;
import org.apache.geode.internal.net.SocketCreator;
import org.apache.geode.internal.sequencelog.MembershipLogger;
+import org.apache.geode.internal.serialization.Version;
import org.apache.geode.internal.tcp.Connection;
import org.apache.geode.internal.tcp.ConnectionTable;
import org.apache.geode.internal.tcp.ReenteredConnectException;
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionAdvisor.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionAdvisor.java
index e551157..33a9d0c 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionAdvisor.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionAdvisor.java
@@ -39,9 +39,7 @@ import org.apache.geode.annotations.internal.MakeNotStatic;
import org.apache.geode.cache.server.CacheServer;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.Assert;
-import org.apache.geode.internal.DataSerializableFixedID;
import org.apache.geode.internal.InternalDataSerializer;
-import org.apache.geode.internal.Version;
import org.apache.geode.internal.cache.CacheDistributionAdvisor.CacheProfile;
import org.apache.geode.internal.cache.DistributedRegion;
import org.apache.geode.internal.cache.UpdateAttributesProcessor;
@@ -49,6 +47,9 @@ import org.apache.geode.internal.cache.persistence.PersistentMemberID;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LogMarker;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.SerializationContext;
+import org.apache.geode.internal.serialization.Version;
import org.apache.geode.internal.util.ArrayUtils;
/**
@@ -1468,14 +1469,16 @@ public class DistributionAdvisor {
}
@Override
- public void toData(DataOutput out) throws IOException {
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
InternalDataSerializer.invokeToData(peerMemberId, out);
out.writeInt(version);
out.writeInt(serialNumber);
}
@Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
peerMemberId = new InternalDistributedMember();
InternalDataSerializer.invokeFromData(peerMemberId, in);
version = in.readInt();
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionManager.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionManager.java
index 57f5243..3c631d6 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionManager.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionManager.java
@@ -31,10 +31,10 @@ import org.apache.geode.distributed.Role;
import org.apache.geode.distributed.internal.locks.ElderState;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.distributed.internal.membership.MembershipManager;
-import org.apache.geode.internal.Version;
import org.apache.geode.internal.alerting.AlertingService;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.monitoring.ThreadsMonitoring;
+import org.apache.geode.internal.serialization.Version;
/**
* This interface defines the services provided by any class that is a distribution manager.
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionMessage.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionMessage.java
index 21151a0..c830486 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionMessage.java
@@ -32,12 +32,13 @@ import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.internal.deadlock.MessageDependencyMonitor;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.Assert;
-import org.apache.geode.internal.DataSerializableFixedID;
-import org.apache.geode.internal.Version;
import org.apache.geode.internal.cache.EventID;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LogMarker;
import org.apache.geode.internal.sequencelog.MessageLogger;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.SerializationContext;
+import org.apache.geode.internal.serialization.Version;
import org.apache.geode.internal.tcp.Connection;
import org.apache.geode.internal.util.Breadcrumbs;
@@ -555,7 +556,8 @@ public abstract class DistributionMessage implements DataSerializableFixedID, Cl
* (<code>super.toData()</code>).
*/
@Override
- public void toData(DataOutput out) throws IOException {
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
// DataSerializer.writeObject(this.recipients, out); // no need to serialize; filled in later
// ((IpAddress)this.sender).toData(out); // no need to serialize; filled in later
// out.writeLong(this.timeStamp);
@@ -567,7 +569,8 @@ public abstract class DistributionMessage implements DataSerializableFixedID, Cl
* (<code>super.fromData()</code>).
*/
@Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
// this.recipients = (Set)DataSerializer.readObject(in); // no to deserialize; filled in later
// this.sender = DataSerializer.readIpAddress(in); // no to deserialize; filled in later
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/HighPriorityAckedMessage.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/HighPriorityAckedMessage.java
index b97ccc0..2a08627 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/HighPriorityAckedMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/HighPriorityAckedMessage.java
@@ -30,6 +30,7 @@ import org.apache.geode.distributed.internal.membership.InternalDistributedMembe
import org.apache.geode.internal.Assert;
import org.apache.geode.internal.OSProcess;
import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.serialization.SerializationContext;
/**
* A message that is sent to a given collection of managers and then awaits replies. It is used by
@@ -203,8 +204,9 @@ public class HighPriorityAckedMessage extends HighPriorityDistributionMessage
}
@Override
- public void toData(DataOutput out) throws IOException {
- super.toData(out);
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
+ super.toData(out, context);
out.writeInt(processorId);
out.writeInt(this.op.ordinal());
out.writeBoolean(this.useNative);
@@ -212,9 +214,10 @@ public class HighPriorityAckedMessage extends HighPriorityDistributionMessage
}
@Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
- super.fromData(in);
+ super.fromData(in, context);
processorId = in.readInt();
this.op = operationType.values()[in.readInt()];
this.useNative = in.readBoolean();
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalDistributedSystem.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalDistributedSystem.java
index 96ae52d..66c3e2a 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalDistributedSystem.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalDistributedSystem.java
@@ -76,7 +76,6 @@ import org.apache.geode.distributed.internal.membership.QuorumChecker;
import org.apache.geode.distributed.internal.membership.adapter.GMSMembershipManager;
import org.apache.geode.distributed.internal.membership.gms.messenger.MembershipInformation;
import org.apache.geode.internal.Assert;
-import org.apache.geode.internal.DSFIDFactory;
import org.apache.geode.internal.InternalDataSerializer;
import org.apache.geode.internal.InternalInstantiator;
import org.apache.geode.internal.SystemTimer;
@@ -534,12 +533,6 @@ public class InternalDistributedSystem extends DistributedSystem
alertingSession = AlertingSession.create();
alertingService = new AlertingService();
loggingSession = LoggingSession.create();
-
- // register DSFID types first; invoked explicitly so that all message type
- // initializations do not happen in first deserialization on a possibly
- // "precious" thread
- DSFIDFactory.registerTypes();
-
originalConfig = config.distributionConfig();
isReconnectingDS = config.isReconnecting();
quorumChecker = config.quorumChecker();
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/LonerDistributionManager.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/LonerDistributionManager.java
index 7dbda8d..d4bb171 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/LonerDistributionManager.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/LonerDistributionManager.java
@@ -49,7 +49,6 @@ import org.apache.geode.distributed.internal.membership.InternalDistributedMembe
import org.apache.geode.distributed.internal.membership.MemberAttributes;
import org.apache.geode.distributed.internal.membership.MembershipManager;
import org.apache.geode.i18n.LogWriterI18n;
-import org.apache.geode.internal.Version;
import org.apache.geode.internal.alerting.AlertingService;
import org.apache.geode.internal.alerting.NullAlertingService;
import org.apache.geode.internal.cache.InternalCache;
@@ -59,6 +58,7 @@ import org.apache.geode.internal.monitoring.ThreadsMonitoring;
import org.apache.geode.internal.monitoring.ThreadsMonitoringImpl;
import org.apache.geode.internal.monitoring.ThreadsMonitoringImplDummy;
import org.apache.geode.internal.net.SocketCreator;
+import org.apache.geode.internal.serialization.Version;
/**
* A <code>LonerDistributionManager</code> is a dm that never communicates with anyone else.
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplyMessage.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplyMessage.java
index f0ad614..d75c1d4 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplyMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplyMessage.java
@@ -29,6 +29,7 @@ import org.apache.geode.distributed.internal.membership.InternalDistributedMembe
import org.apache.geode.internal.Assert;
import org.apache.geode.internal.cache.versions.ConcurrentCacheModificationException;
import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.serialization.SerializationContext;
/**
* A message that acknowledges that an operation completed successfully, or threw a CacheException.
@@ -266,8 +267,9 @@ public class ReplyMessage extends HighPriorityDistributionMessage {
}
@Override
- public void toData(DataOutput out) throws IOException {
- super.toData(out);
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
+ super.toData(out, context);
byte status = 0;
if (this.ignored) {
@@ -297,8 +299,9 @@ public class ReplyMessage extends HighPriorityDistributionMessage {
}
@Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
- super.fromData(in);
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
+ super.fromData(in, context);
byte status = in.readByte();
this.ignored = testFlag(status, IGNORED_FLAG);
this.closed = testFlag(status, CLOSED_FLAG);
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplyProcessor21.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplyProcessor21.java
index 486d102..9b4963b 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplyProcessor21.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplyProcessor21.java
@@ -28,16 +28,16 @@ import org.apache.geode.CancelCriterion;
import org.apache.geode.InternalGemFireException;
import org.apache.geode.annotations.internal.MakeNotStatic;
import org.apache.geode.cache.TimeoutException;
-import org.apache.geode.cache.UnsupportedVersionException;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.DistributedSystemDisconnectedException;
import org.apache.geode.distributed.internal.deadlock.MessageDependencyMonitor;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.Assert;
-import org.apache.geode.internal.DSFIDNotFoundException;
-import org.apache.geode.internal.Version;
import org.apache.geode.internal.cache.versions.ConcurrentCacheModificationException;
import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.serialization.DSFIDNotFoundException;
+import org.apache.geode.internal.serialization.UnsupportedSerializationVersionException;
+import org.apache.geode.internal.serialization.Version;
import org.apache.geode.internal.util.Breadcrumbs;
import org.apache.geode.internal.util.concurrent.StoppableCountDownLatch;
@@ -474,9 +474,9 @@ public class ReplyProcessor21 implements MembershipListener {
final short versionOrdinal = ex.getProductVersionOrdinal();
String versionStr = null;
try {
- Version version = Version.fromOrdinal(versionOrdinal, false);
+ Version version = Version.fromOrdinal(versionOrdinal);
versionStr = version.toString();
- } catch (UnsupportedVersionException e) {
+ } catch (UnsupportedSerializationVersionException e) {
}
if (versionStr == null) {
versionStr = "Ordinal=" + versionOrdinal;
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/SerialAckedMessage.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/SerialAckedMessage.java
index e3bc872..5142ee0 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/SerialAckedMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/SerialAckedMessage.java
@@ -28,6 +28,7 @@ import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.Assert;
import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.serialization.SerializationContext;
/**
* A message that is sent to a given collection of managers and then awaits replies. It is used by
@@ -133,16 +134,18 @@ public class SerialAckedMessage extends SerialDistributionMessage implements Mes
}
@Override
- public void toData(DataOutput out) throws IOException {
- super.toData(out);
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
+ super.toData(out, context);
out.writeInt(processorId);
DataSerializer.writeObject(this.id, out);
}
@Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
- super.fromData(in);
+ super.fromData(in, context);
processorId = in.readInt();
this.id = (InternalDistributedMember) DataSerializer.readObject(in);
}
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/ServerLocator.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/ServerLocator.java
index 2ed366e..4e8014a 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/ServerLocator.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/ServerLocator.java
@@ -51,7 +51,6 @@ import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.distributed.internal.DistributionAdvisor.Profile;
import org.apache.geode.distributed.internal.tcpserver.TcpHandler;
import org.apache.geode.distributed.internal.tcpserver.TcpServer;
-import org.apache.geode.internal.DataSerializableFixedID;
import org.apache.geode.internal.cache.CacheServerAdvisor.CacheServerProfile;
import org.apache.geode.internal.cache.ControllerAdvisor;
import org.apache.geode.internal.cache.ControllerAdvisor.ControllerProfile;
@@ -59,6 +58,7 @@ import org.apache.geode.internal.cache.FindDurableQueueProcessor;
import org.apache.geode.internal.cache.GridAdvisor.GridProfile;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.net.SocketCreator;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
/**
*
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/ShutdownMessage.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/ShutdownMessage.java
index 8f890aa..4b9e74c 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/ShutdownMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/ShutdownMessage.java
@@ -21,6 +21,7 @@ import java.io.IOException;
import org.apache.geode.DataSerializer;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.Assert;
+import org.apache.geode.internal.serialization.SerializationContext;
/**
* A message that is sent to all other distribution manager when a distribution manager shuts down.
@@ -98,16 +99,18 @@ public class ShutdownMessage extends HighPriorityDistributionMessage
}
@Override
- public void toData(DataOutput out) throws IOException {
- super.toData(out);
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
+ super.toData(out, context);
out.writeInt(processorId);
DataSerializer.writeObject(this.id, out);
}
@Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
- super.fromData(in);
+ super.fromData(in, context);
processorId = in.readInt();
this.id = (InternalDistributedMember) DataSerializer.readObject(in);
}
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupMessage.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupMessage.java
index f7bed1b..2544bc0 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupMessage.java
@@ -33,9 +33,10 @@ import org.apache.geode.internal.InternalDataSerializer;
import org.apache.geode.internal.InternalDataSerializer.SerializerAttributesHolder;
import org.apache.geode.internal.InternalInstantiator;
import org.apache.geode.internal.InternalInstantiator.InstantiatorAttributesHolder;
-import org.apache.geode.internal.Version;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.net.SocketCreator;
+import org.apache.geode.internal.serialization.SerializationContext;
+import org.apache.geode.internal.serialization.Version;
/**
* A message that is sent to all other distribution manager when a distribution manager starts up.
@@ -320,8 +321,9 @@ public class StartupMessage extends DistributionMessage implements AdminMessageT
}
@Override
- public void toData(DataOutput out) throws IOException {
- super.toData(out);
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
+ super.toData(out, context);
DataSerializer.writeString(this.version, out);
out.writeInt(this.replyProcessorId);
@@ -371,7 +373,7 @@ public class StartupMessage extends DistributionMessage implements AdminMessageT
}
/**
- * Notes a problem that occurs while invoking {@link #fromData}.
+ * Notes a problem that occurs while invoking {@link DataSerializableFixedID#fromData}.
*/
private void recordFromDataProblem(String s) {
if (this.fromDataProblems == null) {
@@ -383,8 +385,9 @@ public class StartupMessage extends DistributionMessage implements AdminMessageT
}
@Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
- super.fromData(in);
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
+ super.fromData(in, context);
this.version = DataSerializer.readString(in);
this.replyProcessorId = in.readInt();
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupResponseMessage.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupResponseMessage.java
index 757dd97..e7cbf5b 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupResponseMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupResponseMessage.java
@@ -28,9 +28,10 @@ import org.apache.geode.internal.InternalDataSerializer;
import org.apache.geode.internal.InternalDataSerializer.SerializerAttributesHolder;
import org.apache.geode.internal.InternalInstantiator;
import org.apache.geode.internal.InternalInstantiator.InstantiatorAttributesHolder;
-import org.apache.geode.internal.Version;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LogMarker;
+import org.apache.geode.internal.serialization.SerializationContext;
+import org.apache.geode.internal.serialization.Version;
/**
* A message that is sent to all other distribution manager when a distribution manager starts up.
@@ -206,9 +207,10 @@ public class StartupResponseMessage extends DistributionMessage
}
@Override
- public void toData(DataOutput out) throws IOException {
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
- super.toData(out);
+ super.toData(out, context);
out.writeInt(processorId);
DataSerializer.writeString(this.rejectionMessage, out);
@@ -235,9 +237,10 @@ public class StartupResponseMessage extends DistributionMessage
}
@Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
- super.fromData(in);
+ super.fromData(in, context);
this.processorId = in.readInt();
this.rejectionMessage = DataSerializer.readString(in);
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupResponseWithVersionMessage.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupResponseWithVersionMessage.java
index 7b9b777..9696cc6 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupResponseWithVersionMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupResponseWithVersionMessage.java
@@ -24,8 +24,9 @@ import org.apache.logging.log4j.Logger;
import org.apache.geode.DataSerializer;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.GemFireVersion;
-import org.apache.geode.internal.Version;
import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.serialization.SerializationContext;
+import org.apache.geode.internal.serialization.Version;
/**
* @since GemFire 6.6.2
@@ -82,8 +83,9 @@ public class StartupResponseWithVersionMessage extends StartupResponseMessage {
}
@Override
- public void toData(DataOutput out) throws IOException {
- super.toData(out);
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
+ super.toData(out, context);
DataSerializer.writeString(this.version, out);
StartupMessageData data = new StartupMessageData();
data.writeHostedLocators(this.hostedLocators);
@@ -92,8 +94,9 @@ public class StartupResponseWithVersionMessage extends StartupResponseMessage {
}
@Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
- super.fromData(in);
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
+ super.fromData(in, context);
this.version = DataSerializer.readString(in);
StartupMessageData data = new StartupMessageData();
data.readFrom(in);
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/WaitForViewInstallation.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/WaitForViewInstallation.java
index a813bbd..2627a38 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/WaitForViewInstallation.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/WaitForViewInstallation.java
@@ -22,6 +22,7 @@ import org.apache.logging.log4j.Logger;
import org.apache.geode.CancelException;
import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.serialization.SerializationContext;
public class WaitForViewInstallation extends HighPriorityDistributionMessage
implements MessageWithReply {
@@ -78,7 +79,7 @@ public class WaitForViewInstallation extends HighPriorityDistributionMessage
/*
* (non-Javadoc)
*
- * @see org.apache.geode.internal.DataSerializableFixedID#getDSFID()
+ * @see org.apache.geode.internal.serialization.DataSerializableFixedID#getDSFID()
*/
@Override
public int getDSFID() {
@@ -86,15 +87,17 @@ public class WaitForViewInstallation extends HighPriorityDistributionMessage
}
@Override
- public void toData(DataOutput out) throws IOException {
- super.toData(out);
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
+ super.toData(out, context);
out.writeLong(this.viewId);
out.writeInt(this.processorId);
}
@Override
- public void fromData(DataInput in) throws ClassNotFoundException, IOException {
- super.fromData(in);
+ public void fromData(DataInput in,
+ SerializationContext context) throws ClassNotFoundException, IOException {
+ super.fromData(in, context);
this.viewId = in.readLong();
this.processorId = in.readInt();
}
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockQueryProcessor.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockQueryProcessor.java
index c8fc7cc..b95fd70 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockQueryProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockQueryProcessor.java
@@ -37,6 +37,7 @@ import org.apache.geode.distributed.internal.locks.DLockGrantor.DLockGrantToken;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LogMarker;
+import org.apache.geode.internal.serialization.SerializationContext;
/**
* Queries the grantor for current leasing information of a lock.
@@ -319,8 +320,9 @@ public class DLockQueryProcessor extends ReplyProcessor21 {
}
@Override
- public void toData(DataOutput out) throws IOException {
- super.toData(out);
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
+ super.toData(out, context);
DataSerializer.writeString(this.serviceName, out);
DataSerializer.writeObject(this.objectName, out);
out.writeBoolean(this.lockBatch);
@@ -328,8 +330,9 @@ public class DLockQueryProcessor extends ReplyProcessor21 {
}
@Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
- super.fromData(in);
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
+ super.fromData(in, context);
this.serviceName = DataSerializer.readString(in);
this.objectName = DataSerializer.readObject(in);
this.lockBatch = in.readBoolean();
@@ -434,8 +437,9 @@ public class DLockQueryProcessor extends ReplyProcessor21 {
}
@Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
- super.fromData(in);
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
+ super.fromData(in, context);
this.replyCode = in.readInt();
if (this.replyCode == OK) {
InternalDistributedMember lessee =
@@ -449,8 +453,9 @@ public class DLockQueryProcessor extends ReplyProcessor21 {
}
@Override
- public void toData(DataOutput out) throws IOException {
- super.toData(out);
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
+ super.toData(out, context);
out.writeInt(this.replyCode);
if (this.replyCode == OK) {
if (this.lesseeThread == null) {
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockRecoverGrantorProcessor.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockRecoverGrantorProcessor.java
index a6c5d4d..18707cc 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockRecoverGrantorProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockRecoverGrantorProcessor.java
@@ -38,6 +38,7 @@ import org.apache.geode.distributed.internal.membership.InternalDistributedMembe
import org.apache.geode.internal.Assert;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LogMarker;
+import org.apache.geode.internal.serialization.SerializationContext;
/**
* Handles messaging to all members of a lock service for the purposes of recoverying from the loss
@@ -276,8 +277,9 @@ public class DLockRecoverGrantorProcessor extends ReplyProcessor21 {
}
@Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
- super.fromData(in);
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
+ super.fromData(in, context);
this.serviceName = DataSerializer.readString(in);
this.processorId = in.readInt();
this.grantorSerialNumber = in.readInt();
@@ -286,8 +288,9 @@ public class DLockRecoverGrantorProcessor extends ReplyProcessor21 {
}
@Override
- public void toData(DataOutput out) throws IOException {
- super.toData(out);
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
+ super.toData(out, context);
DataSerializer.writeString(this.serviceName, out);
out.writeInt(this.processorId);
out.writeInt(this.grantorSerialNumber);
@@ -353,15 +356,17 @@ public class DLockRecoverGrantorProcessor extends ReplyProcessor21 {
}
@Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
- super.fromData(in);
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
+ super.fromData(in, context);
this.replyCode = in.readByte();
this.heldLocks = (DLockRemoteToken[]) DataSerializer.readObjectArray(in);
}
@Override
- public void toData(DataOutput out) throws IOException {
- super.toData(out);
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
+ super.toData(out, context);
out.writeByte(this.replyCode);
DataSerializer.writeObjectArray(this.heldLocks, out);
}
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockReleaseProcessor.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockReleaseProcessor.java
index 5b722aa..9edbfb1 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockReleaseProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockReleaseProcessor.java
@@ -36,6 +36,7 @@ import org.apache.geode.distributed.internal.membership.InternalDistributedMembe
import org.apache.geode.internal.Assert;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LogMarker;
+import org.apache.geode.internal.serialization.SerializationContext;
/**
* Synchronously releases a lock.
@@ -341,8 +342,9 @@ public class DLockReleaseProcessor extends ReplyProcessor21 {
}
@Override
- public void toData(DataOutput out) throws IOException {
- super.toData(out);
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
+ super.toData(out, context);
DataSerializer.writeString(this.serviceName, out);
DataSerializer.writeObject(this.objectName, out);
out.writeBoolean(this.lockBatch);
@@ -351,8 +353,9 @@ public class DLockReleaseProcessor extends ReplyProcessor21 {
}
@Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
- super.fromData(in);
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
+ super.fromData(in, context);
this.serviceName = DataSerializer.readString(in);
this.objectName = DataSerializer.readObject(in);
this.lockBatch = in.readBoolean();
@@ -389,15 +392,17 @@ public class DLockReleaseProcessor extends ReplyProcessor21 {
}
@Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
- super.fromData(in);
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
+ super.fromData(in, context);
this.serviceName = DataSerializer.readString(in);
this.replyCode = in.readInt();
}
@Override
- public void toData(DataOutput out) throws IOException {
- super.toData(out);
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
+ super.toData(out, context);
DataSerializer.writeString(this.serviceName, out);
out.writeInt(this.replyCode);
}
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockRemoteToken.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockRemoteToken.java
index c94c13d..6580b06 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockRemoteToken.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockRemoteToken.java
@@ -22,8 +22,9 @@ import java.io.IOException;
import org.apache.geode.DataSerializer;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.internal.DataSerializableFixedID;
-import org.apache.geode.internal.Version;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.SerializationContext;
+import org.apache.geode.internal.serialization.Version;
/**
* Represents a held lock in a member for use when initializing a new grantor. All currently held
@@ -195,7 +196,8 @@ public class DLockRemoteToken implements DataSerializableFixedID {
* Writes the contents of this object to the given output.
*/
@Override
- public void toData(DataOutput out) throws IOException {
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
DataSerializer.writeObject(this.name, out);
DataSerializer.writeObject(this.lesseeThread.getDistributedMember(), out);
out.writeInt(this.lesseeThread.getThreadId());
@@ -207,7 +209,8 @@ public class DLockRemoteToken implements DataSerializableFixedID {
* Unsupported. Use {@link DLockRemoteToken#createFromDataInput(DataInput)} instead.
*/
@Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
throw new UnsupportedOperationException(
"Use DLockRemoteToken#createFromDataInput(DataInput) instead.");
}
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockRequestProcessor.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockRequestProcessor.java
index 9c43f5a..8c6a1cf 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockRequestProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockRequestProcessor.java
@@ -41,6 +41,7 @@ import org.apache.geode.distributed.internal.membership.InternalDistributedMembe
import org.apache.geode.internal.Assert;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LogMarker;
+import org.apache.geode.internal.serialization.SerializationContext;
/**
* Provides handling of remote and local lock requests. <br>
@@ -921,8 +922,9 @@ public class DLockRequestProcessor extends ReplyProcessor21 {
}
@Override
- public void toData(DataOutput out) throws IOException {
- super.toData(out);
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
+ super.toData(out, context);
out.writeUTF(this.serviceName);
DataSerializer.writeObject(this.objectName, out);
out.writeLong(this.startTime);
@@ -939,8 +941,9 @@ public class DLockRequestProcessor extends ReplyProcessor21 {
}
@Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
- super.fromData(in);
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
+ super.fromData(in, context);
this.serviceName = in.readUTF();
this.objectName = DataSerializer.readObject(in);
this.startTime = in.readLong();
@@ -1166,8 +1169,9 @@ public class DLockRequestProcessor extends ReplyProcessor21 {
}
@Override
- public void toData(DataOutput out) throws IOException {
- super.toData(out);
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
+ super.toData(out, context);
out.writeByte(this.responseCode);
out.writeUTF(this.serviceName);
DataSerializer.writeObject(this.objectName, out);
@@ -1178,8 +1182,9 @@ public class DLockRequestProcessor extends ReplyProcessor21 {
}
@Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
- super.fromData(in);
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
+ super.fromData(in, context);
this.responseCode = in.readByte();
this.serviceName = in.readUTF();
this.objectName = DataSerializer.readObject(in);
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockService.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockService.java
index f453f61..1ca8cb0 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockService.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockService.java
@@ -54,11 +54,12 @@ import org.apache.geode.distributed.internal.deadlock.UnsafeThreadLocal;
import org.apache.geode.distributed.internal.locks.DLockQueryProcessor.DLockQueryReplyMessage;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.Assert;
-import org.apache.geode.internal.DataSerializableFixedID;
import org.apache.geode.internal.OSProcess;
-import org.apache.geode.internal.Version;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LogMarker;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.SerializationContext;
+import org.apache.geode.internal.serialization.Version;
import org.apache.geode.internal.util.StopWatch;
import org.apache.geode.internal.util.concurrent.FutureResult;
@@ -2983,10 +2984,12 @@ public class DLockService extends DistributedLockService {
}
@Override
- public void fromData(DataInput in) {}
+ public void fromData(DataInput in,
+ SerializationContext context) {}
@Override
- public void toData(DataOutput out) {}
+ public void toData(DataOutput out,
+ SerializationContext context) {}
@Override
public Version[] getSerializationVersions() {
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DeposeGrantorProcessor.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DeposeGrantorProcessor.java
index d1a3a34..0974e23 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DeposeGrantorProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DeposeGrantorProcessor.java
@@ -32,6 +32,7 @@ import org.apache.geode.distributed.internal.ReplyProcessor21;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LogMarker;
+import org.apache.geode.internal.serialization.SerializationContext;
/**
* A processor for telling the old grantor that it is deposed by a new grantor. Processor waits for
@@ -152,8 +153,9 @@ public class DeposeGrantorProcessor extends ReplyProcessor21 {
}
@Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
- super.fromData(in);
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
+ super.fromData(in, context);
this.processorId = in.readInt();
this.serviceName = DataSerializer.readString(in);
this.newGrantor = (InternalDistributedMember) DataSerializer.readObject(in);
@@ -162,8 +164,9 @@ public class DeposeGrantorProcessor extends ReplyProcessor21 {
}
@Override
- public void toData(DataOutput out) throws IOException {
- super.toData(out);
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
+ super.toData(out, context);
out.writeInt(this.processorId);
DataSerializer.writeString(this.serviceName, out);
DataSerializer.writeObject(this.newGrantor, out);
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/ElderInitProcessor.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/ElderInitProcessor.java
index 8c56e2f..b015118 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/ElderInitProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/ElderInitProcessor.java
@@ -39,6 +39,7 @@ import org.apache.geode.distributed.internal.membership.InternalDistributedMembe
import org.apache.geode.internal.Assert;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LogMarker;
+import org.apache.geode.internal.serialization.SerializationContext;
/**
* A processor for initializing the ElderState. This may involve sending a message to every existing
@@ -199,14 +200,16 @@ public class ElderInitProcessor extends ReplyProcessor21 {
}
@Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
- super.fromData(in);
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
+ super.fromData(in, context);
this.processorId = in.readInt();
}
@Override
- public void toData(DataOutput out) throws IOException {
- super.toData(out);
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
+ super.toData(out, context);
out.writeInt(this.processorId);
}
@@ -258,8 +261,9 @@ public class ElderInitProcessor extends ReplyProcessor21 {
}
@Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
- super.fromData(in);
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
+ super.fromData(in, context);
this.grantors = DataSerializer.readArrayList(in);
this.grantorVersions = DataSerializer.readArrayList(in);
this.grantorSerialNumbers = DataSerializer.readArrayList(in);
@@ -267,8 +271,9 @@ public class ElderInitProcessor extends ReplyProcessor21 {
}
@Override
- public void toData(DataOutput out) throws IOException {
- super.toData(out);
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
+ super.toData(out, context);
DataSerializer.writeArrayList(this.grantors, out);
DataSerializer.writeArrayList(this.grantorVersions, out);
DataSerializer.writeArrayList(this.grantorSerialNumbers, out);
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/GrantorRequestProcessor.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/GrantorRequestProcessor.java
index 0edf338..0b046a5 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/GrantorRequestProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/GrantorRequestProcessor.java
@@ -38,6 +38,7 @@ import org.apache.geode.distributed.internal.membership.InternalDistributedMembe
import org.apache.geode.internal.Assert;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LogMarker;
+import org.apache.geode.internal.serialization.SerializationContext;
import org.apache.geode.internal.util.concurrent.StoppableCondition;
import org.apache.geode.internal.util.concurrent.StoppableReentrantLock;
@@ -536,8 +537,9 @@ public class GrantorRequestProcessor extends ReplyProcessor21 {
}
@Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
- super.fromData(in);
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
+ super.fromData(in, context);
this.grantorVersion = in.readLong();
this.dlsSerialNumber = in.readInt();
this.serviceName = DataSerializer.readString(in);
@@ -549,8 +551,9 @@ public class GrantorRequestProcessor extends ReplyProcessor21 {
}
@Override
- public void toData(DataOutput out) throws IOException {
- super.toData(out);
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
+ super.toData(out, context);
out.writeLong(this.grantorVersion);
out.writeInt(this.dlsSerialNumber);
DataSerializer.writeString(this.serviceName, out);
@@ -627,8 +630,9 @@ public class GrantorRequestProcessor extends ReplyProcessor21 {
}
@Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
- super.fromData(in);
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
+ super.fromData(in, context);
this.grantor = (InternalDistributedMember) DataSerializer.readObject(in);
this.elderVersionId = in.readLong();
this.grantorSerialNumber = in.readInt();
@@ -636,8 +640,9 @@ public class GrantorRequestProcessor extends ReplyProcessor21 {
}
@Override
- public void toData(DataOutput out) throws IOException {
- super.toData(out);
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
+ super.toData(out, context);
DataSerializer.writeObject(this.grantor, out);
out.writeLong(this.elderVersionId);
out.writeInt(this.grantorSerialNumber);
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/NonGrantorDestroyedProcessor.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/NonGrantorDestroyedProcessor.java
index 68d21d2..9be4f27 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/NonGrantorDestroyedProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/NonGrantorDestroyedProcessor.java
@@ -35,6 +35,7 @@ import org.apache.geode.distributed.internal.membership.InternalDistributedMembe
import org.apache.geode.internal.Assert;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LogMarker;
+import org.apache.geode.internal.serialization.SerializationContext;
/**
* A processor for telling the grantor that a lock service participant has shutdown. The grantor
@@ -195,15 +196,17 @@ public class NonGrantorDestroyedProcessor extends ReplyProcessor21 {
}
@Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
- super.fromData(in);
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
+ super.fromData(in, context);
this.processorId = in.readInt();
this.serviceName = DataSerializer.readString(in);
}
@Override
- public void toData(DataOutput out) throws IOException {
- super.toData(out);
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
+ super.toData(out, context);
out.writeInt(this.processorId);
DataSerializer.writeString(this.serviceName, out);
}
@@ -264,14 +267,16 @@ public class NonGrantorDestroyedProcessor extends ReplyProcessor21 {
}
@Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
- super.fromData(in);
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
+ super.fromData(in, context);
this.replyCode = in.readByte();
}
@Override
- public void toData(DataOutput out) throws IOException {
- super.toData(out);
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
+ super.toData(out, context);
out.writeByte(this.replyCode);
}
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java
index 7327829..35a6b4a 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java
@@ -35,7 +35,6 @@ import org.apache.geode.InternalGemFireError;
import org.apache.geode.annotations.Immutable;
import org.apache.geode.annotations.VisibleForTesting;
import org.apache.geode.annotations.internal.MutableForTesting;
-import org.apache.geode.cache.UnsupportedVersionException;
import org.apache.geode.cache.client.ServerConnectivityException;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.DurableClientAttributes;
@@ -44,12 +43,14 @@ import org.apache.geode.distributed.internal.ClusterDistributionManager;
import org.apache.geode.distributed.internal.DistributionAdvisor.ProfileId;
import org.apache.geode.distributed.internal.ServerLocation;
import org.apache.geode.internal.Assert;
-import org.apache.geode.internal.DataSerializableFixedID;
import org.apache.geode.internal.InternalDataSerializer;
import org.apache.geode.internal.OSProcess;
-import org.apache.geode.internal.Version;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.net.SocketCreator;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.SerializationContext;
+import org.apache.geode.internal.serialization.UnsupportedSerializationVersionException;
+import org.apache.geode.internal.serialization.Version;
/**
* This is the fundamental representation of a member of a GemFire distributed system.
@@ -115,7 +116,8 @@ public class InternalDistributedMember implements DistributedMember, Externaliza
/** The versions in which this message was modified */
@Immutable
- private static final Version[] dsfidVersions = new Version[] {Version.GFE_71, Version.GFE_90};
+ private static final Version[] dsfidVersions = new Version[] {
+ Version.GFE_71, Version.GFE_90};
private void defaultToCurrentHost() {
netMbr.setProcessId(OSProcess.getId());
@@ -159,8 +161,8 @@ public class InternalDistributedMember implements DistributedMember, Externaliza
short version = netMbr.getVersionOrdinal();
try {
- this.versionObj = Version.fromOrdinal(version, false);
- } catch (UnsupportedVersionException e) {
+ this.versionObj = Version.fromOrdinal(version);
+ } catch (UnsupportedSerializationVersionException e) {
this.versionObj = Version.CURRENT;
}
// checkHostName();
@@ -182,8 +184,8 @@ public class InternalDistributedMember implements DistributedMember, Externaliza
short version = m.getVersionOrdinal();
try {
- this.versionObj = Version.fromOrdinal(version, false);
- } catch (UnsupportedVersionException e) {
+ this.versionObj = Version.fromOrdinal(version);
+ } catch (UnsupportedSerializationVersionException e) {
this.versionObj = Version.CURRENT;
}
cachedToString = null;
@@ -858,15 +860,17 @@ public class InternalDistributedMember implements DistributedMember, Externaliza
}
@Override
- public void toData(DataOutput out) throws IOException {
- toDataPre_GFE_9_0_0_0(out);
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
+ toDataPre_GFE_9_0_0_0(out, context);
if (netMbr.getVersionOrdinal() >= Version.GFE_90.ordinal()) {
getNetMember().writeAdditionalData(out);
}
}
- public void toDataPre_GFE_9_0_0_0(DataOutput out) throws IOException {
+ public void toDataPre_GFE_9_0_0_0(DataOutput out, SerializationContext context)
+ throws IOException {
// Assert.assertTrue(vmKind > 0);
// NOTE: If you change the serialized format of this class
// then bump Connection.HANDSHAKE_VERSION since an
@@ -911,7 +915,8 @@ public class InternalDistributedMember implements DistributedMember, Externaliza
Version.writeOrdinal(out, version, true);
}
- public void toDataPre_GFE_7_1_0_0(DataOutput out) throws IOException {
+ public void toDataPre_GFE_7_1_0_0(DataOutput out, SerializationContext context)
+ throws IOException {
Assert.assertTrue(netMbr.getVmKind() > 0);
// disabled to allow post-connect setting of the port for loner systems
// Assert.assertTrue(getPort() > 0);
@@ -958,8 +963,9 @@ public class InternalDistributedMember implements DistributedMember, Externaliza
@Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
- fromDataPre_GFE_9_0_0_0(in);
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
+ fromDataPre_GFE_9_0_0_0(in, context);
// just in case this is just a non-versioned read
// from a file we ought to check the version
if (getNetMember().getVersionOrdinal() >= Version.GFE_90.ordinal()) {
@@ -971,7 +977,8 @@ public class InternalDistributedMember implements DistributedMember, Externaliza
}
}
- public void fromDataPre_GFE_9_0_0_0(DataInput in) throws IOException, ClassNotFoundException {
+ public void fromDataPre_GFE_9_0_0_0(DataInput in, SerializationContext context)
+ throws IOException, ClassNotFoundException {
InetAddress inetAddr = DataSerializer.readInetAddress(in);
int port = in.readInt();
@@ -1017,7 +1024,8 @@ public class InternalDistributedMember implements DistributedMember, Externaliza
// Assert.assertTrue(getPort() > 0);
}
- public void fromDataPre_GFE_7_1_0_0(DataInput in) throws IOException, ClassNotFoundException {
+ public void fromDataPre_GFE_7_1_0_0(DataInput in, SerializationContext context)
+ throws IOException, ClassNotFoundException {
InetAddress inetAddr = DataSerializer.readInetAddress(in);
int port = in.readInt();
@@ -1100,7 +1108,8 @@ public class InternalDistributedMember implements DistributedMember, Externaliza
netMbr = MemberFactory.newNetMember(inetAddr, hostName, port, sbEnabled, elCoord,
InternalDataSerializer.getVersionForDataStream(in).ordinal(), attr);
- if (InternalDataSerializer.getVersionForDataStream(in).compareTo(Version.GFE_90) == 0) {
+ if (InternalDataSerializer.getVersionForDataStream(in).compareTo(
+ Version.GFE_90) == 0) {
netMbr.readAdditionalData(in);
}
}
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/NetMember.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/NetMember.java
index 1623bd7..7be9250 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/NetMember.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/NetMember.java
@@ -20,7 +20,7 @@ import java.io.IOException;
import java.net.InetAddress;
import org.apache.geode.distributed.DurableClientAttributes;
-import org.apache.geode.internal.Version;
+import org.apache.geode.internal.serialization.Version;
/**
* This is the SPI for the basic element of membership provided in Geode.
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/adapter/GMSMemberAdapter.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/adapter/GMSMemberAdapter.java
index a06e362..01d56ec 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/adapter/GMSMemberAdapter.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/adapter/GMSMemberAdapter.java
@@ -22,7 +22,7 @@ import java.net.InetAddress;
import org.apache.geode.distributed.DurableClientAttributes;
import org.apache.geode.distributed.internal.membership.NetMember;
import org.apache.geode.distributed.internal.membership.gms.GMSMember;
-import org.apache.geode.internal.Version;
+import org.apache.geode.internal.serialization.Version;
/**
* GMSMemberAdapter implements the NetMember interface required by InternalDistributedMember
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/adapter/GMSMemberFactory.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/adapter/GMSMemberFactory.java
index 993b71b..466cb63 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/adapter/GMSMemberFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/adapter/GMSMemberFactory.java
@@ -34,9 +34,10 @@ import org.apache.geode.distributed.internal.membership.NetMember;
import org.apache.geode.distributed.internal.membership.gms.GMSMember;
import org.apache.geode.distributed.internal.membership.gms.Services;
import org.apache.geode.distributed.internal.membership.gms.interfaces.Authenticator;
-import org.apache.geode.internal.Version;
+import org.apache.geode.internal.InternalDataSerializer;
import org.apache.geode.internal.admin.remote.RemoteTransportConfig;
import org.apache.geode.internal.net.SocketCreator;
+import org.apache.geode.internal.serialization.Version;
import org.apache.geode.internal.tcp.ConnectionException;
import org.apache.geode.security.GemFireSecurityException;
@@ -117,7 +118,8 @@ public class GMSMemberFactory implements MemberServices {
final DistributionConfig config) throws DistributionException {
GMSMembershipManager gmsMembershipManager = new GMSMembershipManager(listener);
Services services =
- new Services(gmsMembershipManager.getGMSManager(), transport, stats, authenticator, config);
+ new Services(gmsMembershipManager.getGMSManager(), transport, stats, authenticator, config,
+ InternalDataSerializer.getDSFIDSerializer());
try {
services.init();
services.start();
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/adapter/GMSMembershipManager.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/adapter/GMSMembershipManager.java
index 300b36f..9ec8647 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/adapter/GMSMembershipManager.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/adapter/GMSMembershipManager.java
@@ -82,14 +82,14 @@ import org.apache.geode.distributed.internal.membership.gms.interfaces.Manager;
import org.apache.geode.distributed.internal.membership.gms.membership.GMSJoinLeave;
import org.apache.geode.distributed.internal.membership.gms.messenger.GMSQuorumChecker;
import org.apache.geode.internal.Assert;
-import org.apache.geode.internal.DataSerializableFixedID;
import org.apache.geode.internal.SystemTimer;
-import org.apache.geode.internal.Version;
import org.apache.geode.internal.admin.remote.RemoteTransportConfig;
import org.apache.geode.internal.cache.partitioned.PartitionMessageWithDirectReply;
import org.apache.geode.internal.logging.LoggingThread;
import org.apache.geode.internal.logging.log4j.AlertAppender;
import org.apache.geode.internal.logging.log4j.LogMarker;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.Version;
import org.apache.geode.internal.tcp.ConnectExceptions;
import org.apache.geode.internal.tcp.MemberShunnedException;
import org.apache.geode.internal.util.Breadcrumbs;
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/adapter/GMSMessageAdapter.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/adapter/GMSMessageAdapter.java
index fc0178c..75e78e4 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/adapter/GMSMessageAdapter.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/adapter/GMSMessageAdapter.java
@@ -25,8 +25,8 @@ import org.apache.geode.distributed.internal.HighPriorityDistributionMessage;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.distributed.internal.membership.gms.GMSMember;
import org.apache.geode.distributed.internal.membership.gms.interfaces.GMSMessage;
-import org.apache.geode.internal.DataSerializableFixedID;
import org.apache.geode.internal.cache.DirectReplyMessage;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
/**
* GMSMessageAdapter wraps a Geode DistributionMessage to be sent via the GMS Messenger
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/adapter/LocalViewMessage.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/adapter/LocalViewMessage.java
index 3d482bf..83ca4b8 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/adapter/LocalViewMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/adapter/LocalViewMessage.java
@@ -22,6 +22,7 @@ import org.apache.geode.distributed.internal.ClusterDistributionManager;
import org.apache.geode.distributed.internal.SerialDistributionMessage;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.distributed.internal.membership.MembershipView;
+import org.apache.geode.internal.serialization.SerializationContext;
/**
@@ -66,12 +67,14 @@ public class LocalViewMessage extends SerialDistributionMessage {
}
@Override
- public void toData(DataOutput out) throws IOException {
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
throw new UnsupportedOperationException();
}
@Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
throw new UnsupportedOperationException();
}
}
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSMember.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSMember.java
index 71ec3a1..0b550ad 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSMember.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSMember.java
@@ -22,12 +22,12 @@ import java.net.InetAddress;
import org.jgroups.util.UUID;
-import org.apache.geode.DataSerializer;
import org.apache.geode.annotations.VisibleForTesting;
-import org.apache.geode.internal.DataSerializableFixedID;
-import org.apache.geode.internal.InternalDataSerializer;
-import org.apache.geode.internal.Version;
import org.apache.geode.internal.net.SocketCreator;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.SerializationContext;
+import org.apache.geode.internal.serialization.StaticSerialization;
+import org.apache.geode.internal.serialization.Version;
/**
* GMSMember is the membership identifier class for Group Membership Services.
@@ -58,7 +58,7 @@ public class GMSMember implements DataSerializableFixedID {
private int directPort;
private String name;
private String[] groups;
- private short versionOrdinal = Version.CURRENT_ORDINAL;
+ private short versionOrdinal = Version.getCurrentVersion().ordinal();
private long uuidLSBs;
private long uuidMSBs;
private String durableId;
@@ -96,7 +96,7 @@ public class GMSMember implements DataSerializableFixedID {
*/
@VisibleForTesting
public GMSMember(String i, int p) {
- this(i, p, Version.CURRENT);
+ this(i, p, Version.getCurrentVersion());
}
/**
@@ -488,11 +488,12 @@ public class GMSMember implements DataSerializableFixedID {
static final int LONER_VM_TYPE = 13; // from ClusterDistributionManager
@Override
- public void toData(DataOutput out) throws IOException {
- DataSerializer.writeInetAddress(getInetAddress(), out);
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
+ StaticSerialization.writeInetAddress(getInetAddress(), out);
out.writeInt(getPort());
- DataSerializer.writeString(hostName, out);
+ StaticSerialization.writeString(hostName, out);
int flags = 0;
if (isNetworkPartitionDetectionEnabled())
@@ -509,17 +510,17 @@ public class GMSMember implements DataSerializableFixedID {
out.writeInt(getProcessId());
int vmKind = getVmKind();
out.writeByte(vmKind);
- DataSerializer.writeStringArray(getGroups(), out);
+ StaticSerialization.writeStringArray(getGroups(), out);
- DataSerializer.writeString(getName(), out);
+ StaticSerialization.writeString(getName(), out);
if (vmKind == LONER_VM_TYPE) {
- DataSerializer.writeString("", out);
+ StaticSerialization.writeString("", out);
} else { // added in 6.5 for unique identifiers in P2P
- DataSerializer.writeString(String.valueOf(getVmViewId()), out);
+ StaticSerialization.writeString(String.valueOf(getVmViewId()), out);
}
- DataSerializer
+ StaticSerialization
.writeString(durableId == null ? "" : durableId, out);
- DataSerializer.writeInteger(durableId == null ? 300 : durableTimeout, out);
+ out.writeInt(durableId == null ? 300 : durableTimeout);
Version.writeOrdinal(out, versionOrdinal, true);
@@ -528,7 +529,8 @@ public class GMSMember implements DataSerializableFixedID {
}
}
- public void writeEssentialData(DataOutput out) throws IOException {
+ public void writeEssentialData(DataOutput out,
+ SerializationContext context) throws IOException {
Version.writeOrdinal(out, this.versionOrdinal, true);
int flags = 0;
@@ -538,22 +540,23 @@ public class GMSMember implements DataSerializableFixedID {
flags |= PREFERRED_FOR_COORD_BIT;
out.writeShort(flags);
- DataSerializer.writeInetAddress(inetAddr, out);
+ StaticSerialization.writeInetAddress(inetAddr, out);
out.writeInt(udpPort);
out.writeInt(vmViewId);
out.writeLong(uuidMSBs);
out.writeLong(uuidLSBs);
- if (InternalDataSerializer.getVersionForDataStream(out).compareTo(Version.GEODE_1_2_0) >= 0) {
+ if (context.getSerializationVersion().ordinal() >= Version.GEODE_1_2_0.ordinal()) {
out.writeByte(vmKind);
}
}
@Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
- inetAddr = DataSerializer.readInetAddress(in);
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
+ inetAddr = StaticSerialization.readInetAddress(in);
udpPort = in.readInt();
- this.hostName = DataSerializer.readString(in);
+ this.hostName = StaticSerialization.readString(in);
int flags = in.readUnsignedByte();
preferredForCoordinator = (flags & PREFERRED_FOR_COORD_BIT) != 0;
@@ -562,39 +565,37 @@ public class GMSMember implements DataSerializableFixedID {
directPort = in.readInt();
processId = in.readInt();
vmKind = (byte) in.readUnsignedByte();
- groups = DataSerializer.readStringArray(in);
+ groups = StaticSerialization.readStringArray(in);
vmViewId = -1;
- name = DataSerializer.readString(in);
+ name = StaticSerialization.readString(in);
if (vmKind == LONER_DM_TYPE) {
- DataSerializer.readString(in);
+ StaticSerialization.readString(in);
} else {
- String str = DataSerializer.readString(in);
+ String str = StaticSerialization.readString(in);
if (str != null) { // backward compatibility from earlier than 6.5
vmViewId = Integer.parseInt(str);
}
}
- durableId = DataSerializer.readString(in);
+ durableId = StaticSerialization.readString(in);
durableTimeout = in.readInt();
- versionOrdinal = readVersion(flags, in);
+ versionOrdinal = readVersion(flags, in, context);
if (versionOrdinal >= Version.GFE_90.ordinal()) {
readAdditionalData(in);
}
}
- private short readVersion(int flags, DataInput in) throws IOException {
+ private short readVersion(int flags, DataInput in,
+ SerializationContext context) throws IOException {
if ((flags & VERSION_BIT) != 0) {
return Version.readOrdinal(in);
} else {
// prior to 7.1 member IDs did not serialize their version information
- Version v = InternalDataSerializer.getVersionForDataStreamOrNull(in);
- if (v != null) {
- return v.ordinal();
- }
- return Version.CURRENT_ORDINAL;
+ Version v = context.getSerializationVersion();
+ return v.ordinal();
}
}
@@ -606,14 +607,15 @@ public class GMSMember implements DataSerializableFixedID {
this.hostName = hostName;
}
- public void readEssentialData(DataInput in) throws IOException, ClassNotFoundException {
+ public void readEssentialData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
this.versionOrdinal = Version.readOrdinal(in);
int flags = in.readShort();
this.networkPartitionDetectionEnabled = (flags & NPD_ENABLED_BIT) != 0;
this.preferredForCoordinator = (flags & PREFERRED_FOR_COORD_BIT) != 0;
- this.inetAddr = DataSerializer.readInetAddress(in);
+ this.inetAddr = StaticSerialization.readInetAddress(in);
if (this.inetAddr != null) {
this.hostName =
SocketCreator.resolve_dns ? SocketCreator.getHostName(inetAddr)
@@ -623,7 +625,7 @@ public class GMSMember implements DataSerializableFixedID {
this.vmViewId = in.readInt();
this.uuidMSBs = in.readLong();
this.uuidLSBs = in.readLong();
- if (InternalDataSerializer.getVersionForDataStream(in).compareTo(Version.GEODE_1_2_0) >= 0) {
+ if (context.getSerializationVersion().ordinal() >= Version.GEODE_1_2_0.ordinal()) {
this.vmKind = in.readByte();
}
this.isPartial = true;
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSMembershipView.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSMembershipView.java
index 6336838..9f69a9e 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSMembershipView.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSMembershipView.java
@@ -32,12 +32,12 @@ import java.util.stream.Collectors;
import org.apache.logging.log4j.Logger;
-import org.apache.geode.DataSerializer;
import org.apache.geode.annotations.Immutable;
-import org.apache.geode.internal.DataSerializableFixedID;
-import org.apache.geode.internal.InternalDataSerializer;
-import org.apache.geode.internal.Version;
import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.SerializationContext;
+import org.apache.geode.internal.serialization.StaticSerialization;
+import org.apache.geode.internal.serialization.Version;
/**
* The GMSMembershipView class represents a membership view. Note that this class is not
@@ -598,60 +598,48 @@ public class GMSMembershipView implements DataSerializableFixedID {
}
@Override
- public void toData(DataOutput out) throws IOException {
- GMSUtil.writeMemberID(creator, out);
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
+ GMSUtil.writeMemberID(creator, out, context);
out.writeInt(viewId);
- writeAsArrayList(members, out);
- GMSUtil.writeSetOfMemberIDs(shutdownMembers, out);
- GMSUtil.writeSetOfMemberIDs(crashedMembers, out);
- DataSerializer.writeIntArray(failureDetectionPorts, out);
+ writeAsArrayList(members, out, context);
+ GMSUtil.writeSetOfMemberIDs(shutdownMembers, out, context);
+ GMSUtil.writeSetOfMemberIDs(crashedMembers, out, context);
+ StaticSerialization.writeIntArray(failureDetectionPorts, out);
// TODO expensive serialization
- DataSerializer.writeHashMap(publicKeys, out);
+ StaticSerialization.writeHashMap(publicKeys, out, context);
}
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
- creator = GMSUtil.readMemberID(in);
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
+ creator = GMSUtil.readMemberID(in, context);
viewId = in.readInt();
- members = GMSUtil.readArrayOfIDs(in);
+ members = GMSUtil.readArrayOfIDs(in, context);
assert members != null;
this.hashedMembers = new HashSet<>(members);
- shutdownMembers = GMSUtil.readHashSetOfMemberIDs(in);
- crashedMembers = GMSUtil.readHashSetOfMemberIDs(in);
- failureDetectionPorts = DataSerializer.readIntArray(in);
- Map pubkeys = DataSerializer.readHashMap(in);
+ shutdownMembers = GMSUtil.readHashSetOfMemberIDs(in, context);
+ crashedMembers = GMSUtil.readHashSetOfMemberIDs(in, context);
+ failureDetectionPorts = StaticSerialization.readIntArray(in);
+ Map pubkeys = StaticSerialization.readHashMap(in, context);
if (pubkeys != null) {
publicKeys.putAll(pubkeys);
}
}
/** this will deserialize as an ArrayList */
- private void writeAsArrayList(List<GMSMember> list, DataOutput out) throws IOException {
+ private void writeAsArrayList(List<GMSMember> list, DataOutput out,
+ SerializationContext context) throws IOException {
int size;
if (list == null) {
size = -1;
} else {
size = list.size();
}
- InternalDataSerializer.writeArrayLength(size, out);
+ StaticSerialization.writeArrayLength(size, out);
if (size > 0) {
for (int i = 0; i < size; i++) {
- GMSUtil.writeMemberID(list.get(i), out);
- }
- }
- }
-
- private void writeAsSet(Set<GMSMember> set, DataOutput out) throws IOException {
- int size;
- if (set == null) {
- size = -1;
- } else {
- size = set.size();
- }
- InternalDataSerializer.writeArrayLength(size, out);
- if (size > 0) {
- for (GMSMember member : set) {
- GMSUtil.writeMemberID(member, out);
+ GMSUtil.writeMemberID(list.get(i), out, context);
}
}
}
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSUtil.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSUtil.java
index d320d84..3b4f476 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSUtil.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSUtil.java
@@ -30,14 +30,14 @@ import java.util.StringTokenizer;
import org.apache.logging.log4j.Logger;
-import org.apache.geode.DataSerializer;
import org.apache.geode.GemFireConfigException;
import org.apache.geode.distributed.internal.membership.gms.membership.HostAddress;
-import org.apache.geode.internal.DSFIDFactory;
-import org.apache.geode.internal.InternalDataSerializer;
-import org.apache.geode.internal.Version;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.net.SocketCreator;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.SerializationContext;
+import org.apache.geode.internal.serialization.StaticSerialization;
+import org.apache.geode.internal.serialization.Version;
public class GMSUtil {
private static final Logger logger = LogService.getLogger();
@@ -64,8 +64,9 @@ public class GMSUtil {
return parseLocators(locatorsString, addr);
}
- public static GMSMember readMemberID(DataInput in) throws IOException, ClassNotFoundException {
- Object id = DataSerializer.readObject(in);
+ public static GMSMember readMemberID(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
+ Object id = context.getDSFIDSerializer().getDataSerializer().readObject(in);
if (id == null || id instanceof GMSMember) {
return (GMSMember) id;
}
@@ -80,15 +81,16 @@ public class GMSUtil {
}
}
- public static Set<GMSMember> readHashSetOfMemberIDs(DataInput in)
+ public static Set<GMSMember> readHashSetOfMemberIDs(DataInput in,
+ SerializationContext context)
throws IOException, ClassNotFoundException {
- int size = InternalDataSerializer.readArrayLength(in);
+ int size = StaticSerialization.readArrayLength(in);
if (size == -1) {
return null;
}
Set<GMSMember> result = new HashSet<>();
for (int i = 0; i < size; i++) {
- result.add(readMemberID(in));
+ result.add(readMemberID(in, context));
}
return result;
}
@@ -195,65 +197,53 @@ public class GMSUtil {
return sb.toString();
}
- public static List<GMSMember> readArrayOfIDs(DataInput in)
+ public static List<GMSMember> readArrayOfIDs(DataInput in,
+ SerializationContext context)
throws IOException, ClassNotFoundException {
- int size = InternalDataSerializer.readArrayLength(in);
+ int size = StaticSerialization.readArrayLength(in);
if (size == -1) {
return null;
}
List<GMSMember> result = new ArrayList<>(size);
for (int i = 0; i < size; i++) {
- result.add(readMemberID(in));
+ result.add(readMemberID(in, context));
}
return result;
}
- private static void writeAsInternalDistributedMember(GMSMember suspect, DataOutput out)
+ private static void writeAsInternalDistributedMember(GMSMember suspect, DataOutput out,
+ SerializationContext context)
throws IOException {
- InternalDataSerializer.writeDSFID(suspect, DSFIDFactory.DISTRIBUTED_MEMBER, out);
- // DataSerializer.writeObject(new InternalDistributedMember(new GMSMemberAdapter(suspect)),
- // out);
+ context.getDSFIDSerializer().writeDSFID(suspect, DataSerializableFixedID.DISTRIBUTED_MEMBER,
+ out);
}
- public static void writeMemberID(GMSMember id, DataOutput out) throws IOException {
+ public static void writeMemberID(GMSMember id, DataOutput out,
+ SerializationContext context) throws IOException {
if (id == null) {
- DataSerializer.writeObject(id, out);
+ context.getDSFIDSerializer().getDataSerializer().writeObject(id, out);
return;
}
- if (InternalDataSerializer.getVersionForDataStream(out).ordinal() < Version.GEODE_1_10_0
- .ordinal()) {
- writeAsInternalDistributedMember(id, out);
+ short ordinal = context.getSerializationVersion().ordinal();
+ if (ordinal <= Version.GEODE_1_10_0.ordinal()) {
+ writeAsInternalDistributedMember(id, out, context);
} else {
- DataSerializer.writeObject(id, out);
+ context.getDSFIDSerializer().writeDSFID(id, out);
}
}
- public static Set<GMSMember> readSetOfMemberIDs(DataInput in)
- throws IOException, ClassNotFoundException {
- int size = InternalDataSerializer.readArrayLength(in);
- if (size == -1) {
- return null;
- }
- Set<GMSMember> result = new HashSet<>(size);
- for (int i = 0; i < size; i++) {
- result.add(readMemberID(in));
- }
- return result;
-
-
- }
-
- public static void writeSetOfMemberIDs(Set<GMSMember> set, DataOutput out) throws IOException {
+ public static void writeSetOfMemberIDs(Set<GMSMember> set, DataOutput out,
+ SerializationContext context) throws IOException {
int size;
if (set == null) {
size = -1;
} else {
size = set.size();
}
- InternalDataSerializer.writeArrayLength(size, out);
+ StaticSerialization.writeArrayLength(size, out);
if (size > 0) {
for (GMSMember member : set) {
- GMSUtil.writeMemberID(member, out);
+ GMSUtil.writeMemberID(member, out, context);
}
}
}
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/Services.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/Services.java
index 447057f..9302321 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/Services.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/Services.java
@@ -14,12 +14,31 @@
*/
package org.apache.geode.distributed.internal.membership.gms;
+import static org.apache.geode.internal.serialization.DataSerializableFixedID.FINAL_CHECK_PASSED_MESSAGE;
+import static org.apache.geode.internal.serialization.DataSerializableFixedID.FIND_COORDINATOR_REQ;
+import static org.apache.geode.internal.serialization.DataSerializableFixedID.FIND_COORDINATOR_RESP;
+import static org.apache.geode.internal.serialization.DataSerializableFixedID.GET_VIEW_REQ;
+import static org.apache.geode.internal.serialization.DataSerializableFixedID.GET_VIEW_RESP;
+import static org.apache.geode.internal.serialization.DataSerializableFixedID.GMSMEMBER;
+import static org.apache.geode.internal.serialization.DataSerializableFixedID.HEARTBEAT_REQUEST;
+import static org.apache.geode.internal.serialization.DataSerializableFixedID.HEARTBEAT_RESPONSE;
+import static org.apache.geode.internal.serialization.DataSerializableFixedID.INSTALL_VIEW_MESSAGE;
+import static org.apache.geode.internal.serialization.DataSerializableFixedID.JOIN_REQUEST;
+import static org.apache.geode.internal.serialization.DataSerializableFixedID.JOIN_RESPONSE;
+import static org.apache.geode.internal.serialization.DataSerializableFixedID.LEAVE_REQUEST_MESSAGE;
+import static org.apache.geode.internal.serialization.DataSerializableFixedID.NETVIEW;
+import static org.apache.geode.internal.serialization.DataSerializableFixedID.NETWORK_PARTITION_MESSAGE;
+import static org.apache.geode.internal.serialization.DataSerializableFixedID.REMOVE_MEMBER_REQUEST;
+import static org.apache.geode.internal.serialization.DataSerializableFixedID.SUSPECT_MEMBERS_MESSAGE;
+import static org.apache.geode.internal.serialization.DataSerializableFixedID.VIEW_ACK_MESSAGE;
+
import java.util.Timer;
import org.apache.logging.log4j.Logger;
import org.apache.geode.CancelCriterion;
import org.apache.geode.ForcedDisconnectException;
+import org.apache.geode.annotations.VisibleForTesting;
import org.apache.geode.distributed.DistributedSystemDisconnectedException;
import org.apache.geode.distributed.internal.DMStats;
import org.apache.geode.distributed.internal.DistributionConfig;
@@ -30,10 +49,26 @@ import org.apache.geode.distributed.internal.membership.gms.interfaces.JoinLeave
import org.apache.geode.distributed.internal.membership.gms.interfaces.Locator;
import org.apache.geode.distributed.internal.membership.gms.interfaces.Manager;
import org.apache.geode.distributed.internal.membership.gms.interfaces.Messenger;
+import org.apache.geode.distributed.internal.membership.gms.locator.FindCoordinatorRequest;
+import org.apache.geode.distributed.internal.membership.gms.locator.FindCoordinatorResponse;
+import org.apache.geode.distributed.internal.membership.gms.locator.GetViewRequest;
+import org.apache.geode.distributed.internal.membership.gms.locator.GetViewResponse;
import org.apache.geode.distributed.internal.membership.gms.membership.GMSJoinLeave;
+import org.apache.geode.distributed.internal.membership.gms.messages.FinalCheckPassedMessage;
+import org.apache.geode.distributed.internal.membership.gms.messages.HeartbeatMessage;
+import org.apache.geode.distributed.internal.membership.gms.messages.HeartbeatRequestMessage;
+import org.apache.geode.distributed.internal.membership.gms.messages.InstallViewMessage;
+import org.apache.geode.distributed.internal.membership.gms.messages.JoinRequestMessage;
+import org.apache.geode.distributed.internal.membership.gms.messages.JoinResponseMessage;
+import org.apache.geode.distributed.internal.membership.gms.messages.LeaveRequestMessage;
+import org.apache.geode.distributed.internal.membership.gms.messages.NetworkPartitionMessage;
+import org.apache.geode.distributed.internal.membership.gms.messages.RemoveMemberMessage;
+import org.apache.geode.distributed.internal.membership.gms.messages.SuspectMembersMessage;
+import org.apache.geode.distributed.internal.membership.gms.messages.ViewAckMessage;
import org.apache.geode.distributed.internal.membership.gms.messenger.JGroupsMessenger;
import org.apache.geode.internal.admin.remote.RemoteTransportConfig;
import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.serialization.DSFIDSerializer;
@SuppressWarnings("ConstantConditions")
public class Services {
@@ -48,6 +83,7 @@ public class Services {
private final ServiceConfig config;
private final DMStats stats;
private final Stopper cancelCriterion;
+ private final DSFIDSerializer serializer;
private volatile boolean stopping;
private volatile boolean stopped;
@@ -87,11 +123,13 @@ public class Services {
this.healthMon = null;
this.messenger = null;
this.auth = null;
+ this.serializer = null;
}
public Services(Manager membershipManager,
RemoteTransportConfig transport, DMStats stats,
- final Authenticator authenticator, DistributionConfig config) {
+ final Authenticator authenticator, DistributionConfig config,
+ DSFIDSerializer serializer) {
this.cancelCriterion = new Stopper();
this.stats = stats;
this.config = new ServiceConfig(transport, config);
@@ -100,6 +138,30 @@ public class Services {
this.healthMon = new GMSHealthMonitor();
this.messenger = new JGroupsMessenger();
this.auth = authenticator;
+ this.serializer = serializer;
+ registerSerializables(serializer);
+ }
+
+ @VisibleForTesting
+ public static void registerSerializables(DSFIDSerializer serializer) {
+ serializer.registerDSFID(FINAL_CHECK_PASSED_MESSAGE, FinalCheckPassedMessage.class);
+ serializer.registerDSFID(NETWORK_PARTITION_MESSAGE, NetworkPartitionMessage.class);
+ serializer.registerDSFID(REMOVE_MEMBER_REQUEST, RemoveMemberMessage.class);
+ serializer.registerDSFID(HEARTBEAT_REQUEST, HeartbeatRequestMessage.class);
+ serializer.registerDSFID(HEARTBEAT_RESPONSE, HeartbeatMessage.class);
+ serializer.registerDSFID(SUSPECT_MEMBERS_MESSAGE, SuspectMembersMessage.class);
+ serializer.registerDSFID(LEAVE_REQUEST_MESSAGE, LeaveRequestMessage.class);
+ serializer.registerDSFID(VIEW_ACK_MESSAGE, ViewAckMessage.class);
+ serializer.registerDSFID(INSTALL_VIEW_MESSAGE, InstallViewMessage.class);
+ serializer.registerDSFID(GMSMEMBER, GMSMember.class);
+ serializer.registerDSFID(NETVIEW, GMSMembershipView.class);
+ serializer.registerDSFID(GET_VIEW_REQ, GetViewRequest.class);
+ serializer.registerDSFID(GET_VIEW_RESP, GetViewResponse.class);
+ serializer.registerDSFID(FIND_COORDINATOR_REQ, FindCoordinatorRequest.class);
+ serializer.registerDSFID(FIND_COORDINATOR_RESP, FindCoordinatorResponse.class);
+ serializer.registerDSFID(JOIN_RESPONSE, JoinResponseMessage.class);
+ serializer.registerDSFID(JOIN_REQUEST, JoinRequestMessage.class);
+
}
/**
@@ -301,6 +363,10 @@ public class Services {
return !getConfig().getDistributionConfig().getDisableAutoReconnect();
}
+ public DSFIDSerializer getSerializer() {
+ return this.serializer;
+ }
+
public class Stopper extends CancelCriterion {
volatile String reasonForStopping = null;
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitor.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
index b169f9e..095386c 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
@@ -68,10 +68,10 @@ import org.apache.geode.distributed.internal.membership.gms.messages.HeartbeatRe
import org.apache.geode.distributed.internal.membership.gms.messages.SuspectMembersMessage;
import org.apache.geode.distributed.internal.membership.gms.messages.SuspectRequest;
import org.apache.geode.internal.ConnectionWatcher;
-import org.apache.geode.internal.Version;
import org.apache.geode.internal.logging.LoggingExecutors;
import org.apache.geode.internal.net.SocketCreatorFactory;
import org.apache.geode.internal.security.SecurableCommunicationChannel;
+import org.apache.geode.internal.serialization.Version;
/**
* Failure Detection
@@ -636,7 +636,7 @@ public class GMSHealthMonitor implements HealthMonitor {
}
void writeMemberToStream(GMSMember gmbr, DataOutputStream out) throws IOException {
- out.writeShort(Version.CURRENT_ORDINAL);
+ out.writeShort(Version.getCurrentVersion().ordinal());
out.writeInt(gmbr.getVmViewId());
out.writeLong(gmbr.getUuidLSBs());
out.writeLong(gmbr.getUuidMSBs());
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/interfaces/Manager.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/interfaces/Manager.java
index 46510d6..dc244f2 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/interfaces/Manager.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/interfaces/Manager.java
@@ -19,7 +19,7 @@ import java.util.Collection;
import org.apache.geode.distributed.internal.membership.gms.GMSMember;
import org.apache.geode.distributed.internal.membership.gms.GMSMembershipView;
import org.apache.geode.distributed.internal.membership.gms.Services;
-import org.apache.geode.internal.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
/**
* Manager presents the GMS services to the outside world and handles startup/shutdown race
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/locator/FindCoordinatorRequest.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/locator/FindCoordinatorRequest.java
index 740d600..291faa1 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/locator/FindCoordinatorRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/locator/FindCoordinatorRequest.java
@@ -23,8 +23,9 @@ import java.util.Collection;
import org.apache.geode.distributed.internal.membership.gms.GMSMember;
import org.apache.geode.distributed.internal.membership.gms.GMSUtil;
import org.apache.geode.distributed.internal.membership.gms.messages.AbstractGMSMessage;
-import org.apache.geode.internal.InternalDataSerializer;
-import org.apache.geode.internal.Version;
+import org.apache.geode.internal.serialization.SerializationContext;
+import org.apache.geode.internal.serialization.StaticSerialization;
+import org.apache.geode.internal.serialization.Version;
public class FindCoordinatorRequest extends AbstractGMSMessage
implements PeerLocatorRequest {
@@ -103,34 +104,36 @@ public class FindCoordinatorRequest extends AbstractGMSMessage
// TODO serialization not backward compatible with 1.9 - may need InternalDistributedMember, not
// GMSMember
@Override
- public void toData(DataOutput out) throws IOException {
- GMSUtil.writeMemberID(memberID, out);
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
+ GMSUtil.writeMemberID(memberID, out, context);
if (this.rejectedCoordinators != null) {
out.writeInt(this.rejectedCoordinators.size());
for (GMSMember mbr : this.rejectedCoordinators) {
- GMSUtil.writeMemberID(mbr, out);
+ GMSUtil.writeMemberID(mbr, out, context);
}
} else {
out.writeInt(0);
}
out.writeInt(lastViewId);
out.writeInt(requestId);
- InternalDataSerializer.writeString(dhalgo, out);
- InternalDataSerializer.writeByteArray(this.myPublicKey, out);
+ StaticSerialization.writeString(dhalgo, out);
+ StaticSerialization.writeByteArray(this.myPublicKey, out);
}
@Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
- this.memberID = GMSUtil.readMemberID(in);
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
+ this.memberID = GMSUtil.readMemberID(in, context);
int size = in.readInt();
this.rejectedCoordinators = new ArrayList<GMSMember>(size);
for (int i = 0; i < size; i++) {
- this.rejectedCoordinators.add(GMSUtil.readMemberID(in));
+ this.rejectedCoordinators.add(GMSUtil.readMemberID(in, context));
}
this.lastViewId = in.readInt();
this.requestId = in.readInt();
- this.dhalgo = InternalDataSerializer.readString(in);
- this.myPublicKey = InternalDataSerializer.readByteArray(in);
+ this.dhalgo = StaticSerialization.readString(in);
+ this.myPublicKey = StaticSerialization.readByteArray(in);
}
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/locator/FindCoordinatorResponse.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/locator/FindCoordinatorResponse.java
index 1b05a68..901f341 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/locator/FindCoordinatorResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/locator/FindCoordinatorResponse.java
@@ -22,14 +22,14 @@ import java.util.HashSet;
import java.util.Objects;
import java.util.Set;
-import org.apache.geode.DataSerializer;
import org.apache.geode.distributed.internal.membership.gms.GMSMember;
import org.apache.geode.distributed.internal.membership.gms.GMSMembershipView;
import org.apache.geode.distributed.internal.membership.gms.GMSUtil;
import org.apache.geode.distributed.internal.membership.gms.messages.AbstractGMSMessage;
-import org.apache.geode.internal.DataSerializableFixedID;
-import org.apache.geode.internal.InternalDataSerializer;
-import org.apache.geode.internal.Version;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.SerializationContext;
+import org.apache.geode.internal.serialization.StaticSerialization;
+import org.apache.geode.internal.serialization.Version;
public class FindCoordinatorResponse extends AbstractGMSMessage
implements DataSerializableFixedID {
@@ -152,32 +152,34 @@ public class FindCoordinatorResponse extends AbstractGMSMessage
// TODO serialization not backward compatible with 1.9 - may need InternalDistributedMember, not
// GMSMember
@Override
- public void toData(DataOutput out) throws IOException {
- GMSUtil.writeMemberID(coordinator, out);
- GMSUtil.writeMemberID(senderId, out);
- InternalDataSerializer.writeByteArray(coordinatorPublicKey, out);
- InternalDataSerializer.writeString(rejectionMessage, out);
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
+ GMSUtil.writeMemberID(coordinator, out, context);
+ GMSUtil.writeMemberID(senderId, out, context);
+ StaticSerialization.writeByteArray(coordinatorPublicKey, out);
+ StaticSerialization.writeString(rejectionMessage, out);
out.writeBoolean(isShortForm);
out.writeBoolean(fromView);
out.writeBoolean(networkPartitionDetectionEnabled);
out.writeBoolean(usePreferredCoordinators);
- DataSerializer.writeObject(view, out);
- GMSUtil.writeSetOfMemberIDs(registrants, out);
+ context.getDSFIDSerializer().writeDSFID(view, out);
+ GMSUtil.writeSetOfMemberIDs(registrants, out, context);
}
@Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
- coordinator = GMSUtil.readMemberID(in);
- senderId = GMSUtil.readMemberID(in);
- coordinatorPublicKey = InternalDataSerializer.readByteArray(in);
- rejectionMessage = InternalDataSerializer.readString(in);
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
+ coordinator = GMSUtil.readMemberID(in, context);
+ senderId = GMSUtil.readMemberID(in, context);
+ coordinatorPublicKey = StaticSerialization.readByteArray(in);
+ rejectionMessage = StaticSerialization.readString(in);
isShortForm = in.readBoolean();
if (!isShortForm) {
fromView = in.readBoolean();
networkPartitionDetectionEnabled = in.readBoolean();
usePreferredCoordinators = in.readBoolean();
- view = DataSerializer.readObject(in);
- registrants = GMSUtil.readHashSetOfMemberIDs(in);
+ view = (GMSMembershipView) context.getDSFIDSerializer().readDSFID(in);
+ registrants = GMSUtil.readHashSetOfMemberIDs(in, context);
}
}
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/locator/GMSLocator.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/locator/GMSLocator.java
index 131482d..22c9734 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/locator/GMSLocator.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/locator/GMSLocator.java
@@ -14,11 +14,12 @@
*/
package org.apache.geode.distributed.internal.membership.gms.locator;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
-import java.io.ObjectInput;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.net.InetAddress;
@@ -36,7 +37,6 @@ import java.util.concurrent.ConcurrentHashMap;
import org.apache.logging.log4j.Logger;
-import org.apache.geode.DataSerializer;
import org.apache.geode.InternalGemFireException;
import org.apache.geode.annotations.VisibleForTesting;
import org.apache.geode.distributed.internal.LocatorStats;
@@ -47,9 +47,10 @@ import org.apache.geode.distributed.internal.membership.gms.Services;
import org.apache.geode.distributed.internal.membership.gms.interfaces.Locator;
import org.apache.geode.distributed.internal.membership.gms.membership.HostAddress;
import org.apache.geode.distributed.internal.tcpserver.TcpClient;
-import org.apache.geode.internal.Version;
-import org.apache.geode.internal.VersionedObjectInput;
+import org.apache.geode.internal.InternalDataSerializer;
import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.serialization.Version;
+import org.apache.geode.internal.serialization.VersionedDataInputStream;
public class GMSLocator implements Locator {
@@ -332,10 +333,13 @@ public class GMSLocator implements Locator {
logger.warn("Peer locator is unable to delete persistent membership information in {}",
viewFile.getAbsolutePath());
}
- try (ObjectOutputStream oos = new ObjectOutputStream(new FileOutputStream(viewFile))) {
+ try (FileOutputStream fileStream = new FileOutputStream(viewFile);
+ ObjectOutputStream oos = new ObjectOutputStream(fileStream)) {
oos.writeInt(LOCATOR_FILE_STAMP);
- oos.writeInt(Version.CURRENT_ORDINAL);
- DataSerializer.writeObject(view, oos);
+ oos.writeInt(Version.getCurrentVersion().ordinal());
+ oos.flush();
+ DataOutputStream dataOutputStream = new DataOutputStream(fileStream);
+ services.getSerializer().getDataSerializer().writeObject(view, dataOutputStream);
} catch (Exception e) {
logger.warn(
"Peer locator encountered an error writing current membership to disk. Disabling persistence. Care should be taken when bouncing this locator as it will not be able to recover knowledge of the running distributed system",
@@ -413,23 +417,30 @@ public class GMSLocator implements Locator {
}
logger.info("Peer locator recovering from {}", file.getAbsolutePath());
- try (ObjectInput ois = new ObjectInputStream(new FileInputStream(file))) {
- if (ois.readInt() != LOCATOR_FILE_STAMP) {
+ try (FileInputStream fileInputStream = new FileInputStream(file);
+ ObjectInputStream ois = new ObjectInputStream(fileInputStream)) {
+ int stamp = ois.readInt();
+ if (stamp != LOCATOR_FILE_STAMP) {
return false;
}
- ObjectInput input = ois;
- int version = input.readInt();
- if (version != Version.CURRENT_ORDINAL) {
+ int version = ois.readInt();
+ int currentVersion = Version.getCurrentVersion().ordinal();
+ DataInputStream input = new DataInputStream(fileInputStream);
+ if (version != currentVersion) {
Version geodeVersion = Version.fromOrdinalNoThrow((short) version, false);
- logger.info("Peer locator found that persistent view was written with {}", geodeVersion);
- if (version > Version.CURRENT_ORDINAL) {
+ logger.info("Peer locator found that persistent view was written with version {}",
+ geodeVersion);
+ if (version > currentVersion) {
return false;
}
- input = new VersionedObjectInput(input, geodeVersion);
+ input = new VersionedDataInputStream(ois, geodeVersion);
}
- recoveredView = DataSerializer.readObject(input);
+ // TBD - services isn't available when we recover from disk so this will throw an NPE
+ // recoveredView = (GMSMembershipView) services.getSerializer().readDSFID(input);
+ recoveredView = (GMSMembershipView) InternalDataSerializer.readObject(input);
+
// this is not a valid view so it shouldn't have a usable Id
recoveredView.setViewId(-1);
List<GMSMember> members = new ArrayList<>(recoveredView.getMembers());
@@ -444,7 +455,7 @@ public class GMSLocator implements Locator {
logger.info("Peer locator recovered membership is {}", recoveredView);
return true;
- } catch (Exception e) {
+ } catch (Throwable e) {
String message =
String.format("Unable to recover previous membership view from %s", file.toString());
logger.warn(message, e);
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/locator/GetViewRequest.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/locator/GetViewRequest.java
index 5f69884..6b1fff1 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/locator/GetViewRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/locator/GetViewRequest.java
@@ -18,8 +18,9 @@ import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
-import org.apache.geode.internal.DataSerializableFixedID;
-import org.apache.geode.internal.Version;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.SerializationContext;
+import org.apache.geode.internal.serialization.Version;
public class GetViewRequest implements DataSerializableFixedID, PeerLocatorRequest {
@@ -36,9 +37,11 @@ public class GetViewRequest implements DataSerializableFixedID, PeerLocatorReque
}
@Override
- public void toData(DataOutput out) throws IOException {}
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {}
@Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {}
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {}
}
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/locator/GetViewResponse.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/locator/GetViewResponse.java
index aeb9984..c88208c 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/locator/GetViewResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/locator/GetViewResponse.java
@@ -18,10 +18,10 @@ import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
-import org.apache.geode.DataSerializer;
import org.apache.geode.distributed.internal.membership.gms.GMSMembershipView;
-import org.apache.geode.internal.DataSerializableFixedID;
-import org.apache.geode.internal.Version;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.SerializationContext;
+import org.apache.geode.internal.serialization.Version;
public class GetViewResponse implements DataSerializableFixedID {
@@ -50,13 +50,15 @@ public class GetViewResponse implements DataSerializableFixedID {
}
@Override
- public void toData(DataOutput out) throws IOException {
- DataSerializer.writeObject(view, out);
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
+ context.getDSFIDSerializer().writeDSFID(view, out);
}
@Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
- view = DataSerializer.readObject(in);
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
+ view = (GMSMembershipView) context.getDSFIDSerializer().readDSFID(in);
}
}
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeave.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeave.java
index 3399db7..04c4f48 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeave.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeave.java
@@ -17,9 +17,9 @@ package org.apache.geode.distributed.internal.membership.gms.membership;
import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
import static org.apache.geode.distributed.ConfigurationProperties.START_LOCATOR;
import static org.apache.geode.distributed.internal.membership.gms.ServiceConfig.MEMBER_REQUEST_COLLECTION_INTERVAL;
-import static org.apache.geode.internal.DataSerializableFixedID.JOIN_REQUEST;
-import static org.apache.geode.internal.DataSerializableFixedID.LEAVE_REQUEST_MESSAGE;
-import static org.apache.geode.internal.DataSerializableFixedID.REMOVE_MEMBER_REQUEST;
+import static org.apache.geode.internal.serialization.DataSerializableFixedID.JOIN_REQUEST;
+import static org.apache.geode.internal.serialization.DataSerializableFixedID.LEAVE_REQUEST_MESSAGE;
+import static org.apache.geode.internal.serialization.DataSerializableFixedID.REMOVE_MEMBER_REQUEST;
import java.io.IOException;
import java.net.InetSocketAddress;
@@ -68,9 +68,9 @@ import org.apache.geode.distributed.internal.membership.gms.messages.NetworkPart
import org.apache.geode.distributed.internal.membership.gms.messages.RemoveMemberMessage;
import org.apache.geode.distributed.internal.membership.gms.messages.ViewAckMessage;
import org.apache.geode.distributed.internal.tcpserver.TcpClient;
-import org.apache.geode.internal.Version;
import org.apache.geode.internal.logging.LoggingExecutors;
import org.apache.geode.internal.logging.LoggingThread;
+import org.apache.geode.internal.serialization.Version;
import org.apache.geode.security.AuthenticationRequiredException;
import org.apache.geode.security.GemFireSecurityException;
@@ -541,7 +541,8 @@ public class GMSJoinLeave implements JoinLeave {
logger.info("Received a join request from {}", incomingRequest.getMemberID());
if (!ALLOW_OLD_VERSION_FOR_TESTING
- && incomingRequest.getMemberID().getVersionOrdinal() < Version.CURRENT.ordinal()) {
+ && incomingRequest.getMemberID().getVersionOrdinal() < Version.getCurrentVersion()
+ .ordinal()) {
logger.warn("detected an attempt to start a peer using an older version of the product {}",
incomingRequest.getMemberID());
JoinResponseMessage m =
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/AbstractGMSMessage.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/AbstractGMSMessage.java
index bb4303b..de51cdb 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/AbstractGMSMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/AbstractGMSMessage.java
@@ -20,7 +20,7 @@ import java.util.List;
import org.apache.geode.annotations.Immutable;
import org.apache.geode.distributed.internal.membership.gms.GMSMember;
import org.apache.geode.distributed.internal.membership.gms.interfaces.GMSMessage;
-import org.apache.geode.internal.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
public abstract class AbstractGMSMessage implements DataSerializableFixedID, GMSMessage {
@Immutable
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/FinalCheckPassedMessage.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/FinalCheckPassedMessage.java
index 1e5fecb..8dbcb79 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/FinalCheckPassedMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/FinalCheckPassedMessage.java
@@ -20,7 +20,8 @@ import java.io.IOException;
import org.apache.geode.distributed.internal.membership.gms.GMSMember;
import org.apache.geode.distributed.internal.membership.gms.GMSUtil;
-import org.apache.geode.internal.Version;
+import org.apache.geode.internal.serialization.SerializationContext;
+import org.apache.geode.internal.serialization.Version;
public class FinalCheckPassedMessage extends AbstractGMSMessage {
@@ -51,13 +52,15 @@ public class FinalCheckPassedMessage extends AbstractGMSMessage {
}
@Override
- public void toData(DataOutput out) throws IOException {
- GMSUtil.writeMemberID(suspect, out);
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
+ GMSUtil.writeMemberID(suspect, out, context);
}
@Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
- suspect = GMSUtil.readMemberID(in);
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
+ suspect = GMSUtil.readMemberID(in, context);
}
public GMSMember getSuspect() {
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/HeartbeatMessage.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/HeartbeatMessage.java
index 420ddb1..edf75b7 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/HeartbeatMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/HeartbeatMessage.java
@@ -18,7 +18,8 @@ import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
-import org.apache.geode.internal.Version;
+import org.apache.geode.internal.serialization.SerializationContext;
+import org.apache.geode.internal.serialization.Version;
public class HeartbeatMessage extends AbstractGMSMessage {
/**
@@ -54,12 +55,14 @@ public class HeartbeatMessage extends AbstractGMSMessage {
}
@Override
- public void toData(DataOutput out) throws IOException {
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
out.writeInt(requestId);
}
@Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
requestId = in.readInt();
}
}
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/HeartbeatRequestMessage.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/HeartbeatRequestMessage.java
index bcd617e..4ec6a94 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/HeartbeatRequestMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/HeartbeatRequestMessage.java
@@ -20,7 +20,8 @@ import java.io.IOException;
import org.apache.geode.distributed.internal.membership.gms.GMSMember;
import org.apache.geode.distributed.internal.membership.gms.GMSUtil;
-import org.apache.geode.internal.Version;
+import org.apache.geode.internal.serialization.SerializationContext;
+import org.apache.geode.internal.serialization.Version;
public class HeartbeatRequestMessage extends AbstractGMSMessage {
@@ -65,14 +66,16 @@ public class HeartbeatRequestMessage extends AbstractGMSMessage {
}
@Override
- public void toData(DataOutput out) throws IOException {
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
out.writeInt(requestId);
- GMSUtil.writeMemberID(target, out);
+ GMSUtil.writeMemberID(target, out, context);
}
@Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
requestId = in.readInt();
- target = GMSUtil.readMemberID(in);
+ target = GMSUtil.readMemberID(in, context);
}
}
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/InstallViewMessage.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/InstallViewMessage.java
index b32e538..2e53b8e 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/InstallViewMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/InstallViewMessage.java
@@ -19,9 +19,9 @@ import java.io.DataOutput;
import java.io.IOException;
import java.util.Objects;
-import org.apache.geode.DataSerializer;
import org.apache.geode.distributed.internal.membership.gms.GMSMembershipView;
-import org.apache.geode.internal.Version;
+import org.apache.geode.internal.serialization.SerializationContext;
+import org.apache.geode.internal.serialization.Version;
public class InstallViewMessage extends AbstractGMSMessage {
@@ -79,19 +79,21 @@ public class InstallViewMessage extends AbstractGMSMessage {
}
@Override
- public void toData(DataOutput out) throws IOException {
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
out.writeInt(previousViewId);
out.writeInt(kind.ordinal());
- DataSerializer.writeObject(this.view, out);
- DataSerializer.writeObject(this.credentials, out);
+ context.getDSFIDSerializer().writeDSFID(this.view, out);
+ context.getDSFIDSerializer().getDataSerializer().writeObject(this.credentials, out);
}
@Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
this.previousViewId = in.readInt();
this.kind = messageType.values()[in.readInt()];
- this.view = DataSerializer.readObject(in);
- this.credentials = DataSerializer.readObject(in);
+ this.view = (GMSMembershipView) context.getDSFIDSerializer().readDSFID(in);
+ this.credentials = context.getDSFIDSerializer().getDataSerializer().readObject(in);
}
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/JoinRequestMessage.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/JoinRequestMessage.java
index 0ae0839..c876390 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/JoinRequestMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/JoinRequestMessage.java
@@ -19,10 +19,10 @@ import java.io.DataOutput;
import java.io.IOException;
import java.util.Objects;
-import org.apache.geode.DataSerializer;
import org.apache.geode.distributed.internal.membership.gms.GMSMember;
import org.apache.geode.distributed.internal.membership.gms.GMSUtil;
-import org.apache.geode.internal.Version;
+import org.apache.geode.internal.serialization.SerializationContext;
+import org.apache.geode.internal.serialization.Version;
public class JoinRequestMessage extends AbstractGMSMessage {
private GMSMember memberID;
@@ -87,10 +87,11 @@ public class JoinRequestMessage extends AbstractGMSMessage {
}
@Override
- public void toData(DataOutput out) throws IOException {
- GMSUtil.writeMemberID(memberID, out);
- DataSerializer.writeObject(credentials, out);
- DataSerializer.writePrimitiveInt(failureDetectionPort, out);
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
+ GMSUtil.writeMemberID(memberID, out, context);
+ context.getDSFIDSerializer().getDataSerializer().writeObject(credentials, out);
+ out.writeInt(failureDetectionPort);
// preserve the multicast setting so the receiver can tell
// if this is a mcast join request
out.writeBoolean(false);
@@ -98,10 +99,11 @@ public class JoinRequestMessage extends AbstractGMSMessage {
}
@Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
- memberID = GMSUtil.readMemberID(in);
- credentials = DataSerializer.readObject(in);
- failureDetectionPort = DataSerializer.readPrimitiveInt(in);
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
+ memberID = GMSUtil.readMemberID(in, context);
+ credentials = context.getDSFIDSerializer().getDataSerializer().readObject(in);
+ failureDetectionPort = in.readInt();
// setMulticast(in.readBoolean());
in.readBoolean();
requestId = in.readInt();
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/JoinResponseMessage.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/JoinResponseMessage.java
index ccac9d4..b79a4de 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/JoinResponseMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/JoinResponseMessage.java
@@ -20,11 +20,12 @@ import java.io.IOException;
import java.util.Arrays;
import java.util.Objects;
-import org.apache.geode.DataSerializer;
import org.apache.geode.distributed.internal.membership.gms.GMSMember;
import org.apache.geode.distributed.internal.membership.gms.GMSMembershipView;
import org.apache.geode.distributed.internal.membership.gms.GMSUtil;
-import org.apache.geode.internal.Version;
+import org.apache.geode.internal.serialization.SerializationContext;
+import org.apache.geode.internal.serialization.StaticSerialization;
+import org.apache.geode.internal.serialization.Version;
// TODO this class has been made unintelligible with different combinations of response values.
// It needs to have an enum that indicates what type of response is in the message or it
@@ -111,21 +112,23 @@ public class JoinResponseMessage extends AbstractGMSMessage {
}
@Override
- public void toData(DataOutput out) throws IOException {
- DataSerializer.writeObject(currentView, out);
- GMSUtil.writeMemberID(memberID, out);
- DataSerializer.writeString(rejectionMessage, out);
- DataSerializer.writeByteArray(messengerData, out);
- DataSerializer.writeByteArray(secretPk, out);
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
+ context.getDSFIDSerializer().writeDSFID(currentView, out);
+ GMSUtil.writeMemberID(memberID, out, context);
+ StaticSerialization.writeString(rejectionMessage, out);
+ StaticSerialization.writeByteArray(messengerData, out);
+ StaticSerialization.writeByteArray(secretPk, out);
}
@Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
- currentView = DataSerializer.readObject(in);
- memberID = GMSUtil.readMemberID(in);
- rejectionMessage = DataSerializer.readString(in);
- messengerData = DataSerializer.readByteArray(in);
- secretPk = DataSerializer.readByteArray(in);
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
+ currentView = (GMSMembershipView) context.getDSFIDSerializer().readDSFID(in);
+ memberID = GMSUtil.readMemberID(in, context);
+ rejectionMessage = StaticSerialization.readString(in);
+ messengerData = StaticSerialization.readByteArray(in);
+ secretPk = StaticSerialization.readByteArray(in);
}
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/LeaveRequestMessage.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/LeaveRequestMessage.java
index 2199001..c6487ca 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/LeaveRequestMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/LeaveRequestMessage.java
@@ -19,10 +19,11 @@ import java.io.DataOutput;
import java.io.IOException;
import java.util.List;
-import org.apache.geode.DataSerializer;
import org.apache.geode.distributed.internal.membership.gms.GMSMember;
import org.apache.geode.distributed.internal.membership.gms.GMSUtil;
-import org.apache.geode.internal.Version;
+import org.apache.geode.internal.serialization.SerializationContext;
+import org.apache.geode.internal.serialization.StaticSerialization;
+import org.apache.geode.internal.serialization.Version;
public class LeaveRequestMessage extends AbstractGMSMessage implements HasMemberID {
private GMSMember memberID;
@@ -68,15 +69,17 @@ public class LeaveRequestMessage extends AbstractGMSMessage implements HasMember
}
@Override
- public void toData(DataOutput out) throws IOException {
- GMSUtil.writeMemberID(memberID, out);
- DataSerializer.writeString(reason, out);
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
+ GMSUtil.writeMemberID(memberID, out, context);
+ StaticSerialization.writeString(reason, out);
}
@Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
- memberID = GMSUtil.readMemberID(in);
- reason = DataSerializer.readString(in);
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
+ memberID = GMSUtil.readMemberID(in, context);
+ reason = StaticSerialization.readString(in);
}
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/NetworkPartitionMessage.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/NetworkPartitionMessage.java
index 88dcfd3..bd238de 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/NetworkPartitionMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/NetworkPartitionMessage.java
@@ -20,7 +20,8 @@ import java.io.IOException;
import java.util.List;
import org.apache.geode.distributed.internal.membership.gms.GMSMember;
-import org.apache.geode.internal.Version;
+import org.apache.geode.internal.serialization.SerializationContext;
+import org.apache.geode.internal.serialization.Version;
public class NetworkPartitionMessage extends AbstractGMSMessage {
@@ -36,12 +37,14 @@ public class NetworkPartitionMessage extends AbstractGMSMessage {
}
@Override
- public void toData(DataOutput out) throws IOException {
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
}
@Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
}
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/RemoveMemberMessage.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/RemoveMemberMessage.java
index a526a3d..9079420 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/RemoveMemberMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/RemoveMemberMessage.java
@@ -19,10 +19,11 @@ import java.io.DataOutput;
import java.io.IOException;
import java.util.List;
-import org.apache.geode.DataSerializer;
import org.apache.geode.distributed.internal.membership.gms.GMSMember;
import org.apache.geode.distributed.internal.membership.gms.GMSUtil;
-import org.apache.geode.internal.Version;
+import org.apache.geode.internal.serialization.SerializationContext;
+import org.apache.geode.internal.serialization.StaticSerialization;
+import org.apache.geode.internal.serialization.Version;
public class RemoveMemberMessage extends AbstractGMSMessage implements HasMemberID {
private GMSMember memberID;
@@ -74,15 +75,17 @@ public class RemoveMemberMessage extends AbstractGMSMessage implements HasMember
}
@Override
- public void toData(DataOutput out) throws IOException {
- GMSUtil.writeMemberID(memberID, out);
- DataSerializer.writeString(reason, out);
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
+ GMSUtil.writeMemberID(memberID, out, context);
+ StaticSerialization.writeString(reason, out);
}
@Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
- memberID = GMSUtil.readMemberID(in);
- reason = DataSerializer.readString(in);
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
+ memberID = GMSUtil.readMemberID(in, context);
+ reason = StaticSerialization.readString(in);
}
}
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/SuspectMembersMessage.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/SuspectMembersMessage.java
index a26dd1c..ed69ab6 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/SuspectMembersMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/SuspectMembersMessage.java
@@ -20,10 +20,11 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import org.apache.geode.DataSerializer;
import org.apache.geode.distributed.internal.membership.gms.GMSMember;
import org.apache.geode.distributed.internal.membership.gms.GMSUtil;
-import org.apache.geode.internal.Version;
+import org.apache.geode.internal.serialization.SerializationContext;
+import org.apache.geode.internal.serialization.StaticSerialization;
+import org.apache.geode.internal.serialization.Version;
public class SuspectMembersMessage extends AbstractGMSMessage {
final List<SuspectRequest> suspectRequests;
@@ -59,12 +60,13 @@ public class SuspectMembersMessage extends AbstractGMSMessage {
}
@Override
- public void toData(DataOutput out) throws IOException {
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
if (suspectRequests != null) {
out.writeInt(suspectRequests.size());
for (SuspectRequest sr : suspectRequests) {
- GMSUtil.writeMemberID(sr.getSuspectMember(), out);
- DataSerializer.writeString(sr.getReason(), out);
+ GMSUtil.writeMemberID(sr.getSuspectMember(), out, context);
+ StaticSerialization.writeString(sr.getReason(), out);
}
} else {
out.writeInt(0);
@@ -72,11 +74,12 @@ public class SuspectMembersMessage extends AbstractGMSMessage {
}
@Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
int size = in.readInt();
for (int i = 0; i < size; i++) {
SuspectRequest sr = new SuspectRequest(
- GMSUtil.readMemberID(in), DataSerializer.readString(in));
+ GMSUtil.readMemberID(in, context), StaticSerialization.readString(in));
suspectRequests.add(sr);
}
}
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/ViewAckMessage.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/ViewAckMessage.java
index 0309785..d46e2ea 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/ViewAckMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/ViewAckMessage.java
@@ -18,10 +18,10 @@ import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
-import org.apache.geode.DataSerializer;
import org.apache.geode.distributed.internal.membership.gms.GMSMember;
import org.apache.geode.distributed.internal.membership.gms.GMSMembershipView;
-import org.apache.geode.internal.Version;
+import org.apache.geode.internal.serialization.SerializationContext;
+import org.apache.geode.internal.serialization.Version;
public class ViewAckMessage extends AbstractGMSMessage {
@@ -66,17 +66,19 @@ public class ViewAckMessage extends AbstractGMSMessage {
}
@Override
- public void toData(DataOutput out) throws IOException {
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
out.writeInt(this.viewId);
out.writeBoolean(this.preparing);
- DataSerializer.writeObject(this.alternateView, out);
+ context.getDSFIDSerializer().writeDSFID(this.alternateView, out);
}
@Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
this.viewId = in.readInt();
this.preparing = in.readBoolean();
- this.alternateView = DataSerializer.readObject(in);
+ this.alternateView = (GMSMembershipView) context.getDSFIDSerializer().readDSFID(in);
}
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/GMSPingPonger.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/GMSPingPonger.java
index 58c01b4..44c0569 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/GMSPingPonger.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/GMSPingPonger.java
@@ -18,7 +18,7 @@ import org.jgroups.Address;
import org.jgroups.JChannel;
import org.jgroups.Message;
-import org.apache.geode.internal.Version;
+import org.apache.geode.internal.serialization.Version;
public class GMSPingPonger {
private byte[] pingInBytes = new byte[] {'p', 'i', 'n', 'g'};
@@ -39,11 +39,13 @@ public class GMSPingPonger {
}
public Message createPongMessage(Address src, Address dest) {
- return createJGMessage(pongInBytes, src, dest, Version.CURRENT_ORDINAL);
+ return createJGMessage(pongInBytes, src, dest,
+ Version.getCurrentVersion().ordinal());
}
public Message createPingMessage(Address src, Address dest) {
- return createJGMessage(pingInBytes, src, dest, Version.CURRENT_ORDINAL);
+ return createJGMessage(pingInBytes, src, dest,
+ Version.getCurrentVersion().ordinal());
}
public void sendPingMessage(JChannel channel, Address src, JGAddress dest) throws Exception {
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGroupsMessenger.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGroupsMessenger.java
index 8b0dcf6..ff50628 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGroupsMessenger.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGroupsMessenger.java
@@ -16,10 +16,10 @@ package org.apache.geode.distributed.internal.membership.gms.messenger;
import static org.apache.geode.distributed.internal.membership.gms.GMSUtil.replaceStrings;
import static org.apache.geode.distributed.internal.membership.gms.messages.AbstractGMSMessage.ALL_RECIPIENTS;
-import static org.apache.geode.internal.DataSerializableFixedID.FIND_COORDINATOR_REQ;
-import static org.apache.geode.internal.DataSerializableFixedID.FIND_COORDINATOR_RESP;
-import static org.apache.geode.internal.DataSerializableFixedID.JOIN_REQUEST;
-import static org.apache.geode.internal.DataSerializableFixedID.JOIN_RESPONSE;
+import static org.apache.geode.internal.serialization.DataSerializableFixedID.FIND_COORDINATOR_REQ;
+import static org.apache.geode.internal.serialization.DataSerializableFixedID.FIND_COORDINATOR_RESP;
+import static org.apache.geode.internal.serialization.DataSerializableFixedID.JOIN_REQUEST;
+import static org.apache.geode.internal.serialization.DataSerializableFixedID.JOIN_RESPONSE;
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
@@ -65,7 +65,6 @@ import org.jgroups.stack.IpAddress;
import org.jgroups.util.Digest;
import org.jgroups.util.UUID;
-import org.apache.geode.DataSerializer;
import org.apache.geode.ForcedDisconnectException;
import org.apache.geode.GemFireConfigException;
import org.apache.geode.GemFireIOException;
@@ -89,15 +88,16 @@ import org.apache.geode.distributed.internal.membership.gms.locator.FindCoordina
import org.apache.geode.distributed.internal.membership.gms.messages.JoinRequestMessage;
import org.apache.geode.distributed.internal.membership.gms.messages.JoinResponseMessage;
import org.apache.geode.internal.ClassPathLoader;
-import org.apache.geode.internal.HeapDataOutputStream;
-import org.apache.geode.internal.InternalDataSerializer;
import org.apache.geode.internal.OSProcess;
-import org.apache.geode.internal.Version;
-import org.apache.geode.internal.VersionedDataInputStream;
import org.apache.geode.internal.admin.remote.RemoteTransportConfig;
import org.apache.geode.internal.alerting.AlertingAction;
import org.apache.geode.internal.cache.DistributedCacheOperation;
import org.apache.geode.internal.net.SocketCreator;
+import org.apache.geode.internal.serialization.BufferDataOutputStream;
+import org.apache.geode.internal.serialization.DSFIDSerializerImpl;
+import org.apache.geode.internal.serialization.StaticSerialization;
+import org.apache.geode.internal.serialization.Version;
+import org.apache.geode.internal.serialization.VersionedDataInputStream;
import org.apache.geode.internal.tcp.MemberShunnedException;
@SuppressWarnings("StatementWithEmptyBody")
@@ -544,7 +544,8 @@ public class JGroupsMessenger implements Messenger {
-1 /* directport */, -1 /* viewID */, config.getName(),
GMSUtil.parseGroups(config.getRoles(), config.getGroups()), config.getDurableClientId(),
config.getDurableClientTimeout(),
- config.getEnableNetworkPartitionDetection(), isLocator, Version.CURRENT_ORDINAL,
+ config.getEnableNetworkPartitionDetection(), isLocator,
+ Version.getCurrentVersion().ordinal(),
jgAddress.getUUIDMsbs(), jgAddress.getUUIDLsbs());
gmsMember.setMemberWeight((byte) (services.getConfig().getMemberWeight() & 0xff));
gmsMember.setNetworkPartitionDetectionEnabled(
@@ -695,7 +696,8 @@ public class JGroupsMessenger implements Messenger {
if (useMcast) {
long startSer = theStats.startMsgSerialization();
- Message jmsg = createJGMessage(msg, local, null, Version.CURRENT_ORDINAL);
+ Message jmsg =
+ createJGMessage(msg, local, null, Version.getCurrentVersion().ordinal());
theStats.endMsgSerialization(startSer);
Exception problem;
@@ -850,9 +852,11 @@ public class JGroupsMessenger implements Messenger {
setMessageFlags(gfmsg, msg);
try {
long start = services.getStatistics().startMsgSerialization();
- HeapDataOutputStream out_stream =
- new HeapDataOutputStream(Version.fromOrdinalOrCurrent(version));
- Version.CURRENT.writeOrdinal(out_stream, true);
+ BufferDataOutputStream out_stream =
+ new BufferDataOutputStream(
+ services.getSerializer().getDataSerializer().getVersionForOrdinalOrCurrent(version));
+ Version.writeOrdinal(out_stream,
+ Version.getCurrentVersion().ordinal(), true);
if (encrypt != null) {
out_stream.writeBoolean(true);
writeEncryptedMessage(gfmsg, dst, version, out_stream);
@@ -882,11 +886,11 @@ public class JGroupsMessenger implements Messenger {
}
void writeEncryptedMessage(GMSMessage gfmsg, GMSMember recipient, short version,
- HeapDataOutputStream out)
+ BufferDataOutputStream out)
throws Exception {
long start = services.getStatistics().startUDPMsgEncryption();
try {
- InternalDataSerializer.writeDSFIDHeader(gfmsg.getDSFID(), out);
+ ((DSFIDSerializerImpl) services.getSerializer()).writeDSFIDHeader(gfmsg.getDSFID(), out);
byte[] pk = null;
int requestId = 0;
GMSMember pkMbr = null;
@@ -911,11 +915,12 @@ public class JGroupsMessenger implements Messenger {
}
out.writeInt(requestId);
if (pk != null) {
- InternalDataSerializer.writeByteArray(pk, out);
+ StaticSerialization.writeByteArray(pk, out);
}
- HeapDataOutputStream out_stream =
- new HeapDataOutputStream(Version.fromOrdinalOrCurrent(version));
+ BufferDataOutputStream out_stream =
+ new BufferDataOutputStream(
+ services.getSerializer().getDataSerializer().getVersionForOrdinalOrCurrent(version));
byte[] messageBytes = serializeMessage(gfmsg, out_stream);
if (pkMbr != null) {
@@ -925,7 +930,7 @@ public class JGroupsMessenger implements Messenger {
// using cluster secret key
messageBytes = encrypt.encryptData(messageBytes);
}
- InternalDataSerializer.writeByteArray(messageBytes, out);
+ StaticSerialization.writeByteArray(messageBytes, out);
} finally {
services.getStatistics().endUDPMsgEncryption(start);
}
@@ -950,11 +955,13 @@ public class JGroupsMessenger implements Messenger {
return requestId;
}
- byte[] serializeMessage(GMSMessage gfmsg, HeapDataOutputStream out_stream)
+ byte[] serializeMessage(GMSMessage gfmsg, BufferDataOutputStream out_stream)
throws IOException {
GMSMember m = this.localAddress;
- m.writeEssentialData(out_stream);
- DataSerializer.writeObject(services.getManager().unwrapMessage(gfmsg), out_stream);
+ m.writeEssentialData(out_stream,
+ services.getSerializer().createSerializationContext(out_stream));
+ services.getSerializer().getDataSerializer()
+ .writeObject(services.getManager().unwrapMessage(gfmsg), out_stream);
return out_stream.toByteArray();
}
@@ -1004,8 +1011,9 @@ public class JGroupsMessenger implements Messenger {
short ordinal = Version.readOrdinal(dis);
- if (ordinal < Version.CURRENT_ORDINAL) {
- dis = new VersionedDataInputStream(dis, Version.fromOrdinalNoThrow(ordinal, true));
+ if (ordinal < Version.getCurrentVersion().ordinal()) {
+ dis = new VersionedDataInputStream(dis,
+ services.getSerializer().getDataSerializer().getVersionForOrdinalOrCurrent(ordinal));
}
// read
@@ -1054,7 +1062,7 @@ public class JGroupsMessenger implements Messenger {
@SuppressWarnings("resource")
GMSMessage readEncryptedMessage(DataInputStream dis, short ordinal,
GMSEncrypt encryptLocal) throws Exception {
- int dfsid = InternalDataSerializer.readDSFIDHeader(dis);
+ int dfsid = ((DSFIDSerializerImpl) services.getSerializer()).readDSFIDHeader(dis);
int requestId = dis.readInt();
long start = services.getStatistics().startUDPMsgDecryption();
try {
@@ -1081,12 +1089,12 @@ public class JGroupsMessenger implements Messenger {
byte[] pk = null;
if (readPK) {
- pk = InternalDataSerializer.readByteArray(dis);
- data = InternalDataSerializer.readByteArray(dis);
+ pk = StaticSerialization.readByteArray(dis);
+ data = StaticSerialization.readByteArray(dis);
// using prefixed pk from sender
data = encryptLocal.decryptData(data, pk);
} else {
- data = InternalDataSerializer.readByteArray(dis);
+ data = StaticSerialization.readByteArray(dis);
// from cluster key
if (pkMbr != null) {
// using member public key
@@ -1100,8 +1108,9 @@ public class JGroupsMessenger implements Messenger {
{
DataInputStream in = new DataInputStream(new ByteArrayInputStream(data));
- if (ordinal < Version.CURRENT_ORDINAL) {
- in = new VersionedDataInputStream(in, Version.fromOrdinalNoThrow(ordinal, true));
+ if (ordinal < Version.getCurrentVersion().ordinal()) {
+ in = new VersionedDataInputStream(in,
+ services.getSerializer().getDataSerializer().getVersionForOrdinalOrCurrent(ordinal));
}
GMSMessage result = deserializeMessage(in, ordinal);
@@ -1124,8 +1133,8 @@ public class JGroupsMessenger implements Messenger {
GMSMessage deserializeMessage(DataInputStream in, short ordinal)
throws ClassNotFoundException, IOException {
GMSMember m = new GMSMember();
- m.readEssentialData(in);
- GMSMessage result = services.getManager().wrapMessage(DataSerializer.readObject(in));
+ m.readEssentialData(in, services.getSerializer().createSerializationContext(in));
+ GMSMessage result = services.getManager().wrapMessage(services.getSerializer().readDSFID(in));
setSender(result, m, ordinal);
@@ -1143,7 +1152,10 @@ public class JGroupsMessenger implements Messenger {
// get the multicast message digest and pass it with the join response
Digest digest = (Digest) this.myChannel.getProtocolStack().getTopProtocol()
.down(Event.GET_DIGEST_EVT);
- HeapDataOutputStream hdos = new HeapDataOutputStream(500, Version.CURRENT);
+ BufferDataOutputStream hdos = new BufferDataOutputStream(500,
+ services.getSerializer().getDataSerializer()
+ .getVersionForOrdinalOrCurrent(
+ Version.getCurrentVersion().ordinal()));
try {
digest.writeTo(hdos);
} catch (Exception e) {
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/streaming/StreamingOperation.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/streaming/StreamingOperation.java
index de0a549..f30d7ca 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/streaming/StreamingOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/streaming/StreamingOperation.java
@@ -53,12 +53,13 @@ import org.apache.geode.distributed.internal.ReplyProcessor21;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.HeapDataOutputStream;
import org.apache.geode.internal.InternalDataSerializer;
-import org.apache.geode.internal.Version;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.PartitionedRegionQueryEvaluator;
import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.serialization.SerializationContext;
+import org.apache.geode.internal.serialization.Version;
import org.apache.geode.internal.util.BlobHelper;
/**
@@ -399,14 +400,16 @@ public abstract class StreamingOperation {
}
@Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
- super.fromData(in);
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
+ super.fromData(in, context);
this.processorId = in.readInt();
}
@Override
- public void toData(DataOutput out) throws IOException {
- super.toData(out);
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
+ super.toData(out, context);
out.writeInt(this.processorId);
}
@@ -500,9 +503,10 @@ public abstract class StreamingOperation {
@Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
int n;
- super.fromData(in);
+ super.fromData(in, context);
n = in.readInt();
this.msgNum = in.readInt();
this.lastMsg = in.readBoolean();
@@ -583,8 +587,9 @@ public abstract class StreamingOperation {
}
@Override
- public void toData(DataOutput out) throws IOException {
- super.toData(out);
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
+ super.toData(out, context);
if (this.chunkStream == null) {
out.writeInt(-1);
} else {
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/TcpClient.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/TcpClient.java
index b3453b3..2db2f52 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/TcpClient.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/TcpClient.java
@@ -34,17 +34,17 @@ import org.apache.logging.log4j.Logger;
import org.apache.geode.DataSerializer;
import org.apache.geode.annotations.internal.MakeNotStatic;
-import org.apache.geode.cache.UnsupportedVersionException;
import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.internal.Version;
-import org.apache.geode.internal.VersionedDataInputStream;
-import org.apache.geode.internal.VersionedDataOutputStream;
import org.apache.geode.internal.admin.SSLConfig;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.net.SSLConfigurationFactory;
import org.apache.geode.internal.net.SocketCreator;
import org.apache.geode.internal.net.SocketCreatorFactory;
import org.apache.geode.internal.security.SecurableCommunicationChannel;
+import org.apache.geode.internal.serialization.UnsupportedSerializationVersionException;
+import org.apache.geode.internal.serialization.Version;
+import org.apache.geode.internal.serialization.VersionedDataInputStream;
+import org.apache.geode.internal.serialization.VersionedDataOutputStream;
/**
* <p>
@@ -222,7 +222,7 @@ public class TcpClient {
if (replyExpected) {
DataInputStream in = new DataInputStream(sock.getInputStream());
- in = new VersionedDataInputStream(in, Version.fromOrdinal(serverVersion, false));
+ in = new VersionedDataInputStream(in, Version.fromOrdinal(serverVersion));
try {
Object response = DataSerializer.readObject(in);
logger.debug("received response: {}", response);
@@ -237,7 +237,7 @@ public class TcpClient {
} else {
return null;
}
- } catch (UnsupportedVersionException ex) {
+ } catch (UnsupportedSerializationVersionException ex) {
if (logger.isDebugEnabled()) {
logger
.debug("Remote TcpServer version: " + serverVersion + " is higher than local version: "
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/TcpServer.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/TcpServer.java
index f6604c6..6c12a1c 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/TcpServer.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/TcpServer.java
@@ -44,7 +44,6 @@ import org.apache.geode.DataSerializer;
import org.apache.geode.SystemFailure;
import org.apache.geode.annotations.internal.MutableForTesting;
import org.apache.geode.cache.IncompatibleVersionException;
-import org.apache.geode.cache.UnsupportedVersionException;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.distributed.internal.DistributionConfigImpl;
import org.apache.geode.distributed.internal.DistributionStats;
@@ -52,11 +51,7 @@ import org.apache.geode.distributed.internal.InternalConfigurationPersistenceSer
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.InternalLocator;
import org.apache.geode.distributed.internal.PoolStatHelper;
-import org.apache.geode.internal.DSFIDFactory;
import org.apache.geode.internal.GemFireVersion;
-import org.apache.geode.internal.Version;
-import org.apache.geode.internal.VersionedDataInputStream;
-import org.apache.geode.internal.VersionedDataOutputStream;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.client.protocol.ClientProtocolProcessor;
import org.apache.geode.internal.cache.client.protocol.ClientProtocolService;
@@ -71,6 +66,10 @@ import org.apache.geode.internal.logging.LoggingThread;
import org.apache.geode.internal.net.SocketCreator;
import org.apache.geode.internal.net.SocketCreatorFactory;
import org.apache.geode.internal.security.SecurableCommunicationChannel;
+import org.apache.geode.internal.serialization.UnsupportedSerializationVersionException;
+import org.apache.geode.internal.serialization.Version;
+import org.apache.geode.internal.serialization.VersionedDataInputStream;
+import org.apache.geode.internal.serialization.VersionedDataOutputStream;
/**
* TCP server which listens on a port and delegates requests to a request handler. The server uses
@@ -168,11 +167,6 @@ public class TcpServer {
this.poolHelper = poolHelper;
this.internalLocator = internalLocator;
this.clientProtocolServiceLoader = clientProtocolServiceLoader;
- // register DSFID types first; invoked explicitly so that all message type
- // initializations do not happen in first deserialization on a possibly
- // "precious" thread
- DSFIDFactory.registerTypes();
-
this.executor = createExecutor(poolHelper);
this.threadName = threadName;
@@ -439,7 +433,7 @@ public class TcpServer {
}
private void processOneConnection(Socket socket, long startTime, DataInputStream input)
- throws IOException, UnsupportedVersionException, ClassNotFoundException {
+ throws IOException, UnsupportedSerializationVersionException, ClassNotFoundException {
// At this point we've read the leading byte of the gossip version and found it to be 0,
// continue reading the next three bytes
int gossipVersion = 0;
@@ -462,9 +456,9 @@ public class TcpServer {
if (log.isDebugEnabled() && versionOrdinal != Version.CURRENT_ORDINAL) {
log.debug("Locator reading request from " + socket.getInetAddress() + " with version "
- + Version.fromOrdinal(versionOrdinal, false));
+ + Version.fromOrdinal(versionOrdinal));
}
- input = new VersionedDataInputStream(input, Version.fromOrdinal(versionOrdinal, false));
+ input = new VersionedDataInputStream(input, Version.fromOrdinal(versionOrdinal));
request = DataSerializer.readObject(input);
if (log.isDebugEnabled()) {
log.debug("Locator received request " + request + " from " + socket.getInetAddress());
@@ -490,7 +484,7 @@ public class TcpServer {
DataOutputStream output = new DataOutputStream(socket.getOutputStream());
if (versionOrdinal != Version.CURRENT_ORDINAL) {
output =
- new VersionedDataOutputStream(output, Version.fromOrdinal(versionOrdinal, false));
+ new VersionedDataOutputStream(output, Version.fromOrdinal(versionOrdinal));
}
DataSerializer.writeObject(response, output);
output.flush();
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/VersionResponse.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/VersionResponse.java
index 04d2df5..9d16408 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/VersionResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/VersionResponse.java
@@ -19,7 +19,7 @@ import java.io.DataOutput;
import java.io.IOException;
import org.apache.geode.DataSerializable;
-import org.apache.geode.internal.Version;
+import org.apache.geode.internal.serialization.Version;
/**
* Get GemFire version of the member running TcpServer.
diff --git a/geode-core/src/main/java/org/apache/geode/internal/DSFIDFactory.java b/geode-core/src/main/java/org/apache/geode/internal/DSFIDFactory.java
index 1f0b447..384078b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/DSFIDFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/DSFIDFactory.java
@@ -17,16 +17,10 @@ package org.apache.geode.internal;
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-
-import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
import org.apache.geode.DataSerializer;
-import org.apache.geode.InternalGemFireError;
import org.apache.geode.admin.internal.SystemMemberCacheEventProcessor;
import org.apache.geode.admin.jmx.internal.StatAlertNotification;
-import org.apache.geode.annotations.Immutable;
import org.apache.geode.cache.InterestResultPolicy;
import org.apache.geode.cache.client.internal.CacheServerLoadMessage;
import org.apache.geode.cache.client.internal.locator.ClientConnectionRequest;
@@ -404,6 +398,11 @@ import org.apache.geode.internal.cache.wan.GatewaySenderEventImpl;
import org.apache.geode.internal.cache.wan.GatewaySenderQueueEntrySynchronizationOperation;
import org.apache.geode.internal.cache.wan.parallel.ParallelQueueRemovalMessage;
import org.apache.geode.internal.cache.wan.serial.BatchDestroyOperation;
+import org.apache.geode.internal.serialization.DSFIDSerializer;
+import org.apache.geode.internal.serialization.DSFIDSerializerImpl;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.SerializationContext;
+import org.apache.geode.internal.serialization.Version;
import org.apache.geode.management.internal.JmxManagerAdvisor.JmxManagerProfile;
import org.apache.geode.management.internal.JmxManagerAdvisor.JmxManagerProfileMessage;
import org.apache.geode.management.internal.JmxManagerLocatorRequest;
@@ -423,9 +422,10 @@ import org.apache.geode.pdx.internal.EnumInfo;
*/
public class DSFIDFactory implements DataSerializableFixedID {
- private DSFIDFactory() {
- // no instances allowed
- throw new UnsupportedOperationException();
+ private final DSFIDSerializer serializer;
+
+ DSFIDFactory(DSFIDSerializer serializer) {
+ this.serializer = serializer;
}
@Override
@@ -434,12 +434,14 @@ public class DSFIDFactory implements DataSerializableFixedID {
}
@Override
- public void toData(DataOutput out) throws IOException {
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
throw new UnsupportedOperationException();
}
@Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
+ public void fromData(DataInput in,
+ SerializationContext context) throws IOException, ClassNotFoundException {
throw new UnsupportedOperationException();
}
@@ -448,509 +450,535 @@ public class DSFIDFactory implements DataSerializableFixedID {
throw new UnsupportedOperationException();
}
- @Immutable
- private static final Constructor<?>[] dsfidMap = new Constructor<?>[256];
-
- @Immutable("This maybe should be wrapped in an unmodifiableMap?")
- private static final Int2ObjectOpenHashMap dsfidMap2 = new Int2ObjectOpenHashMap(800);
-
- static {
- registerDSFIDTypes();
- }
-
- /** Register the constructor for a fixed ID class. */
- public static void registerDSFID(int dsfid, Class dsfidClass) {
- try {
- Constructor<?> cons = dsfidClass.getConstructor((Class[]) null);
- cons.setAccessible(true);
- if (!cons.isAccessible()) {
- throw new InternalGemFireError(
- "default constructor not accessible " + "for DSFID=" + dsfid + ": " + dsfidClass);
- }
- if (dsfid >= Byte.MIN_VALUE && dsfid <= Byte.MAX_VALUE) {
- dsfidMap[dsfid + Byte.MAX_VALUE + 1] = cons;
- } else {
- dsfidMap2.put(dsfid, cons);
- }
- } catch (NoSuchMethodException nsme) {
- throw new InternalGemFireError(nsme);
- }
- }
-
- public static void registerTypes() {
- // nothing to do; static initializer will take care of the type registration
- }
-
- private static void registerDSFIDTypes() {
- registerDSFID(FINAL_CHECK_PASSED_MESSAGE, FinalCheckPassedMessage.class);
- registerDSFID(NETWORK_PARTITION_MESSAGE, NetworkPartitionMessage.class);
- registerDSFID(REMOVE_MEMBER_REQUEST, RemoveMemberMessage.class);
- registerDSFID(HEARTBEAT_REQUEST, HeartbeatRequestMessage.class);
- registerDSFID(HEARTBEAT_RESPONSE, HeartbeatMessage.class);
- registerDSFID(SUSPECT_MEMBERS_MESSAGE, SuspectMembersMessage.class);
- registerDSFID(LEAVE_REQUEST_MESSAGE, LeaveRequestMessage.class);
- registerDSFID(VIEW_ACK_MESSAGE, ViewAckMessage.class);
- registerDSFID(INSTALL_VIEW_MESSAGE, InstallViewMessage.class);
- registerDSFID(GMSMEMBER, GMSMember.class);
- registerDSFID(NETVIEW, GMSMembershipView.class);
- registerDSFID(GET_VIEW_REQ, GetViewRequest.class);
- registerDSFID(GET_VIEW_RESP, GetViewResponse.class);
- registerDSFID(FIND_COORDINATOR_REQ, FindCoordinatorRequest.class);
- registerDSFID(FIND_COORDINATOR_RESP, FindCoordinatorResponse.class);
- registerDSFID(JOIN_RESPONSE, JoinResponseMessage.class);
- registerDSFID(JOIN_REQUEST, JoinRequestMessage.class);
- registerDSFID(CLIENT_TOMBSTONE_MESSAGE, ClientTombstoneMessage.class);
- registerDSFID(R_CLEAR_MSG, RemoteClearMessage.class);
- registerDSFID(R_CLEAR_MSG_REPLY, RemoteClearReplyMessage.class);
- registerDSFID(WAIT_FOR_VIEW_INSTALLATION, WaitForViewInstallation.class);
- registerDSFID(DISPATCHED_AND_CURRENT_EVENTS, DispatchedAndCurrentEvents.class);
- registerDSFID(DISTRIBUTED_MEMBER, InternalDistributedMember.class);
- registerDSFID(UPDATE_MESSAGE, UpdateOperation.UpdateMessage.class);
- registerDSFID(REPLY_MESSAGE, ReplyMessage.class);
- registerDSFID(PR_DESTROY, DestroyMessage.class);
- registerDSFID(CREATE_REGION_MESSAGE, CreateRegionProcessor.CreateRegionMessage.class);
- registerDSFID(CREATE_REGION_REPLY_MESSAGE,
+ void registerDSFIDTypes() {
+ serializer.registerDSFID(FINAL_CHECK_PASSED_MESSAGE, FinalCheckPassedMessage.class);
+ serializer.registerDSFID(NETWORK_PARTITION_MESSAGE, NetworkPartitionMessage.class);
+ serializer.registerDSFID(REMOVE_MEMBER_REQUEST, RemoveMemberMessage.class);
+ serializer.registerDSFID(HEARTBEAT_REQUEST, HeartbeatRequestMessage.class);
+ serializer.registerDSFID(HEARTBEAT_RESPONSE, HeartbeatMessage.class);
+ serializer.registerDSFID(SUSPECT_MEMBERS_MESSAGE, SuspectMembersMessage.class);
+ serializer.registerDSFID(LEAVE_REQUEST_MESSAGE, LeaveRequestMessage.class);
+ serializer.registerDSFID(VIEW_ACK_MESSAGE, ViewAckMessage.class);
+ serializer.registerDSFID(INSTALL_VIEW_MESSAGE, InstallViewMessage.class);
+ serializer.registerDSFID(GMSMEMBER, GMSMember.class);
+ serializer.registerDSFID(NETVIEW, GMSMembershipView.class);
+ serializer.registerDSFID(GET_VIEW_REQ, GetViewRequest.class);
+ serializer.registerDSFID(GET_VIEW_RESP, GetViewResponse.class);
+ serializer.registerDSFID(FIND_COORDINATOR_REQ, FindCoordinatorRequest.class);
+ serializer.registerDSFID(FIND_COORDINATOR_RESP, FindCoordinatorResponse.class);
+ serializer.registerDSFID(JOIN_RESPONSE, JoinResponseMessage.class);
+ serializer.registerDSFID(JOIN_REQUEST, JoinRequestMessage.class);
+ serializer.registerDSFID(CLIENT_TOMBSTONE_MESSAGE, ClientTombstoneMessage.class);
+ serializer.registerDSFID(R_CLEAR_MSG, RemoteClearMessage.class);
+ serializer.registerDSFID(R_CLEAR_MSG_REPLY, RemoteClearReplyMessage.class);
+ serializer.registerDSFID(WAIT_FOR_VIEW_INSTALLATION, WaitForViewInstallation.class);
+ serializer.registerDSFID(DISPATCHED_AND_CURRENT_EVENTS, DispatchedAndCurrentEvents.class);
+ serializer.registerDSFID(DISTRIBUTED_MEMBER, InternalDistributedMember.class);
+ serializer.registerDSFID(UPDATE_MESSAGE, UpdateOperation.UpdateMessage.class);
+ serializer.registerDSFID(REPLY_MESSAGE, ReplyMessage.class);
+ serializer.registerDSFID(PR_DESTROY, DestroyMessage.class);
+ serializer.registerDSFID(CREATE_REGION_MESSAGE,
+ CreateRegionProcessor.CreateRegionMessage.class);
+ serializer.registerDSFID(CREATE_REGION_REPLY_MESSAGE,
CreateRegionProcessor.CreateRegionReplyMessage.class);
- registerDSFID(REGION_STATE_MESSAGE, InitialImageOperation.RegionStateMessage.class);
- registerDSFID(QUERY_MESSAGE, SearchLoadAndWriteProcessor.QueryMessage.class);
- registerDSFID(RESPONSE_MESSAGE, SearchLoadAndWriteProcessor.ResponseMessage.class);
- registerDSFID(NET_SEARCH_REQUEST_MESSAGE,
+ serializer.registerDSFID(REGION_STATE_MESSAGE, InitialImageOperation.RegionStateMessage.class);
+ serializer.registerDSFID(QUERY_MESSAGE, SearchLoadAndWriteProcessor.QueryMessage.class);
+ serializer.registerDSFID(RESPONSE_MESSAGE, SearchLoadAndWriteProcessor.ResponseMessage.class);
+ serializer.registerDSFID(NET_SEARCH_REQUEST_MESSAGE,
SearchLoadAndWriteProcessor.NetSearchRequestMessage.class);
- registerDSFID(NET_SEARCH_REPLY_MESSAGE,
+ serializer.registerDSFID(NET_SEARCH_REPLY_MESSAGE,
SearchLoadAndWriteProcessor.NetSearchReplyMessage.class);
- registerDSFID(NET_LOAD_REQUEST_MESSAGE,
+ serializer.registerDSFID(NET_LOAD_REQUEST_MESSAGE,
SearchLoadAndWriteProcessor.NetLoadRequestMessage.class);
- registerDSFID(NET_LOAD_REPLY_MESSAGE, SearchLoadAndWriteProcessor.NetLoadReplyMessage.class);
- registerDSFID(NET_WRITE_REQUEST_MESSAGE,
+ serializer.registerDSFID(NET_LOAD_REPLY_MESSAGE,
+ SearchLoadAndWriteProcessor.NetLoadReplyMessage.class);
+ serializer.registerDSFID(NET_WRITE_REQUEST_MESSAGE,
SearchLoadAndWriteProcessor.NetWriteRequestMessage.class);
- registerDSFID(NET_WRITE_REPLY_MESSAGE, SearchLoadAndWriteProcessor.NetWriteReplyMessage.class);
- registerDSFID(DLOCK_REQUEST_MESSAGE, DLockRequestProcessor.DLockRequestMessage.class);
- registerDSFID(DLOCK_RESPONSE_MESSAGE, DLockRequestProcessor.DLockResponseMessage.class);
- registerDSFID(DLOCK_RELEASE_MESSAGE, DLockReleaseProcessor.DLockReleaseMessage.class);
- registerDSFID(ADMIN_CACHE_EVENT_MESSAGE,
+ serializer.registerDSFID(NET_WRITE_REPLY_MESSAGE,
+ SearchLoadAndWriteProcessor.NetWriteReplyMessage.class);
+ serializer.registerDSFID(DLOCK_REQUEST_MESSAGE,
+ DLockRequestProcessor.DLockRequestMessage.class);
+ serializer.registerDSFID(DLOCK_RESPONSE_MESSAGE,
+ DLockRequestProcessor.DLockResponseMessage.class);
+ serializer.registerDSFID(DLOCK_RELEASE_MESSAGE,
+ DLockReleaseProcessor.DLockReleaseMessage.class);
+ serializer.registerDSFID(ADMIN_CACHE_EVENT_MESSAGE,
SystemMemberCacheEventProcessor.SystemMemberCacheMessage.class);
- registerDSFID(CQ_ENTRY_EVENT, CqEntry.class);
- registerDSFID(REQUEST_IMAGE_MESSAGE, InitialImageOperation.RequestImageMessage.class);
- registerDSFID(IMAGE_REPLY_MESSAGE, InitialImageOperation.ImageReplyMessage.class);
- registerDSFID(IMAGE_ENTRY, InitialImageOperation.Entry.class);
- registerDSFID(CLOSE_CACHE_MESSAGE, CloseCacheMessage.class);
- registerDSFID(NON_GRANTOR_DESTROYED_MESSAGE,
+ serializer.registerDSFID(CQ_ENTRY_EVENT, CqEntry.class);
+ serializer.registerDSFID(REQUEST_IMAGE_MESSAGE,
+ InitialImageOperation.RequestImageMessage.class);
+ serializer.registerDSFID(IMAGE_REPLY_MESSAGE, InitialImageOperation.ImageReplyMessage.class);
+ serializer.registerDSFID(IMAGE_ENTRY, InitialImageOperation.Entry.class);
+ serializer.registerDSFID(CLOSE_CACHE_MESSAGE, CloseCacheMessage.class);
+ serializer.registerDSFID(NON_GRANTOR_DESTROYED_MESSAGE,
NonGrantorDestroyedProcessor.NonGrantorDestroyedMessage.class);
- registerDSFID(DLOCK_RELEASE_REPLY, DLockReleaseProcessor.DLockReleaseReplyMessage.class);
- registerDSFID(GRANTOR_REQUEST_MESSAGE, GrantorRequestProcessor.GrantorRequestMessage.class);
- registerDSFID(GRANTOR_INFO_REPLY_MESSAGE,
+ serializer.registerDSFID(DLOCK_RELEASE_REPLY,
+ DLockReleaseProcessor.DLockReleaseReplyMessage.class);
+ serializer.registerDSFID(GRANTOR_REQUEST_MESSAGE,
+ GrantorRequestProcessor.GrantorRequestMessage.class);
+ serializer.registerDSFID(GRANTOR_INFO_REPLY_MESSAGE,
GrantorRequestProcessor.GrantorInfoReplyMessage.class);
- registerDSFID(ELDER_INIT_MESSAGE, ElderInitProcessor.ElderInitMessage.class);
- registerDSFID(ELDER_INIT_REPLY_MESSAGE, ElderInitProcessor.ElderInitReplyMessage.class);
- registerDSFID(DEPOSE_GRANTOR_MESSAGE, DeposeGrantorProcessor.DeposeGrantorMessage.class);
- registerDSFID(STARTUP_MESSAGE, StartupMessage.class);
- registerDSFID(STARTUP_RESPONSE_MESSAGE, StartupResponseMessage.class);
- registerDSFID(STARTUP_RESPONSE_WITHVERSION_MESSAGE, StartupResponseWithVersionMessage.class);
- registerDSFID(SHUTDOWN_MESSAGE, ShutdownMessage.class);
- registerDSFID(DESTROY_REGION_MESSAGE, DestroyRegionOperation.DestroyRegionMessage.class);
- registerDSFID(PR_PUTALL_MESSAGE, PutAllPRMessage.class);
- registerDSFID(PR_REMOVE_ALL_MESSAGE, RemoveAllPRMessage.class);
- registerDSFID(PR_REMOVE_ALL_REPLY_MESSAGE, RemoveAllPRMessage.RemoveAllReplyMessage.class);
- registerDSFID(REMOTE_REMOVE_ALL_MESSAGE, RemoteRemoveAllMessage.class);
- registerDSFID(REMOTE_REMOVE_ALL_REPLY_MESSAGE,
+ serializer.registerDSFID(ELDER_INIT_MESSAGE, ElderInitProcessor.ElderInitMessage.class);
+ serializer.registerDSFID(ELDER_INIT_REPLY_MESSAGE,
+ ElderInitProcessor.ElderInitReplyMessage.class);
+ serializer.registerDSFID(DEPOSE_GRANTOR_MESSAGE,
+ DeposeGrantorProcessor.DeposeGrantorMessage.class);
+ serializer.registerDSFID(STARTUP_MESSAGE, StartupMessage.class);
+ serializer.registerDSFID(STARTUP_RESPONSE_MESSAGE, StartupResponseMessage.class);
+ serializer.registerDSFID(STARTUP_RESPONSE_WITHVERSION_MESSAGE,
+ StartupResponseWithVersionMessage.class);
+ serializer.registerDSFID(SHUTDOWN_MESSAGE, ShutdownMessage.class);
+ serializer.registerDSFID(DESTROY_REGION_MESSAGE,
+ DestroyRegionOperation.DestroyRegionMessage.class);
+ serializer.registerDSFID(PR_PUTALL_MESSAGE, PutAllPRMessage.class);
+ serializer.registerDSFID(PR_REMOVE_ALL_MESSAGE, RemoveAllPRMessage.class);
+ serializer.registerDSFID(PR_REMOVE_ALL_REPLY_MESSAGE,
+ RemoveAllPRMessage.RemoveAllReplyMessage.class);
+ serializer.registerDSFID(REMOTE_REMOVE_ALL_MESSAGE, RemoteRemoveAllMessage.class);
+ serializer.registerDSFID(REMOTE_REMOVE_ALL_REPLY_MESSAGE,
RemoteRemoveAllMessage.RemoveAllReplyMessage.class);
- registerDSFID(DISTTX_ROLLBACK_MESSAGE, DistTXRollbackMessage.class);
- registerDSFID(DISTTX_COMMIT_MESSAGE, DistTXCommitMessage.class);
- registerDSFID(DISTTX_PRE_COMMIT_MESSAGE, DistTXPrecommitMessage.class);
- registerDSFID(DISTTX_ROLLBACK_REPLY_MESSAGE,
+ serializer.registerDSFID(DISTTX_ROLLBACK_MESSAGE, DistTXRollbackMessage.class);
+ serializer.registerDSFID(DISTTX_COMMIT_MESSAGE, DistTXCommitMessage.class);
+ serializer.registerDSFID(DISTTX_PRE_COMMIT_MESSAGE, DistTXPrecommitMessage.class);
+ serializer.registerDSFID(DISTTX_ROLLBACK_REPLY_MESSAGE,
DistTXRollbackMessage.DistTXRollbackReplyMessage.class);
- registerDSFID(DISTTX_COMMIT_REPLY_MESSAGE, DistTXCommitMessage.DistTXCommitReplyMessage.class);
- registerDSFID(DISTTX_PRE_COMMIT_REPLY_MESSAGE,
+ serializer.registerDSFID(DISTTX_COMMIT_REPLY_MESSAGE,
+ DistTXCommitMessage.DistTXCommitReplyMessage.class);
+ serializer.registerDSFID(DISTTX_PRE_COMMIT_REPLY_MESSAGE,
DistTXPrecommitMessage.DistTXPrecommitReplyMessage.class);
- registerDSFID(PR_PUT_MESSAGE, PutMessage.class);
- registerDSFID(INVALIDATE_MESSAGE, InvalidateOperation.InvalidateMessage.class);
- registerDSFID(DESTROY_MESSAGE, DestroyOperation.DestroyMessage.class);
- registerDSFID(DA_PROFILE, DistributionAdvisor.Profile.class);
- registerDSFID(CACHE_PROFILE, CacheDistributionAdvisor.CacheProfile.class);
- registerDSFID(HA_PROFILE, HARegion.HARegionAdvisor.HAProfile.class);
- registerDSFID(ENTRY_EVENT, EntryEventImpl.class);
- registerDSFID(UPDATE_ATTRIBUTES_MESSAGE,
+ serializer.registerDSFID(PR_PUT_MESSAGE, PutMessage.class);
+ serializer.registerDSFID(INVALIDATE_MESSAGE, InvalidateOperation.InvalidateMessage.class);
+ serializer.registerDSFID(DESTROY_MESSAGE, DestroyOperation.DestroyMessage.class);
+ serializer.registerDSFID(DA_PROFILE, DistributionAdvisor.Profile.class);
+ serializer.registerDSFID(CACHE_PROFILE, CacheDistributionAdvisor.CacheProfile.class);
+ serializer.registerDSFID(HA_PROFILE, HARegion.HARegionAdvisor.HAProfile.class);
+ serializer.registerDSFID(ENTRY_EVENT, EntryEventImpl.class);
+ serializer.registerDSFID(UPDATE_ATTRIBUTES_MESSAGE,
UpdateAttributesProcessor.UpdateAttributesMessage.class);
- registerDSFID(PROFILE_REPLY_MESSAGE, UpdateAttributesProcessor.ProfileReplyMessage.class);
- registerDSFID(PROFILES_REPLY_MESSAGE, UpdateAttributesProcessor.ProfilesReplyMessage.class);
- registerDSFID(REGION_EVENT, RegionEventImpl.class);
- registerDSFID(TX_COMMIT_MESSAGE, TXCommitMessage.class);
- registerDSFID(COMMIT_PROCESS_FOR_LOCKID_MESSAGE, CommitProcessForLockIdMessage.class);
- registerDSFID(COMMIT_PROCESS_FOR_TXID_MESSAGE, CommitProcessForTXIdMessage.class);
- registerDSFID(FILTER_PROFILE, FilterProfile.class);
- registerDSFID(REMOTE_PUTALL_REPLY_MESSAGE, RemotePutAllMessage.PutAllReplyMessage.class);
- registerDSFID(REMOTE_PUTALL_MESSAGE, RemotePutAllMessage.class);
- registerDSFID(VERSION_TAG, VMVersionTag.class);
- registerDSFID(ADD_CACHESERVER_PROFILE_UPDATE, AddCacheServerProfileMessage.class);
- registerDSFID(REMOVE_CACHESERVER_PROFILE_UPDATE, RemoveCacheServerProfileMessage.class);
- registerDSFID(SERVER_INTEREST_REGISTRATION_MESSAGE, ServerInterestRegistrationMessage.class);
- registerDSFID(FILTER_PROFILE_UPDATE, FilterProfile.OperationMessage.class);
- registerDSFID(PR_GET_MESSAGE, GetMessage.class);
- registerDSFID(R_FETCH_ENTRY_MESSAGE, RemoteFetchEntryMessage.class);
- registerDSFID(R_FETCH_ENTRY_REPLY_MESSAGE,
+ serializer.registerDSFID(PROFILE_REPLY_MESSAGE,
+ UpdateAttributesProcessor.ProfileReplyMessage.class);
+ serializer.registerDSFID(PROFILES_REPLY_MESSAGE,
+ UpdateAttributesProcessor.ProfilesReplyMessage.class);
+ serializer.registerDSFID(REGION_EVENT, RegionEventImpl.class);
+ serializer.registerDSFID(TX_COMMIT_MESSAGE, TXCommitMessage.class);
+ serializer.registerDSFID(COMMIT_PROCESS_FOR_LOCKID_MESSAGE,
+ CommitProcessForLockIdMessage.class);
+ serializer.registerDSFID(COMMIT_PROCESS_FOR_TXID_MESSAGE, CommitProcessForTXIdMessage.class);
+ serializer.registerDSFID(FILTER_PROFILE, FilterProfile.class);
+ serializer.registerDSFID(REMOTE_PUTALL_REPLY_MESSAGE,
+ RemotePutAllMessage.PutAllReplyMessage.class);
+ serializer.registerDSFID(REMOTE_PUTALL_MESSAGE, RemotePutAllMessage.class);
+ serializer.registerDSFID(VERSION_TAG, VMVersionTag.class);
+ serializer.registerDSFID(ADD_CACHESERVER_PROFILE_UPDATE, AddCacheServerProfileMessage.class);
+ serializer.registerDSFID(REMOVE_CACHESERVER_PROFILE_UPDATE,
+ RemoveCacheServerProfileMessage.class);
+ serializer.registerDSFID(SERVER_INTEREST_REGISTRATION_MESSAGE,
+ ServerInterestRegistrationMessage.class);
+ serializer.registerDSFID(FILTER_PROFILE_UPDATE, FilterProfile.OperationMessage.class);
+ serializer.registerDSFID(PR_GET_MESSAGE, GetMessage.class);
+ serializer.registerDSFID(R_FETCH_ENTRY_MESSAGE, RemoteFetchEntryMessage.class);
+ serializer.registerDSFID(R_FETCH_ENTRY_REPLY_MESSAGE,
RemoteFetchEntryMessage.FetchEntryReplyMessage.class);
- registerDSFID(R_CONTAINS_MESSAGE, RemoteContainsKeyValueMessage.class);
- registerDSFID(R_CONTAINS_REPLY_MESSAGE,
+ serializer.registerDSFID(R_CONTAINS_MESSAGE, RemoteContainsKeyValueMessage.class);
+ serializer.registerDSFID(R_CONTAINS_REPLY_MESSAGE,
RemoteContainsKeyValueMessage.RemoteContainsKeyValueReplyMessage.class);
- registerDSFID(R_DESTROY_MESSAGE, RemoteDestroyMessage.class);
- registerDSFID(R_DESTROY_REPLY_MESSAGE, RemoteDestroyMessage.DestroyReplyMessage.class);
- registerDSFID(R_INVALIDATE_MESSAGE, RemoteInvalidateMessage.class);
- registerDSFID(R_INVALIDATE_REPLY_MESSAGE, RemoteInvalidateMessage.InvalidateReplyMessage.class);
- registerDSFID(R_GET_MESSAGE, RemoteGetMessage.class);
- registerDSFID(R_GET_REPLY_MESSAGE, RemoteGetMessage.GetReplyMessage.class);
- registerDSFID(R_PUT_MESSAGE, RemotePutMessage.class);
- registerDSFID(R_PUT_REPLY_MESSAGE, RemotePutMessage.PutReplyMessage.class);
- registerDSFID(R_SIZE_MESSAGE, RemoteSizeMessage.class);
- registerDSFID(R_SIZE_REPLY_MESSAGE, RemoteSizeMessage.SizeReplyMessage.class);
- registerDSFID(PR_DESTROY_REPLY_MESSAGE, DestroyMessage.DestroyReplyMessage.class);
- registerDSFID(CLI_FUNCTION_RESULT, CliFunctionResult.class);
- registerDSFID(R_FETCH_KEYS_MESSAGE, RemoteFetchKeysMessage.class);
- registerDSFID(R_FETCH_KEYS_REPLY, RemoteFetchKeysMessage.RemoteFetchKeysReplyMessage.class);
- registerDSFID(R_REMOTE_COMMIT_REPLY_MESSAGE, TXRemoteCommitReplyMessage.class);
- registerDSFID(TRANSACTION_LOCK_ID, TXLockIdImpl.class);
- registerDSFID(PR_GET_REPLY_MESSAGE, GetReplyMessage.class);
- registerDSFID(PR_NODE, Node.class);
- registerDSFID(UPDATE_WITH_CONTEXT_MESSAGE, UpdateOperation.UpdateWithContextMessage.class);
- registerDSFID(DESTROY_WITH_CONTEXT_MESSAGE, DestroyOperation.DestroyWithContextMessage.class);
- registerDSFID(INVALIDATE_WITH_CONTEXT_MESSAGE,
+ serializer.registerDSFID(R_DESTROY_MESSAGE, RemoteDestroyMessage.class);
+ serializer.registerDSFID(R_DESTROY_REPLY_MESSAGE,
+ RemoteDestroyMessage.DestroyReplyMessage.class);
+ serializer.registerDSFID(R_INVALIDATE_MESSAGE, RemoteInvalidateMessage.class);
+ serializer.registerDSFID(R_INVALIDATE_REPLY_MESSAGE,
+ RemoteInvalidateMessage.InvalidateReplyMessage.class);
+ serializer.registerDSFID(R_GET_MESSAGE, RemoteGetMessage.class);
+ serializer.registerDSFID(R_GET_REPLY_MESSAGE, RemoteGetMessage.GetReplyMessage.class);
+ serializer.registerDSFID(R_PUT_MESSAGE, RemotePutMessage.class);
+ serializer.registerDSFID(R_PUT_REPLY_MESSAGE, RemotePutMessage.PutReplyMessage.class);
+ serializer.registerDSFID(R_SIZE_MESSAGE, RemoteSizeMessage.class);
+ serializer.registerDSFID(R_SIZE_REPLY_MESSAGE, RemoteSizeMessage.SizeReplyMessage.class);
+ serializer.registerDSFID(PR_DESTROY_REPLY_MESSAGE, DestroyMessage.DestroyReplyMessage.class);
+ serializer.registerDSFID(CLI_FUNCTION_RESULT, CliFunctionResult.class);
+ serializer.registerDSFID(R_FETCH_KEYS_MESSAGE, RemoteFetchKeysMessage.class);
+ serializer.registerDSFID(R_FETCH_KEYS_REPLY,
+ RemoteFetchKeysMessage.RemoteFetchKeysReplyMessage.class);
+ serializer.registerDSFID(R_REMOTE_COMMIT_REPLY_MESSAGE, TXRemoteCommitReplyMessage.class);
+ serializer.registerDSFID(TRANSACTION_LOCK_ID, TXLockIdImpl.class);
+ serializer.registerDSFID(PR_GET_REPLY_MESSAGE, GetReplyMessage.class);
+ serializer.registerDSFID(PR_NODE, Node.class);
+ serializer.registerDSFID(UPDATE_WITH_CONTEXT_MESSAGE,
+ UpdateOperation.UpdateWithContextMessage.class);
+ serializer.registerDSFID(DESTROY_WITH_CONTEXT_MESSAGE,
+ DestroyOperation.DestroyWithContextMessage.class);
+ serializer.registerDSFID(INVALIDATE_WITH_CONTEXT_MESSAGE,
InvalidateOperation.InvalidateWithContextMessage.class);
- registerDSFID(REGION_VERSION_VECTOR, VMRegionVersionVector.class);
- registerDSFID(CLIENT_PROXY_MEMBERSHIPID, ClientProxyMembershipID.class);
- registerDSFID(EVENT_ID, EventID.class);
- registerDSFID(CLIENT_UPDATE_MESSAGE, ClientUpdateMessageImpl.class);
- registerDSFID(CLEAR_REGION_MESSAGE_WITH_CONTEXT, ClearRegionWithContextMessage.class);
- registerDSFID(CLIENT_INSTANTIATOR_MESSAGE, ClientInstantiatorMessage.class);
- registerDSFID(CLIENT_DATASERIALIZER_MESSAGE, ClientDataSerializerMessage.class);
- registerDSFID(REGISTRATION_MESSAGE, InternalInstantiator.RegistrationMessage.class);
- registerDSFID(REGISTRATION_CONTEXT_MESSAGE,
+ serializer.registerDSFID(REGION_VERSION_VECTOR, VMRegionVersionVector.class);
+ serializer.registerDSFID(CLIENT_PROXY_MEMBERSHIPID, ClientProxyMembershipID.class);
+ serializer.registerDSFID(EVENT_ID, EventID.class);
+ serializer.registerDSFID(CLIENT_UPDATE_MESSAGE, ClientUpdateMessageImpl.class);
+ serializer.registerDSFID(CLEAR_REGION_MESSAGE_WITH_CONTEXT,
+ ClearRegionWithContextMessage.class);
+ serializer.registerDSFID(CLIENT_INSTANTIATOR_MESSAGE, ClientInstantiatorMessage.class);
+ serializer.registerDSFID(CLIENT_DATASERIALIZER_MESSAGE, ClientDataSerializerMessage.class);
+ serializer.registerDSFID(REGISTRATION_MESSAGE, InternalInstantiator.RegistrationMessage.class);
+ serializer.registerDSFID(REGISTRATION_CONTEXT_MESSAGE,
InternalInstantiator.RegistrationContextMessage.class);
- registerDSFID(RESULTS_COLLECTION_WRAPPER, ResultsCollectionWrapper.class);
- registerDSFID(RESULTS_SET, ResultsSet.class);
- registerDSFID(SORTED_RESULT_SET, SortedResultSet.class);
- registerDSFID(SORTED_STRUCT_SET, SortedStructSet.class);
- registerDSFID(NWAY_MERGE_RESULTS, NWayMergeResults.class);
- registerDSFID(CUMULATIVE_RESULTS, CumulativeNonDistinctResults.class);
- registerDSFID(UNDEFINED, Undefined.class);
- registerDSFID(STRUCT_IMPL, StructImpl.class);
- registerDSFID(STRUCT_SET, StructSet.class);
- registerDSFID(END_OF_BUCKET, PRQueryProcessor.EndOfBucket.class);
- registerDSFID(STRUCT_BAG, StructBag.class);
- registerDSFID(LINKED_RESULTSET, LinkedResultSet.class);
- registerDSFID(LINKED_STRUCTSET, LinkedStructSet.class);
- registerDSFID(PR_BUCKET_BACKUP_MESSAGE, BucketBackupMessage.class);
- registerDSFID(PR_BUCKET_PROFILE_UPDATE_MESSAGE, BucketProfileUpdateMessage.class);
- registerDSFID(PR_ALL_BUCKET_PROFILES_UPDATE_MESSAGE, AllBucketProfilesUpdateMessage.class);
- registerDSFID(PR_BUCKET_SIZE_MESSAGE, BucketSizeMessage.class);
- registerDSFID(PR_CONTAINS_KEY_VALUE_MESSAGE, ContainsKeyValueMessage.class);
- registerDSFID(PR_DUMP_ALL_PR_CONFIG_MESSAGE, DumpAllPRConfigMessage.class);
- registerDSFID(PR_DUMP_BUCKETS_MESSAGE, DumpBucketsMessage.class);
- registerDSFID(PR_FETCH_ENTRIES_MESSAGE, FetchEntriesMessage.class);
- registerDSFID(PR_FETCH_ENTRY_MESSAGE, FetchEntryMessage.class);
- registerDSFID(PR_FETCH_KEYS_MESSAGE, FetchKeysMessage.class);
- registerDSFID(PR_FLUSH_MESSAGE, FlushMessage.class);
- registerDSFID(PR_IDENTITY_REQUEST_MESSAGE, IdentityRequestMessage.class);
- registerDSFID(PR_IDENTITY_UPDATE_MESSAGE, IdentityUpdateMessage.class);
- registerDSFID(PR_INDEX_CREATION_MSG, IndexCreationMsg.class);
- registerDSFID(PR_MANAGE_BUCKET_MESSAGE, ManageBucketMessage.class);
- registerDSFID(PR_PRIMARY_REQUEST_MESSAGE, PrimaryRequestMessage.class);
- registerDSFID(PR_PRIMARY_REQUEST_REPLY_MESSAGE, PrimaryRequestReplyMessage.class);
- registerDSFID(PR_SANITY_CHECK_MESSAGE, PRSanityCheckMessage.class);
- registerDSFID(PR_PUTALL_REPLY_MESSAGE, PutAllReplyMessage.class);
- registerDSFID(PR_PUT_REPLY_MESSAGE, PutReplyMessage.class);
- registerDSFID(PR_QUERY_MESSAGE, QueryMessage.class);
- registerDSFID(PR_REMOVE_INDEXES_MESSAGE, RemoveIndexesMessage.class);
- registerDSFID(PR_REMOVE_INDEXES_REPLY_MESSAGE, RemoveIndexesReplyMessage.class);
- registerDSFID(PR_SIZE_MESSAGE, SizeMessage.class);
- registerDSFID(PR_SIZE_REPLY_MESSAGE, SizeReplyMessage.class);
- registerDSFID(PR_BUCKET_SIZE_REPLY_MESSAGE, BucketSizeReplyMessage.class);
- registerDSFID(PR_CONTAINS_KEY_VALUE_REPLY_MESSAGE, ContainsKeyValueReplyMessage.class);
- registerDSFID(PR_FETCH_ENTRIES_REPLY_MESSAGE, FetchEntriesReplyMessage.class);
- registerDSFID(PR_FETCH_ENTRY_REPLY_MESSAGE, FetchEntryReplyMessage.class);
- registerDSFID(PR_IDENTITY_REPLY_MESSAGE, IdentityReplyMessage.class);
... 23139 lines suppressed ...