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/26 23:04:50 UTC

[geode] branch dsfid_separation_wip updated (f09c93c -> ab7af10)

This is an automated email from the ASF dual-hosted git repository.

bschuchardt pushed a change to branch dsfid_separation_wip
in repository https://gitbox.apache.org/repos/asf/geode.git.


 discard f09c93c  implemented new SerializationContext for DataSerializableFixedID toData/fromData
 discard 34db26b  introduction of SerializationVersion, a superclass of Version
 discard c5e5b8d  redoing lost work
 discard 2e9adb3  Proof of concept: Isolation of DataSerializableFixedID for use in membership
     add c5121fb  GEODE-7105: Changed Function execution HA docs
     add babf35d  Minor language edit
     add 222bbe6  Merge pull request #3950 from nabarunnag/feature/GEODE-7105
     add f17931b  GEODE-7085: Ensure bitset is flushed in all code paths
     add 7d6e08a  GEODE-6945: expand the type to related xml attributes (#3936)
     add 5d0153a  GEODE-7089: Each client registration thread uses its own queue
     add b5c0395  GEODE-7087: Reset flag after unlock bucket primary lock. (#3926)
     add 5a6c1f8  GEODE-7099: Clean up MeterSubregistryReconnectDistributedTest (#3942)
     add 9368e09  GEODE-6915: Improve CompiledGroupBySelect Tests (#3954)
     add 174af1d  GEODE-7088: Using ConcurrentSets for interested clients
     add 5bb753a  GEODE-7088: Fixing test build issue
     add 7aeb882  GEODE-7104: Ensure compatibility with Spring 5.x (#3948)
     add 7efc2cd  GEODE-130: Cleanup internal API warnings. (#3872)
     add c94b6e1  GEODE-7091: Add Micrometer binders to meter registry (#3952)
     add a4dad30  GEODE-7072 CI Failure: WANRollingUpgradeEventProcessingMixedSiteOneCu… (#3966)
     add 785c6a3  GEODE-7112: add wait until user transaction is timed out. (#3961)
     add 2ad5d3e  GEODE-7083: Cleanup static analyzer warnings.
     add b8c5a0b  GEODE-7083: Adds statistics to PeerTypeRegistration
     add 4ab4a28  Format fix for a nested list
     add d8a1dde  fix geode-examples in ci to use repo branch instead of hardcoding develop
     add 2381aa7  Add 1.9.1 to Version list
     add a4e84ad  Add 1.9.1 to Version list
     add 0c16b1b  GEODE-7066: Modified batch conflation to use event id instead of shadow key
     add 083f1ba  GEODE-6910: Add Aggregate Function Documentation (#3962)
     add feb7567  GEODE-7107: Introduce HttpService interface (#3963)
     add 6549e25  GEODE-7120: Adjust pipeline values for RAM and timeouts
     new d26ae43  Proof of concept: Isolation of DataSerializableFixedID for use in membership
     new 4c4e727  redoing lost work
     new 26e6aab  introduction of SerializationVersion, a superclass of Version
     new 7155367  implemented new SerializationContext for DataSerializableFixedID toData/fromData
     new ab7af10  fixed rebase conflict compilation error

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (f09c93c)
            \
             N -- N -- N   refs/heads/dsfid_separation_wip (ab7af10)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../src/test/resources/expected-pom.xml            |   6 +
 .../dockerizedtest/DockerizedExecHandle.java       |  36 +--
 ci/pipelines/examples/jinja.template.yml           |   2 +-
 ci/pipelines/geode-build/jinja.template.yml        |   2 +-
 ci/pipelines/shared/jinja.variables.yml            |   4 +-
 .../apache/geode/metrics/MicrometerBinderTest.java | 195 +++++++++++
 .../management/internal/AgentUtilJUnitTest.java    |  13 +-
 .../integrationTest/resources/assembly_content.txt |   1 +
 .../resources/dependency_classpath.txt             |   1 +
 .../source/subnavs/geode-subnav.erb                |   3 -
 geode-core/build.gradle                            |   3 +-
 .../internal/jta/dunit/TxnTimeOutDUnitTest.java    |  17 +-
 .../MeterSubregistryReconnectDistributedTest.java  | 127 ++++----
 .../internal/TypeRegistrationDistributedTest.java  | 175 ++++++++++
 .../CompiledGroupBySelectIntegrationTest.java      | 253 +++++++++++++++
 .../internal/CompiledGroupBySelectJUnitTest.java   | 152 ---------
 .../gms/fd/GMSHealthMonitorJUnitTest.java          |  27 ++
 .../cache/ha/HARegionQueueIntegrationTest.java     |   4 +-
 .../org/apache/geode/pdx/PdxInstanceJUnitTest.java | 234 ++++++--------
 .../codeAnalysis/sanctionedDataSerializables.txt   |   4 +-
 .../apache/geode/cache/internal/HttpService.java   |  45 +++
 .../distributed/internal/InternalLocator.java      |  23 +-
 .../membership/gms/fd/GMSHealthMonitor.java        |   2 +-
 .../unsafe/RegisterSignalHandlerSupport.java       |   6 +-
 .../org/apache/geode/internal/JvmSizeUtils.java    |   8 +-
 .../java/org/apache/geode/internal/Version.java    |   6 +
 .../geode/internal/cache/GemFireCacheImpl.java     |   9 +-
 .../apache/geode/internal/cache/InternalCache.java |   1 +
 .../cache/InternalCacheForClientAccess.java        |   1 +
 .../{HttpService.java => InternalHttpService.java} |  24 +-
 .../org/apache/geode/internal/cache/TXState.java   |  68 ++--
 .../internal/cache/tier/sockets/AcceptorImpl.java  |   6 +-
 .../cache/tier/sockets/CacheClientNotifier.java    |  65 ++--
 .../ClientRegistrationEventQueueManager.java       | 357 ++++++++++-----------
 .../tier/sockets/ClientUpdateMessageImpl.java      | 110 +++----
 .../cache/tier/sockets/CommandInitializer.java     |   1 +
 .../cache/versions/RegionVersionHolder.java        |  22 +-
 .../wan/AbstractGatewaySenderEventProcessor.java   |  15 +-
 .../internal/cache/xmlcache/CacheCreation.java     |   2 +-
 .../concurrent/CompactConcurrentHashSet2.java      |  11 +-
 .../metrics/CacheMeterRegistryFactory.java         |   8 +
 .../internal/offheap/AddressableMemoryManager.java |   8 +-
 .../serialization/SerializationVersion.java        |   2 +-
 .../internal/size/ReflectionSingleObjectSizer.java |   8 +-
 .../geode/management/internal/AgentUtil.java       |  40 +--
 .../geode/management/internal/ManagementAgent.java |  33 +-
 .../geode/management/internal/RestAgent.java       |  23 +-
 .../internal/cli/commands/CreateRegionCommand.java | 155 +--------
 .../cli/shell/unsafe/GfshSignalHandler.java        |  15 +-
 .../configuration/converters/RegionConverter.java  | 156 ++++++++-
 .../unsafe/ReadOpFileAccessController.java         |   2 +-
 .../pdx/internal/AutoSerializableManager.java      |   8 +-
 .../geode/pdx/internal/PeerTypeRegistration.java   | 181 +++++------
 .../pdx/internal/TypeRegistrationStatistics.java   |  80 +++++
 .../geode/internal/cache/BucketRegionTest.java     |   7 +-
 .../geode/internal/cache/CacheServerImplTest.java  |  16 +-
 .../geode/internal/cache/GemFireCacheImplTest.java |  14 +-
 .../internal/cache/LocalRegionPartialMockTest.java |   7 +-
 .../apache/geode/internal/cache/TXStateTest.java   |  90 ++++++
 .../cache/tier/sockets/AcceptorImplTest.java       |   4 +-
 .../tier/sockets/CacheClientNotifierTest.java      |  62 +++-
 .../ClientRegistrationEventQueueManagerTest.java   | 271 ++++++++++------
 .../tier/sockets/ClientUpdateMessageImplTest.java  | 112 +++++++
 .../RegionVersionHolderBitSetJUnitTest.java        |  25 ++
 .../versions/RegionVersionHolderJUnitTest.java     |   8 +-
 ...rallelGatewaySenderEventProcessorJUnitTest.java |  56 +++-
 ...SerialGatewaySenderEventProcessorJUnitTest.java | 146 +++++++++
 .../CacheMeterRegistryFactoryBindersTest.java      |  96 ++++++
 .../metrics/CacheMeterRegistryFactoryTest.java     |  34 --
 ...Test.java => InternalHttpServiceJunitTest.java} |  17 +-
 .../cli/commands/CreateRegionCommandTest.java      |  28 --
 .../cli/shell/unsafe/GfshSignalHandlerTest.java    |   3 +-
 .../converters/RegionConverterTest.java            |  28 ++
 .../validators/MemberValidatorTest.java            |   2 +-
 geode-core/src/test/resources/expected-pom.xml     |   5 +
 .../converters/RegionConverterTest.xml}            |   0
 .../geode/test/dunit/rules/CQUnitTestRule.java     |   2 +-
 .../data_regions/managing_data_regions.html.md.erb |  20 +-
 .../how_function_execution_works.html.md.erb       |   2 +-
 .../developing/query_select/aggregates.html.md.erb | 111 -------
 .../query_select/the_select_statement.html.md.erb  | 285 +++++++++++++++-
 .../querying_quick_reference.html.md.erb           |   2 +-
 .../security/templates/LdapUserAuthenticator.java  |   2 +-
 .../AnalyzeSerializablesJUnitTestBase.java         |   2 +-
 .../ClusterManagementListResultAssert.java         |   2 +-
 .../geode/cache/configuration/RegionType.java      |   2 +-
 .../geode/management/api/CorrespondWith.java       |  11 +-
 .../geode/tools/pulse/tests/rules/ServerRule.java  |  14 +-
 .../src/main/webapp/WEB-INF/spring-security.xml    |   6 +-
 geode-unsafe/build.gradle                          |  50 +++
 .../security/MBeanServerFileAccessController.java  |  42 +++
 .../geode/unsafe/internal/sun/misc/Signal.java     | 126 ++++++++
 .../unsafe/internal/sun/misc/SignalHandler.java    |  20 +-
 .../geode/unsafe/internal/sun/misc/Unsafe.java     | 107 +++---
 .../internal/sun/reflect/ReflectionFactory.java    |  19 +-
 .../internal/sun/misc/SignalHandlerTest.java       |  26 +-
 .../geode/unsafe/internal/sun/misc/SignalTest.java | 113 +++++++
 geode-unsafe/src/test/resources/expected-pom.xml   |  48 +++
 .../web/controllers/RestAccessControllerTest.java  |   5 +-
 .../web/controllers/support/CacheProviderImpl.java |   7 +-
 .../web/security/GeodeAuthenticationProvider.java  |   4 +-
 .../internal/web/security/RestSecurityService.java |   4 +-
 .../internal/rest/BaseLocatorContextLoader.java    |   8 +-
 .../controllers/AbstractManagementController.java  |   6 +-
 .../rest/security/GeodeAuthenticationProvider.java |   4 +-
 .../rest/security/RestSecurityService.java         |   4 +-
 .../controllers/AbstractCommandsController.java    |   7 +-
 .../support/LoginHandlerInterceptor.java           |   4 +-
 settings.gradle                                    |   1 +
 .../geode/pmd/StaticFieldsMustBeImmutable.java     |   2 +-
 110 files changed, 3329 insertions(+), 1530 deletions(-)
 create mode 100644 geode-assembly/src/acceptanceTest/java/org/apache/geode/metrics/MicrometerBinderTest.java
 create mode 100644 geode-core/src/distributedTest/java/org/apache/geode/pdx/internal/TypeRegistrationDistributedTest.java
 create mode 100644 geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/CompiledGroupBySelectIntegrationTest.java
 delete mode 100644 geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/CompiledGroupBySelectJUnitTest.java
 create mode 100644 geode-core/src/main/java/org/apache/geode/cache/internal/HttpService.java
 rename geode-core/src/main/java/org/apache/geode/internal/cache/{HttpService.java => InternalHttpService.java} (93%)
 create mode 100644 geode-core/src/main/java/org/apache/geode/pdx/internal/TypeRegistrationStatistics.java
 create mode 100644 geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientUpdateMessageImplTest.java
 create mode 100644 geode-core/src/test/java/org/apache/geode/internal/metrics/CacheMeterRegistryFactoryBindersTest.java
 rename geode-core/src/test/java/org/apache/geode/management/internal/{HttpServiceJunitTest.java => InternalHttpServiceJunitTest.java} (79%)
 rename geode-core/src/test/resources/org/apache/geode/management/internal/{cli/commands/CreateRegionCommandTest.xml => configuration/converters/RegionConverterTest.xml} (100%)
 delete mode 100644 geode-docs/developing/query_select/aggregates.html.md.erb
 create mode 100755 geode-unsafe/build.gradle
 create mode 100644 geode-unsafe/src/main/java/org/apache/geode/unsafe/internal/com/sun/jmx/remote/security/MBeanServerFileAccessController.java
 create mode 100644 geode-unsafe/src/main/java/org/apache/geode/unsafe/internal/sun/misc/Signal.java
 copy geode-core/src/main/java/org/apache/geode/distributed/internal/unsafe/RegisterSignalHandlerSupport.java => geode-unsafe/src/main/java/org/apache/geode/unsafe/internal/sun/misc/SignalHandler.java (65%)
 rename geode-core/src/main/java/org/apache/geode/pdx/internal/unsafe/UnsafeWrapper.java => geode-unsafe/src/main/java/org/apache/geode/unsafe/internal/sun/misc/Unsafe.java (60%)
 copy geode-core/src/main/java/org/apache/geode/distributed/internal/unsafe/RegisterSignalHandlerSupport.java => geode-unsafe/src/main/java/org/apache/geode/unsafe/internal/sun/reflect/ReflectionFactory.java (65%)
 copy geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/support/CacheProviderImpl.java => geode-unsafe/src/test/java/org/apache/geode/unsafe/internal/sun/misc/SignalHandlerTest.java (54%)
 create mode 100644 geode-unsafe/src/test/java/org/apache/geode/unsafe/internal/sun/misc/SignalTest.java
 create mode 100644 geode-unsafe/src/test/resources/expected-pom.xml


[geode] 01/05: Proof of concept: Isolation of DataSerializableFixedID for use in membership

Posted by bs...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

bschuchardt pushed a commit to branch dsfid_separation_wip
in repository https://gitbox.apache.org/repos/asf/geode.git

commit d26ae437fb7273dc71e63e254b3d051101693713
Author: Bruce Schuchardt <bs...@pivotal.io>
AuthorDate: Tue Aug 20 08:58:38 2019 -0700

    Proof of concept: Isolation of DataSerializableFixedID for use in
    membership
    
    InternalDataSerializer holds a DSFIDFactory instance and a
    DSFIDSerializer instance (which is also a DSFIDFactory).
    
    InternalDataSerializer registers Geode DSFID classes with the factory.
    InternalDataSerializer defers DSFID serialization/deserialization to
    DSFIDSerializer.
    
    Need to move registration of membership DSFID classes to that package
    and change GMS initialization to create a DSFIDSerializer if one isn't
    provided.  How do we pass in Geode's DSFIDSerializer?
    
    Just started figuring out how to provide a writeObject() method to the
    toData methods in DSFID classes and elsewhere.
    
    Need to enhance DSFID toData/fromData to provide serialization context.
    
    Exceptions still not isolated.
    
    Version still references classes outside of the serialization package.
---
 .../org/apache/geode/internal/DSFIDFactory.java    | 1054 +-------------------
 .../geode/internal/HeapDataOutputStream.java       |    5 +-
 .../BufferDataOutputStream.java}                   |   15 +-
 .../{ => serialization}/ByteBufferWriter.java      |    0
 .../geode/internal/{ => serialization}/DSCODE.java |    1 +
 .../DSFIDNotFoundException.java                    |    0
 .../internal/serialization/DSFIDSerializer.java    |  363 +++++++
 .../DataSerializableFixedID.java                   |    0
 .../{util => serialization}/DscodeHelper.java      |    2 +-
 .../ObjectSerializer.java}                         |   15 +-
 .../{ => serialization}/SerializationVersions.java |    2 +
 .../internal/{ => serialization}/Version.java      |    0
 .../VersionedDataInputStream.java                  |    2 +
 .../VersionedDataOutputStream.java                 |    2 +
 .../{ => serialization}/VersionedDataStream.java   |    2 +
 .../{ => serialization}/VersionedObjectInput.java  |    2 +
 .../{ => serialization}/VersionedObjectOutput.java |    2 +
 .../internal/HeapDataOutputStreamJUnitTest.java    |    4 +-
 .../geode/internal/HeapDataOutputStreamTest.java   |    4 +-
 .../internal/{ => serialization}/DSCODETest.java   |    1 +
 .../{ => serialization}/VersionJUnitTest.java      |    1 +
 21 files changed, 427 insertions(+), 1050 deletions(-)

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..2cb5ea1 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
@@ -12,454 +12,34 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.apache.geode.internal;
+package org.apache.geode.internal.serialization;
 
 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;
-import org.apache.geode.cache.client.internal.locator.ClientConnectionResponse;
-import org.apache.geode.cache.client.internal.locator.ClientReplacementRequest;
-import org.apache.geode.cache.client.internal.locator.GetAllServersRequest;
-import org.apache.geode.cache.client.internal.locator.GetAllServersResponse;
-import org.apache.geode.cache.client.internal.locator.LocatorListRequest;
-import org.apache.geode.cache.client.internal.locator.LocatorListResponse;
-import org.apache.geode.cache.client.internal.locator.LocatorStatusRequest;
-import org.apache.geode.cache.client.internal.locator.LocatorStatusResponse;
-import org.apache.geode.cache.client.internal.locator.QueueConnectionRequest;
-import org.apache.geode.cache.client.internal.locator.QueueConnectionResponse;
-import org.apache.geode.cache.query.QueryService;
-import org.apache.geode.cache.query.internal.CqEntry;
-import org.apache.geode.cache.query.internal.CumulativeNonDistinctResults;
-import org.apache.geode.cache.query.internal.LinkedResultSet;
-import org.apache.geode.cache.query.internal.LinkedStructSet;
-import org.apache.geode.cache.query.internal.NWayMergeResults;
-import org.apache.geode.cache.query.internal.NullToken;
-import org.apache.geode.cache.query.internal.PRQueryTraceInfo;
-import org.apache.geode.cache.query.internal.ResultsBag;
-import org.apache.geode.cache.query.internal.ResultsCollectionWrapper;
-import org.apache.geode.cache.query.internal.ResultsSet;
-import org.apache.geode.cache.query.internal.SortedResultSet;
-import org.apache.geode.cache.query.internal.SortedStructSet;
-import org.apache.geode.cache.query.internal.StructBag;
-import org.apache.geode.cache.query.internal.StructImpl;
-import org.apache.geode.cache.query.internal.StructSet;
-import org.apache.geode.cache.query.internal.Undefined;
-import org.apache.geode.cache.query.internal.index.IndexCreationData;
-import org.apache.geode.cache.query.internal.index.IndexManager;
-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.distributed.internal.DistributionAdvisor;
-import org.apache.geode.distributed.internal.HighPriorityAckedMessage;
-import org.apache.geode.distributed.internal.ReplyMessage;
-import org.apache.geode.distributed.internal.SerialAckedMessage;
-import org.apache.geode.distributed.internal.ShutdownMessage;
-import org.apache.geode.distributed.internal.StartupMessage;
-import org.apache.geode.distributed.internal.StartupResponseMessage;
-import org.apache.geode.distributed.internal.StartupResponseWithVersionMessage;
-import org.apache.geode.distributed.internal.WaitForViewInstallation;
-import org.apache.geode.distributed.internal.locks.DLockQueryProcessor;
-import org.apache.geode.distributed.internal.locks.DLockRecoverGrantorProcessor.DLockRecoverGrantorMessage;
-import org.apache.geode.distributed.internal.locks.DLockRecoverGrantorProcessor.DLockRecoverGrantorReplyMessage;
-import org.apache.geode.distributed.internal.locks.DLockReleaseProcessor;
-import org.apache.geode.distributed.internal.locks.DLockRemoteToken;
-import org.apache.geode.distributed.internal.locks.DLockRequestProcessor;
-import org.apache.geode.distributed.internal.locks.DLockService;
-import org.apache.geode.distributed.internal.locks.DeposeGrantorProcessor;
-import org.apache.geode.distributed.internal.locks.ElderInitProcessor;
-import org.apache.geode.distributed.internal.locks.GrantorRequestProcessor;
-import org.apache.geode.distributed.internal.locks.NonGrantorDestroyedProcessor;
-import org.apache.geode.distributed.internal.locks.NonGrantorDestroyedProcessor.NonGrantorDestroyedReplyMessage;
-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.GMSMembershipView;
-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.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.streaming.StreamingOperation.StreamingReplyMessage;
-import org.apache.geode.internal.admin.ClientMembershipMessage;
-import org.apache.geode.internal.admin.remote.AddHealthListenerRequest;
-import org.apache.geode.internal.admin.remote.AddHealthListenerResponse;
-import org.apache.geode.internal.admin.remote.AddStatListenerRequest;
-import org.apache.geode.internal.admin.remote.AddStatListenerResponse;
-import org.apache.geode.internal.admin.remote.AdminConsoleDisconnectMessage;
-import org.apache.geode.internal.admin.remote.AdminConsoleMessage;
-import org.apache.geode.internal.admin.remote.AdminFailureResponse;
-import org.apache.geode.internal.admin.remote.AlertLevelChangeMessage;
-import org.apache.geode.internal.admin.remote.AlertListenerMessage;
-import org.apache.geode.internal.admin.remote.AlertsNotificationMessage;
-import org.apache.geode.internal.admin.remote.AppCacheSnapshotMessage;
-import org.apache.geode.internal.admin.remote.BridgeServerRequest;
-import org.apache.geode.internal.admin.remote.BridgeServerResponse;
-import org.apache.geode.internal.admin.remote.CacheConfigRequest;
-import org.apache.geode.internal.admin.remote.CacheConfigResponse;
-import org.apache.geode.internal.admin.remote.CacheInfoRequest;
-import org.apache.geode.internal.admin.remote.CacheInfoResponse;
-import org.apache.geode.internal.admin.remote.CancelStatListenerRequest;
-import org.apache.geode.internal.admin.remote.CancelStatListenerResponse;
-import org.apache.geode.internal.admin.remote.CancellationMessage;
-import org.apache.geode.internal.admin.remote.ChangeRefreshIntervalMessage;
-import org.apache.geode.internal.admin.remote.ClientHealthStats;
-import org.apache.geode.internal.admin.remote.CompactRequest;
-import org.apache.geode.internal.admin.remote.CompactResponse;
-import org.apache.geode.internal.admin.remote.DestroyEntryMessage;
-import org.apache.geode.internal.admin.remote.DestroyRegionMessage;
-import org.apache.geode.internal.admin.remote.DurableClientInfoRequest;
-import org.apache.geode.internal.admin.remote.DurableClientInfoResponse;
-import org.apache.geode.internal.admin.remote.FetchDistLockInfoRequest;
-import org.apache.geode.internal.admin.remote.FetchDistLockInfoResponse;
-import org.apache.geode.internal.admin.remote.FetchHealthDiagnosisRequest;
-import org.apache.geode.internal.admin.remote.FetchHealthDiagnosisResponse;
-import org.apache.geode.internal.admin.remote.FetchHostRequest;
-import org.apache.geode.internal.admin.remote.FetchHostResponse;
-import org.apache.geode.internal.admin.remote.FetchResourceAttributesRequest;
-import org.apache.geode.internal.admin.remote.FetchResourceAttributesResponse;
-import org.apache.geode.internal.admin.remote.FetchStatsRequest;
-import org.apache.geode.internal.admin.remote.FetchStatsResponse;
-import org.apache.geode.internal.admin.remote.FetchSysCfgRequest;
-import org.apache.geode.internal.admin.remote.FetchSysCfgResponse;
-import org.apache.geode.internal.admin.remote.FlushAppCacheSnapshotMessage;
-import org.apache.geode.internal.admin.remote.HealthListenerMessage;
-import org.apache.geode.internal.admin.remote.LicenseInfoRequest;
-import org.apache.geode.internal.admin.remote.LicenseInfoResponse;
-import org.apache.geode.internal.admin.remote.MissingPersistentIDsRequest;
-import org.apache.geode.internal.admin.remote.MissingPersistentIDsResponse;
-import org.apache.geode.internal.admin.remote.ObjectDetailsRequest;
-import org.apache.geode.internal.admin.remote.ObjectDetailsResponse;
-import org.apache.geode.internal.admin.remote.ObjectNamesRequest;
-import org.apache.geode.internal.admin.remote.ObjectNamesResponse;
-import org.apache.geode.internal.admin.remote.PrepareRevokePersistentIDRequest;
-import org.apache.geode.internal.admin.remote.RefreshMemberSnapshotRequest;
-import org.apache.geode.internal.admin.remote.RefreshMemberSnapshotResponse;
-import org.apache.geode.internal.admin.remote.RegionAttributesRequest;
-import org.apache.geode.internal.admin.remote.RegionAttributesResponse;
-import org.apache.geode.internal.admin.remote.RegionRequest;
-import org.apache.geode.internal.admin.remote.RegionResponse;
-import org.apache.geode.internal.admin.remote.RegionSizeRequest;
-import org.apache.geode.internal.admin.remote.RegionSizeResponse;
-import org.apache.geode.internal.admin.remote.RegionStatisticsRequest;
-import org.apache.geode.internal.admin.remote.RegionStatisticsResponse;
-import org.apache.geode.internal.admin.remote.RegionSubRegionSizeRequest;
-import org.apache.geode.internal.admin.remote.RegionSubRegionsSizeResponse;
-import org.apache.geode.internal.admin.remote.RemoveHealthListenerRequest;
-import org.apache.geode.internal.admin.remote.RemoveHealthListenerResponse;
-import org.apache.geode.internal.admin.remote.ResetHealthStatusRequest;
-import org.apache.geode.internal.admin.remote.ResetHealthStatusResponse;
-import org.apache.geode.internal.admin.remote.RevokePersistentIDRequest;
-import org.apache.geode.internal.admin.remote.RevokePersistentIDResponse;
-import org.apache.geode.internal.admin.remote.RootRegionRequest;
-import org.apache.geode.internal.admin.remote.RootRegionResponse;
-import org.apache.geode.internal.admin.remote.ShutdownAllGatewayHubsRequest;
-import org.apache.geode.internal.admin.remote.ShutdownAllRequest;
-import org.apache.geode.internal.admin.remote.ShutdownAllResponse;
-import org.apache.geode.internal.admin.remote.SnapshotResultMessage;
-import org.apache.geode.internal.admin.remote.StatAlertsManagerAssignMessage;
-import org.apache.geode.internal.admin.remote.StatListenerMessage;
-import org.apache.geode.internal.admin.remote.StoreSysCfgRequest;
-import org.apache.geode.internal.admin.remote.StoreSysCfgResponse;
-import org.apache.geode.internal.admin.remote.SubRegionRequest;
-import org.apache.geode.internal.admin.remote.SubRegionResponse;
-import org.apache.geode.internal.admin.remote.TailLogRequest;
-import org.apache.geode.internal.admin.remote.TailLogResponse;
-import org.apache.geode.internal.admin.remote.UpdateAlertDefinitionMessage;
-import org.apache.geode.internal.admin.remote.VersionInfoRequest;
-import org.apache.geode.internal.admin.remote.VersionInfoResponse;
-import org.apache.geode.internal.admin.statalerts.GaugeThresholdDecoratorImpl;
-import org.apache.geode.internal.admin.statalerts.NumberThresholdDecoratorImpl;
-import org.apache.geode.internal.cache.AddCacheServerProfileMessage;
-import org.apache.geode.internal.cache.BucketAdvisor;
-import org.apache.geode.internal.cache.CacheDistributionAdvisor;
-import org.apache.geode.internal.cache.CacheServerAdvisor.CacheServerProfile;
-import org.apache.geode.internal.cache.ClientRegionEventImpl;
-import org.apache.geode.internal.cache.CloseCacheMessage;
-import org.apache.geode.internal.cache.ControllerAdvisor.ControllerProfile;
-import org.apache.geode.internal.cache.CreateRegionProcessor;
-import org.apache.geode.internal.cache.DestroyOperation;
-import org.apache.geode.internal.cache.DestroyPartitionedRegionMessage;
-import org.apache.geode.internal.cache.DestroyRegionOperation;
-import org.apache.geode.internal.cache.DistTXCommitMessage;
-import org.apache.geode.internal.cache.DistTXPrecommitMessage;
-import org.apache.geode.internal.cache.DistTXPrecommitMessage.DistTxPrecommitResponse;
-import org.apache.geode.internal.cache.DistTXRollbackMessage;
-import org.apache.geode.internal.cache.DistributedClearOperation.ClearRegionMessage;
-import org.apache.geode.internal.cache.DistributedClearOperation.ClearRegionWithContextMessage;
-import org.apache.geode.internal.cache.DistributedPutAllOperation.EntryVersionsList;
-import org.apache.geode.internal.cache.DistributedPutAllOperation.PutAllMessage;
-import org.apache.geode.internal.cache.DistributedRegionFunctionStreamingMessage;
-import org.apache.geode.internal.cache.DistributedRemoveAllOperation.RemoveAllMessage;
-import org.apache.geode.internal.cache.DistributedTombstoneOperation.TombstoneMessage;
-import org.apache.geode.internal.cache.EntryEventImpl;
-import org.apache.geode.internal.cache.EventID;
-import org.apache.geode.internal.cache.ExpireDisconnectedClientTransactionsMessage;
-import org.apache.geode.internal.cache.FilterProfile;
-import org.apache.geode.internal.cache.FindDurableQueueProcessor.FindDurableQueueMessage;
-import org.apache.geode.internal.cache.FindDurableQueueProcessor.FindDurableQueueReply;
-import org.apache.geode.internal.cache.FindRemoteTXMessage;
-import org.apache.geode.internal.cache.FindRemoteTXMessage.FindRemoteTXMessageReply;
-import org.apache.geode.internal.cache.FindVersionTagOperation.FindVersionTagMessage;
-import org.apache.geode.internal.cache.FindVersionTagOperation.VersionTagReply;
-import org.apache.geode.internal.cache.FunctionStreamingOrderedReplyMessage;
-import org.apache.geode.internal.cache.FunctionStreamingReplyMessage;
-import org.apache.geode.internal.cache.HARegion;
-import org.apache.geode.internal.cache.InitialImageFlowControl.FlowControlPermitMessage;
-import org.apache.geode.internal.cache.InitialImageOperation;
-import org.apache.geode.internal.cache.InitialImageOperation.InitialImageVersionedEntryList;
-import org.apache.geode.internal.cache.InvalidateOperation;
-import org.apache.geode.internal.cache.InvalidatePartitionedRegionMessage;
-import org.apache.geode.internal.cache.InvalidateRegionOperation.InvalidateRegionMessage;
-import org.apache.geode.internal.cache.JtaAfterCompletionMessage;
-import org.apache.geode.internal.cache.JtaBeforeCompletionMessage;
-import org.apache.geode.internal.cache.LatestLastAccessTimeMessage;
-import org.apache.geode.internal.cache.MemberFunctionStreamingMessage;
-import org.apache.geode.internal.cache.Node;
-import org.apache.geode.internal.cache.PRQueryProcessor;
-import org.apache.geode.internal.cache.PartitionRegionConfig;
-import org.apache.geode.internal.cache.PreferBytesCachedDeserializable;
-import org.apache.geode.internal.cache.RegionEventImpl;
-import org.apache.geode.internal.cache.ReleaseClearLockMessage;
-import org.apache.geode.internal.cache.RemoveCacheServerProfileMessage;
-import org.apache.geode.internal.cache.RoleEventImpl;
-import org.apache.geode.internal.cache.SearchLoadAndWriteProcessor;
-import org.apache.geode.internal.cache.ServerPingMessage;
-import org.apache.geode.internal.cache.StateFlushOperation.StateMarkerMessage;
-import org.apache.geode.internal.cache.StateFlushOperation.StateStabilizationMessage;
-import org.apache.geode.internal.cache.StateFlushOperation.StateStabilizedMessage;
-import org.apache.geode.internal.cache.StoreAllCachedDeserializable;
-import org.apache.geode.internal.cache.TXCommitMessage;
-import org.apache.geode.internal.cache.TXCommitMessage.CommitProcessForLockIdMessage;
-import org.apache.geode.internal.cache.TXCommitMessage.CommitProcessForTXIdMessage;
-import org.apache.geode.internal.cache.TXCommitMessage.CommitProcessQueryMessage;
-import org.apache.geode.internal.cache.TXCommitMessage.CommitProcessQueryReplyMessage;
-import org.apache.geode.internal.cache.TXEntryState;
-import org.apache.geode.internal.cache.TXId;
-import org.apache.geode.internal.cache.TXRemoteCommitMessage;
-import org.apache.geode.internal.cache.TXRemoteCommitMessage.TXRemoteCommitReplyMessage;
-import org.apache.geode.internal.cache.TXRemoteRollbackMessage;
-import org.apache.geode.internal.cache.Token;
-import org.apache.geode.internal.cache.UpdateAttributesProcessor;
-import org.apache.geode.internal.cache.UpdateEntryVersionOperation.UpdateEntryVersionMessage;
-import org.apache.geode.internal.cache.UpdateOperation;
-import org.apache.geode.internal.cache.VMCachedDeserializable;
-import org.apache.geode.internal.cache.backup.AbortBackupRequest;
-import org.apache.geode.internal.cache.backup.BackupResponse;
-import org.apache.geode.internal.cache.backup.FinishBackupRequest;
-import org.apache.geode.internal.cache.backup.FlushToDiskRequest;
-import org.apache.geode.internal.cache.backup.FlushToDiskResponse;
-import org.apache.geode.internal.cache.backup.PrepareBackupRequest;
-import org.apache.geode.internal.cache.compression.SnappyCompressedCachedDeserializable;
-import org.apache.geode.internal.cache.control.ResourceAdvisor.ResourceManagerProfile;
-import org.apache.geode.internal.cache.control.ResourceAdvisor.ResourceProfileMessage;
-import org.apache.geode.internal.cache.ha.HARegionQueue.DispatchedAndCurrentEvents;
-import org.apache.geode.internal.cache.ha.QueueRemovalMessage;
-import org.apache.geode.internal.cache.locks.TXLockBatch;
-import org.apache.geode.internal.cache.locks.TXLockIdImpl;
-import org.apache.geode.internal.cache.locks.TXLockUpdateParticipantsMessage;
-import org.apache.geode.internal.cache.locks.TXLockUpdateParticipantsMessage.TXLockUpdateParticipantsReplyMessage;
-import org.apache.geode.internal.cache.locks.TXOriginatorRecoveryProcessor.TXOriginatorRecoveryMessage;
-import org.apache.geode.internal.cache.locks.TXOriginatorRecoveryProcessor.TXOriginatorRecoveryReplyMessage;
-import org.apache.geode.internal.cache.partitioned.AllBucketProfilesUpdateMessage;
-import org.apache.geode.internal.cache.partitioned.BecomePrimaryBucketMessage;
-import org.apache.geode.internal.cache.partitioned.BecomePrimaryBucketMessage.BecomePrimaryBucketReplyMessage;
-import org.apache.geode.internal.cache.partitioned.BucketBackupMessage;
-import org.apache.geode.internal.cache.partitioned.BucketCountLoadProbe;
-import org.apache.geode.internal.cache.partitioned.BucketProfileUpdateMessage;
-import org.apache.geode.internal.cache.partitioned.BucketSizeMessage;
-import org.apache.geode.internal.cache.partitioned.BucketSizeMessage.BucketSizeReplyMessage;
-import org.apache.geode.internal.cache.partitioned.ContainsKeyValueMessage;
-import org.apache.geode.internal.cache.partitioned.ContainsKeyValueMessage.ContainsKeyValueReplyMessage;
-import org.apache.geode.internal.cache.partitioned.CreateBucketMessage;
-import org.apache.geode.internal.cache.partitioned.CreateBucketMessage.CreateBucketReplyMessage;
-import org.apache.geode.internal.cache.partitioned.DeposePrimaryBucketMessage;
-import org.apache.geode.internal.cache.partitioned.DeposePrimaryBucketMessage.DeposePrimaryBucketReplyMessage;
-import org.apache.geode.internal.cache.partitioned.DestroyMessage;
-import org.apache.geode.internal.cache.partitioned.DestroyRegionOnDataStoreMessage;
-import org.apache.geode.internal.cache.partitioned.DumpAllPRConfigMessage;
-import org.apache.geode.internal.cache.partitioned.DumpB2NRegion;
-import org.apache.geode.internal.cache.partitioned.DumpB2NRegion.DumpB2NReplyMessage;
-import org.apache.geode.internal.cache.partitioned.DumpBucketsMessage;
-import org.apache.geode.internal.cache.partitioned.EndBucketCreationMessage;
-import org.apache.geode.internal.cache.partitioned.FetchBulkEntriesMessage;
-import org.apache.geode.internal.cache.partitioned.FetchBulkEntriesMessage.FetchBulkEntriesReplyMessage;
-import org.apache.geode.internal.cache.partitioned.FetchEntriesMessage;
-import org.apache.geode.internal.cache.partitioned.FetchEntriesMessage.FetchEntriesReplyMessage;
-import org.apache.geode.internal.cache.partitioned.FetchEntryMessage;
-import org.apache.geode.internal.cache.partitioned.FetchEntryMessage.FetchEntryReplyMessage;
-import org.apache.geode.internal.cache.partitioned.FetchKeysMessage;
-import org.apache.geode.internal.cache.partitioned.FetchKeysMessage.FetchKeysReplyMessage;
-import org.apache.geode.internal.cache.partitioned.FetchPartitionDetailsMessage;
-import org.apache.geode.internal.cache.partitioned.FetchPartitionDetailsMessage.FetchPartitionDetailsReplyMessage;
-import org.apache.geode.internal.cache.partitioned.FlushMessage;
-import org.apache.geode.internal.cache.partitioned.GetMessage;
-import org.apache.geode.internal.cache.partitioned.GetMessage.GetReplyMessage;
-import org.apache.geode.internal.cache.partitioned.IdentityRequestMessage;
-import org.apache.geode.internal.cache.partitioned.IdentityRequestMessage.IdentityReplyMessage;
-import org.apache.geode.internal.cache.partitioned.IdentityUpdateMessage;
-import org.apache.geode.internal.cache.partitioned.IndexCreationMsg;
-import org.apache.geode.internal.cache.partitioned.IndexCreationMsg.IndexCreationReplyMsg;
-import org.apache.geode.internal.cache.partitioned.InterestEventMessage;
-import org.apache.geode.internal.cache.partitioned.InterestEventMessage.InterestEventReplyMessage;
-import org.apache.geode.internal.cache.partitioned.InvalidateMessage;
-import org.apache.geode.internal.cache.partitioned.ManageBackupBucketMessage;
-import org.apache.geode.internal.cache.partitioned.ManageBackupBucketMessage.ManageBackupBucketReplyMessage;
-import org.apache.geode.internal.cache.partitioned.ManageBucketMessage;
-import org.apache.geode.internal.cache.partitioned.ManageBucketMessage.ManageBucketReplyMessage;
-import org.apache.geode.internal.cache.partitioned.MoveBucketMessage;
-import org.apache.geode.internal.cache.partitioned.MoveBucketMessage.MoveBucketReplyMessage;
-import org.apache.geode.internal.cache.partitioned.PRSanityCheckMessage;
-import org.apache.geode.internal.cache.partitioned.PRTombstoneMessage;
-import org.apache.geode.internal.cache.partitioned.PRUpdateEntryVersionMessage;
-import org.apache.geode.internal.cache.partitioned.PartitionedRegionFunctionStreamingMessage;
-import org.apache.geode.internal.cache.partitioned.PrimaryRequestMessage;
-import org.apache.geode.internal.cache.partitioned.PrimaryRequestMessage.PrimaryRequestReplyMessage;
-import org.apache.geode.internal.cache.partitioned.PutAllPRMessage;
-import org.apache.geode.internal.cache.partitioned.PutAllPRMessage.PutAllReplyMessage;
-import org.apache.geode.internal.cache.partitioned.PutMessage;
-import org.apache.geode.internal.cache.partitioned.PutMessage.PutReplyMessage;
-import org.apache.geode.internal.cache.partitioned.QueryMessage;
-import org.apache.geode.internal.cache.partitioned.RegionAdvisor;
-import org.apache.geode.internal.cache.partitioned.RemoveAllPRMessage;
-import org.apache.geode.internal.cache.partitioned.RemoveBucketMessage;
-import org.apache.geode.internal.cache.partitioned.RemoveBucketMessage.RemoveBucketReplyMessage;
-import org.apache.geode.internal.cache.partitioned.RemoveIndexesMessage;
-import org.apache.geode.internal.cache.partitioned.RemoveIndexesMessage.RemoveIndexesReplyMessage;
-import org.apache.geode.internal.cache.partitioned.SizeMessage;
-import org.apache.geode.internal.cache.partitioned.SizeMessage.SizeReplyMessage;
-import org.apache.geode.internal.cache.partitioned.SizedBasedLoadProbe;
-import org.apache.geode.internal.cache.persistence.DiskStoreID;
-import org.apache.geode.internal.cache.persistence.MembershipFlushRequest;
-import org.apache.geode.internal.cache.persistence.MembershipViewRequest;
-import org.apache.geode.internal.cache.persistence.MembershipViewRequest.MembershipViewReplyMessage;
-import org.apache.geode.internal.cache.persistence.PersistentStateQueryMessage;
-import org.apache.geode.internal.cache.persistence.PersistentStateQueryMessage.PersistentStateQueryReplyMessage;
-import org.apache.geode.internal.cache.persistence.PrepareNewPersistentMemberMessage;
-import org.apache.geode.internal.cache.persistence.RemovePersistentMemberMessage;
-import org.apache.geode.internal.cache.snapshot.FlowController.FlowControlAbortMessage;
-import org.apache.geode.internal.cache.snapshot.FlowController.FlowControlAckMessage;
-import org.apache.geode.internal.cache.snapshot.SnapshotPacket;
-import org.apache.geode.internal.cache.snapshot.SnapshotPacket.SnapshotRecord;
-import org.apache.geode.internal.cache.tier.sockets.ClientDataSerializerMessage;
-import org.apache.geode.internal.cache.tier.sockets.ClientDenylistProcessor.ClientDenylistMessage;
-import org.apache.geode.internal.cache.tier.sockets.ClientInstantiatorMessage;
-import org.apache.geode.internal.cache.tier.sockets.ClientInterestMessageImpl;
-import org.apache.geode.internal.cache.tier.sockets.ClientMarkerMessageImpl;
-import org.apache.geode.internal.cache.tier.sockets.ClientPingMessageImpl;
-import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
-import org.apache.geode.internal.cache.tier.sockets.ClientTombstoneMessage;
-import org.apache.geode.internal.cache.tier.sockets.ClientUpdateMessageImpl;
-import org.apache.geode.internal.cache.tier.sockets.HAEventWrapper;
-import org.apache.geode.internal.cache.tier.sockets.InterestResultPolicyImpl;
-import org.apache.geode.internal.cache.tier.sockets.ObjectPartList;
-import org.apache.geode.internal.cache.tier.sockets.ObjectPartList651;
-import org.apache.geode.internal.cache.tier.sockets.RemoveClientFromDenylistMessage;
-import org.apache.geode.internal.cache.tier.sockets.SerializedObjectPartList;
-import org.apache.geode.internal.cache.tier.sockets.ServerInterestRegistrationMessage;
-import org.apache.geode.internal.cache.tier.sockets.VersionedObjectList;
-import org.apache.geode.internal.cache.tx.DistTxEntryEvent;
-import org.apache.geode.internal.cache.tx.RemoteClearMessage;
-import org.apache.geode.internal.cache.tx.RemoteClearMessage.RemoteClearReplyMessage;
-import org.apache.geode.internal.cache.tx.RemoteContainsKeyValueMessage;
-import org.apache.geode.internal.cache.tx.RemoteDestroyMessage;
-import org.apache.geode.internal.cache.tx.RemoteFetchEntryMessage;
-import org.apache.geode.internal.cache.tx.RemoteFetchKeysMessage;
-import org.apache.geode.internal.cache.tx.RemoteFetchVersionMessage;
-import org.apache.geode.internal.cache.tx.RemoteGetMessage;
-import org.apache.geode.internal.cache.tx.RemoteInvalidateMessage;
-import org.apache.geode.internal.cache.tx.RemotePutAllMessage;
-import org.apache.geode.internal.cache.tx.RemotePutMessage;
-import org.apache.geode.internal.cache.tx.RemoteRemoveAllMessage;
-import org.apache.geode.internal.cache.tx.RemoteSizeMessage;
-import org.apache.geode.internal.cache.versions.DiskRegionVersionVector;
-import org.apache.geode.internal.cache.versions.DiskVersionTag;
-import org.apache.geode.internal.cache.versions.VMRegionVersionVector;
-import org.apache.geode.internal.cache.versions.VMVersionTag;
-import org.apache.geode.internal.cache.wan.GatewaySenderAdvisor;
-import org.apache.geode.internal.cache.wan.GatewaySenderEventCallbackArgument;
-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.management.internal.JmxManagerAdvisor.JmxManagerProfile;
-import org.apache.geode.management.internal.JmxManagerAdvisor.JmxManagerProfileMessage;
-import org.apache.geode.management.internal.JmxManagerLocatorRequest;
-import org.apache.geode.management.internal.JmxManagerLocatorResponse;
-import org.apache.geode.management.internal.ManagerStartupMessage;
-import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
-import org.apache.geode.management.internal.configuration.messages.ConfigurationResponse;
-import org.apache.geode.pdx.internal.CheckTypeRegistryState;
-import org.apache.geode.pdx.internal.EnumId;
-import org.apache.geode.pdx.internal.EnumInfo;
+import org.apache.geode.internal.InternalDataSerializer;
 
 /**
- * Factory for instances of DataSerializableFixedID instances. Note that this class implements
- * DataSerializableFixedID to inherit constants but is not actually an instance of this interface.
- *
- * @since GemFire 5.7
+ * Factory for instances of DataSerializableFixedID instances.  Constructors must be registered
+ * with this factory in order for it to deserialize anything.
  */
-public class DSFIDFactory implements DataSerializableFixedID {
-
-  private DSFIDFactory() {
-    // no instances allowed
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public int getDSFID() {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public void toData(DataOutput out) throws IOException {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public void fromData(DataInput in) throws IOException, ClassNotFoundException {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public Version[] getSerializationVersions() {
-    throw new UnsupportedOperationException();
-  }
+public class DSFIDFactory {
 
   @Immutable
-  private static final Constructor<?>[] dsfidMap = new Constructor<?>[256];
+  private final Constructor<?>[] dsfidMap = new Constructor<?>[256];
 
   @Immutable("This maybe should be wrapped in an unmodifiableMap?")
-  private static final Int2ObjectOpenHashMap dsfidMap2 = new Int2ObjectOpenHashMap(800);
+  private final Int2ObjectOpenHashMap dsfidMap2 = new Int2ObjectOpenHashMap(800);
 
-  static {
-    registerDSFIDTypes();
-  }
 
   /** Register the constructor for a fixed ID class. */
-  public static void registerDSFID(int dsfid, Class dsfidClass) {
+  public void registerDSFID(int dsfid, Class dsfidClass) {
     try {
       Constructor<?> cons = dsfidClass.getConstructor((Class[]) null);
       cons.setAccessible(true);
@@ -477,610 +57,46 @@ public class DSFIDFactory implements DataSerializableFixedID {
     }
   }
 
-  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,
-        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,
-        SearchLoadAndWriteProcessor.NetSearchRequestMessage.class);
-    registerDSFID(NET_SEARCH_REPLY_MESSAGE,
-        SearchLoadAndWriteProcessor.NetSearchReplyMessage.class);
-    registerDSFID(NET_LOAD_REQUEST_MESSAGE,
-        SearchLoadAndWriteProcessor.NetLoadRequestMessage.class);
-    registerDSFID(NET_LOAD_REPLY_MESSAGE, SearchLoadAndWriteProcessor.NetLoadReplyMessage.class);
-    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,
-        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,
-        NonGrantorDestroyedProcessor.NonGrantorDestroyedMessage.class);
-    registerDSFID(DLOCK_RELEASE_REPLY, DLockReleaseProcessor.DLockReleaseReplyMessage.class);
-    registerDSFID(GRANTOR_REQUEST_MESSAGE, GrantorRequestProcessor.GrantorRequestMessage.class);
-    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,
-        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,
-        DistTXRollbackMessage.DistTXRollbackReplyMessage.class);
-    registerDSFID(DISTTX_COMMIT_REPLY_MESSAGE, DistTXCommitMessage.DistTXCommitReplyMessage.class);
-    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,
-        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,
-        RemoteFetchEntryMessage.FetchEntryReplyMessage.class);
-    registerDSFID(R_CONTAINS_MESSAGE, RemoteContainsKeyValueMessage.class);
-    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,
-        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,
-        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);
-    registerDSFID(PR_INDEX_CREATION_REPLY_MSG, IndexCreationReplyMsg.class);
-    registerDSFID(PR_MANAGE_BUCKET_REPLY_MESSAGE, ManageBucketReplyMessage.class);
-    registerDSFID(PR_FETCH_KEYS_REPLY_MESSAGE, FetchKeysReplyMessage.class);
-    registerDSFID(PR_DUMP_B2N_REGION_MSG, DumpB2NRegion.class);
-    registerDSFID(PR_DUMP_B2N_REPLY_MESSAGE, DumpB2NReplyMessage.class);
-    registerDSFID(DESTROY_PARTITIONED_REGION_MESSAGE, DestroyPartitionedRegionMessage.class);
-    registerDSFID(INVALIDATE_PARTITIONED_REGION_MESSAGE, InvalidatePartitionedRegionMessage.class);
-    registerDSFID(COMMIT_PROCESS_QUERY_MESSAGE, CommitProcessQueryMessage.class);
-    registerDSFID(COMMIT_PROCESS_QUERY_REPLY_MESSAGE, CommitProcessQueryReplyMessage.class);
-    registerDSFID(DESTROY_REGION_WITH_CONTEXT_MESSAGE,
-        DestroyRegionOperation.DestroyRegionWithContextMessage.class);
-    registerDSFID(PUT_ALL_MESSAGE, PutAllMessage.class);
-    registerDSFID(REMOVE_ALL_MESSAGE, RemoveAllMessage.class);
-    registerDSFID(CLEAR_REGION_MESSAGE, ClearRegionMessage.class);
-    registerDSFID(TOMBSTONE_MESSAGE, TombstoneMessage.class);
-    registerDSFID(INVALIDATE_REGION_MESSAGE, InvalidateRegionMessage.class);
-    registerDSFID(STATE_MARKER_MESSAGE, StateMarkerMessage.class);
-    registerDSFID(STATE_STABILIZATION_MESSAGE, StateStabilizationMessage.class);
-    registerDSFID(STATE_STABILIZED_MESSAGE, StateStabilizedMessage.class);
-    registerDSFID(CLIENT_MARKER_MESSAGE_IMPL, ClientMarkerMessageImpl.class);
-    registerDSFID(TX_LOCK_UPDATE_PARTICIPANTS_MESSAGE, TXLockUpdateParticipantsMessage.class);
-    registerDSFID(TX_ORIGINATOR_RECOVERY_MESSAGE, TXOriginatorRecoveryMessage.class);
-    registerDSFID(TX_ORIGINATOR_RECOVERY_REPLY_MESSAGE, TXOriginatorRecoveryReplyMessage.class);
-    registerDSFID(TX_REMOTE_COMMIT_MESSAGE, TXRemoteCommitMessage.class);
-    registerDSFID(TX_REMOTE_ROLLBACK_MESSAGE, TXRemoteRollbackMessage.class);
-    registerDSFID(JTA_BEFORE_COMPLETION_MESSAGE, JtaBeforeCompletionMessage.class);
-    registerDSFID(JTA_AFTER_COMPLETION_MESSAGE, JtaAfterCompletionMessage.class);
-    registerDSFID(QUEUE_REMOVAL_MESSAGE, QueueRemovalMessage.class);
-    registerDSFID(DLOCK_RECOVER_GRANTOR_MESSAGE, DLockRecoverGrantorMessage.class);
-    registerDSFID(DLOCK_RECOVER_GRANTOR_REPLY_MESSAGE, DLockRecoverGrantorReplyMessage.class);
-    registerDSFID(NON_GRANTOR_DESTROYED_REPLY_MESSAGE, NonGrantorDestroyedReplyMessage.class);
-    registerDSFID(IDS_REGISTRATION_MESSAGE, InternalDataSerializer.RegistrationMessage.class);
-    registerDSFID(PR_FETCH_PARTITION_DETAILS_MESSAGE, FetchPartitionDetailsMessage.class);
-    registerDSFID(PR_FETCH_PARTITION_DETAILS_REPLY, FetchPartitionDetailsReplyMessage.class);
-    registerDSFID(PR_DEPOSE_PRIMARY_BUCKET_MESSAGE, DeposePrimaryBucketMessage.class);
-    registerDSFID(PR_DEPOSE_PRIMARY_BUCKET_REPLY, DeposePrimaryBucketReplyMessage.class);
-    registerDSFID(PR_BECOME_PRIMARY_BUCKET_MESSAGE, BecomePrimaryBucketMessage.class);
-    registerDSFID(PR_BECOME_PRIMARY_BUCKET_REPLY, BecomePrimaryBucketReplyMessage.class);
-    registerDSFID(PR_REMOVE_BUCKET_MESSAGE, RemoveBucketMessage.class);
-    registerDSFID(EXPIRE_CLIENT_TRANSACTIONS, ExpireDisconnectedClientTransactionsMessage.class);
-    registerDSFID(PR_REMOVE_BUCKET_REPLY, RemoveBucketReplyMessage.class);
-    registerDSFID(PR_MOVE_BUCKET_MESSAGE, MoveBucketMessage.class);
-    registerDSFID(PR_MOVE_BUCKET_REPLY, MoveBucketReplyMessage.class);
-    registerDSFID(ADD_HEALTH_LISTENER_REQUEST, AddHealthListenerRequest.class);
-    registerDSFID(ADD_HEALTH_LISTENER_RESPONSE, AddHealthListenerResponse.class);
-    registerDSFID(ADD_STAT_LISTENER_REQUEST, AddStatListenerRequest.class);
-    registerDSFID(ADD_STAT_LISTENER_RESPONSE, AddStatListenerResponse.class);
-    registerDSFID(ADMIN_CONSOLE_DISCONNECT_MESSAGE, AdminConsoleDisconnectMessage.class);
-    registerDSFID(ADMIN_CONSOLE_MESSAGE, AdminConsoleMessage.class);
-    registerDSFID(MANAGER_STARTUP_MESSAGE, ManagerStartupMessage.class);
-    registerDSFID(JMX_MANAGER_LOCATOR_REQUEST, JmxManagerLocatorRequest.class);
-    registerDSFID(JMX_MANAGER_LOCATOR_RESPONSE, JmxManagerLocatorResponse.class);
-    registerDSFID(ADMIN_FAILURE_RESPONSE, AdminFailureResponse.class);
-    registerDSFID(ALERT_LEVEL_CHANGE_MESSAGE, AlertLevelChangeMessage.class);
-    registerDSFID(ALERT_LISTENER_MESSAGE, AlertListenerMessage.class);
-    registerDSFID(APP_CACHE_SNAPSHOT_MESSAGE, AppCacheSnapshotMessage.class);
-    registerDSFID(BRIDGE_SERVER_REQUEST, BridgeServerRequest.class);
-    registerDSFID(BRIDGE_SERVER_RESPONSE, BridgeServerResponse.class);
-    registerDSFID(CACHE_CONFIG_REQUEST, CacheConfigRequest.class);
-    registerDSFID(CACHE_CONFIG_RESPONSE, CacheConfigResponse.class);
-    registerDSFID(CACHE_INFO_REQUEST, CacheInfoRequest.class);
-    registerDSFID(CACHE_INFO_RESPONSE, CacheInfoResponse.class);
-    registerDSFID(CANCELLATION_MESSAGE, CancellationMessage.class);
-    registerDSFID(CANCEL_STAT_LISTENER_REQUEST, CancelStatListenerRequest.class);
-    registerDSFID(CANCEL_STAT_LISTENER_RESPONSE, CancelStatListenerResponse.class);
-    registerDSFID(DESTROY_ENTRY_MESSAGE, DestroyEntryMessage.class);
-    registerDSFID(ADMIN_DESTROY_REGION_MESSAGE, DestroyRegionMessage.class);
-    registerDSFID(FETCH_DIST_LOCK_INFO_REQUEST, FetchDistLockInfoRequest.class);
-    registerDSFID(FETCH_DIST_LOCK_INFO_RESPONSE, FetchDistLockInfoResponse.class);
-    registerDSFID(FETCH_HEALTH_DIAGNOSIS_REQUEST, FetchHealthDiagnosisRequest.class);
-    registerDSFID(FETCH_HEALTH_DIAGNOSIS_RESPONSE, FetchHealthDiagnosisResponse.class);
-    registerDSFID(FETCH_HOST_REQUEST, FetchHostRequest.class);
-    registerDSFID(FETCH_HOST_RESPONSE, FetchHostResponse.class);
-    registerDSFID(FETCH_RESOURCE_ATTRIBUTES_REQUEST, FetchResourceAttributesRequest.class);
-    registerDSFID(FETCH_RESOURCE_ATTRIBUTES_RESPONSE, FetchResourceAttributesResponse.class);
-    registerDSFID(FETCH_STATS_REQUEST, FetchStatsRequest.class);
-    registerDSFID(FETCH_STATS_RESPONSE, FetchStatsResponse.class);
-    registerDSFID(FETCH_SYS_CFG_REQUEST, FetchSysCfgRequest.class);
-    registerDSFID(FETCH_SYS_CFG_RESPONSE, FetchSysCfgResponse.class);
-    registerDSFID(FLUSH_APP_CACHE_SNAPSHOT_MESSAGE, FlushAppCacheSnapshotMessage.class);
-    registerDSFID(HEALTH_LISTENER_MESSAGE, HealthListenerMessage.class);
-    registerDSFID(OBJECT_DETAILS_REQUEST, ObjectDetailsRequest.class);
-    registerDSFID(OBJECT_DETAILS_RESPONSE, ObjectDetailsResponse.class);
-    registerDSFID(OBJECT_NAMES_REQUEST, ObjectNamesRequest.class);
-    registerDSFID(LICENSE_INFO_REQUEST, LicenseInfoRequest.class);
-    registerDSFID(LICENSE_INFO_RESPONSE, LicenseInfoResponse.class);
-    registerDSFID(OBJECT_NAMES_RESPONSE, ObjectNamesResponse.class);
-    registerDSFID(REGION_ATTRIBUTES_REQUEST, RegionAttributesRequest.class);
-    registerDSFID(REGION_ATTRIBUTES_RESPONSE, RegionAttributesResponse.class);
-    registerDSFID(REGION_REQUEST, RegionRequest.class);
-    registerDSFID(REGION_RESPONSE, RegionResponse.class);
-    registerDSFID(REGION_SIZE_REQUEST, RegionSizeRequest.class);
-    registerDSFID(REGION_SIZE_RESPONSE, RegionSizeResponse.class);
-    registerDSFID(REGION_STATISTICS_REQUEST, RegionStatisticsRequest.class);
-    registerDSFID(REGION_STATISTICS_RESPONSE, RegionStatisticsResponse.class);
-    registerDSFID(REMOVE_HEALTH_LISTENER_REQUEST, RemoveHealthListenerRequest.class);
-    registerDSFID(REMOVE_HEALTH_LISTENER_RESPONSE, RemoveHealthListenerResponse.class);
-    registerDSFID(RESET_HEALTH_STATUS_REQUEST, ResetHealthStatusRequest.class);
-    registerDSFID(RESET_HEALTH_STATUS_RESPONSE, ResetHealthStatusResponse.class);
-    registerDSFID(ROOT_REGION_REQUEST, RootRegionRequest.class);
-    registerDSFID(ROOT_REGION_RESPONSE, RootRegionResponse.class);
-    registerDSFID(SNAPSHOT_RESULT_MESSAGE, SnapshotResultMessage.class);
-    registerDSFID(STAT_LISTENER_MESSAGE, StatListenerMessage.class);
-    registerDSFID(STORE_SYS_CFG_REQUEST, StoreSysCfgRequest.class);
-    registerDSFID(STORE_SYS_CFG_RESPONSE, StoreSysCfgResponse.class);
-    registerDSFID(SUB_REGION_REQUEST, SubRegionRequest.class);
-    registerDSFID(SUB_REGION_RESPONSE, SubRegionResponse.class);
-    registerDSFID(TAIL_LOG_REQUEST, TailLogRequest.class);
-    registerDSFID(TAIL_LOG_RESPONSE, TailLogResponse.class);
-    registerDSFID(VERSION_INFO_REQUEST, VersionInfoRequest.class);
-    registerDSFID(VERSION_INFO_RESPONSE, VersionInfoResponse.class);
-    registerDSFID(HIGH_PRIORITY_ACKED_MESSAGE, HighPriorityAckedMessage.class);
-    registerDSFID(SERIAL_ACKED_MESSAGE, SerialAckedMessage.class);
-    registerDSFID(BUCKET_PROFILE, BucketAdvisor.BucketProfile.class);
-    registerDSFID(SERVER_BUCKET_PROFILE, BucketAdvisor.ServerBucketProfile.class);
-    registerDSFID(PARTITION_PROFILE, RegionAdvisor.PartitionProfile.class);
-    registerDSFID(GATEWAY_SENDER_PROFILE, GatewaySenderAdvisor.GatewaySenderProfile.class);
-    registerDSFID(ROLE_EVENT, RoleEventImpl.class);
-    registerDSFID(CLIENT_REGION_EVENT, ClientRegionEventImpl.class);
-    registerDSFID(PR_INVALIDATE_MESSAGE, InvalidateMessage.class);
-    registerDSFID(PR_INVALIDATE_REPLY_MESSAGE, InvalidateMessage.InvalidateReplyMessage.class);
-    registerDSFID(TX_LOCK_UPDATE_PARTICIPANTS_REPLY_MESSAGE,
-        TXLockUpdateParticipantsReplyMessage.class);
-    registerDSFID(STREAMING_REPLY_MESSAGE, StreamingReplyMessage.class);
-    registerDSFID(PARTITION_REGION_CONFIG, PartitionRegionConfig.class);
-    registerDSFID(PREFER_BYTES_CACHED_DESERIALIZABLE, PreferBytesCachedDeserializable.class);
-    registerDSFID(VM_CACHED_DESERIALIZABLE, VMCachedDeserializable.class);
-    registerDSFID(GATEWAY_SENDER_EVENT_IMPL, GatewaySenderEventImpl.class);
-    registerDSFID(SUSPEND_LOCKING_TOKEN, DLockService.SuspendLockingToken.class);
-    registerDSFID(OBJECT_TYPE_IMPL, ObjectTypeImpl.class);
-    registerDSFID(STRUCT_TYPE_IMPL, StructTypeImpl.class);
-    registerDSFID(COLLECTION_TYPE_IMPL, CollectionTypeImpl.class);
-    registerDSFID(TX_LOCK_BATCH, TXLockBatch.class);
-    registerDSFID(GATEWAY_SENDER_EVENT_CALLBACK_ARGUMENT, GatewaySenderEventCallbackArgument.class);
-    registerDSFID(MAP_TYPE_IMPL, MapTypeImpl.class);
-    registerDSFID(STORE_ALL_CACHED_DESERIALIZABLE, StoreAllCachedDeserializable.class);
-    registerDSFID(INTEREST_EVENT_MESSAGE, InterestEventMessage.class);
-    registerDSFID(INTEREST_EVENT_REPLY_MESSAGE, InterestEventReplyMessage.class);
-    registerDSFID(HA_EVENT_WRAPPER, HAEventWrapper.class);
-    registerDSFID(STAT_ALERTS_MGR_ASSIGN_MESSAGE, StatAlertsManagerAssignMessage.class);
-    registerDSFID(UPDATE_ALERTS_DEFN_MESSAGE, UpdateAlertDefinitionMessage.class);
-    registerDSFID(REFRESH_MEMBER_SNAP_REQUEST, RefreshMemberSnapshotRequest.class);
-    registerDSFID(REFRESH_MEMBER_SNAP_RESPONSE, RefreshMemberSnapshotResponse.class);
-    registerDSFID(REGION_SUB_SIZE_REQUEST, RegionSubRegionSizeRequest.class);
-    registerDSFID(REGION_SUB_SIZE_RESPONSE, RegionSubRegionsSizeResponse.class);
-    registerDSFID(CHANGE_REFRESH_INT_MESSAGE, ChangeRefreshIntervalMessage.class);
-    registerDSFID(ALERTS_NOTIF_MESSAGE, AlertsNotificationMessage.class);
-    registerDSFID(FIND_DURABLE_QUEUE, FindDurableQueueMessage.class);
-    registerDSFID(FIND_DURABLE_QUEUE_REPLY, FindDurableQueueReply.class);
-    registerDSFID(CACHE_SERVER_LOAD_MESSAGE, CacheServerLoadMessage.class);
-    registerDSFID(CACHE_SERVER_PROFILE, CacheServerProfile.class);
-    registerDSFID(CONTROLLER_PROFILE, ControllerProfile.class);
-    registerDSFID(DLOCK_QUERY_MESSAGE, DLockQueryProcessor.DLockQueryMessage.class);
-    registerDSFID(DLOCK_QUERY_REPLY, DLockQueryProcessor.DLockQueryReplyMessage.class);
-    registerDSFID(LOCATOR_LIST_REQUEST, LocatorListRequest.class);
-    registerDSFID(LOCATOR_LIST_RESPONSE, LocatorListResponse.class);
-    registerDSFID(CLIENT_CONNECTION_REQUEST, ClientConnectionRequest.class);
-    registerDSFID(CLIENT_CONNECTION_RESPONSE, ClientConnectionResponse.class);
-    registerDSFID(QUEUE_CONNECTION_REQUEST, QueueConnectionRequest.class);
-    registerDSFID(QUEUE_CONNECTION_RESPONSE, QueueConnectionResponse.class);
-    registerDSFID(CLIENT_REPLACEMENT_REQUEST, ClientReplacementRequest.class);
-    registerDSFID(OBJECT_PART_LIST, ObjectPartList.class);
-    registerDSFID(VERSIONED_OBJECT_LIST, VersionedObjectList.class);
-    registerDSFID(OBJECT_PART_LIST66, ObjectPartList651.class);
-    registerDSFID(PUTALL_VERSIONS_LIST, EntryVersionsList.class);
-    registerDSFID(INITIAL_IMAGE_VERSIONED_OBJECT_LIST, InitialImageVersionedEntryList.class);
-    registerDSFID(FIND_VERSION_TAG, FindVersionTagMessage.class);
-    registerDSFID(VERSION_TAG_REPLY, VersionTagReply.class);
-    registerDSFID(DURABLE_CLIENT_INFO_REQUEST, DurableClientInfoRequest.class);
-    registerDSFID(DURABLE_CLIENT_INFO_RESPONSE, DurableClientInfoResponse.class);
-    registerDSFID(CLIENT_INTEREST_MESSAGE, ClientInterestMessageImpl.class);
-    registerDSFID(LATEST_LAST_ACCESS_TIME_MESSAGE, LatestLastAccessTimeMessage.class);
-    registerDSFID(STAT_ALERT_DEFN_NUM_THRESHOLD, NumberThresholdDecoratorImpl.class);
-    registerDSFID(STAT_ALERT_DEFN_GAUGE_THRESHOLD, GaugeThresholdDecoratorImpl.class);
-    registerDSFID(CLIENT_HEALTH_STATS, ClientHealthStats.class);
-    registerDSFID(STAT_ALERT_NOTIFICATION, StatAlertNotification.class);
-    registerDSFID(FILTER_INFO_MESSAGE, InitialImageOperation.FilterInfoMessage.class);
-    registerDSFID(SIZED_BASED_LOAD_PROBE, SizedBasedLoadProbe.class);
-    registerDSFID(PR_MANAGE_BACKUP_BUCKET_MESSAGE, ManageBackupBucketMessage.class);
-    registerDSFID(PR_MANAGE_BACKUP_BUCKET_REPLY_MESSAGE, ManageBackupBucketReplyMessage.class);
-    registerDSFID(PR_CREATE_BUCKET_MESSAGE, CreateBucketMessage.class);
-    registerDSFID(PR_CREATE_BUCKET_REPLY_MESSAGE, CreateBucketReplyMessage.class);
-    registerDSFID(RESOURCE_MANAGER_PROFILE, ResourceManagerProfile.class);
-    registerDSFID(RESOURCE_PROFILE_MESSAGE, ResourceProfileMessage.class);
-    registerDSFID(JMX_MANAGER_PROFILE, JmxManagerProfile.class);
-    registerDSFID(JMX_MANAGER_PROFILE_MESSAGE, JmxManagerProfileMessage.class);
-    registerDSFID(CLIENT_DENYLIST_MESSAGE, ClientDenylistMessage.class);
-    registerDSFID(REMOVE_CLIENT_FROM_DENYLIST_MESSAGE, RemoveClientFromDenylistMessage.class);
-    registerDSFID(PR_FUNCTION_STREAMING_MESSAGE, PartitionedRegionFunctionStreamingMessage.class);
-    registerDSFID(MEMBER_FUNCTION_STREAMING_MESSAGE, MemberFunctionStreamingMessage.class);
-    registerDSFID(DR_FUNCTION_STREAMING_MESSAGE, DistributedRegionFunctionStreamingMessage.class);
-    registerDSFID(FUNCTION_STREAMING_REPLY_MESSAGE, FunctionStreamingReplyMessage.class);
-    registerDSFID(GET_ALL_SERVERS_REQUEST, GetAllServersRequest.class);
-    registerDSFID(GET_ALL_SERVRES_RESPONSE, GetAllServersResponse.class);
-    registerDSFID(PERSISTENT_MEMBERSHIP_VIEW_REQUEST, MembershipViewRequest.class);
-    registerDSFID(PERSISTENT_MEMBERSHIP_VIEW_REPLY, MembershipViewReplyMessage.class);
-    registerDSFID(PERSISTENT_STATE_QUERY_REQUEST, PersistentStateQueryMessage.class);
-    registerDSFID(PERSISTENT_STATE_QUERY_REPLY, PersistentStateQueryReplyMessage.class);
-    registerDSFID(PREPARE_NEW_PERSISTENT_MEMBER_REQUEST, PrepareNewPersistentMemberMessage.class);
-    registerDSFID(MISSING_PERSISTENT_IDS_REQUEST, MissingPersistentIDsRequest.class);
-    registerDSFID(MISSING_PERSISTENT_IDS_RESPONSE, MissingPersistentIDsResponse.class);
-    registerDSFID(REVOKE_PERSISTENT_ID_REQUEST, RevokePersistentIDRequest.class);
-    registerDSFID(REVOKE_PERSISTENT_ID_RESPONSE, RevokePersistentIDResponse.class);
-    registerDSFID(REMOVE_PERSISTENT_MEMBER_REQUEST, RemovePersistentMemberMessage.class);
-    registerDSFID(FUNCTION_STREAMING_ORDERED_REPLY_MESSAGE,
-        FunctionStreamingOrderedReplyMessage.class);
-    registerDSFID(REQUEST_SYNC_MESSAGE, InitialImageOperation.RequestSyncMessage.class);
-    registerDSFID(PERSISTENT_MEMBERSHIP_FLUSH_REQUEST, MembershipFlushRequest.class);
-    registerDSFID(SHUTDOWN_ALL_REQUEST, ShutdownAllRequest.class);
-    registerDSFID(SHUTDOWN_ALL_RESPONSE, ShutdownAllResponse.class);
-    registerDSFID(CLIENT_MEMBERSHIP_MESSAGE, ClientMembershipMessage.class);
-    registerDSFID(END_BUCKET_CREATION_MESSAGE, EndBucketCreationMessage.class);
-    registerDSFID(PREPARE_BACKUP_REQUEST, PrepareBackupRequest.class);
-    registerDSFID(BACKUP_RESPONSE, BackupResponse.class); // in older versions this was
-                                                          // FinishBackupResponse which is
-                                                          // compatible
-    registerDSFID(FINISH_BACKUP_REQUEST, FinishBackupRequest.class);
-    registerDSFID(FINISH_BACKUP_RESPONSE, BackupResponse.class); // for backwards compatibility map
-                                                                 // FINISH_BACKUP_RESPONSE to
-                                                                 // BackupResponse
-    registerDSFID(COMPACT_REQUEST, CompactRequest.class);
-    registerDSFID(COMPACT_RESPONSE, CompactResponse.class);
-    registerDSFID(FLOW_CONTROL_PERMIT_MESSAGE, FlowControlPermitMessage.class);
-    registerDSFID(REQUEST_FILTERINFO_MESSAGE, InitialImageOperation.RequestFilterInfoMessage.class);
-    registerDSFID(PARALLEL_QUEUE_REMOVAL_MESSAGE, ParallelQueueRemovalMessage.class);
-    registerDSFID(BATCH_DESTROY_MESSAGE, BatchDestroyOperation.DestroyMessage.class);
-    registerDSFID(FIND_REMOTE_TX_MESSAGE, FindRemoteTXMessage.class);
-    registerDSFID(FIND_REMOTE_TX_REPLY, FindRemoteTXMessageReply.class);
-    registerDSFID(SERIALIZED_OBJECT_PART_LIST, SerializedObjectPartList.class);
-    registerDSFID(FLUSH_TO_DISK_REQUEST, FlushToDiskRequest.class);
-    registerDSFID(FLUSH_TO_DISK_RESPONSE, FlushToDiskResponse.class);
-    registerDSFID(ENUM_ID, EnumId.class);
-    registerDSFID(ENUM_INFO, EnumInfo.class);
-    registerDSFID(CHECK_TYPE_REGISTRY_STATE, CheckTypeRegistryState.class);
-    registerDSFID(PREPARE_REVOKE_PERSISTENT_ID_REQUEST, PrepareRevokePersistentIDRequest.class);
-    registerDSFID(PERSISTENT_RVV, DiskRegionVersionVector.class);
-    registerDSFID(PERSISTENT_VERSION_TAG, DiskVersionTag.class);
-    registerDSFID(DISK_STORE_ID, DiskStoreID.class);
-    registerDSFID(CLIENT_PING_MESSAGE_IMPL, ClientPingMessageImpl.class);
-    registerDSFID(SNAPSHOT_PACKET, SnapshotPacket.class);
-    registerDSFID(SNAPSHOT_RECORD, SnapshotRecord.class);
-    registerDSFID(FLOW_CONTROL_ACK, FlowControlAckMessage.class);
-    registerDSFID(FLOW_CONTROL_ABORT, FlowControlAbortMessage.class);
-    registerDSFID(MGMT_COMPACT_REQUEST,
-        org.apache.geode.management.internal.messages.CompactRequest.class);
-    registerDSFID(MGMT_COMPACT_RESPONSE,
-        org.apache.geode.management.internal.messages.CompactResponse.class);
-    registerDSFID(MGMT_FEDERATION_COMPONENT,
-        org.apache.geode.management.internal.FederationComponent.class);
-    registerDSFID(LOCATOR_STATUS_REQUEST, LocatorStatusRequest.class);
-    registerDSFID(LOCATOR_STATUS_RESPONSE, LocatorStatusResponse.class);
-    registerDSFID(R_FETCH_VERSION_MESSAGE, RemoteFetchVersionMessage.class);
-    registerDSFID(R_FETCH_VERSION_REPLY, RemoteFetchVersionMessage.FetchVersionReplyMessage.class);
-    registerDSFID(RELEASE_CLEAR_LOCK_MESSAGE, ReleaseClearLockMessage.class);
-    registerDSFID(PR_TOMBSTONE_MESSAGE, PRTombstoneMessage.class);
-    registerDSFID(REQUEST_RVV_MESSAGE, InitialImageOperation.RequestRVVMessage.class);
-    registerDSFID(RVV_REPLY_MESSAGE, InitialImageOperation.RVVReplyMessage.class);
-    registerDSFID(SNAPPY_COMPRESSED_CACHED_DESERIALIZABLE,
-        SnappyCompressedCachedDeserializable.class);
-    registerDSFID(UPDATE_ENTRY_VERSION_MESSAGE, UpdateEntryVersionMessage.class);
-    registerDSFID(PR_UPDATE_ENTRY_VERSION_MESSAGE, PRUpdateEntryVersionMessage.class);
-    registerDSFID(PR_FETCH_BULK_ENTRIES_MESSAGE, FetchBulkEntriesMessage.class);
-    registerDSFID(PR_FETCH_BULK_ENTRIES_REPLY_MESSAGE, FetchBulkEntriesReplyMessage.class);
-    registerDSFID(PR_QUERY_TRACE_INFO, PRQueryTraceInfo.class);
-    registerDSFID(INDEX_CREATION_DATA, IndexCreationData.class);
-    registerDSFID(DIST_TX_OP, DistTxEntryEvent.class);
-    registerDSFID(DIST_TX_PRE_COMMIT_RESPONSE, DistTxPrecommitResponse.class);
-    registerDSFID(DIST_TX_THIN_ENTRY_STATE, TXEntryState.DistTxThinEntryState.class);
-    registerDSFID(SERVER_PING_MESSAGE, ServerPingMessage.class);
-    registerDSFID(PR_DESTROY_ON_DATA_STORE_MESSAGE, DestroyRegionOnDataStoreMessage.class);
-    registerDSFID(SHUTDOWN_ALL_GATEWAYHUBS_REQUEST, ShutdownAllGatewayHubsRequest.class);
-    registerDSFID(BUCKET_COUNT_LOAD_PROBE, BucketCountLoadProbe.class);
-    registerDSFID(GATEWAY_SENDER_QUEUE_ENTRY_SYNCHRONIZATION_MESSAGE,
-        GatewaySenderQueueEntrySynchronizationOperation.GatewaySenderQueueEntrySynchronizationMessage.class);
-    registerDSFID(GATEWAY_SENDER_QUEUE_ENTRY_SYNCHRONIZATION_ENTRY,
-        GatewaySenderQueueEntrySynchronizationOperation.GatewaySenderQueueEntrySynchronizationEntry.class);
-    registerDSFID(ABORT_BACKUP_REQUEST, AbortBackupRequest.class);
-  }
-
   /**
    * Creates a DataSerializableFixedID or StreamableFixedID instance by deserializing it from the
    * data input.
    */
-  public static Object create(int dsfid, DataInput in) throws IOException, ClassNotFoundException {
-    switch (dsfid) {
-      case REGION:
-        return (DataSerializableFixedID) DataSerializer.readRegion(in);
-      case END_OF_STREAM_TOKEN:
-        return Token.END_OF_STREAM;
-      case DLOCK_REMOTE_TOKEN:
-        return DLockRemoteToken.createFromDataInput(in);
-      case TRANSACTION_ID:
-        return TXId.createFromData(in);
-      case INTEREST_RESULT_POLICY:
-        return readInterestResultPolicy(in);
-      case UNDEFINED:
-        return readUndefined(in);
-      case RESULTS_BAG:
-        return readResultsBag(in);
-      case TOKEN_INVALID:
-        return Token.INVALID;
-      case TOKEN_LOCAL_INVALID:
-        return Token.LOCAL_INVALID;
-      case TOKEN_DESTROYED:
-        return Token.DESTROYED;
-      case TOKEN_REMOVED:
-        return Token.REMOVED_PHASE1;
-      case TOKEN_REMOVED2:
-        return Token.REMOVED_PHASE2;
-      case TOKEN_TOMBSTONE:
-        return Token.TOMBSTONE;
-      case NULL_TOKEN:
-        return readNullToken(in);
-      case CONFIGURATION_RESPONSE:
-        return readConfigurationResponse(in);
-      case PR_DESTROY_ON_DATA_STORE_MESSAGE:
-        return readDestroyOnDataStore(in);
-      default:
-        final Constructor<?> cons;
-        if (dsfid >= Byte.MIN_VALUE && dsfid <= Byte.MAX_VALUE) {
-          cons = dsfidMap[dsfid + Byte.MAX_VALUE + 1];
+  public Object create(int dsfid, DataInput in) throws IOException, ClassNotFoundException {
+    final Constructor<?> cons;
+    if (dsfid >= Byte.MIN_VALUE && dsfid <= Byte.MAX_VALUE) {
+      cons = dsfidMap[dsfid + Byte.MAX_VALUE + 1];
+    } else {
+      cons = (Constructor<?>) dsfidMap2.get(dsfid);
+    }
+    if (cons != null) {
+      try {
+        Object ds = cons.newInstance((Object[]) null);
+        InternalDataSerializer.invokeFromData(ds, in);
+        return ds;
+      } catch (InstantiationException ie) {
+        throw new IOException(ie.getMessage(), ie);
+      } catch (IllegalAccessException iae) {
+        throw new IOException(iae.getMessage(), iae);
+      } catch (InvocationTargetException ite) {
+        Throwable targetEx = ite.getTargetException();
+        if (targetEx instanceof IOException) {
+          throw (IOException) targetEx;
+        } else if (targetEx instanceof ClassNotFoundException) {
+          throw (ClassNotFoundException) targetEx;
         } else {
-          cons = (Constructor<?>) dsfidMap2.get(dsfid);
-        }
-        if (cons != null) {
-          try {
-            Object ds = cons.newInstance((Object[]) null);
-            InternalDataSerializer.invokeFromData(ds, in);
-            return ds;
-          } catch (InstantiationException ie) {
-            throw new IOException(ie.getMessage(), ie);
-          } catch (IllegalAccessException iae) {
-            throw new IOException(iae.getMessage(), iae);
-          } catch (InvocationTargetException ite) {
-            Throwable targetEx = ite.getTargetException();
-            if (targetEx instanceof IOException) {
-              throw (IOException) targetEx;
-            } else if (targetEx instanceof ClassNotFoundException) {
-              throw (ClassNotFoundException) targetEx;
-            } else {
-              throw new IOException(ite.getMessage(), targetEx);
-            }
-          }
+          throw new IOException(ite.getMessage(), targetEx);
         }
-        throw new DSFIDNotFoundException("Unknown DataSerializableFixedID: " + dsfid, dsfid);
-
+      }
     }
+    throw new DSFIDNotFoundException("Unknown DataSerializableFixedID: " + dsfid, dsfid);
   }
 
 
-  ////////////////// Reading Internal Objects /////////////////
-  /**
-   * Reads an instance of <code>IpAddress</code> from a <code>DataInput</code>.
-   *
-   * @throws IOException A problem occurs while reading from <code>in</code>
-   */
-  public static InternalDistributedMember readInternalDistributedMember(DataInput in)
-      throws IOException, ClassNotFoundException {
-
-    InternalDistributedMember o = new InternalDistributedMember();
-    InternalDataSerializer.invokeFromData(o, in);
-    return o;
-  }
-
-  private static ResultsBag readResultsBag(DataInput in)
-      throws IOException, ClassNotFoundException {
-    ResultsBag o = new ResultsBag(true);
-    InternalDataSerializer.invokeFromData(o, in);
-    return o;
-  }
-
-  private static Undefined readUndefined(DataInput in) throws IOException, ClassNotFoundException {
-    Undefined o = (Undefined) QueryService.UNDEFINED;
-    InternalDataSerializer.invokeFromData(o, in);
-    return o;
-  }
-
-  /**
-   * Reads an instance of <code>InterestResultPolicy</code> from a <code>DataInput</code>.
-   *
-   * @throws IOException A problem occurs while reading from <code>in</code>
-   */
-  private static InterestResultPolicyImpl readInterestResultPolicy(DataInput in)
-      throws IOException, ClassNotFoundException {
-    byte ordinal = in.readByte();
-    return (InterestResultPolicyImpl) InterestResultPolicy.fromOrdinal(ordinal);
-  }
-
-  private static DataSerializableFixedID readDestroyOnDataStore(DataInput in)
-      throws IOException, ClassNotFoundException {
-    DataSerializableFixedID serializable = new DestroyRegionOnDataStoreMessage();
-    serializable.fromData(in);
-    return serializable;
-  }
-
-  private static DataSerializableFixedID readNullToken(DataInput in)
-      throws IOException, ClassNotFoundException {
-    DataSerializableFixedID serializable = (NullToken) IndexManager.NULL;
-    serializable.fromData(in);
-    return serializable;
-  }
-
-  private static DataSerializableFixedID readConfigurationResponse(DataInput in)
-      throws IOException, ClassNotFoundException {
-    DataSerializableFixedID serializable = new ConfigurationResponse();
-    serializable.fromData(in);
-    return serializable;
-  }
-
-  public static Constructor<?>[] getDsfidmap() {
+  public Constructor<?>[] getDsfidmap() {
     return dsfidMap;
   }
 
-  public static Int2ObjectOpenHashMap getDsfidmap2() {
+  public Int2ObjectOpenHashMap getDsfidmap2() {
     return dsfidMap2;
   }
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/HeapDataOutputStream.java b/geode-core/src/main/java/org/apache/geode/internal/HeapDataOutputStream.java
index 8f021bf..09c117d 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/HeapDataOutputStream.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/HeapDataOutputStream.java
@@ -12,7 +12,7 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.apache.geode.internal;
+package org.apache.geode.internal.serialization;
 
 import java.io.DataOutput;
 import java.io.IOException;
@@ -29,6 +29,9 @@ import org.apache.logging.log4j.Logger;
 
 import org.apache.geode.DataSerializer;
 import org.apache.geode.distributed.internal.DistributionConfig;
+import org.apache.geode.internal.ByteBufferWriter;
+import org.apache.geode.internal.InternalDataSerializer;
+import org.apache.geode.internal.ObjToByteArraySerializer;
 import org.apache.geode.internal.cache.BytesAndBitsForCompactor;
 import org.apache.geode.internal.logging.LogService;
 import org.apache.geode.internal.tcp.ByteBufferInputStream.ByteSource;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/ByteBufferWriter.java b/geode-core/src/main/java/org/apache/geode/internal/serialization/BufferDataOutputStream.java
similarity index 62%
copy from geode-core/src/main/java/org/apache/geode/internal/ByteBufferWriter.java
copy to geode-core/src/main/java/org/apache/geode/internal/serialization/BufferDataOutputStream.java
index 5de7511..4bfef78 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/ByteBufferWriter.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/serialization/BufferDataOutputStream.java
@@ -12,18 +12,7 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.apache.geode.internal;
+package org.apache.geode.internal.serialization;
 
-import java.nio.ByteBuffer;
-
-/**
- * Used by a couple of our classes to say they can have a ByteBuffer written to them.
- */
-public interface ByteBufferWriter {
-  /**
-   * Writes bb.position()..bb.limit() bytes to this writer. Note that some implementations of this
-   * interface will keep a reference to bb so callers should expect to give up ownership of bb and
-   * should not modify it after calling this method.
-   */
-  void write(ByteBuffer bb);
+public class BufferDataOutputStream {
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/ByteBufferWriter.java b/geode-core/src/main/java/org/apache/geode/internal/serialization/ByteBufferWriter.java
similarity index 100%
copy from geode-core/src/main/java/org/apache/geode/internal/ByteBufferWriter.java
copy to geode-core/src/main/java/org/apache/geode/internal/serialization/ByteBufferWriter.java
diff --git a/geode-core/src/main/java/org/apache/geode/internal/DSCODE.java b/geode-core/src/main/java/org/apache/geode/internal/serialization/DSCODE.java
similarity index 99%
rename from geode-core/src/main/java/org/apache/geode/internal/DSCODE.java
rename to geode-core/src/main/java/org/apache/geode/internal/serialization/DSCODE.java
index e4762d3..3a534f5 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/DSCODE.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/serialization/DSCODE.java
@@ -15,6 +15,7 @@
 package org.apache.geode.internal;
 
 import org.apache.geode.DataSerializer;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
 
 /**
  * An enumeration that contains a bunch of pre-defined values for use in the implementation of
diff --git a/geode-core/src/main/java/org/apache/geode/internal/DSFIDNotFoundException.java b/geode-core/src/main/java/org/apache/geode/internal/serialization/DSFIDNotFoundException.java
similarity index 100%
rename from geode-core/src/main/java/org/apache/geode/internal/DSFIDNotFoundException.java
rename to geode-core/src/main/java/org/apache/geode/internal/serialization/DSFIDNotFoundException.java
diff --git a/geode-core/src/main/java/org/apache/geode/internal/serialization/DSFIDSerializer.java b/geode-core/src/main/java/org/apache/geode/internal/serialization/DSFIDSerializer.java
new file mode 100644
index 0000000..afae242
--- /dev/null
+++ b/geode-core/src/main/java/org/apache/geode/internal/serialization/DSFIDSerializer.java
@@ -0,0 +1,363 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.serialization;
+
+import static org.apache.geode.internal.serialization.DataSerializableFixedID.NO_FIXED_ID;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.EOFException;
+import java.io.IOException;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.net.SocketException;
+
+import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
+import org.apache.logging.log4j.Logger;
+
+import org.apache.geode.CancelException;
+import org.apache.geode.DataSerializable;
+import org.apache.geode.GemFireRethrowable;
+import org.apache.geode.InternalGemFireError;
+import org.apache.geode.SerializationException;
+import org.apache.geode.SystemFailure;
+import org.apache.geode.ToDataException;
+import org.apache.geode.annotations.Immutable;
+import org.apache.geode.cache.CacheClosedException;
+import org.apache.geode.internal.InternalDataSerializer;
+import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.logging.log4j.LogMarker;
+
+public class BasicDSFIDSerializer {
+  private static final Logger logger = LogService.getLogger();
+
+  @Immutable
+  private final Constructor<?>[] dsfidMap = new Constructor<?>[256];
+
+  @Immutable("This maybe should be wrapped in an unmodifiableMap?")
+  private final Int2ObjectOpenHashMap dsfidMap2 = new Int2ObjectOpenHashMap(800);
+
+
+  // Writes just the header of a DataSerializableFixedID to out.
+  public void writeDSFIDHeader(int dsfid, DataOutput out) throws IOException {
+    if (dsfid == DataSerializableFixedID.ILLEGAL) {
+      throw new IllegalStateException(
+          "attempted to serialize ILLEGAL dsfid");
+    }
+    if (dsfid <= Byte.MAX_VALUE && dsfid >= Byte.MIN_VALUE) {
+      out.writeByte(DSCODE.DS_FIXED_ID_BYTE.toByte());
+      out.writeByte(dsfid);
+    } else if (dsfid <= Short.MAX_VALUE && dsfid >= Short.MIN_VALUE) {
+      out.writeByte(DSCODE.DS_FIXED_ID_SHORT.toByte());
+      out.writeShort(dsfid);
+    } else {
+      out.writeByte(DSCODE.DS_FIXED_ID_INT.toByte());
+      out.writeInt(dsfid);
+    }
+  }
+
+
+  public void writeDSFID(DataSerializableFixedID o, DataOutput out) throws IOException {
+    int dsfid = o.getDSFID();
+    writeDSFID(o, dsfid, out);
+  }
+
+  public void writeDSFID(DataSerializableFixedID o, int dsfid, DataOutput out)
+      throws IOException {
+    if (dsfid == NO_FIXED_ID) {
+      throw new IllegalArgumentException("NO_FIXED_ID is not supported by BasicDSFIDSerializer - use InternalDataSerializer instead: " + o.getClass().getName());
+    }
+    writeDSFIDHeader(dsfid, out);
+    try {
+      invokeToData(o, out);
+    } catch (IOException | CancelException | ToDataException | GemFireRethrowable io) {
+      // Note: this is not a user code toData but one from our
+      // internal code since only GemFire product code implements DSFID
+
+      // Serializing a PDX can result in a cache closed exception. Just rethrow
+
+      throw io;
+    } catch (VirtualMachineError err) {
+      SystemFailure.initiateFailure(err);
+      // If this ever returns, rethrow the error. We're poisoned
+      // now, so don't let this thread continue.
+      throw err;
+    } catch (Throwable t) {
+      // Whenever you catch Error or Throwable, you must also
+      // catch VirtualMachineError (see above). However, there is
+      // _still_ a possibility that you are dealing with a cascading
+      // error condition, so you also need to check to see if the JVM
+      // is still usable:
+      SystemFailure.checkFailure();
+      throw new ToDataException("toData failed on dsfid=" + dsfid + " msg:" + t.getMessage(), t);
+    }
+  }
+
+  /**
+   * For backward compatibility this method should be used to invoke toData on a DSFID.
+   * It will invoke the correct toData method based on the class's version
+   * information. This method does not write information about the class of the object. When
+   * deserializing use the method invokeFromData to read the contents of the object.
+   *
+   * @param ds the object to write
+   * @param out the output stream.
+   */
+  public void invokeToData(Object ds, DataOutput out) throws IOException {
+    boolean isDSFID = ds instanceof DataSerializableFixedID;
+    if (!isDSFID) {
+      throw new IllegalArgumentException("Expected a DataSerializableFixedID but found " + ds.getClass().getName());
+    }
+    try {
+      boolean invoked = false;
+      Version v = InternalDataSerializer.getVersionForDataStreamOrNull(out);
+
+      if (Version.CURRENT != v && v != null) {
+        // get versions where DataOutput was upgraded
+        Version[] versions = null;
+        if (ds instanceof SerializationVersions) {
+          SerializationVersions sv = (SerializationVersions) ds;
+          versions = sv.getSerializationVersions();
+        }
+        // check if the version of the peer or diskstore is different and
+        // there has been a change in the message
+        if (versions != null) {
+          for (Version version : versions) {
+            // if peer version is less than the greatest upgraded version
+            if (v.compareTo(version) < 0) {
+              ds.getClass().getMethod("toDataPre_" + version.getMethodSuffix(),
+                  new Class[] {DataOutput.class}).invoke(ds, out);
+              invoked = true;
+              break;
+            }
+          }
+        }
+      }
+
+      if (!invoked) {
+        ((DataSerializableFixedID) ds).toData(out);
+      }
+    } catch (IOException io) {
+      // DSFID serialization expects an IOException but otherwise
+      // we want to catch it and transform into a ToDataException
+      // since it might be in user code and we want to report it
+      // as a problem with the plugin code
+      throw io;
+    } catch (CancelException | ToDataException | GemFireRethrowable ex) {
+      // Serializing a PDX can result in a cache closed exception. Just rethrow
+      throw ex;
+    } catch (VirtualMachineError err) {
+      SystemFailure.initiateFailure(err);
+      // If this ever returns, rethrow the error. We're poisoned
+      // now, so don't let this thread continue.
+      throw err;
+    } catch (Throwable t) {
+      // Whenever you catch Error or Throwable, you must also
+      // catch VirtualMachineError (see above). However, there is
+      // _still_ a possibility that you are dealing with a cascading
+      // error condition, so you also need to check to see if the JVM
+      // is still usable:
+      SystemFailure.checkFailure();
+      throw new ToDataException(
+          "toData failed on DataSerializableFixedID " + null == ds ? "null" : ds.getClass().toString(), t);
+    }
+  }
+
+  /**
+   * Get the {@link Version} of the peer or disk store that created this {@link DataOutput}. Returns
+   * null if the version is same as this member's.
+   */
+  public Version getVersionForDataStreamOrNull(DataOutput out) {
+    // check if this is a versioned data output
+    if (out instanceof VersionedDataStream) {
+      return ((VersionedDataStream) out).getVersion();
+    } else {
+      // assume latest version
+      return null;
+    }
+  }
+
+
+  public Object readDSFID(final DataInput in, DSCODE dscode)
+      throws IOException, ClassNotFoundException {
+    if (logger.isTraceEnabled(LogMarker.SERIALIZER_VERBOSE)) {
+      logger.trace(LogMarker.SERIALIZER_VERBOSE, "readDSFID: header={}", dscode);
+    }
+    switch (dscode) {
+      case DS_FIXED_ID_BYTE:
+        return create(in.readByte(), in);
+      case DS_FIXED_ID_SHORT:
+        return create(in.readShort(), in);
+      case DS_NO_FIXED_ID:
+        throw new IllegalStateException("DS_NO_FIXED_ID is not supported in readDSFID - use InternalDataSerializer instead");
+      case DS_FIXED_ID_INT:
+        return create(in.readInt(), in);
+      default:
+        throw new IllegalStateException("unexpected byte: " + dscode + " while reading dsfid");
+    }
+  }
+
+  public Object readDSFID(final DataInput in) throws IOException, ClassNotFoundException {
+    checkIn(in);
+    return readDSFID(in, DscodeHelper.toDSCODE(in.readByte()));
+  }
+
+  public int readDSFIDHeader(final DataInput in, DSCODE dscode) throws IOException {
+    switch (dscode) {
+      case DS_FIXED_ID_BYTE:
+        return in.readByte();
+      case DS_FIXED_ID_SHORT:
+        return in.readShort();
+      case DS_FIXED_ID_INT:
+        return in.readInt();
+      default:
+        throw new IllegalStateException("unexpected byte: " + dscode + " while reading dsfid");
+    }
+  }
+
+  public int readDSFIDHeader(final DataInput in) throws IOException {
+    checkIn(in);
+    return readDSFIDHeader(in, DscodeHelper.toDSCODE(in.readByte()));
+  }
+
+  /**
+   * Checks to make sure a {@code DataInput} is not {@code null}.
+   *
+   * @throws NullPointerException If {@code in} is {@code null}
+   */
+  public static void checkIn(DataInput in) {
+    if (in == null) {
+      throw new NullPointerException("Null DataInput");
+    }
+  }
+
+  /**
+   * For backward compatibility this method should be used to invoke fromData on a DSFID or
+   * DataSerializable. It will invoke the correct fromData method based on the class's version
+   * information. This method does not read information about the class of the object. When
+   * serializing use the method invokeToData to write the contents of the object.
+   *
+   * @param ds the object to write
+   * @param in the input stream.
+   */
+  public void invokeFromData(Object ds, DataInput in)
+      throws IOException, ClassNotFoundException {
+    try {
+      boolean invoked = false;
+      Version v = InternalDataSerializer.getVersionForDataStreamOrNull(in);
+      if (Version.CURRENT != v && v != null) {
+        // get versions where DataOutput was upgraded
+        Version[] versions = null;
+        SerializationVersions vds = (SerializationVersions) ds;
+        versions = vds.getSerializationVersions();
+        // check if the version of the peer or diskstore is different and
+        // there has been a change in the message
+        if (versions != null) {
+          for (Version version : versions) {
+            // if peer version is less than the greatest upgraded version
+            if (v.compareTo(version) < 0) {
+              ds.getClass().getMethod("fromDataPre" + '_' + version.getMethodSuffix(),
+                  new Class[] {DataInput.class}).invoke(ds, in);
+              invoked = true;
+              break;
+            }
+          }
+        }
+      }
+      if (!invoked) {
+        ((DataSerializableFixedID) ds).fromData(in);
+
+        if (logger.isTraceEnabled(LogMarker.SERIALIZER_VERBOSE)) {
+          logger.trace(LogMarker.SERIALIZER_VERBOSE, "Read DataSerializableFixedId {}",
+              ds);
+        }
+      }
+    } catch (EOFException | ClassNotFoundException | CacheClosedException | SocketException ex) {
+      // client went away - ignore
+      throw ex;
+    } catch (Exception ex) {
+      throw new SerializationException(
+          String.format("Could not create an instance of %s .",
+              ds.getClass().getName()),
+          ex);
+    }
+  }
+
+
+
+  /** Register the constructor for a fixed ID class. */
+  public 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);
+    }
+  }
+
+  /**
+   * Creates a DataSerializableFixedID or StreamableFixedID instance by deserializing it from the
+   * data input.
+   */
+  public Object create(int dsfid, DataInput in) throws IOException, ClassNotFoundException {
+    final Constructor<?> cons;
+    if (dsfid >= Byte.MIN_VALUE && dsfid <= Byte.MAX_VALUE) {
+      cons = dsfidMap[dsfid + Byte.MAX_VALUE + 1];
+    } else {
+      cons = (Constructor<?>) dsfidMap2.get(dsfid);
+    }
+    if (cons != null) {
+      try {
+        Object ds = cons.newInstance((Object[]) null);
+        invokeFromData(ds, in);
+        return ds;
+      } catch (InstantiationException ie) {
+        throw new IOException(ie.getMessage(), ie);
+      } catch (IllegalAccessException iae) {
+        throw new IOException(iae.getMessage(), iae);
+      } catch (InvocationTargetException ite) {
+        Throwable targetEx = ite.getTargetException();
+        if (targetEx instanceof IOException) {
+          throw (IOException) targetEx;
+        } else if (targetEx instanceof ClassNotFoundException) {
+          throw (ClassNotFoundException) targetEx;
+        } else {
+          throw new IOException(ite.getMessage(), targetEx);
+        }
+      }
+    }
+    throw new DSFIDNotFoundException("Unknown DataSerializableFixedID: " + dsfid, dsfid);
+  }
+
+
+  public Constructor<?>[] getDsfidmap() {
+    return dsfidMap;
+  }
+
+  public Int2ObjectOpenHashMap getDsfidmap2() {
+    return dsfidMap2;
+  }
+
+
+
+}
diff --git a/geode-core/src/main/java/org/apache/geode/internal/DataSerializableFixedID.java b/geode-core/src/main/java/org/apache/geode/internal/serialization/DataSerializableFixedID.java
similarity index 100%
rename from geode-core/src/main/java/org/apache/geode/internal/DataSerializableFixedID.java
rename to geode-core/src/main/java/org/apache/geode/internal/serialization/DataSerializableFixedID.java
diff --git a/geode-core/src/main/java/org/apache/geode/internal/util/DscodeHelper.java b/geode-core/src/main/java/org/apache/geode/internal/serialization/DscodeHelper.java
similarity index 96%
rename from geode-core/src/main/java/org/apache/geode/internal/util/DscodeHelper.java
rename to geode-core/src/main/java/org/apache/geode/internal/serialization/DscodeHelper.java
index 4b48683..dd592e8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/util/DscodeHelper.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/serialization/DscodeHelper.java
@@ -18,7 +18,7 @@ import java.io.IOException;
 import java.util.Arrays;
 
 import org.apache.geode.annotations.Immutable;
-import org.apache.geode.internal.DSCODE;
+import org.apache.geode.internal.serialization.DSCODE;
 
 public class DscodeHelper {
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/ByteBufferWriter.java b/geode-core/src/main/java/org/apache/geode/internal/serialization/ObjectSerializer.java
similarity index 62%
rename from geode-core/src/main/java/org/apache/geode/internal/ByteBufferWriter.java
rename to geode-core/src/main/java/org/apache/geode/internal/serialization/ObjectSerializer.java
index 5de7511..a2ed2b6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/ByteBufferWriter.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/serialization/ObjectSerializer.java
@@ -12,18 +12,7 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.apache.geode.internal;
+package org.apache.geode.internal.serialization;
 
-import java.nio.ByteBuffer;
-
-/**
- * Used by a couple of our classes to say they can have a ByteBuffer written to them.
- */
-public interface ByteBufferWriter {
-  /**
-   * Writes bb.position()..bb.limit() bytes to this writer. Note that some implementations of this
-   * interface will keep a reference to bb so callers should expect to give up ownership of bb and
-   * should not modify it after calling this method.
-   */
-  void write(ByteBuffer bb);
+public interface ObjectSerializer {
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/SerializationVersions.java b/geode-core/src/main/java/org/apache/geode/internal/serialization/SerializationVersions.java
similarity index 96%
rename from geode-core/src/main/java/org/apache/geode/internal/SerializationVersions.java
rename to geode-core/src/main/java/org/apache/geode/internal/serialization/SerializationVersions.java
index 8bcdd9b..4a3f898 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/SerializationVersions.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/serialization/SerializationVersions.java
@@ -14,6 +14,8 @@
  */
 package org.apache.geode.internal;
 
+import org.apache.geode.internal.serialization.Version;
+
 /**
  * This interface is extended by DataSerializableFixedID and VersionedDataSerializable in order to
  * furnish version information to the serialization infrastructure for backward compatibility
diff --git a/geode-core/src/main/java/org/apache/geode/internal/Version.java b/geode-core/src/main/java/org/apache/geode/internal/serialization/Version.java
similarity index 100%
rename from geode-core/src/main/java/org/apache/geode/internal/Version.java
rename to geode-core/src/main/java/org/apache/geode/internal/serialization/Version.java
diff --git a/geode-core/src/main/java/org/apache/geode/internal/VersionedDataInputStream.java b/geode-core/src/main/java/org/apache/geode/internal/serialization/VersionedDataInputStream.java
similarity index 96%
rename from geode-core/src/main/java/org/apache/geode/internal/VersionedDataInputStream.java
rename to geode-core/src/main/java/org/apache/geode/internal/serialization/VersionedDataInputStream.java
index 70b0bc5..a9a5c9d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/VersionedDataInputStream.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/serialization/VersionedDataInputStream.java
@@ -18,6 +18,8 @@ package org.apache.geode.internal;
 import java.io.DataInputStream;
 import java.io.InputStream;
 
+import org.apache.geode.internal.serialization.Version;
+
 
 /**
  * An extension to {@link DataInputStream} that implements {@link VersionedDataStream} for a stream
diff --git a/geode-core/src/main/java/org/apache/geode/internal/VersionedDataOutputStream.java b/geode-core/src/main/java/org/apache/geode/internal/serialization/VersionedDataOutputStream.java
similarity index 96%
rename from geode-core/src/main/java/org/apache/geode/internal/VersionedDataOutputStream.java
rename to geode-core/src/main/java/org/apache/geode/internal/serialization/VersionedDataOutputStream.java
index 91809df..1c1f185 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/VersionedDataOutputStream.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/serialization/VersionedDataOutputStream.java
@@ -18,6 +18,8 @@ package org.apache.geode.internal;
 import java.io.DataOutputStream;
 import java.io.OutputStream;
 
+import org.apache.geode.internal.serialization.Version;
+
 /**
  * An extension of {@link DataOutputStream} that implements {@link VersionedDataStream}.
  *
diff --git a/geode-core/src/main/java/org/apache/geode/internal/VersionedDataStream.java b/geode-core/src/main/java/org/apache/geode/internal/serialization/VersionedDataStream.java
similarity index 93%
rename from geode-core/src/main/java/org/apache/geode/internal/VersionedDataStream.java
rename to geode-core/src/main/java/org/apache/geode/internal/serialization/VersionedDataStream.java
index 12536c6..d68bc84 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/VersionedDataStream.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/serialization/VersionedDataStream.java
@@ -19,6 +19,8 @@ import java.io.DataInput;
 import java.io.DataOutput;
 
 import org.apache.geode.DataSerializable;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.Version;
 
 /**
  * An extension to {@link DataOutput}, {@link DataInput} used internally in product to indicate that
diff --git a/geode-core/src/main/java/org/apache/geode/internal/VersionedObjectInput.java b/geode-core/src/main/java/org/apache/geode/internal/serialization/VersionedObjectInput.java
similarity index 98%
rename from geode-core/src/main/java/org/apache/geode/internal/VersionedObjectInput.java
rename to geode-core/src/main/java/org/apache/geode/internal/serialization/VersionedObjectInput.java
index 3ab5255..46f7156 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/VersionedObjectInput.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/serialization/VersionedObjectInput.java
@@ -18,6 +18,8 @@ package org.apache.geode.internal;
 import java.io.IOException;
 import java.io.ObjectInput;
 
+import org.apache.geode.internal.serialization.Version;
+
 /**
  * An extension to {@link ObjectInput} that implements {@link VersionedDataStream} wrapping given
  * {@link ObjectInput} for a stream coming from a different product version.
diff --git a/geode-core/src/main/java/org/apache/geode/internal/VersionedObjectOutput.java b/geode-core/src/main/java/org/apache/geode/internal/serialization/VersionedObjectOutput.java
similarity index 98%
rename from geode-core/src/main/java/org/apache/geode/internal/VersionedObjectOutput.java
rename to geode-core/src/main/java/org/apache/geode/internal/serialization/VersionedObjectOutput.java
index afc9136..a1f8ce3 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/VersionedObjectOutput.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/serialization/VersionedObjectOutput.java
@@ -18,6 +18,8 @@ package org.apache.geode.internal;
 import java.io.IOException;
 import java.io.ObjectOutput;
 
+import org.apache.geode.internal.serialization.Version;
+
 /**
  * An extension to {@link ObjectOutput} that implements {@link VersionedDataStream} wrapping given
  * {@link ObjectOutput} for a stream directed to a different product version.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/HeapDataOutputStreamJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/HeapDataOutputStreamJUnitTest.java
index b2c327b..74ce53a 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/HeapDataOutputStreamJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/HeapDataOutputStreamJUnitTest.java
@@ -12,7 +12,7 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.apache.geode.internal;
+package org.apache.geode.internal.serialization;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
@@ -28,6 +28,8 @@ import org.junit.experimental.categories.Category;
 
 import org.apache.geode.DataSerializer;
 import org.apache.geode.internal.cache.UnitTestValueHolder;
+import org.apache.geode.internal.serialization.HeapDataOutputStream;
+import org.apache.geode.internal.serialization.Version;
 import org.apache.geode.pdx.internal.TypeRegistry;
 import org.apache.geode.test.junit.categories.SerializationTest;
 
diff --git a/geode-core/src/test/java/org/apache/geode/internal/HeapDataOutputStreamTest.java b/geode-core/src/test/java/org/apache/geode/internal/HeapDataOutputStreamTest.java
index 8ef60b1..86f5604 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/HeapDataOutputStreamTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/HeapDataOutputStreamTest.java
@@ -12,9 +12,9 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.apache.geode.internal;
+package org.apache.geode.internal.serialization;
 
-import static org.apache.geode.internal.HeapDataOutputStream.SMALLEST_CHUNK_SIZE;
+import static org.apache.geode.internal.serialization.HeapDataOutputStream.SMALLEST_CHUNK_SIZE;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/DSCODETest.java b/geode-core/src/test/java/org/apache/geode/internal/serialization/DSCODETest.java
similarity index 97%
rename from geode-core/src/test/java/org/apache/geode/internal/DSCODETest.java
rename to geode-core/src/test/java/org/apache/geode/internal/serialization/DSCODETest.java
index 7240825..7100470 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/DSCODETest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/serialization/DSCODETest.java
@@ -26,6 +26,7 @@ import org.junit.Assert;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
+import org.apache.geode.internal.serialization.DSCODE;
 import org.apache.geode.internal.util.DscodeHelper;
 import org.apache.geode.test.junit.categories.SerializationTest;
 
diff --git a/geode-core/src/test/java/org/apache/geode/internal/VersionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/serialization/VersionJUnitTest.java
similarity index 98%
rename from geode-core/src/test/java/org/apache/geode/internal/VersionJUnitTest.java
rename to geode-core/src/test/java/org/apache/geode/internal/serialization/VersionJUnitTest.java
index 529f1bf..83494bd 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/VersionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/serialization/VersionJUnitTest.java
@@ -21,6 +21,7 @@ import org.junit.Test;
 
 import org.apache.geode.cache.UnsupportedVersionException;
 import org.apache.geode.internal.cache.tier.sockets.CommandInitializer;
+import org.apache.geode.internal.serialization.Version;
 
 public class VersionJUnitTest {
   @Test


[geode] 04/05: implemented new SerializationContext for DataSerializableFixedID toData/fromData

Posted by bs...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

bschuchardt pushed a commit to branch dsfid_separation_wip
in repository https://gitbox.apache.org/repos/asf/geode.git

commit 715536739025a7f1f4969dbf5e77bca1217e781b
Author: Bruce Schuchardt <bs...@pivotal.io>
AuthorDate: Mon Aug 26 15:55:10 2019 -0700

    implemented new SerializationContext for DataSerializableFixedID toData/fromData
    
    new dependency test for the serialization package ensures it doesn't
    refer to any other packages.
    
    membership classes no longer depend on Geode serialization classes
    (DataSerializer, InternalDataSerializer, Version, HeapDataOutputStream,
    etc).
    
    rolling upgrade tests pass
---
 .../geode/ClusterCommunicationsDUnitTest.java      |  11 +-
 .../geode/distributed/internal/DateMessage.java    |  11 +-
 ...ackwardCompatibilitySerializationDUnitTest.java |  51 ++-
 .../gms/messenger/JGroupsMessengerJUnitTest.java   |  10 +-
 .../internal/SystemMemberCacheEventProcessor.java  |  11 +-
 .../admin/jmx/internal/StatAlertNotification.java  |  10 +-
 .../client/internal/CacheServerLoadMessage.java    |  11 +-
 .../internal/locator/ClientConnectionRequest.java  |  11 +-
 .../internal/locator/ClientConnectionResponse.java |   7 +-
 .../internal/locator/ClientReplacementRequest.java |  11 +-
 .../internal/locator/GetAllServersRequest.java     |  11 +-
 .../internal/locator/GetAllServersResponse.java    |   7 +-
 .../internal/locator/LocatorListResponse.java      |   7 +-
 .../internal/locator/LocatorStatusResponse.java    |   7 +-
 .../internal/locator/QueueConnectionRequest.java   |  11 +-
 .../internal/locator/QueueConnectionResponse.java  |   7 +-
 .../internal/locator/ServerLocationRequest.java    |   7 +-
 .../apache/geode/cache/query/internal/CqEntry.java |   7 +-
 .../internal/CumulativeNonDistinctResults.java     |   7 +-
 .../cache/query/internal/LinkedResultSet.java      |   7 +-
 .../cache/query/internal/LinkedStructSet.java      |   7 +-
 .../cache/query/internal/NWayMergeResults.java     |   7 +-
 .../geode/cache/query/internal/NullToken.java      |   7 +-
 .../cache/query/internal/PRQueryTraceInfo.java     |   7 +-
 .../geode/cache/query/internal/ResultsBag.java     |   7 +-
 .../query/internal/ResultsCollectionWrapper.java   |   7 +-
 .../geode/cache/query/internal/ResultsSet.java     |   7 +-
 .../cache/query/internal/SortedResultSet.java      |   7 +-
 .../cache/query/internal/SortedStructSet.java      |   7 +-
 .../geode/cache/query/internal/StructBag.java      |  11 +-
 .../geode/cache/query/internal/StructImpl.java     |   7 +-
 .../geode/cache/query/internal/StructSet.java      |   7 +-
 .../geode/cache/query/internal/Undefined.java      |   7 +-
 .../query/internal/index/IndexCreationData.java    |   7 +-
 .../query/internal/types/CollectionTypeImpl.java   |  11 +-
 .../cache/query/internal/types/MapTypeImpl.java    |  11 +-
 .../cache/query/internal/types/ObjectTypeImpl.java |  15 +-
 .../cache/query/internal/types/StructTypeImpl.java |  11 +-
 .../distributed/internal/DistributionAdvisor.java  |   7 +-
 .../distributed/internal/DistributionMessage.java  |   7 +-
 .../internal/HighPriorityAckedMessage.java         |  11 +-
 .../geode/distributed/internal/ReplyMessage.java   |  11 +-
 .../distributed/internal/SerialAckedMessage.java   |  11 +-
 .../distributed/internal/ShutdownMessage.java      |  11 +-
 .../geode/distributed/internal/StartupMessage.java |  13 +-
 .../internal/StartupResponseMessage.java           |  11 +-
 .../StartupResponseWithVersionMessage.java         |  11 +-
 .../internal/WaitForViewInstallation.java          |  11 +-
 .../internal/locks/DLockQueryProcessor.java        |  21 +-
 .../locks/DLockRecoverGrantorProcessor.java        |  21 +-
 .../internal/locks/DLockReleaseProcessor.java      |  21 +-
 .../internal/locks/DLockRemoteToken.java           |   7 +-
 .../internal/locks/DLockRequestProcessor.java      |  21 +-
 .../distributed/internal/locks/DLockService.java   |   7 +-
 .../internal/locks/DeposeGrantorProcessor.java     |  11 +-
 .../internal/locks/ElderInitProcessor.java         |  21 +-
 .../internal/locks/GrantorRequestProcessor.java    |  21 +-
 .../locks/NonGrantorDestroyedProcessor.java        |  21 +-
 .../membership/InternalDistributedMember.java      |  23 +-
 .../membership/adapter/GMSMemberFactory.java       |   4 +-
 .../membership/adapter/LocalViewMessage.java       |   7 +-
 .../internal/membership/gms/GMSMember.java         |  83 +++--
 .../internal/membership/gms/GMSMembershipView.java |  60 ++--
 .../internal/membership/gms/GMSUtil.java           |  70 ++--
 .../internal/membership/gms/Services.java          |  11 +-
 .../membership/gms/fd/GMSHealthMonitor.java        |   6 +-
 .../gms/locator/FindCoordinatorRequest.java        |  29 +-
 .../gms/locator/FindCoordinatorResponse.java       |  38 ++-
 .../membership/gms/locator/GMSLocator.java         |  40 ++-
 .../membership/gms/locator/GetViewRequest.java     |  11 +-
 .../membership/gms/locator/GetViewResponse.java    |  16 +-
 .../membership/gms/membership/GMSJoinLeave.java    |   5 +-
 .../gms/messages/FinalCheckPassedMessage.java      |  15 +-
 .../membership/gms/messages/HeartbeatMessage.java  |  11 +-
 .../gms/messages/HeartbeatRequestMessage.java      |  15 +-
 .../gms/messages/InstallViewMessage.java           |  20 +-
 .../gms/messages/JoinRequestMessage.java           |  24 +-
 .../gms/messages/JoinResponseMessage.java          |  33 +-
 .../gms/messages/LeaveRequestMessage.java          |  21 +-
 .../gms/messages/NetworkPartitionMessage.java      |  11 +-
 .../gms/messages/RemoveMemberMessage.java          |  21 +-
 .../gms/messages/SuspectMembersMessage.java        |  19 +-
 .../membership/gms/messages/ViewAckMessage.java    |  16 +-
 .../membership/gms/messenger/GMSPingPonger.java    |   8 +-
 .../membership/gms/messenger/JGroupsMessenger.java |  68 ++--
 .../internal/streaming/StreamingOperation.java     |  21 +-
 .../org/apache/geode/internal/DSFIDFactory.java    |  13 +-
 .../apache/geode/internal/ExternalizableDSFID.java |  11 +-
 .../geode/internal/HeapDataOutputStream.java       |   3 +-
 .../geode/internal/InternalDataSerializer.java     | 136 ++++----
 .../geode/internal/InternalInstantiator.java       |  25 +-
 .../java/org/apache/geode/internal/Version.java    |   5 +
 .../internal/admin/ClientMembershipMessage.java    |  11 +-
 .../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   |  23 +-
 .../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     |  11 +-
 .../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    |   7 +-
 .../statalerts/NumberThresholdDecoratorImpl.java   |   7 +-
 .../geode/internal/cache/AbstractRegion.java       |   7 +-
 .../internal/cache/AbstractUpdateOperation.java    |  11 +-
 .../cache/AddCacheServerProfileMessage.java        |  11 +-
 .../apache/geode/internal/cache/BucketAdvisor.java |  21 +-
 .../internal/cache/CacheDistributionAdvisor.java   |  11 +-
 .../geode/internal/cache/CacheServerAdvisor.java   |  11 +-
 .../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     |  21 +-
 .../internal/cache/DestroyRegionOperation.java     |  21 +-
 .../geode/internal/cache/DistTXCommitMessage.java  |  23 +-
 .../internal/cache/DistTXPrecommitMessage.java     |  29 +-
 .../internal/cache/DistTXRollbackMessage.java      |  23 +-
 .../internal/cache/DistributedCacheOperation.java  |   7 +-
 .../internal/cache/DistributedClearOperation.java  |  21 +-
 .../internal/cache/DistributedPutAllOperation.java |  27 +-
 .../DistributedRegionFunctionStreamingMessage.java |  11 +-
 .../cache/DistributedRemoveAllOperation.java       |  20 +-
 .../cache/DistributedTombstoneOperation.java       |  11 +-
 .../geode/internal/cache/EntryEventImpl.java       |   7 +-
 .../org/apache/geode/internal/cache/EventID.java   |  13 +-
 .../geode/internal/cache/EventStateHelper.java     |  15 +-
 ...xpireDisconnectedClientTransactionsMessage.java |   7 +-
 .../apache/geode/internal/cache/FilterProfile.java |  17 +-
 .../geode/internal/cache/FilterRoutingInfo.java    |   3 +-
 .../internal/cache/FindDurableQueueProcessor.java  |  21 +-
 .../geode/internal/cache/FindRemoteTXMessage.java  |  21 +-
 .../internal/cache/FindVersionTagOperation.java    |  21 +-
 .../cache/FunctionStreamingReplyMessage.java       |  11 +-
 .../apache/geode/internal/cache/GridAdvisor.java   |  11 +-
 .../org/apache/geode/internal/cache/HARegion.java  |  11 +-
 .../internal/cache/InitialImageFlowControl.java    |  11 +-
 .../internal/cache/InitialImageOperation.java      | 101 +++---
 .../geode/internal/cache/InvalidateOperation.java  |  21 +-
 .../cache/InvalidatePartitionedRegionMessage.java  |  27 +-
 .../internal/cache/InvalidateRegionOperation.java  |  11 +-
 .../internal/cache/JtaAfterCompletionMessage.java  |  11 +-
 .../cache/LatestLastAccessTimeMessage.java         |  11 +-
 .../cache/MemberFunctionStreamingMessage.java      |  13 +-
 .../java/org/apache/geode/internal/cache/Node.java |   9 +-
 .../geode/internal/cache/PRQueryProcessor.java     |   7 +-
 .../internal/cache/PartitionRegionConfig.java      |   7 +-
 .../cache/PreferBytesCachedDeserializable.java     |   9 +-
 .../geode/internal/cache/RegionEventImpl.java      |   7 +-
 .../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    |  11 +-
 .../geode/internal/cache/StateFlushOperation.java  |  31 +-
 .../cache/StoreAllCachedDeserializable.java        |   9 +-
 .../geode/internal/cache/TXCommitMessage.java      |  35 +-
 .../apache/geode/internal/cache/TXEntryState.java  |   7 +-
 .../java/org/apache/geode/internal/cache/TXId.java |   7 +-
 .../org/apache/geode/internal/cache/TXMessage.java |  11 +-
 .../internal/cache/TXRemoteCommitMessage.java      |  13 +-
 .../org/apache/geode/internal/cache/Token.java     |  37 +-
 .../internal/cache/UpdateAttributesProcessor.java  |  31 +-
 .../cache/UpdateEntryVersionOperation.java         |  11 +-
 .../geode/internal/cache/UpdateOperation.java      |  21 +-
 .../internal/cache/VMCachedDeserializable.java     |   9 +-
 .../internal/cache/backup/BackupResponse.java      |  11 +-
 .../cache/backup/PrepareBackupRequest.java         |  11 +-
 .../CompressedCachedDeserializable.java            |  13 +-
 .../internal/cache/control/ResourceAdvisor.java    |  21 +-
 .../geode/internal/cache/ha/HARegionQueue.java     |   7 +-
 .../internal/cache/ha/QueueRemovalMessage.java     |  11 +-
 .../geode/internal/cache/locks/TXLockBatch.java    |   7 +-
 .../geode/internal/cache/locks/TXLockIdImpl.java   |  17 +-
 .../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    |   7 +-
 .../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 |  21 +-
 .../cache/partitioned/FetchEntriesMessage.java     |  21 +-
 .../cache/partitioned/FetchEntryMessage.java       |  25 +-
 .../cache/partitioned/FetchKeysMessage.java        |  21 +-
 .../partitioned/FetchPartitionDetailsMessage.java  |  25 +-
 .../internal/cache/partitioned/FlushMessage.java   |  11 +-
 .../internal/cache/partitioned/GetMessage.java     |  21 +-
 .../cache/partitioned/IdentityRequestMessage.java  |  21 +-
 .../cache/partitioned/IdentityUpdateMessage.java   |  11 +-
 .../cache/partitioned/IndexCreationMsg.java        |  21 +-
 .../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      |  11 +-
 .../partitioned/PRUpdateEntryVersionMessage.java   |  11 +-
 .../cache/partitioned/PartitionMessage.java        |  16 +-
 .../PartitionedRegionFunctionStreamingMessage.java |  13 +-
 .../cache/partitioned/PrimaryRequestMessage.java   |  21 +-
 .../cache/partitioned/PutAllPRMessage.java         |  21 +-
 .../internal/cache/partitioned/PutMessage.java     |  21 +-
 .../internal/cache/partitioned/QueryMessage.java   |  11 +-
 .../internal/cache/partitioned/RegionAdvisor.java  |  11 +-
 .../cache/partitioned/RemoveAllPRMessage.java      |  21 +-
 .../cache/partitioned/RemoveBucketMessage.java     |  25 +-
 .../cache/partitioned/RemoveIndexesMessage.java    |  21 +-
 .../internal/cache/partitioned/SizeMessage.java    |  21 +-
 .../cache/partitioned/SizedBasedLoadProbe.java     |   7 +-
 .../internal/cache/persistence/DiskStoreID.java    |   7 +-
 .../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 +-
 .../internal/cache/snapshot/SnapshotPacket.java    |  13 +-
 .../tier/sockets/ClientDataSerializerMessage.java  |  11 +-
 .../tier/sockets/ClientDenylistProcessor.java      |  11 +-
 .../tier/sockets/ClientInstantiatorMessage.java    |  11 +-
 .../tier/sockets/ClientInterestMessageImpl.java    |  11 +-
 .../tier/sockets/ClientMarkerMessageImpl.java      |   7 +-
 .../cache/tier/sockets/ClientPingMessageImpl.java  |   7 +-
 .../tier/sockets/ClientProxyMembershipID.java      |   7 +-
 .../cache/tier/sockets/ClientTombstoneMessage.java |   7 +-
 .../tier/sockets/ClientUpdateMessageImpl.java      |   7 +-
 .../cache/tier/sockets/HAEventWrapper.java         |   7 +-
 .../tier/sockets/InterestResultPolicyImpl.java     |   7 +-
 .../cache/tier/sockets/ObjectPartList.java         |   7 +-
 .../cache/tier/sockets/ObjectPartList651.java      |   7 +-
 .../sockets/RemoveClientFromDenylistMessage.java   |  11 +-
 .../tier/sockets/SerializedObjectPartList.java     |   7 +-
 .../sockets/ServerInterestRegistrationMessage.java |  11 +-
 .../cache/tier/sockets/VersionedObjectList.java    |  35 +-
 .../geode/internal/cache/tx/DistTxEntryEvent.java  |   7 +-
 .../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  |  21 +-
 .../internal/cache/tx/RemoteInvalidateMessage.java |  11 +-
 .../internal/cache/tx/RemoteOperationMessage.java  |  16 +-
 .../internal/cache/tx/RemotePutAllMessage.java     |  21 +-
 .../geode/internal/cache/tx/RemotePutMessage.java  |  21 +-
 .../internal/cache/tx/RemoteRemoveAllMessage.java  |  21 +-
 .../geode/internal/cache/tx/RemoteSizeMessage.java |  25 +-
 .../cache/versions/RegionVersionVector.java        |   7 +-
 .../geode/internal/cache/versions/VersionTag.java  |   7 +-
 .../internal/cache/wan/GatewaySenderAdvisor.java   |  21 +-
 .../wan/GatewaySenderEventCallbackArgument.java    |   7 +-
 .../internal/cache/wan/GatewaySenderEventImpl.java |  21 +-
 ...aySenderQueueEntrySynchronizationOperation.java |  17 +-
 .../wan/parallel/ParallelQueueRemovalMessage.java  |  11 +-
 .../cache/wan/serial/BatchDestroyOperation.java    |  11 +-
 .../AbstractSerializationContext.java              |  49 +++
 .../serialization/BufferDataOutputStream.java      |  12 +-
 .../serialization/DSFIDNotFoundException.java      |   4 +-
 .../internal/serialization/DSFIDSerializer.java    | 160 +++++----
 .../serialization/DataSerializableFixedID.java     |  16 +-
 ...alizer.java => DeserializationContextImpl.java} |  22 +-
 ...ctSerializer.java => SerializationContext.java} |  14 +-
 ...rializer.java => SerializationContextImpl.java} |  23 +-
 .../serialization/SerializationVersion.java        |  37 +-
 ...ObjectSerializer.java => SerializerPlugin.java} |  17 +-
 .../serialization/StaticSerialization.java         | 377 +++++++++++++++++++++
 .../ThreadLocalByteArrayCache.java                 |   2 +-
 .../apache/geode/internal/tcp/MsgOutputStream.java |   4 +-
 .../org/apache/geode/internal/tcp/MsgStreamer.java |   3 +-
 .../management/internal/FederationComponent.java   |  10 +-
 .../management/internal/JmxManagerAdvisor.java     |  21 +-
 .../internal/JmxManagerLocatorRequest.java         |   7 +-
 .../internal/JmxManagerLocatorResponse.java        |   7 +-
 .../management/internal/ManagerStartupMessage.java |  11 +-
 .../internal/cli/functions/CliFunctionResult.java  |  23 +-
 .../messages/ConfigurationResponse.java            |   7 +-
 .../internal/messages/CompactRequest.java          |  11 +-
 .../internal/messages/CompactResponse.java         |  11 +-
 .../main/java/org/apache/geode/pdx/FieldType.java  |  24 +-
 .../geode/pdx/internal/CheckTypeRegistryState.java |  11 +-
 .../java/org/apache/geode/pdx/internal/EnumId.java |   7 +-
 .../org/apache/geode/pdx/internal/EnumInfo.java    |   7 +-
 .../locator/LocatorStatusResponseJUnitTest.java    |   4 +-
 .../ResultsBagLimitBehaviourJUnitTest.java         |   4 +-
 .../MembershipDependenciesJUnitTest.java           |  30 +-
 .../membership/gms/GMSMemberJUnitTest.java         |  12 +-
 .../internal/ThreadLocalByteArrayCacheTest.java    |   2 +
 .../cache/ha/EventIdOptimizationJUnitTest.java     |   4 +-
 .../partitioned/PutPutReplyMessageJUnitTest.java   |   4 +-
 .../partitioned/RemotePutMessageJUnitTest.java     |   2 +-
 .../internal/cache/tx/RemotePutAllMessageTest.java |   4 +-
 .../cache/tx/RemotePutReplyMessageJUnitTest.java   |   4 +-
 .../cache/tx/RemoteRemoveAllMessageTest.java       |   4 +-
 .../geode/internal/offheap/DataTypeJUnitTest.java  |   7 +-
 .../SerializationDependenciesJUnitTest.java        |  45 +++
 .../org/apache/geode/pdx/internal/EnumIdTest.java  |   4 +-
 .../apache/geode/pdx/internal/EnumInfoTest.java    |   4 +-
 .../lucene/internal/DestroyLuceneIndexMessage.java |  11 +-
 .../lucene/internal/LuceneResultStructImpl.java    |   7 +-
 .../cache/lucene/internal/StringQueryProvider.java |   7 +-
 .../lucene/internal/distributed/EntryScore.java    |   7 +-
 .../distributed/LuceneFunctionContext.java         |   7 +-
 .../lucene/internal/distributed/TopEntries.java    |   7 +-
 .../internal/distributed/TopEntriesCollector.java  |   7 +-
 .../distributed/TopEntriesCollectorManager.java    |   7 +-
 .../WaitUntilFlushedFunctionContext.java           |   7 +-
 .../cache/lucene/internal/filesystem/ChunkKey.java |   7 +-
 .../cache/lucene/internal/filesystem/File.java     |   7 +-
 .../cache/lucene/internal/results/PageResults.java |   7 +-
 .../internal/locator/wan/LocatorJoinMessage.java   |  11 +-
 .../locator/wan/RemoteLocatorJoinRequest.java      |   7 +-
 .../locator/wan/RemoteLocatorJoinResponse.java     |   7 +-
 .../locator/wan/RemoteLocatorPingRequest.java      |   7 +-
 .../locator/wan/RemoteLocatorPingResponse.java     |   7 +-
 .../internal/locator/wan/RemoteLocatorRequest.java |   7 +-
 .../locator/wan/RemoteLocatorResponse.java         |   7 +-
 411 files changed, 4185 insertions(+), 2241 deletions(-)

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 a3afd62..461fcf4 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/ClusterCommunicationsDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/ClusterCommunicationsDUnitTest.java
@@ -79,6 +79,7 @@ import org.apache.geode.distributed.internal.membership.gms.membership.GMSJoinLe
 import org.apache.geode.internal.AvailablePortHelper;
 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;
@@ -395,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/internal/DateMessage.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/DateMessage.java
index 7296baa..4d23163 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
@@ -24,6 +24,7 @@ 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;
 
 /**
  * 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/internal/BackwardCompatibilitySerializationDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/BackwardCompatibilitySerializationDUnitTest.java
index b6a774c..f89822c 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,9 +32,11 @@ 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.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.SerializationContext;
 import org.apache.geode.internal.serialization.SerializationVersion;
 import org.apache.geode.internal.serialization.SerializationVersions;
 import org.apache.geode.internal.serialization.VersionedDataInputStream;
@@ -199,14 +201,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 {
@@ -246,28 +263,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/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 87e56bb..5454209 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
@@ -254,10 +254,10 @@ public class JGroupsMessengerJUnitTest {
     HeapDataOutputStream out = new HeapDataOutputStream(500, Version.CURRENT);
     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 +276,7 @@ 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), null);
       try {
         messenger.send(msg);
         fail("expected a failure");
@@ -286,7 +286,7 @@ 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), null);
       try {
         messenger.send(msg);
         fail("expected a failure");
@@ -421,7 +421,7 @@ public class JGroupsMessengerJUnitTest {
       if (enableMcast) {
         verify(msg, atLeastOnce()).registerProcessor();
       }
-      verify(msg).toData(isA(DataOutput.class));
+      verify(msg).toData(isA(DataOutput.class), null);
       assertTrue("expected 1 message but found " + interceptor.collectedMessages,
           interceptor.collectedMessages.size() == 1);
       assertTrue(interceptor.collectedMessages.get(0).isFlagSet(Message.Flag.NO_RELIABILITY));
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 a8f333d..31d0903 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.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;
 
 /**
  * Notification to be sent to clients (e.g GFMon2.0 ). It incorporates
@@ -35,7 +35,7 @@ import org.apache.geode.internal.serialization.DataSerializableFixedID;
  * @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/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/locator/ClientConnectionRequest.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/ClientConnectionRequest.java
index 9be89d9..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
@@ -22,6 +22,7 @@ import java.util.Set;
 
 import org.apache.geode.distributed.internal.ServerLocation;
 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 d9c36bb..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
@@ -21,6 +21,7 @@ import java.io.IOException;
 import org.apache.geode.DataSerializer;
 import org.apache.geode.distributed.internal.ServerLocation;
 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 c032ba9..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
@@ -22,6 +22,7 @@ import java.util.Set;
 import org.apache.geode.distributed.internal.ServerLocation;
 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 ce28361..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
@@ -19,6 +19,7 @@ import java.io.DataOutput;
 import java.io.IOException;
 
 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 2433195..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
@@ -21,6 +21,7 @@ import java.util.ArrayList;
 
 import org.apache.geode.distributed.internal.ServerLocation;
 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/LocatorListResponse.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/LocatorListResponse.java
index 7764ee1..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
@@ -21,6 +21,7 @@ import java.util.List;
 
 import org.apache.geode.distributed.internal.ServerLocation;
 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/LocatorStatusResponse.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/LocatorStatusResponse.java
index 9d09864..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
@@ -30,6 +30,7 @@ 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 4caf01c..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
@@ -22,6 +22,7 @@ import java.util.Set;
 import org.apache.geode.DataSerializer;
 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 022453a..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
@@ -22,6 +22,7 @@ import java.util.List;
 import org.apache.geode.DataSerializer;
 import org.apache.geode.distributed.internal.ServerLocation;
 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 0b8a63c..81e28ef 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
@@ -21,6 +21,7 @@ import java.io.IOException;
 import org.apache.geode.DataSerializer;
 import org.apache.geode.internal.Version;
 import org.apache.geode.internal.serialization.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 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/query/internal/CqEntry.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CqEntry.java
index 53b11e1..3cc57f3 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
@@ -22,6 +22,7 @@ import java.io.IOException;
 import org.apache.geode.DataSerializer;
 import org.apache.geode.internal.Version;
 import org.apache.geode.internal.serialization.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 
 /**
@@ -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 5382e71..700e7e1 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
@@ -38,6 +38,7 @@ import org.apache.geode.internal.HeapDataOutputStream;
 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;
 
 /**
  * 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 f01a6e3..8ecca59 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
@@ -34,6 +34,7 @@ import org.apache.geode.cache.query.types.ObjectType;
 import org.apache.geode.cache.query.types.StructType;
 import org.apache.geode.internal.Version;
 import org.apache.geode.internal.serialization.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 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 3df19d4..57d00a7 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
@@ -33,6 +33,7 @@ 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.serialization.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 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 e388351..330f003 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
@@ -39,6 +39,7 @@ import org.apache.geode.internal.HeapDataOutputStream;
 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;
 
 /**
  * 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 75106c8..0a6efcb 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
@@ -22,6 +22,7 @@ import org.apache.geode.cache.query.QueryService;
 import org.apache.geode.cache.query.internal.index.IndexManager;
 import org.apache.geode.internal.Version;
 import org.apache.geode.internal.serialization.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * 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 cc798d1..912a794 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
@@ -25,6 +25,7 @@ import org.apache.geode.distributed.DistributedMember;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
 import org.apache.geode.internal.Version;
 import org.apache.geode.internal.serialization.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 
 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 8f7f8c0..e9bcd29 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
@@ -27,6 +27,7 @@ import org.apache.geode.cache.query.types.ObjectType;
 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;
 
 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 6c65ebf..fc5a3b0 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
@@ -40,6 +40,7 @@ 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;
 
 /**
  * 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 adabcc0..c27b79c 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
@@ -36,6 +36,7 @@ import org.apache.geode.internal.Assert;
 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;
 
 // @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 d46e284..0210298 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
@@ -34,6 +34,7 @@ import org.apache.geode.cache.query.types.ObjectType;
 import org.apache.geode.cache.query.types.StructType;
 import org.apache.geode.internal.Version;
 import org.apache.geode.internal.serialization.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * 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 ccb2392..690be08 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
@@ -34,6 +34,7 @@ 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.serialization.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * 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 618e63f..30a87eb 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
@@ -28,6 +28,7 @@ import org.apache.geode.cache.query.types.ObjectType;
 import org.apache.geode.cache.query.types.StructType;
 import org.apache.geode.internal.Version;
 import org.apache.geode.internal.serialization.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.SerializationContext;
 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 baa6dc5..2680e4c 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
@@ -38,6 +38,7 @@ import org.apache.geode.cache.query.types.ObjectType;
 import org.apache.geode.cache.query.types.StructType;
 import org.apache.geode.internal.Version;
 import org.apache.geode.internal.serialization.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * 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 363c691..6d64b25 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
@@ -23,6 +23,7 @@ import java.io.Serializable;
 import org.apache.geode.cache.query.QueryService;
 import org.apache.geode.internal.Version;
 import org.apache.geode.internal.serialization.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * 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 f180b1d..4d90792 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
@@ -26,6 +26,7 @@ import java.io.IOException;
 import org.apache.geode.cache.query.IndexType;
 import org.apache.geode.internal.Version;
 import org.apache.geode.internal.serialization.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  *
@@ -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 ccabae1..4f44212 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
@@ -24,6 +24,7 @@ import org.apache.geode.cache.query.types.ObjectType;
 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;
 
 /**
  * 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/distributed/internal/DistributionAdvisor.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionAdvisor.java
index ad81f30..610af9c 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
@@ -49,6 +49,7 @@ 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.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/DistributionMessage.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionMessage.java
index 9ebba6b..bc9e04a 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
@@ -38,6 +38,7 @@ 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.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/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/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/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..888ffad 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
@@ -36,6 +36,7 @@ import org.apache.geode.internal.InternalInstantiator.InstantiatorAttributesHold
 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;
 
 /**
  * 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..409a90d 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
@@ -31,6 +31,7 @@ import org.apache.geode.internal.InternalInstantiator.InstantiatorAttributesHold
 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;
 
 /**
  * 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..91fd7b3 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
@@ -26,6 +26,7 @@ import org.apache.geode.distributed.internal.membership.InternalDistributedMembe
 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;
 
 /**
  * @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 c26e055..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 {
@@ -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 22b8ca7..910cd36 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
@@ -24,6 +24,7 @@ import org.apache.geode.distributed.DistributedMember;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
 import org.apache.geode.internal.Version;
 import org.apache.geode.internal.serialization.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * 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 54813c3..da4d100 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
@@ -59,6 +59,7 @@ 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.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 df93ba7..f8d6a95 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
@@ -50,6 +50,7 @@ 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.SerializationVersion;
 
 /**
@@ -860,15 +861,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
@@ -913,7 +916,8 @@ public class InternalDistributedMember implements DistributedMember, Externaliza
     SerializationVersion.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);
@@ -960,8 +964,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()) {
@@ -973,7 +978,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();
 
@@ -1019,7 +1025,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();
 
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..eb28925 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,6 +34,7 @@ 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.InternalDataSerializer;
 import org.apache.geode.internal.Version;
 import org.apache.geode.internal.admin.remote.RemoteTransportConfig;
 import org.apache.geode.internal.net.SocketCreator;
@@ -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/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 0b8b996..4df41a5 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,13 +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.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.SerializationVersion;
+import org.apache.geode.internal.serialization.StaticSerialization;
 
 /**
  * GMSMember is the membership identifier class for Group Membership Services.
@@ -59,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 = SerializationVersion.currentVersion.ordinal();
   private long uuidLSBs;
   private long uuidMSBs;
   private String durableId;
@@ -75,7 +74,7 @@ public class GMSMember implements DataSerializableFixedID {
   public GMSMember() {}
 
   @VisibleForTesting
-  public GMSMember(String localhost, int udpPort, Version version) {
+  public GMSMember(String localhost, int udpPort, SerializationVersion version) {
     this.hostName = localhost;
     this.inetAddr = SocketCreator.toInetAddress(localhost);
     this.udpPort = udpPort;
@@ -97,7 +96,7 @@ public class GMSMember implements DataSerializableFixedID {
    */
   @VisibleForTesting
   public GMSMember(String i, int p) {
-    this(i, p, Version.CURRENT);
+    this(i, p, SerializationVersion.currentVersion);
   }
 
   /**
@@ -432,7 +431,7 @@ public class GMSMember implements DataSerializableFixedID {
   }
 
 
-  public void setVersion(Version v) {
+  public void setVersion(SerializationVersion v) {
     this.versionOrdinal = v.ordinal();
   }
 
@@ -473,7 +472,7 @@ public class GMSMember implements DataSerializableFixedID {
   }
 
   @Override
-  public Version[] getSerializationVersions() {
+  public SerializationVersion[] getSerializationVersions() {
     return null;
   }
 
@@ -489,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())
@@ -510,26 +510,27 @@ 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);
 
     SerializationVersion.writeOrdinal(out, versionOrdinal, true);
 
-    if (versionOrdinal >= Version.GFE_90.ordinal()) {
+    if (versionOrdinal >= SerializationVersion.GFE_90_ORDINAL) {
       writeAdditionalData(out);
     }
   }
 
-  public void writeEssentialData(DataOutput out) throws IOException {
+  public void writeEssentialData(DataOutput out,
+      SerializationContext context) throws IOException {
     SerializationVersion.writeOrdinal(out, this.versionOrdinal, true);
 
     int flags = 0;
@@ -539,23 +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() >= SerializationVersion.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;
@@ -564,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()) {
+    if (versionOrdinal >= SerializationVersion.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 SerializationVersion.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;
+      SerializationVersion v = context.getSerializationVersion();
+      return v.ordinal();
     }
   }
 
@@ -608,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 = SerializationVersion.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)
@@ -625,8 +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() >= SerializationVersion.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 a44d6e5..132e094 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.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.SerializationVersion;
+import org.apache.geode.internal.serialization.StaticSerialization;
 
 /**
  * The GMSMembershipView class represents a membership view. Note that this class is not
@@ -598,66 +598,54 @@ 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);
       }
     }
   }
 
   @Override
-  public Version[] getSerializationVersions() {
+  public SerializationVersion[] getSerializationVersions() {
     return null;
   }
 
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 ce09a5c..554cd00 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.SerializationVersion;
+import org.apache.geode.internal.serialization.StaticSerialization;
 
 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;
     }
-    short ordinal = InternalDataSerializer.getVersionForDataStream(out).ordinal();
-    if (ordinal < Version.GEODE_1_10_0.ordinal()) {
-      writeAsInternalDistributedMember(id, out);
+    short ordinal = context.getSerializationVersion().ordinal();
+    if (ordinal <= SerializationVersion.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..4c24b16 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
@@ -34,6 +34,7 @@ import org.apache.geode.distributed.internal.membership.gms.membership.GMSJoinLe
 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 +49,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 +89,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 +104,7 @@ public class Services {
     this.healthMon = new GMSHealthMonitor();
     this.messenger = new JGroupsMessenger();
     this.auth = authenticator;
+    this.serializer = serializer;
   }
 
   /**
@@ -301,6 +306,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..8d41565 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.SerializationVersion;
 
 /**
  * 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(localAddress.getVersionOrdinal());
     out.writeInt(gmbr.getVmViewId());
     out.writeLong(gmbr.getUuidLSBs());
     out.writeLong(gmbr.getUuidMSBs());
@@ -1387,7 +1387,7 @@ public class GMSHealthMonitor implements HealthMonitor {
 
       if (!failed) {
         if (!isStopping && !initiator.equals(localAddress)
-            && initiator.getVersionOrdinal() >= Version.GEODE_1_4_0.ordinal()) {
+            && initiator.getVersionOrdinal() >= SerializationVersion.GEODE_1_4_0_ORDINAL) {
           // let the sender know that it's okay to monitor this member again
           FinalCheckPassedMessage message = new FinalCheckPassedMessage(initiator, mbr);
           services.getMessenger().send(message);
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..e63a0ec 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.SerializationVersion;
+import org.apache.geode.internal.serialization.StaticSerialization;
 
 public class FindCoordinatorRequest extends AbstractGMSMessage
     implements PeerLocatorRequest {
@@ -87,7 +88,7 @@ public class FindCoordinatorRequest extends AbstractGMSMessage
   }
 
   @Override
-  public Version[] getSerializationVersions() {
+  public SerializationVersion[] getSerializationVersions() {
     return null;
   }
 
@@ -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 0caf10c..a35f963 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.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.SerializationVersion;
+import org.apache.geode.internal.serialization.StaticSerialization;
 
 public class FindCoordinatorResponse extends AbstractGMSMessage
     implements DataSerializableFixedID {
@@ -140,7 +140,7 @@ public class FindCoordinatorResponse extends AbstractGMSMessage
 
 
   @Override
-  public Version[] getSerializationVersions() {
+  public SerializationVersion[] getSerializationVersions() {
     return null;
   }
 
@@ -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..ee0a16a 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,11 @@
  */
 package org.apache.geode.distributed.internal.membership.gms.locator;
 
+import java.io.DataInputStream;
 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 +36,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 +46,11 @@ 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.InternalDataSerializer;
 import org.apache.geode.internal.Version;
-import org.apache.geode.internal.VersionedObjectInput;
 import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.serialization.SerializationVersion;
+import org.apache.geode.internal.serialization.VersionedDataInputStream;
 
 public class GMSLocator implements Locator {
 
@@ -334,8 +335,8 @@ public class GMSLocator implements Locator {
     }
     try (ObjectOutputStream oos = new ObjectOutputStream(new FileOutputStream(viewFile))) {
       oos.writeInt(LOCATOR_FILE_STAMP);
-      oos.writeInt(Version.CURRENT_ORDINAL);
-      DataSerializer.writeObject(view, oos);
+      oos.writeInt(SerializationVersion.getCurrentVersion().ordinal());
+      services.getSerializer().writeDSFID(view, oos);
     } 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 +414,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) {
-        Version geodeVersion = Version.fromOrdinalNoThrow((short) version, false);
-        logger.info("Peer locator found that persistent view was written with {}", geodeVersion);
-        if (version > Version.CURRENT_ORDINAL) {
+      int version = ois.readInt();
+      int currentVersion = SerializationVersion.getCurrentVersion().ordinal();
+      DataInputStream input = new DataInputStream(fileInputStream);
+      if (version != currentVersion) {
+        SerializationVersion geodeVersion = Version.fromOrdinalNoThrow((short) version, false);
+        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 +452,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 528a1a1..a0b536c 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,15 +18,16 @@ import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-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.SerializationVersion;
 
 public class GetViewRequest implements DataSerializableFixedID, PeerLocatorRequest {
 
   public GetViewRequest() {}
 
   @Override
-  public Version[] getSerializationVersions() {
+  public SerializationVersion[] getSerializationVersions() {
     return null;
   }
 
@@ -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 136618c..be5a98d 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.Version;
 import org.apache.geode.internal.serialization.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.SerializationContext;
+import org.apache.geode.internal.serialization.SerializationVersion;
 
 public class GetViewResponse implements DataSerializableFixedID {
 
@@ -40,7 +40,7 @@ public class GetViewResponse implements DataSerializableFixedID {
   }
 
   @Override
-  public Version[] getSerializationVersions() {
+  public SerializationVersion[] getSerializationVersions() {
     return null;
   }
 
@@ -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 4de93ae..341bbcf 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
@@ -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.SerializationVersion;
 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() < SerializationVersion
+            .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/FinalCheckPassedMessage.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/FinalCheckPassedMessage.java
index 1e5fecb..247ffb5 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.SerializationVersion;
 
 public class FinalCheckPassedMessage extends AbstractGMSMessage {
 
@@ -46,18 +47,20 @@ public class FinalCheckPassedMessage extends AbstractGMSMessage {
   }
 
   @Override
-  public Version[] getSerializationVersions() {
+  public SerializationVersion[] getSerializationVersions() {
     return null;
   }
 
   @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..2f3199b 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.SerializationVersion;
 
 public class HeartbeatMessage extends AbstractGMSMessage {
   /**
@@ -49,17 +50,19 @@ public class HeartbeatMessage extends AbstractGMSMessage {
   }
 
   @Override
-  public Version[] getSerializationVersions() {
+  public SerializationVersion[] getSerializationVersions() {
     return null;
   }
 
   @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..3382823 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.SerializationVersion;
 
 public class HeartbeatRequestMessage extends AbstractGMSMessage {
 
@@ -60,19 +61,21 @@ public class HeartbeatRequestMessage extends AbstractGMSMessage {
   }
 
   @Override
-  public Version[] getSerializationVersions() {
+  public SerializationVersion[] getSerializationVersions() {
     return null;
   }
 
   @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..75a15d8 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.SerializationVersion;
 
 public class InstallViewMessage extends AbstractGMSMessage {
 
@@ -69,7 +69,7 @@ public class InstallViewMessage extends AbstractGMSMessage {
   }
 
   @Override
-  public Version[] getSerializationVersions() {
+  public SerializationVersion[] getSerializationVersions() {
     return null;
   }
 
@@ -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..dcbd143 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.SerializationVersion;
 
 public class JoinRequestMessage extends AbstractGMSMessage {
   private GMSMember memberID;
@@ -82,15 +82,16 @@ public class JoinRequestMessage extends AbstractGMSMessage {
   }
 
   @Override
-  public Version[] getSerializationVersions() {
+  public SerializationVersion[] getSerializationVersions() {
     return null;
   }
 
   @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..b5161d5 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.SerializationVersion;
+import org.apache.geode.internal.serialization.StaticSerialization;
 
 // 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
@@ -101,7 +102,7 @@ public class JoinResponseMessage extends AbstractGMSMessage {
   }
 
   @Override
-  public Version[] getSerializationVersions() {
+  public SerializationVersion[] getSerializationVersions() {
     return null;
   }
 
@@ -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..bd65ecb 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.SerializationVersion;
+import org.apache.geode.internal.serialization.StaticSerialization;
 
 public class LeaveRequestMessage extends AbstractGMSMessage implements HasMemberID {
   private GMSMember memberID;
@@ -63,20 +64,22 @@ public class LeaveRequestMessage extends AbstractGMSMessage implements HasMember
   }
 
   @Override
-  public Version[] getSerializationVersions() {
+  public SerializationVersion[] getSerializationVersions() {
     return null;
   }
 
   @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..30c5a34 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.SerializationVersion;
 
 public class NetworkPartitionMessage extends AbstractGMSMessage {
 
@@ -36,17 +37,19 @@ 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 {
 
   }
 
   @Override
-  public Version[] getSerializationVersions() {
+  public SerializationVersion[] getSerializationVersions() {
     return null;
   }
 }
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..1431760 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.SerializationVersion;
+import org.apache.geode.internal.serialization.StaticSerialization;
 
 public class RemoveMemberMessage extends AbstractGMSMessage implements HasMemberID {
   private GMSMember memberID;
@@ -69,20 +70,22 @@ public class RemoveMemberMessage extends AbstractGMSMessage implements HasMember
   }
 
   @Override
-  public Version[] getSerializationVersions() {
+  public SerializationVersion[] getSerializationVersions() {
     return null;
   }
 
   @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..5ed5da9 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.SerializationVersion;
+import org.apache.geode.internal.serialization.StaticSerialization;
 
 public class SuspectMembersMessage extends AbstractGMSMessage {
   final List<SuspectRequest> suspectRequests;
@@ -54,17 +55,18 @@ public class SuspectMembersMessage extends AbstractGMSMessage {
   }
 
   @Override
-  public Version[] getSerializationVersions() {
+  public SerializationVersion[] getSerializationVersions() {
     return null;
   }
 
   @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..d05edc4 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.SerializationVersion;
 
 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
@@ -87,7 +89,7 @@ public class ViewAckMessage extends AbstractGMSMessage {
   }
 
   @Override
-  public Version[] getSerializationVersions() {
+  public SerializationVersion[] getSerializationVersions() {
     return null;
   }
 }
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..5dc615f 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.SerializationVersion;
 
 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,
+        SerializationVersion.getCurrentVersion().ordinal());
   }
 
   public Message createPingMessage(Address src, Address dest) {
-    return createJGMessage(pingInBytes, src, dest, Version.CURRENT_ORDINAL);
+    return createJGMessage(pingInBytes, src, dest,
+        SerializationVersion.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 305a857..fe6a433 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
@@ -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,14 @@ 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.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.SerializationVersion;
+import org.apache.geode.internal.serialization.StaticSerialization;
 import org.apache.geode.internal.serialization.VersionedDataInputStream;
 import org.apache.geode.internal.tcp.MemberShunnedException;
 
@@ -545,7 +543,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,
+        SerializationVersion.getCurrentVersion().ordinal(),
         jgAddress.getUUIDMsbs(), jgAddress.getUUIDLsbs());
     gmsMember.setMemberWeight((byte) (services.getConfig().getMemberWeight() & 0xff));
     gmsMember.setNetworkPartitionDetectionEnabled(
@@ -696,7 +695,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, SerializationVersion.getCurrentVersion().ordinal());
       theStats.endMsgSerialization(startSer);
 
       Exception problem;
@@ -851,9 +851,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));
+      SerializationVersion.writeOrdinal(out_stream,
+          SerializationVersion.getCurrentVersion().ordinal(), true);
       if (encrypt != null) {
         out_stream.writeBoolean(true);
         writeEncryptedMessage(gfmsg, dst, version, out_stream);
@@ -883,11 +885,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);
+      services.getSerializer().writeDSFIDHeader(gfmsg.getDSFID(), out);
       byte[] pk = null;
       int requestId = 0;
       GMSMember pkMbr = null;
@@ -912,11 +914,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) {
@@ -926,7 +929,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);
     }
@@ -951,11 +954,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();
   }
@@ -1005,8 +1010,9 @@ public class JGroupsMessenger implements Messenger {
 
       short ordinal = SerializationVersion.readOrdinal(dis);
 
-      if (ordinal < Version.CURRENT_ORDINAL) {
-        dis = new VersionedDataInputStream(dis, Version.fromOrdinalNoThrow(ordinal, true));
+      if (ordinal < SerializationVersion.getCurrentVersion().ordinal()) {
+        dis = new VersionedDataInputStream(dis,
+            services.getSerializer().getDataSerializer().getVersionForOrdinalOrCurrent(ordinal));
       }
 
       // read
@@ -1055,7 +1061,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 = services.getSerializer().readDSFIDHeader(dis);
     int requestId = dis.readInt();
     long start = services.getStatistics().startUDPMsgDecryption();
     try {
@@ -1082,12 +1088,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
@@ -1101,8 +1107,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 < SerializationVersion.getCurrentVersion().ordinal()) {
+          in = new VersionedDataInputStream(in,
+              services.getSerializer().getDataSerializer().getVersionForOrdinalOrCurrent(ordinal));
         }
 
         GMSMessage result = deserializeMessage(in, ordinal);
@@ -1125,8 +1132,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);
 
@@ -1144,7 +1151,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(
+                      SerializationVersion.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..c217dc8 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
@@ -59,6 +59,7 @@ 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.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/internal/DSFIDFactory.java b/geode-core/src/main/java/org/apache/geode/internal/DSFIDFactory.java
index 7aeecfe..8085c3d 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
@@ -400,6 +400,7 @@ 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.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.SerializationContext;
 import org.apache.geode.management.internal.JmxManagerAdvisor.JmxManagerProfile;
 import org.apache.geode.management.internal.JmxManagerAdvisor.JmxManagerProfileMessage;
 import org.apache.geode.management.internal.JmxManagerLocatorRequest;
@@ -431,12 +432,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();
   }
 
@@ -1054,21 +1057,21 @@ public class DSFIDFactory implements DataSerializableFixedID {
   private static DataSerializableFixedID readDestroyOnDataStore(DataInput in)
       throws IOException, ClassNotFoundException {
     DataSerializableFixedID serializable = new DestroyRegionOnDataStoreMessage();
-    serializable.fromData(in);
+    serializable.fromData(in, null);
     return serializable;
   }
 
   private static DataSerializableFixedID readNullToken(DataInput in)
       throws IOException, ClassNotFoundException {
     DataSerializableFixedID serializable = (NullToken) IndexManager.NULL;
-    serializable.fromData(in);
+    serializable.fromData(in, null);
     return serializable;
   }
 
   private static DataSerializableFixedID readConfigurationResponse(DataInput in)
       throws IOException, ClassNotFoundException {
     DataSerializableFixedID serializable = new ConfigurationResponse();
-    serializable.fromData(in);
+    serializable.fromData(in, null);
     return serializable;
   }
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/ExternalizableDSFID.java b/geode-core/src/main/java/org/apache/geode/internal/ExternalizableDSFID.java
index 692a213..91e7b3f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/ExternalizableDSFID.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/ExternalizableDSFID.java
@@ -22,6 +22,7 @@ import java.io.ObjectInput;
 import java.io.ObjectOutput;
 
 import org.apache.geode.internal.serialization.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * Abstract class for subclasses that want to be Externalizable in addition to being
@@ -36,18 +37,20 @@ public abstract class ExternalizableDSFID implements DataSerializableFixedID, Ex
   public abstract int getDSFID();
 
   @Override
-  public abstract void toData(DataOutput out) throws IOException;
+  public abstract void toData(DataOutput out,
+      SerializationContext context) throws IOException;
 
   @Override
-  public abstract void fromData(DataInput in) throws IOException, ClassNotFoundException;
+  public abstract void fromData(DataInput in,
+      SerializationContext context) throws IOException, ClassNotFoundException;
 
   @Override
   public void writeExternal(ObjectOutput out) throws IOException {
-    toData(out);
+    toData(out, null);
   }
 
   @Override
   public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
-    fromData(in);
+    fromData(in, null);
   }
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/HeapDataOutputStream.java b/geode-core/src/main/java/org/apache/geode/internal/HeapDataOutputStream.java
index f99f371..3bdb8bc 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/HeapDataOutputStream.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/HeapDataOutputStream.java
@@ -23,6 +23,7 @@ import java.nio.channels.SocketChannel;
 
 import org.apache.geode.DataSerializer;
 import org.apache.geode.internal.cache.BytesAndBitsForCompactor;
+import org.apache.geode.internal.serialization.StaticSerialization;
 import org.apache.geode.internal.tcp.ByteBufferInputStream;
 
 /**
@@ -379,7 +380,7 @@ public class HeapDataOutputStream extends
       final int preArraySize = size();
       DataSerializer.writeObject(v, this);
       int arraySize = size() - preArraySize;
-      sizeBuf.put(sizePos, InternalDataSerializer.INT_ARRAY_LEN);
+      sizeBuf.put(sizePos, StaticSerialization.INT_ARRAY_LEN);
       sizeBuf.putInt(sizePos + 1, arraySize);
     }
   }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/InternalDataSerializer.java b/geode-core/src/main/java/org/apache/geode/internal/InternalDataSerializer.java
index af742fe..a1990f9 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/InternalDataSerializer.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/InternalDataSerializer.java
@@ -112,8 +112,11 @@ import org.apache.geode.internal.serialization.DSCODE;
 import org.apache.geode.internal.serialization.DSFIDSerializer;
 import org.apache.geode.internal.serialization.DataSerializableFixedID;
 import org.apache.geode.internal.serialization.DscodeHelper;
+import org.apache.geode.internal.serialization.SerializationContext;
 import org.apache.geode.internal.serialization.SerializationVersion;
 import org.apache.geode.internal.serialization.SerializationVersions;
+import org.apache.geode.internal.serialization.SerializerPlugin;
+import org.apache.geode.internal.serialization.StaticSerialization;
 import org.apache.geode.internal.serialization.VersionedDataStream;
 import org.apache.geode.internal.util.concurrent.CopyOnWriteHashMap;
 import org.apache.geode.pdx.NonPortableClassException;
@@ -140,14 +143,6 @@ import org.apache.geode.pdx.internal.TypeRegistry;
  * @since GemFire 3.5
  */
 public abstract class InternalDataSerializer extends DataSerializer {
-  // array is null
-  public static final byte NULL_ARRAY = -1;
-  /**
-   * array len encoded as int in next 4 bytes
-   *
-   * @since GemFire 5.7
-   */
-  public static final byte INT_ARRAY_LEN = -3;
   public static final boolean LOAD_CLASS_EACH_TIME =
       Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "loadClassOnEveryDeserialization");
   private static final Logger logger = LogService.getLogger();
@@ -246,27 +241,11 @@ public abstract class InternalDataSerializer extends DataSerializer {
   private static final ConcurrentHashMap<String, SerializerAttributesHolder> supportedClassesToHolders =
       new ConcurrentHashMap<>();
   private static final Object listenersSync = new Object();
-  private static final byte TIME_UNIT_NANOSECONDS = -1;
-  private static final byte TIME_UNIT_MICROSECONDS = -2;
-  private static final byte TIME_UNIT_MILLISECONDS = -3;
-  private static final byte TIME_UNIT_SECONDS = -4;
   @MakeNotStatic
   private static final ConcurrentMap<Integer, String> dsfidToClassMap =
       logger.isTraceEnabled(LogMarker.SERIALIZER_WRITE_DSFID_VERBOSE) ? new ConcurrentHashMap<>()
           : null;
-  /**
-   * array len encoded as unsigned short in next 2 bytes
-   *
-   * @since GemFire 5.7
-   */
-  private static final byte SHORT_ARRAY_LEN = -2;
-  private static final int MAX_BYTE_ARRAY_LEN = (byte) -4 & 0xFF;
   private static final ThreadLocal<Boolean> pdxSerializationInProgress = new ThreadLocal<>();
-  // Variable Length long encoded as int in next 4 bytes
-  private static final byte INT_VL = 126;
-  // Variable Length long encoded as long in next 8 bytes
-  private static final byte LONG_VL = 127;
-  private static final int MAX_BYTE_VL = 125;
   @MakeNotStatic
   private static final CopyOnWriteHashMap<String, WeakReference<Class<?>>> classCache =
       LOAD_CLASS_EACH_TIME ? null : new CopyOnWriteHashMap<>();
@@ -294,7 +273,7 @@ public abstract class InternalDataSerializer extends DataSerializer {
   @MakeNotStatic
   private static OldClientSupportService oldClientSupportService;
 
-  private static final DSFIDSerializer dsfidSerializer = new DSFIDSerializer();
+  private static final DSFIDSerializer dsfidSerializer;
 
   private static DSFIDFactory dsfidFactory;
 
@@ -306,6 +285,22 @@ public abstract class InternalDataSerializer extends DataSerializer {
   private static volatile Set<RegistrationListener> listeners = new HashSet<>();
 
   static {
+    dsfidSerializer = new DSFIDSerializer(new SerializerPlugin() {
+      @Override
+      public void writeObject(Object obj, DataOutput output) throws IOException {
+        InternalDataSerializer.writeObject(obj, output);
+      }
+
+      @Override
+      public Object readObject(DataInput input) throws IOException, ClassNotFoundException {
+        return InternalDataSerializer.readObject(input);
+      }
+
+      @Override
+      public SerializationVersion getVersionForOrdinalOrCurrent(int ordinal) {
+        return Version.fromOrdinalOrCurrent((short) ordinal);
+      }
+    });
     initializeWellKnownSerializers();
     dsfidFactory = new DSFIDFactory(dsfidSerializer);
     dsfidFactory.registerDSFIDTypes();
@@ -676,22 +671,22 @@ public abstract class InternalDataSerializer extends DataSerializer {
         switch (timeUnit) {
           case NANOSECONDS: {
             out.writeByte(DSCODE.TIME_UNIT.toByte());
-            out.writeByte(TIME_UNIT_NANOSECONDS);
+            out.writeByte(StaticSerialization.TIME_UNIT_NANOSECONDS);
             break;
           }
           case MICROSECONDS: {
             out.writeByte(DSCODE.TIME_UNIT.toByte());
-            out.writeByte(TIME_UNIT_MICROSECONDS);
+            out.writeByte(StaticSerialization.TIME_UNIT_MICROSECONDS);
             break;
           }
           case MILLISECONDS: {
             out.writeByte(DSCODE.TIME_UNIT.toByte());
-            out.writeByte(TIME_UNIT_MILLISECONDS);
+            out.writeByte(StaticSerialization.TIME_UNIT_MILLISECONDS);
             break;
           }
           case SECONDS: {
             out.writeByte(DSCODE.TIME_UNIT.toByte());
-            out.writeByte(TIME_UNIT_SECONDS);
+            out.writeByte(StaticSerialization.TIME_UNIT_SECONDS);
             break;
           }
           // handles all other timeunits
@@ -1484,13 +1479,13 @@ public abstract class InternalDataSerializer extends DataSerializer {
 
   public static void writeDSFID(DataSerializableFixedID o, int dsfid, DataOutput out)
       throws IOException {
-    if (dsfid != DataSerializableFixedID.NO_FIXED_ID) {
-      dsfidSerializer.writeDSFID(o, dsfid, out);
-      return;
-    }
-    out.writeByte(DSCODE.DS_NO_FIXED_ID.toByte());
-    DataSerializer.writeClass(o.getClass(), out);
     try {
+      if (dsfid != DataSerializableFixedID.NO_FIXED_ID) {
+        dsfidSerializer.writeDSFID(o, dsfid, out);
+        return;
+      }
+      out.writeByte(DSCODE.DS_NO_FIXED_ID.toByte());
+      DataSerializer.writeClass(o.getClass(), out);
       invokeToData(o, out);
     } catch (IOException | CancelException | ToDataException | GemFireRethrowable io) {
       // Note: this is not a user code toData but one from our
@@ -1905,16 +1900,16 @@ public abstract class InternalDataSerializer extends DataSerializer {
 
     TimeUnit unit;
     switch (type) {
-      case TIME_UNIT_NANOSECONDS:
+      case StaticSerialization.TIME_UNIT_NANOSECONDS:
         unit = TimeUnit.NANOSECONDS;
         break;
-      case TIME_UNIT_MICROSECONDS:
+      case StaticSerialization.TIME_UNIT_MICROSECONDS:
         unit = TimeUnit.MICROSECONDS;
         break;
-      case TIME_UNIT_MILLISECONDS:
+      case StaticSerialization.TIME_UNIT_MILLISECONDS:
         unit = TimeUnit.MILLISECONDS;
         break;
-      case TIME_UNIT_SECONDS:
+      case StaticSerialization.TIME_UNIT_SECONDS:
         unit = TimeUnit.SECONDS;
         break;
       default:
@@ -2270,12 +2265,12 @@ public abstract class InternalDataSerializer extends DataSerializer {
    * @param out the output stream.
    */
   public static void invokeToData(Object ds, DataOutput out) throws IOException {
-    boolean isDSFID = ds instanceof DataSerializableFixedID;
-    if (isDSFID) {
-      dsfidSerializer.invokeToData(ds, out);
-      return;
-    }
     try {
+      boolean isDSFID = ds instanceof DataSerializableFixedID;
+      if (isDSFID) {
+        dsfidSerializer.invokeToData(ds, out);
+        return;
+      }
       boolean invoked = false;
       Version v = InternalDataSerializer.getVersionForDataStreamOrNull(out);
 
@@ -2471,28 +2466,28 @@ public abstract class InternalDataSerializer extends DataSerializer {
 
   public static void writeArrayLength(int len, DataOutput out) throws IOException {
     if (len == -1) {
-      out.writeByte(NULL_ARRAY);
-    } else if (len <= MAX_BYTE_ARRAY_LEN) {
+      out.writeByte(StaticSerialization.NULL_ARRAY);
+    } else if (len <= StaticSerialization.MAX_BYTE_ARRAY_LEN) {
       out.writeByte(len);
     } else if (len <= 0xFFFF) {
-      out.writeByte(SHORT_ARRAY_LEN);
+      out.writeByte(StaticSerialization.SHORT_ARRAY_LEN);
       out.writeShort(len);
     } else {
-      out.writeByte(INT_ARRAY_LEN);
+      out.writeByte(StaticSerialization.INT_ARRAY_LEN);
       out.writeInt(len);
     }
   }
 
   public static int readArrayLength(DataInput in) throws IOException {
     byte code = in.readByte();
-    if (code == NULL_ARRAY) {
+    if (code == StaticSerialization.NULL_ARRAY) {
       return -1;
     } else {
       int result = ubyteToInt(code);
-      if (result > MAX_BYTE_ARRAY_LEN) {
-        if (code == SHORT_ARRAY_LEN) {
+      if (result > StaticSerialization.MAX_BYTE_ARRAY_LEN) {
+        if (code == StaticSerialization.SHORT_ARRAY_LEN) {
           return in.readUnsignedShort();
-        } else if (code == INT_ARRAY_LEN) {
+        } else if (code == StaticSerialization.INT_ARRAY_LEN) {
           return in.readInt();
         } else {
           throw new IllegalStateException("unexpected array length code=" + code);
@@ -2577,21 +2572,6 @@ public abstract class InternalDataSerializer extends DataSerializer {
     return in.readUTF();
   }
 
-  @MakeNotStatic("not tied to the cache lifecycle")
-  private static final ThreadLocalByteArrayCache threadLocalByteArrayCache =
-      new ThreadLocalByteArrayCache(65535);
-
-  /**
-   * Returns a byte array for use by the calling thread.
-   * The returned byte array may be longer than minimumLength.
-   * The byte array belongs to the calling thread but callers must
-   * be careful to not call other methods that may also use this
-   * byte array.
-   */
-  public static byte[] getThreadLocalByteArray(int minimumLength) {
-    return threadLocalByteArrayCache.get(minimumLength);
-  }
-
   private static String readStringBytesFromDataInput(DataInput dataInput, int len)
       throws IOException {
     if (logger.isTraceEnabled(LogMarker.SERIALIZER_VERBOSE)) {
@@ -2600,7 +2580,7 @@ public abstract class InternalDataSerializer extends DataSerializer {
     if (len == 0) {
       return "";
     }
-    byte[] buf = getThreadLocalByteArray(len);
+    byte[] buf = StaticSerialization.getThreadLocalByteArray(len);
     dataInput.readFully(buf, 0, len);
     return new String(buf, 0, 0, len); // intentionally using deprecated constructor
   }
@@ -3100,17 +3080,17 @@ public abstract class InternalDataSerializer extends DataSerializer {
     if (data < 0) {
       Assert.fail("Data expected to be >=0 is " + data);
     }
-    if (data <= MAX_BYTE_VL) {
+    if (data <= StaticSerialization.MAX_BYTE_VL) {
       out.writeByte((byte) data);
     } else if (data <= 0x7FFF) {
       // set the sign bit to indicate a short
       out.write(((int) data >>> 8 | 0x80) & 0xFF);
       out.write((int) data & 0xFF);
     } else if (data <= Integer.MAX_VALUE) {
-      out.writeByte(INT_VL);
+      out.writeByte(StaticSerialization.INT_VL);
       out.writeInt((int) data);
     } else {
-      out.writeByte(LONG_VL);
+      out.writeByte(StaticSerialization.LONG_VL);
       out.writeLong(data);
     }
   }
@@ -3127,9 +3107,9 @@ public abstract class InternalDataSerializer extends DataSerializer {
       result = code & 0x7F;
       result <<= 8;
       result |= in.readByte() & 0xFF;
-    } else if (code <= MAX_BYTE_VL) {
+    } else if (code <= StaticSerialization.MAX_BYTE_VL) {
       result = code;
-    } else if (code == INT_VL) {
+    } else if (code == StaticSerialization.INT_VL) {
       result = in.readInt();
     } else {
       result = in.readLong();
@@ -3602,16 +3582,18 @@ public abstract class InternalDataSerializer extends DataSerializer {
     }
 
     @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.writeNonPrimitiveClassName(this.className, out);
       out.writeInt(this.id);
       DataSerializer.writeObject(this.eventId, out);
     }
 
     @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);
       InternalDataSerializer.checkIn(in);
       this.className = DataSerializer.readNonPrimitiveClassName(in);
       this.id = in.readInt();
diff --git a/geode-core/src/main/java/org/apache/geode/internal/InternalInstantiator.java b/geode-core/src/main/java/org/apache/geode/internal/InternalInstantiator.java
index dcdabab..f544f54 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/InternalInstantiator.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/InternalInstantiator.java
@@ -45,6 +45,7 @@ import org.apache.geode.internal.cache.tier.sockets.ClientInstantiatorMessage;
 import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
 import org.apache.geode.internal.cache.tier.sockets.Part;
 import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * Contains the implementation of {@link org.apache.geode.Instantiator} registration and
@@ -807,8 +808,9 @@ public class InternalInstantiator {
     }
 
     @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.writeNonPrimitiveClassName(instantiatorClass.getName(), out);
       DataSerializer.writeNonPrimitiveClassName(instantiatedClass.getName(), out);
       out.writeInt(id);
@@ -825,9 +827,10 @@ public class InternalInstantiator {
     }
 
     @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);
       instantiatorClassName = DataSerializer.readNonPrimitiveClassName(in);
       instantiatedClassName = DataSerializer.readNonPrimitiveClassName(in);
       if (CacheClientNotifier.getInstance() != null) {
@@ -917,15 +920,17 @@ public class InternalInstantiator {
     }
 
     @Override
-    public void fromData(DataInput in) throws IOException, ClassNotFoundException {
-      super.fromData(in);
-      context = ClientProxyMembershipID.readCanonicalized(in);
+    public void fromData(DataInput in,
+        SerializationContext context) throws IOException, ClassNotFoundException {
+      super.fromData(in, context);
+      this.context = ClientProxyMembershipID.readCanonicalized(in);
     }
 
     @Override
-    public void toData(DataOutput out) throws IOException {
-      super.toData(out);
-      DataSerializer.writeObject(context, out);
+    public void toData(DataOutput out,
+        SerializationContext context) throws IOException {
+      super.toData(out, context);
+      DataSerializer.writeObject(this.context, out);
     }
   }
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/Version.java b/geode-core/src/main/java/org/apache/geode/internal/Version.java
index 71243ea..b92d660 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/Version.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/Version.java
@@ -295,6 +295,11 @@ public class Version extends SerializationVersion {
   public static final Version TEST_VERSION = new Version("TEST", "VERSION", (byte) 0, (byte) 0,
       (byte) 0, (byte) 0, validOrdinalForTesting);
 
+  static {
+    /* establish the serialization version for DSFID serialization */
+    SerializationVersion.setCurrentVersion(CURRENT);
+  }
+
   /** Creates a new instance of <code>Version</code> */
   private Version(String product, String name, byte major, byte minor, byte release, byte patch,
       byte ordinal) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/ClientMembershipMessage.java b/geode-core/src/main/java/org/apache/geode/internal/admin/ClientMembershipMessage.java
index 9f4a71c..a82d8d8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/ClientMembershipMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/ClientMembershipMessage.java
@@ -24,6 +24,7 @@ import org.apache.geode.distributed.internal.ClusterDistributionManager;
 import org.apache.geode.distributed.internal.PooledDistributionMessage;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
 import org.apache.geode.internal.serialization.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * A PooledDistributionMessage for notifying admin members about changes in Client Membership
@@ -94,16 +95,18 @@ public class ClientMembershipMessage extends PooledDistributionMessage {
   }
 
   @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.clientId, out);
     DataSerializer.writeString(this.clientHost, out);
     out.writeInt(this.eventType);
   }
 
   @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.clientId = DataSerializer.readString(in);
     this.clientHost = DataSerializer.readString(in);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AddHealthListenerRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AddHealthListenerRequest.java
index 5414cf8..5e0a9af 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AddHealthListenerRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AddHealthListenerRequest.java
@@ -23,6 +23,7 @@ import java.io.IOException;
 import org.apache.geode.DataSerializer;
 import org.apache.geode.admin.GemFireHealthConfig;
 import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * A message that is sent to a particular distribution manager to add a health listener.
@@ -68,14 +69,16 @@ public class AddHealthListenerRequest extends AdminRequest {
   }
 
   @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.cfg, out);
   }
 
   @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.cfg = (GemFireHealthConfig) DataSerializer.readObject(in);
   }
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AddHealthListenerResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AddHealthListenerResponse.java
index c6c0d22..c33f331 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AddHealthListenerResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AddHealthListenerResponse.java
@@ -23,6 +23,7 @@ import java.io.IOException;
 import org.apache.geode.admin.GemFireHealthConfig;
 import org.apache.geode.distributed.internal.DistributionManager;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * The response to adding a health listener.
@@ -57,14 +58,16 @@ public class AddHealthListenerResponse extends AdminResponse {
   }
 
   @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.listenerId);
   }
 
   @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.listenerId = in.readInt();
   }
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AddStatListenerRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AddStatListenerRequest.java
index 15adf6a..a919635 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AddStatListenerRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AddStatListenerRequest.java
@@ -23,6 +23,7 @@ import java.io.IOException;
 import org.apache.geode.distributed.internal.DistributionManager;
 import org.apache.geode.internal.admin.Stat;
 import org.apache.geode.internal.admin.StatResource;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * A message that is sent to a particular distribution manager to add a statistic listener.
@@ -62,15 +63,17 @@ public class AddStatListenerRequest extends AdminRequest {
   }
 
   @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.resourceId);
     out.writeUTF(this.statName);
   }
 
   @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.resourceId = in.readLong();
     this.statName = in.readUTF();
   }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AddStatListenerResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AddStatListenerResponse.java
index 0eed539..54fb91c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AddStatListenerResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AddStatListenerResponse.java
@@ -22,6 +22,7 @@ import java.io.IOException;
 
 import org.apache.geode.distributed.internal.DistributionManager;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.serialization.SerializationContext;
 import org.apache.geode.internal.statistics.GemFireStatSampler;
 
 /**
@@ -59,14 +60,16 @@ public class AddStatListenerResponse extends AdminResponse {
   }
 
   @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.listenerId);
   }
 
   @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.listenerId = in.readInt();
   }
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AdminConsoleDisconnectMessage.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AdminConsoleDisconnectMessage.java
index e37c109..903d855 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AdminConsoleDisconnectMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AdminConsoleDisconnectMessage.java
@@ -25,6 +25,7 @@ import org.apache.geode.distributed.internal.ClusterDistributionManager;
 import org.apache.geode.distributed.internal.InternalDistributedSystem;
 import org.apache.geode.distributed.internal.PooledDistributionMessage;
 import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.serialization.SerializationContext;
 import org.apache.geode.internal.statistics.GemFireStatSampler;
 
 /**
@@ -95,16 +96,18 @@ public class AdminConsoleDisconnectMessage extends PooledDistributionMessage {
   }
 
   @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(alertListenerExpected);
     out.writeBoolean(crashed);
     DataSerializer.writeString(reason, out);
   }
 
   @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);
     alertListenerExpected = in.readBoolean();
     crashed = in.readBoolean();
     reason = DataSerializer.readString(in);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AdminConsoleMessage.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AdminConsoleMessage.java
index 6b46835..1d3ff84 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AdminConsoleMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AdminConsoleMessage.java
@@ -22,6 +22,7 @@ import org.apache.geode.distributed.internal.ClusterDistributionManager;
 import org.apache.geode.distributed.internal.PooledDistributionMessage;
 import org.apache.geode.internal.admin.Alert;
 import org.apache.geode.internal.alerting.AlertLevel;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * A message that is sent to a particular distribution manager to let it know that the sender is an
@@ -55,14 +56,16 @@ public class AdminConsoleMessage extends PooledDistributionMessage {
   }
 
   @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(level);
   }
 
   @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);
     level = in.readInt();
   }
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AdminFailureResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AdminFailureResponse.java
index b709cf5..9f548a0 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AdminFailureResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AdminFailureResponse.java
@@ -20,6 +20,7 @@ import java.io.IOException;
 
 import org.apache.geode.DataSerializer;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * A response to a failed request.
@@ -49,14 +50,16 @@ public class AdminFailureResponse extends AdminResponse {
   }
 
   @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.cause, out);
   }
 
   @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.cause = DataSerializer.readObject(in);
   }
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AdminRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AdminRequest.java
index badaee9..d68f760 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AdminRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AdminRequest.java
@@ -30,6 +30,7 @@ import org.apache.geode.distributed.internal.PooledDistributionMessage;
 import org.apache.geode.distributed.internal.ReplyException;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
 import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * A message that is sent to a particular distribution manager to make an administration request.
@@ -150,15 +151,17 @@ public abstract class AdminRequest extends PooledDistributionMessage {
   protected abstract AdminResponse createResponse(DistributionManager dm);
 
   @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.msgId);
     DataSerializer.writeString(this.modifiedClasspath, out);
   }
 
   @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.msgId = in.readInt();
     this.modifiedClasspath = DataSerializer.readString(in);
   }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AdminResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AdminResponse.java
index 8ea78dd..51e53bb 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AdminResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AdminResponse.java
@@ -24,6 +24,7 @@ import org.apache.geode.distributed.internal.AdminMessageType;
 import org.apache.geode.distributed.internal.ClusterDistributionManager;
 import org.apache.geode.distributed.internal.HighPriorityDistributionMessage;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * A message that is sent as a reply to a {@link AdminRequest}.
@@ -59,16 +60,18 @@ public abstract class AdminResponse extends HighPriorityDistributionMessage
   }
 
   @Override
-  public void toData(DataOutput out) throws IOException {
+  public void toData(DataOutput out,
+      SerializationContext context) throws IOException {
     // System.out.println("BEGIN AdminResponse toData");
-    super.toData(out);
+    super.toData(out, context);
     out.writeInt(this.msgId);
     // System.out.println("END AdminResponse toData");
   }
 
   @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.msgId = in.readInt();
   }
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AlertLevelChangeMessage.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AlertLevelChangeMessage.java
index 5a7414d..f551ad3 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AlertLevelChangeMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AlertLevelChangeMessage.java
@@ -25,6 +25,7 @@ import org.apache.geode.distributed.internal.SerialDistributionMessage;
 import org.apache.geode.internal.alerting.AlertLevel;
 import org.apache.geode.internal.logging.LogService;
 import org.apache.geode.internal.logging.log4j.LogMarker;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * A message that is sent to make members of the distributed system aware that a manager agent wants
@@ -66,14 +67,16 @@ public class AlertLevelChangeMessage 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);
     out.writeInt(newLevel);
   }
 
   @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);
     newLevel = in.readInt();
   }
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AlertListenerMessage.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AlertListenerMessage.java
index e471fff..23a6688 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AlertListenerMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AlertListenerMessage.java
@@ -31,6 +31,7 @@ import org.apache.geode.distributed.internal.PooledDistributionMessage;
 import org.apache.geode.distributed.internal.ResourceEvent;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
 import org.apache.geode.internal.admin.Alert;
+import org.apache.geode.internal.serialization.SerializationContext;
 import org.apache.geode.management.internal.AlertDetails;
 
 /**
@@ -129,8 +130,9 @@ public class AlertListenerMessage extends PooledDistributionMessage implements A
   }
 
   @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(alertLevel);
     DataSerializer.writeObject(date, out);
     DataSerializer.writeString(connectionName, out);
@@ -141,8 +143,9 @@ public class AlertListenerMessage extends PooledDistributionMessage implements A
   }
 
   @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);
     alertLevel = in.readInt();
     date = DataSerializer.readObject(in);
     connectionName = DataSerializer.readString(in);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AlertsNotificationMessage.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AlertsNotificationMessage.java
index 69068b5..2eaf366 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AlertsNotificationMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AlertsNotificationMessage.java
@@ -24,6 +24,7 @@ import org.apache.geode.admin.jmx.internal.StatAlertsAggregator;
 import org.apache.geode.distributed.internal.ClusterDistributionManager;
 import org.apache.geode.distributed.internal.PooledDistributionMessage;
 import org.apache.geode.internal.admin.StatAlert;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * Distribution message to be sent to alert aggregator {@link StatAlertsAggregator} It wraps alert
@@ -38,14 +39,16 @@ public class AlertsNotificationMessage extends PooledDistributionMessage {
   public AlertsNotificationMessage() {}
 
   @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.writeObjectArray(this._alerts, out);
   }
 
   @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._alerts = (StatAlert[]) DataSerializer.readObjectArray(in);
   }
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AppCacheSnapshotMessage.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AppCacheSnapshotMessage.java
index 2a62534..ed8e1ad 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AppCacheSnapshotMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AppCacheSnapshotMessage.java
@@ -24,6 +24,7 @@ import org.apache.geode.GemFireCacheException;
 import org.apache.geode.cache.CacheException;
 import org.apache.geode.cache.Region;
 import org.apache.geode.distributed.internal.ClusterDistributionManager;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 public class AppCacheSnapshotMessage extends RegionAdminMessage {
   // private int numResults;
@@ -107,15 +108,17 @@ public class AppCacheSnapshotMessage extends RegionAdminMessage {
   }
 
   @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(numResults);
     out.writeInt(snapshotId);
   }
 
   @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.numResults = in.readInt();
     this.snapshotId = in.readInt();
   }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/BridgeServerRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/BridgeServerRequest.java
index 7041fd7..f04af02 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/BridgeServerRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/BridgeServerRequest.java
@@ -21,6 +21,7 @@ import java.io.IOException;
 import org.apache.geode.DataSerializer;
 import org.apache.geode.distributed.internal.DistributionManager;
 import org.apache.geode.internal.admin.CacheInfo;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * A message that is sent to a VM that hosts a cache to perform an administrative operation on one
@@ -170,8 +171,9 @@ public class BridgeServerRequest extends AdminRequest {
   }
 
   @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.cacheId);
     out.writeInt(this.operation);
     DataSerializer.writeObject(this.bridgeInfo, out);
@@ -179,8 +181,9 @@ public class BridgeServerRequest extends AdminRequest {
   }
 
   @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.cacheId = in.readInt();
     this.operation = in.readInt();
     this.bridgeInfo = (RemoteBridgeServer) DataSerializer.readObject(in);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/BridgeServerResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/BridgeServerResponse.java
index 5aaeb9a..02007a4 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/BridgeServerResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/BridgeServerResponse.java
@@ -26,6 +26,7 @@ import org.apache.geode.distributed.internal.DistributionManager;
 import org.apache.geode.internal.Assert;
 import org.apache.geode.internal.cache.CacheServerImpl;
 import org.apache.geode.internal.cache.InternalCache;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * A message that is sent in response to a {@link BridgeServerResponse}. It perform an operation on
@@ -148,15 +149,17 @@ public class BridgeServerResponse extends AdminResponse {
   }
 
   @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.bridgeInfo, out);
     DataSerializer.writeObject(this.exception, out);
   }
 
   @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.bridgeInfo = DataSerializer.readObject(in);
     this.exception = DataSerializer.readObject(in);
   }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CacheConfigRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CacheConfigRequest.java
index c1a140b..da1a00a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CacheConfigRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CacheConfigRequest.java
@@ -22,6 +22,7 @@ import java.io.IOException;
 
 import org.apache.geode.distributed.internal.DistributionManager;
 import org.apache.geode.internal.admin.CacheInfo;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * A message that is sent to a particular distribution manager to get information on its current
@@ -64,16 +65,18 @@ public class CacheConfigRequest extends AdminRequest {
   }
 
   @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.attributeCode);
     out.writeInt(this.newValue);
     out.writeInt(this.cacheId);
   }
 
   @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.attributeCode = in.readByte();
     this.newValue = in.readInt();
     this.cacheId = in.readInt();
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CacheConfigResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CacheConfigResponse.java
index 0aae5ff..5a81f4b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CacheConfigResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CacheConfigResponse.java
@@ -25,6 +25,7 @@ import org.apache.geode.distributed.internal.DistributionManager;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
 import org.apache.geode.internal.Assert;
 import org.apache.geode.internal.cache.InternalCache;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * A message that is sent in response to a {@link CacheConfigRequest}.
@@ -96,15 +97,17 @@ public class CacheConfigResponse extends AdminResponse {
   }
 
   @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.info, out);
     DataSerializer.writeObject(this.exception, out);
   }
 
   @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.info = DataSerializer.readObject(in);
     this.exception = DataSerializer.readObject(in);
   }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CacheInfoRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CacheInfoRequest.java
index cfc095d..c7fac94 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CacheInfoRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CacheInfoRequest.java
@@ -21,6 +21,7 @@ import java.io.DataOutput;
 import java.io.IOException;
 
 import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * A message that is sent to a particular distribution manager to get information on its current
@@ -56,13 +57,15 @@ public class CacheInfoRequest extends AdminRequest {
   }
 
   @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
-  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
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CacheInfoResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CacheInfoResponse.java
index f6191c5..3011d47 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CacheInfoResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CacheInfoResponse.java
@@ -24,6 +24,7 @@ import org.apache.geode.cache.CacheFactory;
 import org.apache.geode.distributed.internal.DistributionManager;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
 import org.apache.geode.internal.cache.InternalCache;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * A message that is sent in response to a {@link CacheInfoRequest}.
@@ -60,14 +61,16 @@ public class CacheInfoResponse extends AdminResponse {
   }
 
   @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.info, out);
   }
 
   @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.info = (RemoteCacheInfo) DataSerializer.readObject(in);
   }
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CancelStatListenerRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CancelStatListenerRequest.java
index 14489df..80d72dd 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CancelStatListenerRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CancelStatListenerRequest.java
@@ -21,6 +21,7 @@ import java.io.DataOutput;
 import java.io.IOException;
 
 import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * A message that is sent to a particular distribution manager to get rid of a previously added
@@ -57,14 +58,16 @@ public class CancelStatListenerRequest extends AdminRequest {
   }
 
   @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.listenerId);
   }
 
   @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.listenerId = in.readInt();
   }
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CancelStatListenerResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CancelStatListenerResponse.java
index ec4d260..ab8de06 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CancelStatListenerResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CancelStatListenerResponse.java
@@ -22,6 +22,7 @@ import java.io.IOException;
 
 import org.apache.geode.distributed.internal.DistributionManager;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.serialization.SerializationContext;
 import org.apache.geode.internal.statistics.GemFireStatSampler;
 
 /**
@@ -54,13 +55,15 @@ public class CancelStatListenerResponse extends AdminResponse {
   }
 
   @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
-  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
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CancellationMessage.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CancellationMessage.java
index 8a9ecb8..d599edf 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CancellationMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CancellationMessage.java
@@ -22,6 +22,7 @@ import java.io.IOException;
 import org.apache.geode.distributed.internal.ClusterDistributionManager;
 import org.apache.geode.distributed.internal.PooledDistributionMessage;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * A message that is sent to a particular distribution manager to cancel an admin request
@@ -48,14 +49,16 @@ public class CancellationMessage extends PooledDistributionMessage {
   }
 
   @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(msgToCancel);
   }
 
   @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);
     msgToCancel = in.readInt();
   }
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ChangeRefreshIntervalMessage.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ChangeRefreshIntervalMessage.java
index 725a0ab..d0e81b2 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ChangeRefreshIntervalMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ChangeRefreshIntervalMessage.java
@@ -22,6 +22,7 @@ import org.apache.geode.distributed.internal.ClusterDistributionManager;
 import org.apache.geode.distributed.internal.InternalDistributedSystem;
 import org.apache.geode.distributed.internal.PooledDistributionMessage;
 import org.apache.geode.internal.admin.StatAlertsManager;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * Distribution message, sets refresh time interval in member's alerts manager
@@ -47,14 +48,16 @@ public class ChangeRefreshIntervalMessage extends PooledDistributionMessage {
   }
 
   @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(_refreshInterval);
   }
 
   @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);
     _refreshInterval = in.readLong();
   }
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ClientHealthStats.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ClientHealthStats.java
index 8e36bc4..077841a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ClientHealthStats.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ClientHealthStats.java
@@ -27,6 +27,7 @@ import org.apache.geode.DataSerializer;
 import org.apache.geode.annotations.Immutable;
 import org.apache.geode.internal.Version;
 import org.apache.geode.internal.serialization.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * Bean class act as container for client stats
@@ -223,7 +224,8 @@ public class ClientHealthStats implements DataSerializableFixedID, Serializable
   }
 
   @Override
-  public void toData(DataOutput out) throws IOException {
+  public void toData(DataOutput out,
+      SerializationContext context) throws IOException {
     DataSerializer.writePrimitiveLong(numOfGets, out);
     DataSerializer.writePrimitiveLong(numOfPuts, out);
     DataSerializer.writePrimitiveLong(numOfMisses, out);
@@ -235,7 +237,8 @@ public class ClientHealthStats implements DataSerializableFixedID, Serializable
     DataSerializer.writeHashMap((poolStats), out);
   }
 
-  public void toDataPre_GFE_8_0_0_0(DataOutput out) throws IOException {
+  public void toDataPre_GFE_8_0_0_0(DataOutput out, SerializationContext context)
+      throws IOException {
     DataSerializer.writePrimitiveInt((int) numOfGets, out);
     DataSerializer.writePrimitiveInt((int) numOfPuts, out);
     DataSerializer.writePrimitiveInt((int) numOfMisses, out);
@@ -246,13 +249,15 @@ public class ClientHealthStats implements DataSerializableFixedID, Serializable
     DataSerializer.writeDate(updateTime, out);
   }
 
-  public void toDataPre_GEODE_1_9_0_0(DataOutput out) throws IOException {
-    toDataPre_GFE_8_0_0_0(out);
+  public void toDataPre_GEODE_1_9_0_0(DataOutput out, SerializationContext context)
+      throws IOException {
+    toDataPre_GFE_8_0_0_0(out, context);
     DataSerializer.writeHashMap((poolStats), out);
   }
 
   @Override
-  public void fromData(DataInput in) throws IOException, ClassNotFoundException {
+  public void fromData(DataInput in,
+      SerializationContext context) throws IOException, ClassNotFoundException {
     this.numOfGets = DataSerializer.readPrimitiveLong(in);
     this.numOfPuts = DataSerializer.readPrimitiveLong(in);
     this.numOfMisses = DataSerializer.readPrimitiveLong(in);
@@ -264,7 +269,8 @@ public class ClientHealthStats implements DataSerializableFixedID, Serializable
     this.poolStats = DataSerializer.readHashMap(in);
   }
 
-  public void fromDataPre_GFE_8_0_0_0(DataInput in) throws IOException, ClassNotFoundException {
+  public void fromDataPre_GFE_8_0_0_0(DataInput in, SerializationContext context)
+      throws IOException, ClassNotFoundException {
     this.numOfGets = DataSerializer.readPrimitiveInt(in);
     this.numOfPuts = DataSerializer.readPrimitiveInt(in);
     this.numOfMisses = DataSerializer.readPrimitiveInt(in);
@@ -275,8 +281,9 @@ public class ClientHealthStats implements DataSerializableFixedID, Serializable
     this.updateTime = DataSerializer.readDate(in);
   }
 
-  public void fromDataPre_GEODE_1_9_0_0(DataInput in) throws IOException, ClassNotFoundException {
-    fromDataPre_GFE_8_0_0_0(in);
+  public void fromDataPre_GEODE_1_9_0_0(DataInput in, SerializationContext context)
+      throws IOException, ClassNotFoundException {
+    fromDataPre_GFE_8_0_0_0(in, context);
     this.poolStats = DataSerializer.readHashMap(in);
   }
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CompactRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CompactRequest.java
index 1e71609..8f7e5ed 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CompactRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CompactRequest.java
@@ -37,6 +37,7 @@ import org.apache.geode.distributed.internal.ReplyException;
 import org.apache.geode.internal.cache.DiskStoreImpl;
 import org.apache.geode.internal.cache.InternalCache;
 import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.serialization.SerializationContext;
 import org.apache.geode.internal.util.ArrayUtils;
 
 /**
@@ -100,13 +101,15 @@ public class CompactRequest extends CliLegacyMessage {
   }
 
   @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/internal/admin/remote/CompactResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CompactResponse.java
index ec6b8ae..c068621 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CompactResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CompactResponse.java
@@ -22,6 +22,7 @@ import java.util.HashSet;
 import org.apache.geode.DataSerializer;
 import org.apache.geode.cache.persistence.PersistentID;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 public class CompactResponse extends AdminResponse {
   private HashSet<PersistentID> persistentIds;
@@ -38,14 +39,16 @@ public class CompactResponse extends AdminResponse {
   }
 
   @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);
     persistentIds = DataSerializer.readHashSet(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.writeHashSet(persistentIds, out);
   }
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/DestroyEntryMessage.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/DestroyEntryMessage.java
index 0d521bd..e913b19 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/DestroyEntryMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/DestroyEntryMessage.java
@@ -26,6 +26,7 @@ import org.apache.geode.cache.ExpirationAction;
 import org.apache.geode.cache.Region;
 import org.apache.geode.distributed.internal.ClusterDistributionManager;
 import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * A message that is sent to a particular distribution manager to let it know that the sender is an
@@ -72,15 +73,17 @@ public class DestroyEntryMessage extends RegionAdminMessage {
   }
 
   @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.action, out);
     DataSerializer.writeObject(this.key, out);
   }
 
   @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.action = (ExpirationAction) DataSerializer.readObject(in);
     this.key = DataSerializer.readObject(in);
   }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/DestroyRegionMessage.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/DestroyRegionMessage.java
index 44180d2..151a9a7 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/DestroyRegionMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/DestroyRegionMessage.java
@@ -26,6 +26,7 @@ import org.apache.geode.cache.ExpirationAction;
 import org.apache.geode.cache.Region;
 import org.apache.geode.distributed.internal.ClusterDistributionManager;
 import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * A message that is sent to a particular distribution manager to let it know that the sender is an
@@ -70,14 +71,16 @@ public class DestroyRegionMessage extends RegionAdminMessage {
   }
 
   @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.action, out);
   }
 
   @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.action = (ExpirationAction) DataSerializer.readObject(in);
   }
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/DurableClientInfoRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/DurableClientInfoRequest.java
index 9d1fd7f..a4733e1 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/DurableClientInfoRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/DurableClientInfoRequest.java
@@ -21,6 +21,7 @@ import java.io.IOException;
 
 import org.apache.geode.DataSerializer;
 import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * A message that is sent to a particular distribution manager to get information about a durable
@@ -65,15 +66,17 @@ public class DurableClientInfoRequest extends AdminRequest {
   }
 
   @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.durableId, out);
     out.writeInt(this.action);
   }
 
   @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.durableId = DataSerializer.readString(in);
     this.action = in.readInt();
     setFriendlyName(this);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/DurableClientInfoResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/DurableClientInfoResponse.java
index 98837c5..55eca3e 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/DurableClientInfoResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/DurableClientInfoResponse.java
@@ -24,6 +24,7 @@ import org.apache.geode.distributed.internal.DistributionManager;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
 import org.apache.geode.internal.cache.CacheServerImpl;
 import org.apache.geode.internal.cache.InternalCache;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * A message that is sent in response to a {@link DurableClientInfoRequest}.
@@ -73,14 +74,16 @@ public class DurableClientInfoResponse extends AdminResponse {
   }
 
   @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.returnVal);
   }
 
   @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.returnVal = in.readBoolean();
   }
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchDistLockInfoRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchDistLockInfoRequest.java
index fea0cd2..6c99057 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchDistLockInfoRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchDistLockInfoRequest.java
@@ -21,6 +21,7 @@ import java.io.DataOutput;
 import java.io.IOException;
 
 import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 public class FetchDistLockInfoRequest extends AdminRequest {
   /**
@@ -51,13 +52,15 @@ public class FetchDistLockInfoRequest extends AdminRequest {
   }
 
   @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
-  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
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchDistLockInfoResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchDistLockInfoResponse.java
index 093cf62..a4a99c8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchDistLockInfoResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchDistLockInfoResponse.java
@@ -31,6 +31,7 @@ import org.apache.geode.distributed.internal.locks.DLockService;
 import org.apache.geode.distributed.internal.locks.DLockToken;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
 import org.apache.geode.internal.admin.DLockInfo;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 public class FetchDistLockInfoResponse extends AdminResponse {
   // instance variables
@@ -76,14 +77,16 @@ public class FetchDistLockInfoResponse extends AdminResponse {
   }
 
   @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.lockInfos, out);
   }
 
   @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.lockInfos = (DLockInfo[]) DataSerializer.readObject(in);
   }
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchHealthDiagnosisRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchHealthDiagnosisRequest.java
index 0de607c..fc08707 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchHealthDiagnosisRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchHealthDiagnosisRequest.java
@@ -23,6 +23,7 @@ import java.io.IOException;
 import org.apache.geode.DataSerializer;
 import org.apache.geode.admin.GemFireHealth;
 import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * A message that is sent to a particular distribution manager to fetch its health diagnosis
@@ -62,15 +63,17 @@ public class FetchHealthDiagnosisRequest extends AdminRequest {
   }
 
   @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.id);
     DataSerializer.writeObject(this.healthCode, out);
   }
 
   @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);
     int i = in.readInt();
     GemFireHealth.Health oHC = (GemFireHealth.Health) DataSerializer.readObject(in);
     init_(i, oHC);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchHealthDiagnosisResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchHealthDiagnosisResponse.java
index 73158a1..7c84611 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchHealthDiagnosisResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchHealthDiagnosisResponse.java
@@ -25,6 +25,7 @@ import org.apache.geode.admin.GemFireHealth;
 import org.apache.geode.distributed.internal.DistributionManager;
 import org.apache.geode.distributed.internal.HealthMonitor;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * The response to fetching the health diagnosis.
@@ -63,14 +64,16 @@ public class FetchHealthDiagnosisResponse extends AdminResponse {
   }
 
   @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.diagnosis, out);
   }
 
   @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.diagnosis = DataSerializer.readStringArray(in);
   }
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchHostRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchHostRequest.java
index fa89953..b72774a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchHostRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchHostRequest.java
@@ -21,6 +21,7 @@ import java.io.DataOutput;
 import java.io.IOException;
 
 import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * A message that is sent to a particular distribution manager to get its current information
@@ -52,13 +53,15 @@ public class FetchHostRequest extends AdminRequest {
   }
 
   @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
-  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
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchHostResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchHostResponse.java
index 533972e..2602959 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchHostResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchHostResponse.java
@@ -33,6 +33,7 @@ import org.apache.geode.distributed.internal.membership.InternalDistributedMembe
 import org.apache.geode.internal.GemFireVersion;
 import org.apache.geode.internal.logging.LogService;
 import org.apache.geode.internal.net.SocketCreator;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 
 /**
@@ -143,8 +144,9 @@ public class FetchHostResponse extends AdminResponse {
   }
 
   @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.name, out);
     DataSerializer.writeObject(this.host, out);
     DataSerializer.writeObject(this.geodeHomeDir, out);
@@ -154,8 +156,9 @@ public class FetchHostResponse extends AdminResponse {
   }
 
   @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.name = DataSerializer.readString(in);
     this.host = (InetAddress) DataSerializer.readObject(in);
     this.geodeHomeDir = (File) DataSerializer.readObject(in);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchResourceAttributesRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchResourceAttributesRequest.java
index 09b0422..943719b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchResourceAttributesRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchResourceAttributesRequest.java
@@ -21,6 +21,7 @@ import java.io.DataOutput;
 import java.io.IOException;
 
 import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 public class FetchResourceAttributesRequest extends AdminRequest {
 
@@ -48,14 +49,16 @@ public class FetchResourceAttributesRequest extends AdminRequest {
   }
 
   @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(resourceUniqueId);
   }
 
   @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);
     resourceUniqueId = in.readLong();
   }
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchResourceAttributesResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchResourceAttributesResponse.java
index 0124753..4398b8e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchResourceAttributesResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchResourceAttributesResponse.java
@@ -25,6 +25,7 @@ import org.apache.geode.StatisticsType;
 import org.apache.geode.distributed.internal.DistributionManager;
 import org.apache.geode.distributed.internal.InternalDistributedSystem;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 public class FetchResourceAttributesResponse extends AdminResponse {
 
@@ -68,14 +69,16 @@ public class FetchResourceAttributesResponse extends AdminResponse {
   }
 
   @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(stats, out);
   }
 
   @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);
     stats = (RemoteStat[]) DataSerializer.readObject(in);
   }
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchStatsRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchStatsRequest.java
index e2db098..e2c89ae 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchStatsRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchStatsRequest.java
@@ -22,6 +22,7 @@ import java.io.IOException;
 
 import org.apache.geode.DataSerializer;
 import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 public class FetchStatsRequest extends AdminRequest {
 
@@ -52,14 +53,16 @@ public class FetchStatsRequest extends AdminRequest {
   }
 
   @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.statisticsTypeName, out);
   }
 
   @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.statisticsTypeName = DataSerializer.readString(in);
   }
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchStatsResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchStatsResponse.java
index 4cfbd76..547bb45 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchStatsResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchStatsResponse.java
@@ -24,6 +24,7 @@ import org.apache.geode.DataSerializer;
 import org.apache.geode.Statistics;
 import org.apache.geode.distributed.internal.DistributionManager;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * Provides a response of remote statistic resources for a {@code FetchStatsRequest}
@@ -69,14 +70,16 @@ public class FetchStatsResponse extends AdminResponse {
   }
 
   @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(stats, out);
   }
 
   @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);
     stats = (RemoteStatResource[]) DataSerializer.readObject(in);
   }
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchSysCfgRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchSysCfgRequest.java
index 04a03b9..b03b6a7 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchSysCfgRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchSysCfgRequest.java
@@ -21,6 +21,7 @@ import java.io.DataOutput;
 import java.io.IOException;
 
 import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * A message that is sent to a particular distribution manager to get its current
@@ -59,13 +60,15 @@ public class FetchSysCfgRequest extends AdminRequest {
   }
 
   @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
-  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
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchSysCfgResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchSysCfgResponse.java
index c70a8c5..fb492fd 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchSysCfgResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchSysCfgResponse.java
@@ -25,6 +25,7 @@ import org.apache.geode.distributed.internal.DistributionManager;
 import org.apache.geode.distributed.internal.RuntimeDistributionConfigImpl;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
 import org.apache.geode.internal.Config;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * A message that is sent to a particular distribution manager to get its current {@link Config}.
@@ -59,14 +60,16 @@ public class FetchSysCfgResponse extends AdminResponse {
   }
 
   @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.sc, out);
   }
 
   @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.sc = (Config) DataSerializer.readObject(in);
   }
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FlushAppCacheSnapshotMessage.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FlushAppCacheSnapshotMessage.java
index 6bd075d..1432c21 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FlushAppCacheSnapshotMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FlushAppCacheSnapshotMessage.java
@@ -22,6 +22,7 @@ import java.io.IOException;
 
 import org.apache.geode.distributed.internal.ClusterDistributionManager;
 import org.apache.geode.distributed.internal.PooledDistributionMessage;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 
 /**
@@ -53,13 +54,15 @@ public class FlushAppCacheSnapshotMessage extends PooledDistributionMessage {
   }
 
   @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
-  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
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/HealthListenerMessage.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/HealthListenerMessage.java
index 184366d..470cebf 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/HealthListenerMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/HealthListenerMessage.java
@@ -25,6 +25,7 @@ import org.apache.geode.admin.GemFireHealth;
 import org.apache.geode.distributed.internal.AdminMessageType;
 import org.apache.geode.distributed.internal.ClusterDistributionManager;
 import org.apache.geode.distributed.internal.PooledDistributionMessage;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * A message that is sent to a particular agent who was registered a health listener on a GemFireVM.
@@ -66,15 +67,17 @@ public class HealthListenerMessage extends PooledDistributionMessage implements
   }
 
   @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.listenerId);
     DataSerializer.writeObject(this.status, out);
   }
 
   @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.listenerId = in.readInt();
     this.status = (GemFireHealth.Health) DataSerializer.readObject(in);
   }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/LicenseInfoRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/LicenseInfoRequest.java
index bb9f6dd..188bacd 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/LicenseInfoRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/LicenseInfoRequest.java
@@ -21,6 +21,7 @@ import java.io.DataOutput;
 import java.io.IOException;
 
 import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * A message that is sent to a particular distribution manager to get its current license info.
@@ -54,13 +55,15 @@ public class LicenseInfoRequest extends AdminRequest {
   }
 
   @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
-  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
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/LicenseInfoResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/LicenseInfoResponse.java
index ed2dee6..e61d9b3 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/LicenseInfoResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/LicenseInfoResponse.java
@@ -25,6 +25,7 @@ import org.apache.geode.DataSerializer;
 import org.apache.geode.distributed.internal.DistributionManager;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
 import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * A message that is sent in response to a {@link LicenseInfoRequest}.
@@ -56,14 +57,16 @@ public class LicenseInfoResponse extends AdminResponse {
   }
 
   @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.p, out);
   }
 
   @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.p = (Properties) DataSerializer.readObject(in);
   }
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/MissingPersistentIDsRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/MissingPersistentIDsRequest.java
index 1f4ab36..9bff7c1 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/MissingPersistentIDsRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/MissingPersistentIDsRequest.java
@@ -37,6 +37,7 @@ import org.apache.geode.internal.cache.persistence.PersistentMemberID;
 import org.apache.geode.internal.cache.persistence.PersistentMemberManager;
 import org.apache.geode.internal.cache.persistence.PersistentMemberPattern;
 import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * A request to all members for any persistent members that they are waiting for. TODO prpersist -
@@ -102,8 +103,9 @@ public class MissingPersistentIDsRequest extends CliLegacyMessage {
   }
 
   @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
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/MissingPersistentIDsResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/MissingPersistentIDsResponse.java
index 869835f..5afe088 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/MissingPersistentIDsResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/MissingPersistentIDsResponse.java
@@ -25,6 +25,7 @@ import org.apache.geode.distributed.internal.ClusterDistributionManager;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
 import org.apache.geode.internal.InternalDataSerializer;
 import org.apache.geode.internal.cache.persistence.PersistentMemberPattern;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * The MissingPersistentIdResonse we return 662 peers. This response includes this list of ids that
@@ -56,8 +57,9 @@ public class MissingPersistentIDsResponse extends AdminResponse {
   }
 
   @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);
     int size = in.readInt();
     missingIds = new HashSet<PersistentID>(size);
     for (int i = 0; i < size; i++) {
@@ -75,8 +77,9 @@ public class MissingPersistentIDsResponse extends AdminResponse {
   }
 
   @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(missingIds.size());
     for (PersistentID pattern : missingIds) {
       InternalDataSerializer.invokeToData(pattern, out);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ObjectDetailsRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ObjectDetailsRequest.java
index a6e9b19..4de7561 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ObjectDetailsRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ObjectDetailsRequest.java
@@ -22,6 +22,7 @@ import java.io.IOException;
 
 import org.apache.geode.DataSerializer;
 import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * A message that is sent to a particular app vm to request the value, stats, and attributes of a
@@ -81,15 +82,17 @@ public class ObjectDetailsRequest extends RegionAdminRequest implements Cancella
   }
 
   @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.objName, out);
     out.writeInt(inspectionType);
   }
 
   @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.objName = DataSerializer.readObject(in);
     this.inspectionType = in.readInt();
   }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ObjectDetailsResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ObjectDetailsResponse.java
index ccae14e..571b9f8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ObjectDetailsResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ObjectDetailsResponse.java
@@ -31,6 +31,7 @@ import org.apache.geode.cache.Region;
 import org.apache.geode.cache.StatisticsDisabledException;
 import org.apache.geode.distributed.internal.DistributionManager;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * Responds to {@link ObjectDetailsRequest}.
@@ -106,16 +107,18 @@ public class ObjectDetailsResponse extends AdminResponse implements Cancellable
   }
 
   @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.objectValue, out);
     DataSerializer.writeObject(this.userAttribute, out);
     DataSerializer.writeObject(this.stats, out);
   }
 
   @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.objectValue = DataSerializer.readObject(in);
     this.userAttribute = DataSerializer.readObject(in);
     this.stats = (RemoteCacheStatistics) DataSerializer.readObject(in);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ObjectNamesRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ObjectNamesRequest.java
index 64ed452..16806e1 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ObjectNamesRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ObjectNamesRequest.java
@@ -21,6 +21,7 @@ import java.io.DataOutput;
 import java.io.IOException;
 
 import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * A message that is sent to a particular app vm to request all the subregions of a given parent
@@ -76,13 +77,15 @@ public class ObjectNamesRequest extends RegionAdminRequest implements Cancellabl
   }
 
   @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
-  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
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ObjectNamesResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ObjectNamesResponse.java
index 33e4648..12ed1cb 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ObjectNamesResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ObjectNamesResponse.java
@@ -27,6 +27,7 @@ import org.apache.geode.DataSerializer;
 import org.apache.geode.cache.Region;
 import org.apache.geode.distributed.internal.DistributionManager;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * Responds to {@link ObjectNamesResponse}.
@@ -86,14 +87,16 @@ public class ObjectNamesResponse extends AdminResponse implements Cancellable {
   }
 
   @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.objectNames, out);
   }
 
   @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.objectNames = (HashSet) DataSerializer.readObject(in);
   }
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/PrepareRevokePersistentIDRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/PrepareRevokePersistentIDRequest.java
index 8efc34b..c328a34 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/PrepareRevokePersistentIDRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/PrepareRevokePersistentIDRequest.java
@@ -31,6 +31,7 @@ import org.apache.geode.internal.cache.InternalCache;
 import org.apache.geode.internal.cache.persistence.PersistentMemberManager;
 import org.apache.geode.internal.cache.persistence.PersistentMemberPattern;
 import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * An instruction to all members that they should forget about the persistent member described by
@@ -114,16 +115,18 @@ public class PrepareRevokePersistentIDRequest extends CliLegacyMessage {
   }
 
   @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.pattern = new PersistentMemberPattern();
     InternalDataSerializer.invokeFromData(this.pattern, in);
     this.cancel = 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);
     InternalDataSerializer.invokeToData(this.pattern, out);
     out.writeBoolean(this.cancel);
   }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RefreshMemberSnapshotRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RefreshMemberSnapshotRequest.java
index fd44f15..7c28a0a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RefreshMemberSnapshotRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RefreshMemberSnapshotRequest.java
@@ -20,6 +20,7 @@ import java.io.DataOutput;
 import java.io.IOException;
 
 import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * A message that is sent to a particular distribution manager to get its current
@@ -48,13 +49,15 @@ public class RefreshMemberSnapshotRequest extends AdminRequest {
   }
 
   @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
-  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);
   }
 
   /**
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RefreshMemberSnapshotResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RefreshMemberSnapshotResponse.java
index 9e973f9..32ba18e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RefreshMemberSnapshotResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RefreshMemberSnapshotResponse.java
@@ -25,6 +25,7 @@ import org.apache.geode.distributed.DistributedSystem;
 import org.apache.geode.distributed.internal.DistributionManager;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
 import org.apache.geode.internal.cache.InternalCache;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * A message that is sent to a particular distribution manager to get its current
@@ -61,14 +62,16 @@ public class RefreshMemberSnapshotResponse extends AdminResponse {
   }
 
   @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.snapshot, out);
   }
 
   @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.snapshot = DataSerializer.readObject(in);
   }
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionAdminMessage.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionAdminMessage.java
index 3989b34..e9fc1a4 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionAdminMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionAdminMessage.java
@@ -26,6 +26,7 @@ import org.apache.geode.cache.CacheFactory;
 import org.apache.geode.cache.Region;
 import org.apache.geode.distributed.DistributedSystem;
 import org.apache.geode.distributed.internal.PooledDistributionMessage;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * A message that is sent to a particular app vm on a distribution manager to make an administration
@@ -52,14 +53,16 @@ public abstract class RegionAdminMessage extends PooledDistributionMessage {
   }
 
   @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.regionName, out);
   }
 
   @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.regionName = DataSerializer.readString(in);
   }
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionAdminRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionAdminRequest.java
index 5e140c6..652a1ed 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionAdminRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionAdminRequest.java
@@ -26,6 +26,7 @@ import org.apache.geode.cache.Cache;
 import org.apache.geode.cache.CacheFactory;
 import org.apache.geode.cache.Region;
 import org.apache.geode.distributed.DistributedSystem;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * A message that is sent to a particular app vm on a distribution manager to make an administration
@@ -58,14 +59,16 @@ public abstract class RegionAdminRequest extends AdminRequest {
   }
 
   @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.regionName, out);
   }
 
   @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.regionName = DataSerializer.readString(in);
   }
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionAttributesRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionAttributesRequest.java
index b3119ab..a280d45 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionAttributesRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionAttributesRequest.java
@@ -21,6 +21,7 @@ import java.io.DataOutput;
 import java.io.IOException;
 
 import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * A message that is sent to a particular app vm to request the region statistics of a given region.
@@ -56,13 +57,15 @@ public class RegionAttributesRequest extends RegionAdminRequest {
   }
 
   @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
-  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
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionAttributesResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionAttributesResponse.java
index 69dcfa4..128c599 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionAttributesResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionAttributesResponse.java
@@ -25,6 +25,7 @@ import org.apache.geode.cache.Region;
 import org.apache.geode.cache.RegionAttributes;
 import org.apache.geode.distributed.internal.DistributionManager;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * Responds to {@link RegionAttributesResponse}.
@@ -56,14 +57,16 @@ public class RegionAttributesResponse extends AdminResponse {
   }
 
   @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.attributes, out);
   }
 
   @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.attributes = (RemoteRegionAttributes) DataSerializer.readObject(in);
   }
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionRequest.java
index 9c104ad..0192795 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionRequest.java
@@ -24,6 +24,7 @@ import org.apache.geode.DataSerializer;
 import org.apache.geode.cache.RegionAttributes;
 import org.apache.geode.distributed.internal.DistributionManager;
 import org.apache.geode.internal.admin.CacheInfo;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * A message that is sent to a particular application to get the region for the specified path.
@@ -126,8 +127,9 @@ public class RegionRequest extends AdminRequest {
   }
 
   @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.action);
     out.writeInt(this.cacheId);
     DataSerializer.writeString(this.path, out);
@@ -136,8 +138,9 @@ public class RegionRequest extends AdminRequest {
   }
 
   @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.action = in.readInt();
     this.cacheId = in.readInt();
     this.path = DataSerializer.readString(in);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionResponse.java
index 6f16aa3..7831030 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionResponse.java
@@ -29,6 +29,7 @@ import org.apache.geode.cache.Region;
 import org.apache.geode.distributed.internal.DistributionManager;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
 import org.apache.geode.internal.admin.GemFireVM;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * Responds to {@link RegionResponse}.
@@ -127,16 +128,18 @@ public class RegionResponse extends AdminResponse {
   }
 
   @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.name, out);
     DataSerializer.writeString(this.userAttribute, out);
     DataSerializer.writeObject(this.exception, out);
   }
 
   @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.name = DataSerializer.readString(in);
     this.userAttribute = DataSerializer.readString(in);
     this.exception = (Exception) DataSerializer.readObject(in);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionSizeRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionSizeRequest.java
index 993bc85..a2ab91e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionSizeRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionSizeRequest.java
@@ -22,6 +22,7 @@ import java.io.IOException;
 
 import org.apache.geode.distributed.internal.DistributionManager;
 import org.apache.geode.internal.Assert;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * A message that is sent to a particular app vm to request all the subregions of a given parent
@@ -77,13 +78,15 @@ public class RegionSizeRequest extends RegionAdminRequest implements Cancellable
   }
 
   @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
-  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
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionSizeResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionSizeResponse.java
index 2ed38fd..a64f5cc 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionSizeResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionSizeResponse.java
@@ -24,6 +24,7 @@ import java.util.Set;
 import org.apache.geode.cache.Region;
 import org.apache.geode.distributed.internal.DistributionManager;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * Responds to {@link RegionSizeRequest}.
@@ -81,15 +82,17 @@ public class RegionSizeResponse extends AdminResponse implements Cancellable {
   }
 
   @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(entryCount);
     out.writeInt(subregionCount);
   }
 
   @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.entryCount = in.readInt();
     this.subregionCount = in.readInt();
   }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionStatisticsRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionStatisticsRequest.java
index 6c4697c..70a6eea 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionStatisticsRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionStatisticsRequest.java
@@ -21,6 +21,7 @@ import java.io.DataOutput;
 import java.io.IOException;
 
 import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * A message that is sent to a particular app vm to request the region statistics of a given region.
@@ -55,13 +56,15 @@ public class RegionStatisticsRequest extends RegionAdminRequest {
   }
 
   @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
-  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
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionStatisticsResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionStatisticsResponse.java
index 9e913af..9873648 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionStatisticsResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionStatisticsResponse.java
@@ -25,6 +25,7 @@ import org.apache.geode.cache.CacheStatistics;
 import org.apache.geode.cache.Region;
 import org.apache.geode.distributed.internal.DistributionManager;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * Responds to {@link RegionStatisticsResponse}.
@@ -56,14 +57,16 @@ public class RegionStatisticsResponse extends AdminResponse {
   }
 
   @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.regionStatistics, out);
   }
 
   @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.regionStatistics = (RemoteCacheStatistics) DataSerializer.readObject(in);
   }
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionSubRegionSizeRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionSubRegionSizeRequest.java
index 3eb9126..5ca25b5 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionSubRegionSizeRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionSubRegionSizeRequest.java
@@ -19,6 +19,7 @@ import java.io.DataOutput;
 import java.io.IOException;
 
 import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * Admin request to transfer region info for a member
@@ -61,13 +62,15 @@ public class RegionSubRegionSizeRequest extends AdminRequest implements Cancella
   }
 
   @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
-  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);
   }
 
   /**
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionSubRegionsSizeResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionSubRegionsSizeResponse.java
index 5e24f63..e7d46eb 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionSubRegionsSizeResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionSubRegionsSizeResponse.java
@@ -30,6 +30,7 @@ import org.apache.geode.distributed.internal.DistributionManager;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
 import org.apache.geode.internal.cache.InternalCache;
 import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * Admin response carrying region info for a member
@@ -127,15 +128,17 @@ public class RegionSubRegionsSizeResponse extends AdminResponse implements Cance
   }
 
   @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.cancelled);
     DataSerializer.writeObject(this.snapshot, out);
   }
 
   @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.cancelled = in.readBoolean();
     this.snapshot = DataSerializer.readObject(in);
   }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoveHealthListenerRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoveHealthListenerRequest.java
index cba2a8b..42323fe 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoveHealthListenerRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoveHealthListenerRequest.java
@@ -21,6 +21,7 @@ import java.io.DataOutput;
 import java.io.IOException;
 
 import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * A message that is sent to a particular distribution manager to remove a health listener.
@@ -59,14 +60,16 @@ public class RemoveHealthListenerRequest extends AdminRequest {
   }
 
   @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.id);
   }
 
   @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.id = in.readInt();
   }
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoveHealthListenerResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoveHealthListenerResponse.java
index d16992c..2357900 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoveHealthListenerResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoveHealthListenerResponse.java
@@ -22,6 +22,7 @@ import java.io.IOException;
 
 import org.apache.geode.distributed.internal.DistributionManager;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * The response to adding a health listener.
@@ -50,13 +51,15 @@ public class RemoveHealthListenerResponse extends AdminResponse {
   }
 
   @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
-  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
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ResetHealthStatusRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ResetHealthStatusRequest.java
index c358a7d..6015560 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ResetHealthStatusRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ResetHealthStatusRequest.java
@@ -21,6 +21,7 @@ import java.io.DataOutput;
 import java.io.IOException;
 
 import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * A message that is sent to a particular distribution manager to reset its current health status.
@@ -60,14 +61,16 @@ public class ResetHealthStatusRequest extends AdminRequest {
   }
 
   @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.id);
   }
 
   @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.id = in.readInt();
   }
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ResetHealthStatusResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ResetHealthStatusResponse.java
index 2cce4df..5cc513c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ResetHealthStatusResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ResetHealthStatusResponse.java
@@ -23,6 +23,7 @@ import java.io.IOException;
 import org.apache.geode.distributed.internal.DistributionManager;
 import org.apache.geode.distributed.internal.HealthMonitor;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * The response to reseting the health status.
@@ -56,13 +57,15 @@ public class ResetHealthStatusResponse extends AdminResponse {
   }
 
   @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
-  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
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RevokePersistentIDRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RevokePersistentIDRequest.java
index 69fefca..76b51cb 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RevokePersistentIDRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RevokePersistentIDRequest.java
@@ -30,6 +30,7 @@ import org.apache.geode.internal.cache.InternalCache;
 import org.apache.geode.internal.cache.persistence.PersistentMemberManager;
 import org.apache.geode.internal.cache.persistence.PersistentMemberPattern;
 import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * An instruction to all members that they should forget about the persistent member described by
@@ -89,15 +90,17 @@ public class RevokePersistentIDRequest extends CliLegacyMessage {
   }
 
   @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.pattern = new PersistentMemberPattern();
     InternalDataSerializer.invokeFromData(this.pattern, 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.pattern, out);
   }
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RootRegionRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RootRegionRequest.java
index c67804a..f328b75 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RootRegionRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RootRegionRequest.java
@@ -21,6 +21,7 @@ import java.io.DataOutput;
 import java.io.IOException;
 
 import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * A message that is sent to a particular application to get its root region(s). All it really needs
@@ -57,13 +58,15 @@ public class RootRegionRequest extends AdminRequest {
   }
 
   @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
-  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
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RootRegionResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RootRegionResponse.java
index 3dad8f7..5cab6f6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RootRegionResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RootRegionResponse.java
@@ -30,6 +30,7 @@ import org.apache.geode.distributed.internal.DistributionManager;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
 import org.apache.geode.internal.admin.GemFireVM;
 import org.apache.geode.internal.cache.InternalCache;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * Responds to {@link RootRegionResponse}.
@@ -94,15 +95,17 @@ public class RootRegionResponse extends AdminResponse {
   }
 
   @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.regions, out);
     DataSerializer.writeObject(this.userAttrs, out);
   }
 
   @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.regions = DataSerializer.readObject(in);
     this.userAttrs = DataSerializer.readObject(in);
   }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ShutdownAllGatewayHubsRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ShutdownAllGatewayHubsRequest.java
index 022845e..f3ac703 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ShutdownAllGatewayHubsRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ShutdownAllGatewayHubsRequest.java
@@ -21,6 +21,7 @@ import java.io.IOException;
 import org.apache.geode.distributed.internal.ClusterDistributionManager;
 import org.apache.geode.distributed.internal.DistributionMessage;
 import org.apache.geode.distributed.internal.ReplyMessage;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  *
@@ -54,14 +55,16 @@ public class ShutdownAllGatewayHubsRequest extends DistributionMessage {
   }
 
   @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.rpid = 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.rpid);
   }
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ShutdownAllRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ShutdownAllRequest.java
index 3d73509..120d207 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ShutdownAllRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ShutdownAllRequest.java
@@ -42,6 +42,7 @@ import org.apache.geode.distributed.internal.membership.InternalDistributedMembe
 import org.apache.geode.internal.cache.InternalCache;
 import org.apache.geode.internal.logging.LogService;
 import org.apache.geode.internal.logging.LoggingThread;
+import org.apache.geode.internal.serialization.SerializationContext;
 import org.apache.geode.internal.tcp.ConnectionTable;
 
 /**
@@ -221,13 +222,15 @@ public class ShutdownAllRequest extends AdminRequest {
   }
 
   @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/internal/admin/remote/ShutdownAllResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ShutdownAllResponse.java
index 2bd033c..52681d0 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ShutdownAllResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ShutdownAllResponse.java
@@ -19,6 +19,7 @@ import java.io.DataOutput;
 import java.io.IOException;
 
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 public class ShutdownAllResponse extends AdminResponse {
   private transient boolean isToShutDown = true;
@@ -51,14 +52,16 @@ public class ShutdownAllResponse extends AdminResponse {
   }
 
   @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(isToShutDown);
   }
 
   @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.isToShutDown = in.readBoolean();
   }
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/SnapshotResultMessage.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/SnapshotResultMessage.java
index b7799f1..02b4119 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/SnapshotResultMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/SnapshotResultMessage.java
@@ -27,6 +27,7 @@ import org.apache.geode.distributed.internal.AdminMessageType;
 import org.apache.geode.distributed.internal.ClusterDistributionManager;
 import org.apache.geode.distributed.internal.PooledDistributionMessage;
 import org.apache.geode.internal.admin.CacheSnapshot;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 public class SnapshotResultMessage extends PooledDistributionMessage implements AdminMessageType {
   private CacheSnapshot results;
@@ -68,15 +69,17 @@ public class SnapshotResultMessage extends PooledDistributionMessage implements
   }
 
   @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.results, out);
     out.writeInt(this.snapshotId);
   }
 
   @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.results = (CacheSnapshot) DataSerializer.readObject(in);
     this.snapshotId = in.readInt();
   }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/StatAlertsManagerAssignMessage.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/StatAlertsManagerAssignMessage.java
index 98b7006..7e62941 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/StatAlertsManagerAssignMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/StatAlertsManagerAssignMessage.java
@@ -23,6 +23,7 @@ import org.apache.geode.distributed.internal.ClusterDistributionManager;
 import org.apache.geode.distributed.internal.PooledDistributionMessage;
 import org.apache.geode.internal.admin.StatAlertDefinition;
 import org.apache.geode.internal.admin.StatAlertsManager;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * This class represents a request object to set an alert manager for the newly joined member.
@@ -98,8 +99,9 @@ public class StatAlertsManagerAssignMessage extends PooledDistributionMessage {
    * @param out DataOutput stream to write to
    */
   @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(refreshInterval);
     DataSerializer.writeObjectArray(alertDefs, out);
   }
@@ -110,8 +112,9 @@ public class StatAlertsManagerAssignMessage extends PooledDistributionMessage {
    * @param in DataInput stream to read from
    */
   @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);
     refreshInterval = in.readLong();
     alertDefs = (StatAlertDefinition[]) DataSerializer.readObjectArray(in);
   }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/StatListenerMessage.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/StatListenerMessage.java
index 06c1a2f..ab56cac 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/StatListenerMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/StatListenerMessage.java
@@ -23,6 +23,7 @@ import java.io.IOException;
 import org.apache.geode.distributed.internal.AdminMessageType;
 import org.apache.geode.distributed.internal.ClusterDistributionManager;
 import org.apache.geode.distributed.internal.PooledDistributionMessage;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * A message that is sent to a particular console distribution manager when changes have been
@@ -84,8 +85,9 @@ public class StatListenerMessage extends PooledDistributionMessage implements Ad
   }
 
   @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.timestamp);
     out.writeInt(this.changeCount);
     for (int i = 0; i < this.changeCount; i++) {
@@ -95,8 +97,9 @@ public class StatListenerMessage extends PooledDistributionMessage implements Ad
   }
 
   @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.timestamp = in.readLong();
     this.changeCount = in.readInt();
     this.listenerIds = new int[this.changeCount];
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/StoreSysCfgRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/StoreSysCfgRequest.java
index f4a5220..5c3dc89 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/StoreSysCfgRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/StoreSysCfgRequest.java
@@ -23,6 +23,7 @@ import java.io.IOException;
 import org.apache.geode.DataSerializer;
 import org.apache.geode.distributed.internal.DistributionManager;
 import org.apache.geode.internal.Config;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * A message that is sent to a particular distribution manager to modify its current
@@ -61,14 +62,16 @@ public class StoreSysCfgRequest extends AdminRequest {
   }
 
   @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.sc, out);
   }
 
   @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.sc = (Config) DataSerializer.readObject(in);
   }
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/StoreSysCfgResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/StoreSysCfgResponse.java
index 9c098a7..f3c02bc 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/StoreSysCfgResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/StoreSysCfgResponse.java
@@ -25,6 +25,7 @@ import org.apache.geode.distributed.internal.InternalDistributedSystem;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
 import org.apache.geode.internal.Config;
 import org.apache.geode.internal.ConfigSource;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * A message that is sent to a particular distribution manager to modify its current
@@ -63,13 +64,15 @@ public class StoreSysCfgResponse extends AdminResponse {
   }
 
   @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
-  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
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/SubRegionRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/SubRegionRequest.java
index 6b9dbb2..08144dd 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/SubRegionRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/SubRegionRequest.java
@@ -21,6 +21,7 @@ import java.io.DataOutput;
 import java.io.IOException;
 
 import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * A message that is sent to a particular app vm to request all the subregions of a given parent
@@ -56,13 +57,15 @@ public class SubRegionRequest extends RegionAdminRequest {
   }
 
   @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
-  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
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/SubRegionResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/SubRegionResponse.java
index 4d12ecd..27c3ce6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/SubRegionResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/SubRegionResponse.java
@@ -30,6 +30,7 @@ import org.apache.geode.cache.Region;
 import org.apache.geode.distributed.internal.DistributionManager;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
 import org.apache.geode.internal.admin.GemFireVM;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * Responds to {@link SubRegionResponse}.
@@ -83,15 +84,17 @@ public class SubRegionResponse extends AdminResponse {
   }
 
   @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.subRegionNames, out);
     DataSerializer.writeObject(this.userAttributes, out);
   }
 
   @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.subRegionNames = (String[]) DataSerializer.readObject(in);
     this.userAttributes = (String[]) DataSerializer.readObject(in);
   }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/TailLogRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/TailLogRequest.java
index 8f716ce..05a2867 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/TailLogRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/TailLogRequest.java
@@ -21,6 +21,7 @@ import java.io.DataOutput;
 import java.io.IOException;
 
 import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 public class TailLogRequest extends AdminRequest {
   public static TailLogRequest create() {
@@ -43,13 +44,15 @@ public class TailLogRequest extends AdminRequest {
   }
 
   @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
-  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
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/TailLogResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/TailLogResponse.java
index c22c383..8191c5e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/TailLogResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/TailLogResponse.java
@@ -29,6 +29,7 @@ import org.apache.geode.distributed.internal.InternalDistributedSystem;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
 import org.apache.geode.internal.logging.LogFile;
 import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 public class TailLogResponse extends AdminResponse {
   private static final Logger logger = LogService.getLogger();
@@ -71,15 +72,17 @@ public class TailLogResponse extends AdminResponse {
   }
 
   @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(tail, out);
     DataSerializer.writeString(childTail, out);
   }
 
   @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);
     tail = DataSerializer.readString(in);
     childTail = DataSerializer.readString(in);
   }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/UpdateAlertDefinitionMessage.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/UpdateAlertDefinitionMessage.java
index 5bdfd97..e534ec9 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/UpdateAlertDefinitionMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/UpdateAlertDefinitionMessage.java
@@ -24,6 +24,7 @@ import org.apache.geode.distributed.internal.InternalDistributedSystem;
 import org.apache.geode.distributed.internal.PooledDistributionMessage;
 import org.apache.geode.internal.admin.StatAlertDefinition;
 import org.apache.geode.internal.admin.StatAlertsManager;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * distribution message to register alert's definition {@link StatAlertDefinition} to member's alert
@@ -66,15 +67,17 @@ public class UpdateAlertDefinitionMessage extends PooledDistributionMessage {
   }
 
   @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(_actionCode);
     DataSerializer.writeObjectArray(this._alertDefinitions, out);
   }
 
   @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._actionCode = in.readByte();
     this._alertDefinitions = (StatAlertDefinition[]) DataSerializer.readObjectArray(in);
   }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/VersionInfoRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/VersionInfoRequest.java
index e02c615..ee0bcfc 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/VersionInfoRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/VersionInfoRequest.java
@@ -21,6 +21,7 @@ import java.io.DataOutput;
 import java.io.IOException;
 
 import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * A message that is sent to a particular distribution manager to get its current version info.
@@ -56,13 +57,15 @@ public class VersionInfoRequest extends AdminRequest {
   }
 
   @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
-  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
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/VersionInfoResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/VersionInfoResponse.java
index 76c74dd..9584f08 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/VersionInfoResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/VersionInfoResponse.java
@@ -24,6 +24,7 @@ import org.apache.geode.DataSerializer;
 import org.apache.geode.distributed.internal.DistributionManager;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
 import org.apache.geode.internal.GemFireVersion;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * A message that is sent in response to a {@link VersionInfoRequest}.
@@ -56,14 +57,16 @@ public class VersionInfoResponse extends AdminResponse {
   }
 
   @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.verInfo, out);
   }
 
   @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.verInfo = DataSerializer.readString(in);
   }
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/GaugeThresholdDecoratorImpl.java b/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/GaugeThresholdDecoratorImpl.java
index 8c4f798..71cba4c 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/GaugeThresholdDecoratorImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/GaugeThresholdDecoratorImpl.java
@@ -24,6 +24,7 @@ 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;
 
 /**
  * Implementation of {@link StatAlertDefinition}, represents threshold as data range
@@ -123,14 +124,16 @@ public class GaugeThresholdDecoratorImpl extends BaseDecoratorImpl
   }
 
   @Override
-  public void toData(DataOutput out) throws IOException {
+  public void toData(DataOutput out,
+      SerializationContext context) throws IOException {
     super.toData(out);
     DataSerializer.writeObject(this.lowerLimit, out);
     DataSerializer.writeObject(this.upperLimit, out);
   }
 
   @Override
-  public void fromData(DataInput in) throws IOException, ClassNotFoundException {
+  public void fromData(DataInput in,
+      SerializationContext context) throws IOException, ClassNotFoundException {
     super.fromData(in);
     this.lowerLimit = (Number) DataSerializer.readObject(in);
     this.upperLimit = (Number) DataSerializer.readObject(in);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/NumberThresholdDecoratorImpl.java b/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/NumberThresholdDecoratorImpl.java
index da8b2ec..77af2e6 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/NumberThresholdDecoratorImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/NumberThresholdDecoratorImpl.java
@@ -24,6 +24,7 @@ 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;
 
 /**
  * Implementation of {@link StatAlertDefinition}, represents threshold as number
@@ -123,14 +124,16 @@ public class NumberThresholdDecoratorImpl extends BaseDecoratorImpl
   }
 
   @Override
-  public void toData(DataOutput out) throws IOException {
+  public void toData(DataOutput out,
+      SerializationContext context) throws IOException {
     super.toData(out);
     DataSerializer.writeObject(this.threshold, out);
     DataSerializer.writePrimitiveBoolean(this.evalForGtThan, out);
   }
 
   @Override
-  public void fromData(DataInput in) throws IOException, ClassNotFoundException {
+  public void fromData(DataInput in,
+      SerializationContext context) throws IOException, ClassNotFoundException {
     super.fromData(in);
     this.threshold = (Number) DataSerializer.readObject(in);
     this.evalForGtThan = DataSerializer.readPrimitiveBoolean(in);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegion.java
index ee7dfd2..4fe2f25 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegion.java
@@ -95,6 +95,7 @@ import org.apache.geode.internal.cache.extension.SimpleExtensionPoint;
 import org.apache.geode.internal.cache.snapshot.RegionSnapshotServiceImpl;
 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.statistics.StatisticsClock;
 import org.apache.geode.internal.util.ArrayUtils;
 import org.apache.geode.pdx.internal.PeerTypeRegistration;
@@ -1805,12 +1806,14 @@ public abstract class AbstractRegion implements InternalRegion, AttributesMutato
   }
 
   @Override
-  public void toData(DataOutput out) throws IOException {
+  public void toData(DataOutput out,
+      SerializationContext context) throws IOException {
     DataSerializer.writeRegion(this, out);
   }
 
   @Override
-  public void fromData(DataInput in) throws IOException, ClassNotFoundException {
+  public void fromData(DataInput in,
+      SerializationContext context) throws IOException, ClassNotFoundException {
     // should never be called since the special DataSerializer.readRegion is used.
     throw new UnsupportedOperationException("fromData is not implemented");
   }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractUpdateOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractUpdateOperation.java
index fa1b83f..8baf14f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractUpdateOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractUpdateOperation.java
@@ -40,6 +40,7 @@ import org.apache.geode.internal.Version;
 import org.apache.geode.internal.cache.versions.ConcurrentCacheModificationException;
 import org.apache.geode.internal.cache.versions.VersionTag;
 import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * Common code for both UpdateOperation and DistributedPutAllOperation.
@@ -297,14 +298,16 @@ public abstract class AbstractUpdateOperation extends DistributedCacheOperation
     }
 
     @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.lastModified = in.readLong();
     }
 
     @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.lastModified);
     }
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/AddCacheServerProfileMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/AddCacheServerProfileMessage.java
index 763cf00..588b251 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/AddCacheServerProfileMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/AddCacheServerProfileMessage.java
@@ -31,6 +31,7 @@ import org.apache.geode.distributed.internal.ReplyMessage;
 import org.apache.geode.distributed.internal.SerialDistributionMessage;
 import org.apache.geode.internal.cache.LocalRegion.InitializationLevel;
 import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * OperationMessage synchronously propagates a change in the profile to another member. It is a
@@ -145,14 +146,16 @@ public class AddCacheServerProfileMessage 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);
     out.writeInt(this.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);
     this.processorId = in.readInt();
   }
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/BucketAdvisor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/BucketAdvisor.java
index 578dbfa..c1c75f3 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/BucketAdvisor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/BucketAdvisor.java
@@ -68,6 +68,7 @@ import org.apache.geode.internal.cache.partitioned.DeposePrimaryBucketMessage.De
 import org.apache.geode.internal.cache.partitioned.RegionAdvisor;
 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.StopWatch;
 
 /**
@@ -2251,16 +2252,18 @@ public class BucketAdvisor extends CacheDistributionAdvisor {
     }
 
     @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);
       isPrimary = in.readBoolean();
       isHosting = in.readBoolean();
       isInitializing = 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(isPrimary);
       out.writeBoolean(isHosting);
       out.writeBoolean(isInitializing);
@@ -2304,15 +2307,17 @@ public class BucketAdvisor extends CacheDistributionAdvisor {
     }
 
     @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);
       bucketServerLocations = SerializationHelper.readBucketServerLocationSet(in);
       bucketId = DataSerializer.readPrimitiveInt(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.writeBucketServerLocationSet(bucketServerLocations, out);
       DataSerializer.writePrimitiveInt(bucketId, out);
     }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheDistributionAdvisor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheDistributionAdvisor.java
index 95ab059..1f41e0f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheDistributionAdvisor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheDistributionAdvisor.java
@@ -51,6 +51,7 @@ import org.apache.geode.internal.cache.persistence.PersistentMemberID;
 import org.apache.geode.internal.logging.LogService;
 import org.apache.geode.internal.logging.log4j.LogMarker;
 import org.apache.geode.internal.serialization.DSCODE;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * Adds bookkeeping info and cache-specific behavior to DistributionAdvisor. Adds bit-encoded flags
@@ -779,8 +780,9 @@ public class CacheDistributionAdvisor extends DistributionAdvisor {
     }
 
     @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(getIntInfo());
       if (persistentID != null) {
         InternalDataSerializer.invokeToData(persistentID, out);
@@ -804,8 +806,9 @@ public class CacheDistributionAdvisor extends DistributionAdvisor {
     }
 
     @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);
       int bits = in.readInt();
       setIntInfo(bits);
       if (hasPersistentID(bits)) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServerAdvisor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServerAdvisor.java
index d48375b..831ed9c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServerAdvisor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServerAdvisor.java
@@ -27,6 +27,7 @@ import org.apache.geode.distributed.internal.ClusterDistributionManager;
 import org.apache.geode.distributed.internal.DistributionAdvisee;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
 import org.apache.geode.internal.InternalDataSerializer;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 
 /**
@@ -132,8 +133,9 @@ public class CacheServerAdvisor extends GridAdvisor {
     }
 
     @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.groups, out);
       out.writeInt(maxConnections);
       InternalDataSerializer.invokeToData(initialLoad, out);
@@ -141,8 +143,9 @@ public class CacheServerAdvisor extends GridAdvisor {
     }
 
     @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.groups = DataSerializer.readStringArray(in);
       this.maxConnections = in.readInt();
       this.initialLoad = new ServerLoad();
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ClientRegionEventImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ClientRegionEventImpl.java
index cd82557..32fc5ea 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/ClientRegionEventImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ClientRegionEventImpl.java
@@ -23,6 +23,7 @@ import org.apache.geode.DataSerializer;
 import org.apache.geode.cache.Operation;
 import org.apache.geode.distributed.DistributedMember;
 import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 
 /**
@@ -92,14 +93,16 @@ public class ClientRegionEventImpl extends RegionEventImpl {
   }
 
   @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(getContext(), out);
   }
 
   @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);
     setContext(ClientProxyMembershipID.readCanonicalized(in));
   }
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/CloseCacheMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/CloseCacheMessage.java
index 66cf168..c7ff0aa 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/CloseCacheMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/CloseCacheMessage.java
@@ -27,6 +27,7 @@ import org.apache.geode.distributed.internal.HighPriorityDistributionMessage;
 import org.apache.geode.distributed.internal.MessageWithReply;
 import org.apache.geode.distributed.internal.ReplyMessage;
 import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 
 /** Creates a new instance of CloseCacheMessage */
@@ -93,14 +94,16 @@ public class CloseCacheMessage extends HighPriorityDistributionMessage implement
   }
 
   @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);
   }
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ControllerAdvisor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ControllerAdvisor.java
index eb2ae12..ee6fbc2 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/ControllerAdvisor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ControllerAdvisor.java
@@ -24,6 +24,7 @@ import org.apache.geode.distributed.internal.ClusterDistributionManager;
 import org.apache.geode.distributed.internal.DistributionAdvisee;
 import org.apache.geode.distributed.internal.ServerLocator;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 
 /**
@@ -118,13 +119,15 @@ public class ControllerAdvisor extends GridAdvisor {
     }
 
     @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
-    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
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/CreateRegionProcessor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/CreateRegionProcessor.java
index c959e6a..8aef0bd 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/CreateRegionProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/CreateRegionProcessor.java
@@ -59,6 +59,7 @@ import org.apache.geode.internal.cache.partitioned.RegionAdvisor;
 import org.apache.geode.internal.cache.partitioned.RegionAdvisor.PartitionProfile;
 import org.apache.geode.internal.cache.persistence.PersistentMemberID;
 import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * This message processor handles creation and initial exchange of
@@ -745,8 +746,9 @@ public class CreateRegionProcessor implements ProfileExchangeProcessor {
     }
 
     @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.profile = (CacheProfile) DataSerializer.readObject(in);
       this.processorId = in.readInt();
@@ -759,8 +761,9 @@ public class CreateRegionProcessor implements ProfileExchangeProcessor {
     }
 
     @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);
       DataSerializer.writeObject(this.profile, out);
       out.writeInt(this.processorId);
@@ -806,8 +809,9 @@ public class CreateRegionProcessor implements ProfileExchangeProcessor {
     }
 
     @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);
       if (in.readBoolean()) {
         this.profile = (CacheProfile) DataSerializer.readObject(in);
       }
@@ -834,8 +838,9 @@ public class CreateRegionProcessor implements ProfileExchangeProcessor {
     }
 
     @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.profile != null);
       if (this.profile != null) {
         DataSerializer.writeObject(this.profile, out);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DestroyOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DestroyOperation.java
index 4d9bbae..46f7d04 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DestroyOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DestroyOperation.java
@@ -29,6 +29,7 @@ import org.apache.geode.distributed.internal.DirectReplyProcessor;
 import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
 import org.apache.geode.internal.cache.versions.ConcurrentCacheModificationException;
 import org.apache.geode.internal.offheap.annotations.Retained;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * Handles distribution messaging for destroying an entry in a region.
@@ -154,8 +155,9 @@ public class DestroyOperation extends DistributedCacheOperation {
     }
 
     @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.eventId = (EventID) DataSerializer.readObject(in);
       this.key = DataSerializer.readObject(in);
       Boolean hasTailKey = DataSerializer.readBoolean(in);
@@ -165,8 +167,9 @@ public class DestroyOperation extends DistributedCacheOperation {
     }
 
     @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.eventId, out);
       DataSerializer.writeObject(this.key, out);
 
@@ -244,14 +247,16 @@ public class DestroyOperation extends DistributedCacheOperation {
     }
 
     @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.context = ClientProxyMembershipID.readCanonicalized(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.context, out);
     }
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DestroyPartitionedRegionMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DestroyPartitionedRegionMessage.java
index 070fb6b..d0307e1 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DestroyPartitionedRegionMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DestroyPartitionedRegionMessage.java
@@ -39,6 +39,7 @@ import org.apache.geode.internal.cache.partitioned.RegionAdvisor;
 import org.apache.geode.internal.cache.partitioned.RegionAdvisor.PartitionProfile;
 import org.apache.geode.internal.logging.LogService;
 import org.apache.geode.internal.logging.log4j.LogMarker;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * This message is sent for two purposes <br>
@@ -221,14 +222,16 @@ public class DestroyPartitionedRegionMessage extends PartitionMessage {
 
 
   @Override
-  public void fromData(DataInput in) throws IOException, ClassNotFoundException {
-    fromDataPre_GEODE_1_9_0_0(in);
+  public void fromData(DataInput in,
+      SerializationContext context) throws IOException, ClassNotFoundException {
+    fromDataPre_GEODE_1_9_0_0(in, context);
     this.eventID = DataSerializer.readObject(in);
 
   }
 
-  public void fromDataPre_GEODE_1_9_0_0(DataInput in) throws IOException, ClassNotFoundException {
-    super.fromData(in);
+  public void fromDataPre_GEODE_1_9_0_0(DataInput in, SerializationContext context)
+      throws IOException, ClassNotFoundException {
+    super.fromData(in, null);
     this.cbArg = DataSerializer.readObject(in);
     this.op = Operation.fromOrdinal(in.readByte());
     this.prSerial = in.readInt();
@@ -240,13 +243,15 @@ public class DestroyPartitionedRegionMessage extends PartitionMessage {
   }
 
   @Override
-  public void toData(DataOutput out) throws IOException {
-    toDataPre_GEODE_1_9_0_0(out);
+  public void toData(DataOutput out,
+      SerializationContext context) throws IOException {
+    toDataPre_GEODE_1_9_0_0(out, context);
     DataSerializer.writeObject(this.eventID, out);
   }
 
-  public void toDataPre_GEODE_1_9_0_0(DataOutput out) throws IOException {
-    super.toData(out);
+  public void toDataPre_GEODE_1_9_0_0(DataOutput out, SerializationContext context)
+      throws IOException {
+    super.toData(out, null);
     DataSerializer.writeObject(this.cbArg, out);
     out.writeByte(this.op.ordinal);
     out.writeInt(this.prSerial);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DestroyRegionOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DestroyRegionOperation.java
index c7a8563..dfe1d03 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DestroyRegionOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DestroyRegionOperation.java
@@ -46,6 +46,7 @@ import org.apache.geode.internal.cache.LocalRegion.InitializationLevel;
 import org.apache.geode.internal.cache.partitioned.PRLocallyDestroyedException;
 import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
 import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 public class DestroyRegionOperation extends DistributedCacheOperation {
 
@@ -439,8 +440,9 @@ public class DestroyRegionOperation extends DistributedCacheOperation {
     }
 
     @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.eventID = (EventID) DataSerializer.readObject(in);
       this.serialNum = DataSerializer.readPrimitiveInt(in);
       this.notifyOfRegionDeparture = DataSerializer.readPrimitiveBoolean(in);
@@ -448,8 +450,9 @@ public class DestroyRegionOperation extends DistributedCacheOperation {
     }
 
     @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.eventID, out);
       DataSerializer.writePrimitiveInt(this.serialNum, out);
       DataSerializer.writePrimitiveBoolean(this.notifyOfRegionDeparture, out);
@@ -479,14 +482,16 @@ public class DestroyRegionOperation extends DistributedCacheOperation {
     }
 
     @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.context = 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.context, out);
     }
   }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXCommitMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXCommitMessage.java
index b7d9ef9..6e73b9f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXCommitMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXCommitMessage.java
@@ -46,6 +46,7 @@ import org.apache.geode.internal.Assert;
 import org.apache.geode.internal.cache.TXEntryState.DistTxThinEntryState;
 import org.apache.geode.internal.logging.LogService;
 import org.apache.geode.internal.logging.log4j.LogMarker;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 public class DistTXCommitMessage extends TXMessage {
 
@@ -140,14 +141,16 @@ public class DistTXCommitMessage extends TXMessage {
 
 
   @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.entryStateList = DataSerializer.readArrayList(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.writeArrayList(entryStateList, out);
   }
 
@@ -179,7 +182,7 @@ public class DistTXCommitMessage extends TXMessage {
     public DistTXCommitReplyMessage() {}
 
     public DistTXCommitReplyMessage(DataInput in) throws IOException, ClassNotFoundException {
-      fromData(in);
+      fromData(in, null);
     }
 
     private DistTXCommitReplyMessage(int processorId, TXCommitMessage val) {
@@ -241,14 +244,16 @@ public class DistTXCommitMessage extends TXMessage {
     }
 
     @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(commitMessage, out);
     }
 
     @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.commitMessage = (TXCommitMessage) DataSerializer.readObject(in);
     }
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXPrecommitMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXPrecommitMessage.java
index 38b4ba6..89363e3 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXPrecommitMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXPrecommitMessage.java
@@ -51,6 +51,7 @@ import org.apache.geode.internal.cache.tx.DistTxEntryEvent;
 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;
 
 public class DistTXPrecommitMessage extends TXMessage {
 
@@ -141,14 +142,16 @@ public class DistTXPrecommitMessage extends TXMessage {
   }
 
   @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((ArrayList<?>) secondaryTransactionalOperations, out);
   }
 
   @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.secondaryTransactionalOperations = DataSerializer.readArrayList(in);
   }
 
@@ -183,7 +186,7 @@ public class DistTXPrecommitMessage extends TXMessage {
     public DistTXPrecommitReplyMessage() {}
 
     public DistTXPrecommitReplyMessage(DataInput in) throws IOException, ClassNotFoundException {
-      fromData(in);
+      fromData(in, null);
     }
 
     private DistTXPrecommitReplyMessage(int processorId, DistTxPrecommitResponse val) {
@@ -245,14 +248,16 @@ public class DistTXPrecommitMessage extends TXMessage {
     }
 
     @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(commitResponse, out);
     }
 
     @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.commitResponse = (DistTxPrecommitResponse) DataSerializer.readObject(in);
     }
 
@@ -486,13 +491,15 @@ public class DistTXPrecommitMessage extends TXMessage {
     }
 
     @Override
-    public void toData(DataOutput out) throws IOException {
+    public void toData(DataOutput out,
+        SerializationContext context) throws IOException {
       DataSerializer.writeBoolean(commitState, out);
       DataSerializer.writeArrayList(distTxEventList, out);
     }
 
     @Override
-    public void fromData(DataInput in) throws IOException, ClassNotFoundException {
+    public void fromData(DataInput in,
+        SerializationContext context) throws IOException, ClassNotFoundException {
       this.commitState = DataSerializer.readBoolean(in);
       this.distTxEventList = DataSerializer.readArrayList(in);
     }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXRollbackMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXRollbackMessage.java
index 3770e79..48d920b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXRollbackMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXRollbackMessage.java
@@ -47,6 +47,7 @@ import org.apache.geode.internal.Assert;
 import org.apache.geode.internal.cache.tx.RemoteOperationMessage.RemoteOperationResponse;
 import org.apache.geode.internal.logging.LogService;
 import org.apache.geode.internal.logging.log4j.LogMarker;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 public class DistTXRollbackMessage extends TXMessage {
 
@@ -105,14 +106,16 @@ public class DistTXRollbackMessage extends TXMessage {
   }
 
   @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);
     // more data
   }
 
   @Override
-  public void toData(DataOutput out) throws IOException {
-    super.toData(out);
+  public void toData(DataOutput out,
+      SerializationContext context) throws IOException {
+    super.toData(out, context);
     // more data
   }
 
@@ -138,7 +141,7 @@ public class DistTXRollbackMessage extends TXMessage {
     public DistTXRollbackReplyMessage() {}
 
     public DistTXRollbackReplyMessage(DataInput in) throws IOException, ClassNotFoundException {
-      fromData(in);
+      fromData(in, null);
     }
 
     private DistTXRollbackReplyMessage(int processorId, Boolean val) {
@@ -199,14 +202,16 @@ public class DistTXRollbackMessage extends TXMessage {
     }
 
     @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.writeBoolean(this.rollbackState, out);
     }
 
     @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.rollbackState = DataSerializer.readBoolean(in);
     }
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedCacheOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedCacheOperation.java
index b2d34ef..d63e638 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedCacheOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedCacheOperation.java
@@ -82,6 +82,7 @@ import org.apache.geode.internal.offheap.StoredObject;
 import org.apache.geode.internal.offheap.annotations.Released;
 import org.apache.geode.internal.offheap.annotations.Unretained;
 import org.apache.geode.internal.sequencelog.EntryLogger;
+import org.apache.geode.internal.serialization.SerializationContext;
 import org.apache.geode.internal.util.DelayedAction;
 
 public abstract class DistributedCacheOperation {
@@ -1361,7 +1362,8 @@ public abstract class DistributedCacheOperation {
     }
 
     @Override
-    public void fromData(DataInput in) throws IOException, ClassNotFoundException {
+    public void fromData(DataInput in,
+        SerializationContext context) throws IOException, ClassNotFoundException {
       short bits = in.readShort();
       short extBits = in.readShort();
       this.flags = bits;
@@ -1404,7 +1406,8 @@ public abstract class DistributedCacheOperation {
     }
 
     @Override
-    public void toData(DataOutput out) throws IOException {
+    public void toData(DataOutput out,
+        SerializationContext context) throws IOException {
       short bits = 0;
       short extendedBits = 0;
       bits = computeCompressedShort(bits);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedClearOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedClearOperation.java
index 78f3ae0..2a1fc32 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedClearOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedClearOperation.java
@@ -29,6 +29,7 @@ import org.apache.geode.distributed.internal.membership.InternalDistributedMembe
 import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
 import org.apache.geode.internal.cache.versions.RegionVersionVector;
 import org.apache.geode.internal.cache.versions.VersionTag;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 public class DistributedClearOperation extends DistributedCacheOperation {
   public static enum OperationType {
@@ -229,8 +230,9 @@ public class DistributedClearOperation extends DistributedCacheOperation {
 
 
     @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.clearOp = OperationType.values()[in.readByte()];
       this.eventID = (EventID) DataSerializer.readObject(in);
       this.rvv = (RegionVersionVector) DataSerializer.readObject(in);
@@ -238,8 +240,9 @@ public class DistributedClearOperation extends DistributedCacheOperation {
     }
 
     @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.clearOp.ordinal());
       DataSerializer.writeObject(this.eventID, out);
       DataSerializer.writeObject(this.rvv, out);
@@ -282,14 +285,16 @@ public class DistributedClearOperation extends DistributedCacheOperation {
     }
 
     @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.context = 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.context, out);
     }
   }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedPutAllOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedPutAllOperation.java
index 6e9554e..4211519 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedPutAllOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedPutAllOperation.java
@@ -60,6 +60,7 @@ import org.apache.geode.internal.offheap.annotations.Retained;
 import org.apache.geode.internal.offheap.annotations.Unretained;
 import org.apache.geode.internal.serialization.ByteArrayDataInput;
 import org.apache.geode.internal.serialization.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * Handles distribution of a Region.putall operation.
@@ -397,9 +398,9 @@ public class DistributedPutAllOperation extends AbstractUpdateOperation {
      * that the callers to this method are backwards compatible by creating toDataPreXX methods for
      * them even if they are not changed. <br>
      * Callers for this method are: <br>
-     * {@link PutAllMessage#toData(DataOutput)} <br>
-     * {@link PutAllPRMessage#toData(DataOutput)} <br>
-     * {@link RemotePutAllMessage#toData(DataOutput)} <br>
+     * {@link DataSerializableFixedID#toData(DataOutput, SerializationContext)} <br>
+     * {@link DataSerializableFixedID#toData(DataOutput, SerializationContext)} <br>
+     * {@link DataSerializableFixedID#toData(DataOutput, SerializationContext)} <br>
      */
     public void toData(final DataOutput out) throws IOException {
       Object key = this.key;
@@ -664,7 +665,8 @@ public class DistributedPutAllOperation extends AbstractUpdateOperation {
     static final byte FLAG_TAG_WITH_NUMBER_ID = 3;
 
     @Override
-    public void toData(DataOutput out) throws IOException {
+    public void toData(DataOutput out,
+        SerializationContext context) throws IOException {
       int flags = 0;
       boolean hasTags = false;
 
@@ -720,7 +722,8 @@ public class DistributedPutAllOperation extends AbstractUpdateOperation {
     }
 
     @Override
-    public void fromData(DataInput in) throws IOException, ClassNotFoundException {
+    public void fromData(DataInput in,
+        SerializationContext context) throws IOException, ClassNotFoundException {
       int flags = in.readByte();
       boolean hasTags = (flags & 0x04) == 0x04;
       boolean persistent = (flags & 0x20) == 0x20;
@@ -764,12 +767,12 @@ public class DistributedPutAllOperation extends AbstractUpdateOperation {
 
     @Override
     public void writeExternal(ObjectOutput out) throws IOException {
-      toData(out);
+      toData(out, null);
     }
 
     @Override
     public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
-      fromData(in);
+      fromData(in, null);
     }
 
     @Override
@@ -1196,9 +1199,10 @@ public class DistributedPutAllOperation extends AbstractUpdateOperation {
     }
 
     @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.eventId = (EventID) DataSerializer.readObject(in);
       this.putAllDataSize = (int) InternalDataSerializer.readUnsignedVL(in);
       this.putAllData = new PutAllEntryData[this.putAllDataSize];
@@ -1225,8 +1229,9 @@ public class DistributedPutAllOperation extends AbstractUpdateOperation {
     }
 
     @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.eventId, out);
       InternalDataSerializer.writeUnsignedVL(this.putAllDataSize, out);
       if (this.putAllDataSize > 0) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegionFunctionStreamingMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegionFunctionStreamingMessage.java
index 2def2d5..b554ecc 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegionFunctionStreamingMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegionFunctionStreamingMessage.java
@@ -43,6 +43,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;
 
 public class DistributedRegionFunctionStreamingMessage extends DistributionMessage
     implements TransactionMessage {
@@ -309,8 +310,9 @@ public class DistributedRegionFunctionStreamingMessage extends DistributionMessa
   }
 
   @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);
 
     short flags = in.readShort();
     if ((flags & HAS_PROCESSOR_ID) != 0) {
@@ -341,8 +343,9 @@ public class DistributedRegionFunctionStreamingMessage extends DistributionMessa
   }
 
   @Override
-  public void toData(DataOutput out) throws IOException {
-    super.toData(out);
+  public void toData(DataOutput out,
+      SerializationContext context) throws IOException {
+    super.toData(out, context);
 
     short flags = 0;
     if (this.processorId != 0)
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRemoveAllOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRemoveAllOperation.java
index acca29a..42e26fb 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRemoveAllOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRemoveAllOperation.java
@@ -40,11 +40,9 @@ import org.apache.geode.internal.Version;
 import org.apache.geode.internal.cache.DistributedPutAllOperation.EntryVersionsList;
 import org.apache.geode.internal.cache.FilterRoutingInfo.FilterInfo;
 import org.apache.geode.internal.cache.ha.ThreadIdentifier;
-import org.apache.geode.internal.cache.partitioned.PutAllPRMessage;
 import org.apache.geode.internal.cache.partitioned.RemoveAllPRMessage;
 import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
 import org.apache.geode.internal.cache.tier.sockets.VersionedObjectList;
-import org.apache.geode.internal.cache.tx.RemotePutAllMessage;
 import org.apache.geode.internal.cache.tx.RemoteRemoveAllMessage;
 import org.apache.geode.internal.cache.versions.ConcurrentCacheModificationException;
 import org.apache.geode.internal.cache.versions.DiskVersionTag;
@@ -55,6 +53,8 @@ import org.apache.geode.internal.offheap.annotations.Released;
 import org.apache.geode.internal.offheap.annotations.Retained;
 import org.apache.geode.internal.offheap.annotations.Unretained;
 import org.apache.geode.internal.serialization.ByteArrayDataInput;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * Handles distribution of a Region.removeAll operation.
@@ -370,9 +370,9 @@ public class DistributedRemoveAllOperation extends AbstractUpdateOperation {
      * that the callers to this method are backwards compatible by creating toDataPreXX methods for
      * them even if they are not changed. <br>
      * Callers for this method are: <br>
-     * {@link RemoveAllMessage#toData(DataOutput)} <br>
-     * {@link PutAllPRMessage#toData(DataOutput)} <br>
-     * {@link RemotePutAllMessage#toData(DataOutput)} <br>
+     * {@link DataSerializableFixedID#toData(DataOutput, SerializationContext)} <br>
+     * {@link DataSerializableFixedID#toData(DataOutput, SerializationContext)} <br>
+     * {@link DataSerializableFixedID#toData(DataOutput, SerializationContext)} <br>
      */
     public void toData(final DataOutput out) throws IOException {
       Object key = this.key;
@@ -979,9 +979,10 @@ public class DistributedRemoveAllOperation extends AbstractUpdateOperation {
     }
 
     @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.eventId = (EventID) DataSerializer.readObject(in);
       this.removeAllDataSize = (int) InternalDataSerializer.readUnsignedVL(in);
       this.removeAllData = new RemoveAllEntryData[this.removeAllDataSize];
@@ -1008,9 +1009,10 @@ public class DistributedRemoveAllOperation extends AbstractUpdateOperation {
     }
 
     @Override
-    public void toData(DataOutput out) throws IOException {
+    public void toData(DataOutput out,
+        SerializationContext context) throws IOException {
 
-      super.toData(out);
+      super.toData(out, context);
       DataSerializer.writeObject(this.eventId, out);
       InternalDataSerializer.writeUnsignedVL(this.removeAllDataSize, out);
       if (this.removeAllDataSize > 0) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedTombstoneOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedTombstoneOperation.java
index 9c847f2..de35308 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedTombstoneOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedTombstoneOperation.java
@@ -34,6 +34,7 @@ import org.apache.geode.internal.Version;
 import org.apache.geode.internal.cache.FilterRoutingInfo.FilterInfo;
 import org.apache.geode.internal.cache.persistence.DiskStoreID;
 import org.apache.geode.internal.cache.versions.VersionSource;
+import org.apache.geode.internal.serialization.SerializationContext;
 import org.apache.geode.internal.serialization.SerializationVersions;
 
 public class DistributedTombstoneOperation extends DistributedCacheOperation {
@@ -181,8 +182,9 @@ public class DistributedTombstoneOperation extends DistributedCacheOperation {
     }
 
     @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.op = TOperation.values()[in.readByte()];
       // this.regionVersion = in.readLong();
       int count = in.readInt();
@@ -203,8 +205,9 @@ public class DistributedTombstoneOperation extends DistributedCacheOperation {
     }
 
     @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.op.ordinal());
       // out.writeLong(this.regionVersion);
       out.writeInt(this.regionGCVersions.size());
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/EntryEventImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/EntryEventImpl.java
index 0b94d4a..67637f7 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/EntryEventImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/EntryEventImpl.java
@@ -79,6 +79,7 @@ import org.apache.geode.internal.offheap.annotations.Retained;
 import org.apache.geode.internal.offheap.annotations.Unretained;
 import org.apache.geode.internal.serialization.ByteArrayDataInput;
 import org.apache.geode.internal.serialization.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.SerializationContext;
 import org.apache.geode.internal.size.Sizeable;
 import org.apache.geode.internal.util.ArrayUtils;
 import org.apache.geode.internal.util.BlobHelper;
@@ -192,7 +193,8 @@ public class EntryEventImpl implements InternalEntryEvent, InternalCacheEvent,
    * Reads the contents of this message from the given input.
    */
   @Override
-  public void fromData(DataInput in) throws IOException, ClassNotFoundException {
+  public void fromData(DataInput in,
+      SerializationContext context) throws IOException, ClassNotFoundException {
     this.eventID = (EventID) DataSerializer.readObject(in);
     Object key = DataSerializer.readObject(in);
     Object value = DataSerializer.readObject(in);
@@ -2228,7 +2230,8 @@ public class EntryEventImpl implements InternalEntryEvent, InternalCacheEvent,
   }
 
   @Override
-  public void toData(DataOutput out) throws IOException {
+  public void toData(DataOutput out,
+      SerializationContext context) throws IOException {
     DataSerializer.writeObject(this.eventID, out);
     DataSerializer.writeObject(this.getKey(), out);
     DataSerializer.writeObject(this.keyInfo.getValue(), out);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/EventID.java b/geode-core/src/main/java/org/apache/geode/internal/cache/EventID.java
index 5e08365..31e9e61 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/EventID.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/EventID.java
@@ -46,6 +46,7 @@ import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
 import org.apache.geode.internal.logging.LogService;
 import org.apache.geode.internal.serialization.ByteArrayDataInput;
 import org.apache.geode.internal.serialization.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.SerializationContext;
 import org.apache.geode.internal.util.Breadcrumbs;
 
 /**
@@ -347,7 +348,8 @@ public class EventID implements DataSerializableFixedID, Serializable, Externali
   }
 
   @Override
-  public void toData(DataOutput dop) throws IOException {
+  public void toData(DataOutput dop,
+      SerializationContext context) throws IOException {
     Version version = InternalDataSerializer.getVersionForDataStream(dop);
     // if we are sending to old clients we need to reserialize the ID
     // using the client's version to ensure it gets the proper on-wire form
@@ -369,14 +371,16 @@ public class EventID implements DataSerializableFixedID, Serializable, Externali
     dop.writeByte(this.breadcrumbCounter);
   }
 
-  public void toDataPre_GFE_8_0_0_0(DataOutput dop) throws IOException {
+  public void toDataPre_GFE_8_0_0_0(DataOutput dop, SerializationContext context)
+      throws IOException {
     DataSerializer.writeByteArray(this.membershipID, dop);
     DataSerializer.writeByteArray(getOptimizedByteArrayForEventID(this.threadID, this.sequenceID),
         dop);
   }
 
   @Override
-  public void fromData(DataInput di) throws IOException, ClassNotFoundException {
+  public void fromData(DataInput di,
+      SerializationContext context) throws IOException, ClassNotFoundException {
     this.membershipID = DataSerializer.readByteArray(di);
     ByteBuffer eventIdParts = ByteBuffer.wrap(DataSerializer.readByteArray(di));
     this.threadID = readEventIdPartsFromOptmizedByteArray(eventIdParts);
@@ -385,7 +389,8 @@ public class EventID implements DataSerializableFixedID, Serializable, Externali
     this.breadcrumbCounter = di.readByte();
   }
 
-  public void fromDataPre_GFE_8_0_0_0(DataInput di) throws IOException, ClassNotFoundException {
+  public void fromDataPre_GFE_8_0_0_0(DataInput di, SerializationContext context)
+      throws IOException, ClassNotFoundException {
     this.membershipID = DataSerializer.readByteArray(di);
     ByteBuffer eventIdParts = ByteBuffer.wrap(DataSerializer.readByteArray(di));
     this.threadID = readEventIdPartsFromOptmizedByteArray(eventIdParts);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/EventStateHelper.java b/geode-core/src/main/java/org/apache/geode/internal/cache/EventStateHelper.java
index cd45b65..4d52aad 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/EventStateHelper.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/EventStateHelper.java
@@ -26,11 +26,10 @@ import java.util.Map;
 import org.apache.geode.DataSerializer;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
 import org.apache.geode.internal.InternalDataSerializer;
-import org.apache.geode.internal.cache.CreateRegionProcessor.CreateRegionReplyMessage;
-import org.apache.geode.internal.cache.InitialImageOperation.RegionStateMessage;
 import org.apache.geode.internal.cache.event.EventSequenceNumberHolder;
 import org.apache.geode.internal.cache.ha.HARegionQueue.DispatchedAndCurrentEvents;
 import org.apache.geode.internal.cache.ha.ThreadIdentifier;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
 
 /**
  * A helper class for serializing the event state map.
@@ -45,8 +44,10 @@ public class EventStateHelper {
    * creating toDataPreXX methods. Also make sure that the callers to this method are backwards
    * compatible by creating toDataPreXX methods for them even if they are not changed. <br>
    * Callers for this method are: <br>
-   * {@link CreateRegionReplyMessage#toData(DataOutput)} <br>
-   * {@link RegionStateMessage#toData(DataOutput)} <br>
+   * {@link DataSerializableFixedID#toData(DataOutput, org.apache.geode.internal.serialization.SerializationContext)}
+   * <br>
+   * {@link DataSerializableFixedID#toData(DataOutput, org.apache.geode.internal.serialization.SerializationContext)}
+   * <br>
    *
    * @param myId the memberId that is serializing
    */
@@ -102,8 +103,10 @@ public class EventStateHelper {
    * creating fromDataPreXX methods. Also make sure that the callers to this method are backwards
    * compatible by creating fromDataPreXX methods for them even if they are not changed. <br>
    * Callers for this method are: <br>
-   * {@link CreateRegionReplyMessage#fromData(DataInput)} <br>
-   * {@link RegionStateMessage#fromData(DataInput)} <br>
+   * {@link DataSerializableFixedID#fromData(DataInput, org.apache.geode.internal.serialization.SerializationContext)}
+   * <br>
+   * {@link DataSerializableFixedID#fromData(DataInput, org.apache.geode.internal.serialization.SerializationContext)}
+   * <br>
    */
   public static Map deDataSerialize(DataInput dip, boolean isHARegion)
       throws IOException, ClassNotFoundException {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ExpireDisconnectedClientTransactionsMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ExpireDisconnectedClientTransactionsMessage.java
index 5ac5858..5c7c079 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/ExpireDisconnectedClientTransactionsMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ExpireDisconnectedClientTransactionsMessage.java
@@ -26,6 +26,7 @@ import org.apache.geode.distributed.internal.DistributionManager;
 import org.apache.geode.distributed.internal.HighPriorityDistributionMessage;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
 import org.apache.geode.internal.Version;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 public class ExpireDisconnectedClientTransactionsMessage
     extends HighPriorityDistributionMessage {
@@ -54,12 +55,14 @@ public class ExpireDisconnectedClientTransactionsMessage
   }
 
   @Override
-  public void toData(DataOutput out) throws IOException {
+  public void toData(DataOutput out,
+      SerializationContext context) throws IOException {
     DataSerializer.writeHashSet((HashSet<TXId>) this.txIds, out);
   }
 
   @Override
-  public void fromData(DataInput in) throws IOException, ClassNotFoundException {
+  public void fromData(DataInput in,
+      SerializationContext context) throws IOException, ClassNotFoundException {
     this.txIds = DataSerializer.readHashSet(in);
   }
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/FilterProfile.java b/geode-core/src/main/java/org/apache/geode/internal/cache/FilterProfile.java
index 29d2da1..b6940c9 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/FilterProfile.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/FilterProfile.java
@@ -77,6 +77,7 @@ import org.apache.geode.internal.logging.LogService;
 import org.apache.geode.internal.logging.log4j.LogMarker;
 import org.apache.geode.internal.offheap.annotations.Unretained;
 import org.apache.geode.internal.serialization.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.SerializationContext;
 import org.apache.geode.internal.util.concurrent.CopyOnWriteHashMap;
 
 /**
@@ -1484,7 +1485,8 @@ public class FilterProfile implements DataSerializableFixedID {
 
 
   @Override
-  public void fromData(DataInput in) throws IOException, ClassNotFoundException {
+  public void fromData(DataInput in,
+      SerializationContext context) throws IOException, ClassNotFoundException {
     InternalDistributedMember id = new InternalDistributedMember();
     InternalDataSerializer.invokeFromData(id, in);
     this.memberID = id;
@@ -1523,7 +1525,8 @@ public class FilterProfile implements DataSerializableFixedID {
   }
 
   @Override
-  public void toData(DataOutput out) throws IOException {
+  public void toData(DataOutput out,
+      SerializationContext context) throws IOException {
     InternalDataSerializer.invokeToData(memberID, out);
     InternalDataSerializer.writeSetOfLongs(this.allKeyClients.getSnapshot(),
         this.clientMap.hasLongID, out);
@@ -1985,8 +1988,9 @@ public class FilterProfile implements DataSerializableFixedID {
     }
 
     @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);
       out.writeUTF(this.regionName);
       out.writeShort(this.opType.ordinal());
@@ -2008,8 +2012,9 @@ public class FilterProfile implements DataSerializableFixedID {
     }
 
     @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.regionName = in.readUTF();
       this.opType = operationType.values()[in.readShort()];
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/FilterRoutingInfo.java b/geode-core/src/main/java/org/apache/geode/internal/cache/FilterRoutingInfo.java
index f227aba..8fcf163 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/FilterRoutingInfo.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/FilterRoutingInfo.java
@@ -35,6 +35,7 @@ import org.apache.geode.internal.ObjToByteArraySerializer;
 import org.apache.geode.internal.Version;
 import org.apache.geode.internal.VersionedDataSerializable;
 import org.apache.geode.internal.serialization.ByteArrayDataInput;
+import org.apache.geode.internal.serialization.StaticSerialization;
 
 /**
  * This class is used to hold the information about the servers and their Filters (CQs and Interest
@@ -380,7 +381,7 @@ public class FilterRoutingInfo implements VersionedDataSerializable {
       size += interestedClients == null ? 4 : interestedClients.size() * 8 + 5;
       size += interestedClientsInv == null ? 4 : interestedClientsInv.size() * 8 + 5;
       size += cqs == null ? 0 : cqs.size() * 12;
-      byte[] myData = InternalDataSerializer.getThreadLocalByteArray(size);
+      byte[] myData = StaticSerialization.getThreadLocalByteArray(size);
       hdos = new HeapDataOutputStream(myData);
       hdos.disallowExpansion();
       if (this.cqs == null) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/FindDurableQueueProcessor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/FindDurableQueueProcessor.java
index 2f95748..51aae3a 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/FindDurableQueueProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/FindDurableQueueProcessor.java
@@ -38,6 +38,7 @@ import org.apache.geode.distributed.internal.ServerLocation;
 import org.apache.geode.distributed.internal.ServerLocator;
 import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
 import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * A processor for helping a locator find the durable queues for a given durable client id. Asks
@@ -169,15 +170,17 @@ public class FindDurableQueueProcessor 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.proxyId = ClientProxyMembershipID.readCanonicalized(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.writeObject(this.proxyId, out);
     }
@@ -204,14 +207,16 @@ public class FindDurableQueueProcessor 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.matches = DataSerializer.readArrayList(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.writeArrayList(matches, out);
     }
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/FindRemoteTXMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/FindRemoteTXMessage.java
index 4c8cd34..cc9c64c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/FindRemoteTXMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/FindRemoteTXMessage.java
@@ -40,6 +40,7 @@ import org.apache.geode.distributed.internal.membership.InternalDistributedMembe
 import org.apache.geode.internal.InternalDataSerializer;
 import org.apache.geode.internal.cache.partitioned.PartitionMessage;
 import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * Message to all the peers to ask which member hosts the transaction for the given transaction id
@@ -161,15 +162,17 @@ public class FindRemoteTXMessage 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);
     DataSerializer.writeObject(this.txId, out);
     out.writeInt(this.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);
     this.txId = DataSerializer.readObject(in);
     this.processorId = in.readInt();
   }
@@ -254,8 +257,9 @@ public class FindRemoteTXMessage 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.writeBoolean(this.isHostingTx);
       boolean sendTXCommitMessage = this.txCommitMessage != null;
       out.writeBoolean(sendTXCommitMessage);
@@ -268,8 +272,9 @@ public class FindRemoteTXMessage 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);
       this.isHostingTx = in.readBoolean();
       if (in.readBoolean()) {
         this.isPartialCommitMessage = in.readBoolean();
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/FindVersionTagOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/FindVersionTagOperation.java
index ea440d0..c16aa8e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/FindVersionTagOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/FindVersionTagOperation.java
@@ -34,6 +34,7 @@ import org.apache.geode.distributed.internal.ReplyProcessor21;
 import org.apache.geode.internal.InternalDataSerializer;
 import org.apache.geode.internal.cache.versions.VersionTag;
 import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 public class FindVersionTagOperation {
   private static final Logger logger = LogService.getLogger();
@@ -173,8 +174,9 @@ public class FindVersionTagOperation {
     }
 
     @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);
       out.writeUTF(this.regionName);
       InternalDataSerializer.invokeToData(this.eventId, out);
@@ -182,8 +184,9 @@ public class FindVersionTagOperation {
     }
 
     @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.regionName = in.readUTF();
       this.eventId = new EventID();
@@ -214,14 +217,16 @@ public class FindVersionTagOperation {
     }
 
     @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.versionTag, out);
     }
 
     @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.versionTag = (VersionTag) DataSerializer.readObject(in);
     }
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/FunctionStreamingReplyMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/FunctionStreamingReplyMessage.java
index e6dcde6..7a127e7 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/FunctionStreamingReplyMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/FunctionStreamingReplyMessage.java
@@ -29,6 +29,7 @@ import org.apache.geode.distributed.internal.ReplyException;
 import org.apache.geode.distributed.internal.ReplyMessage;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
 import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 public class FunctionStreamingReplyMessage extends ReplyMessage {
   private static final Logger logger = LogService.getLogger();
@@ -81,8 +82,9 @@ public class FunctionStreamingReplyMessage extends ReplyMessage {
   }
 
   @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.msgNum = in.readInt();
     this.lastMsg = in.readBoolean();
     this.processorId = in.readInt();
@@ -98,8 +100,9 @@ public class FunctionStreamingReplyMessage extends ReplyMessage {
   }
 
   @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.msgNum);
     out.writeBoolean(this.lastMsg);
     out.writeInt(this.processorId);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/GridAdvisor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/GridAdvisor.java
index 83d041b..db7c184 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/GridAdvisor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/GridAdvisor.java
@@ -30,6 +30,7 @@ import org.apache.geode.distributed.internal.DistributionAdvisee;
 import org.apache.geode.distributed.internal.DistributionAdvisor;
 import org.apache.geode.distributed.internal.InternalLocator;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * Used to share code with BridgeServerAdvisor and ControllerAdvisor
@@ -356,15 +357,17 @@ public abstract class GridAdvisor extends DistributionAdvisor {
     }
 
     @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.host, out);
       DataSerializer.writePrimitiveInt(this.port, out);
     }
 
     @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.host = DataSerializer.readString(in);
       this.port = DataSerializer.readPrimitiveInt(in);
       finishInit();
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/HARegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/HARegion.java
index 9f2e989..2f75681 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/HARegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/HARegion.java
@@ -46,6 +46,7 @@ import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
 import org.apache.geode.internal.cache.tier.sockets.HAEventWrapper;
 import org.apache.geode.internal.logging.LogService;
 import org.apache.geode.internal.offheap.annotations.Released;
+import org.apache.geode.internal.serialization.SerializationContext;
 import org.apache.geode.internal.statistics.StatisticsClock;
 
 /**
@@ -547,8 +548,9 @@ public class HARegion extends DistributedRegion {
        * DataInput)
        */
       @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);
         int flags = in.readByte();
         hasRegisteredInterest = (flags & HAS_REGISTERED_INTEREST_BIT) != 0;
         isPrimary = (flags & IS_PRIMARY_BIT) != 0;
@@ -561,8 +563,9 @@ public class HARegion extends DistributedRegion {
        * DataOutput)
        */
       @Override
-      public void toData(DataOutput out) throws IOException {
-        super.toData(out);
+      public void toData(DataOutput out,
+          SerializationContext context) throws IOException {
+        super.toData(out, context);
         int flags = 0;
         if (hasRegisteredInterest) {
           flags |= HAS_REGISTERED_INTEREST_BIT;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/InitialImageFlowControl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/InitialImageFlowControl.java
index f8c1ab6..45bde2e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/InitialImageFlowControl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/InitialImageFlowControl.java
@@ -34,6 +34,7 @@ import org.apache.geode.distributed.internal.ProcessorKeeper21;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
 import org.apache.geode.internal.logging.LogService;
 import org.apache.geode.internal.serialization.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * This class keeps track of how many InitialImageMessages are in flight between the initial image
@@ -237,14 +238,16 @@ public class InitialImageFlowControl implements MembershipListener {
     }
 
     @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);
       keeperId = 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(keeperId);
     }
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/InitialImageOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/InitialImageOperation.java
index fc126bd..03c429b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/InitialImageOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/InitialImageOperation.java
@@ -96,6 +96,7 @@ import org.apache.geode.internal.sequencelog.EntryLogger;
 import org.apache.geode.internal.sequencelog.RegionLogger;
 import org.apache.geode.internal.serialization.ByteArrayDataInput;
 import org.apache.geode.internal.serialization.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.SerializationContext;
 import org.apache.geode.internal.util.ObjectIntProcedure;
 
 /**
@@ -2122,8 +2123,9 @@ public class InitialImageOperation {
     }
 
     @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.processorId = in.readInt();
       this.keysOnly = in.readBoolean();
@@ -2136,8 +2138,9 @@ public class InitialImageOperation {
     }
 
     @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.writeInt(this.processorId);
       out.writeBoolean(this.keysOnly);
@@ -2350,15 +2353,17 @@ public class InitialImageOperation {
     }
 
     @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.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);
       DataSerializer.writeString(this.regionPath, out);
       out.writeInt(this.processorId);
     }
@@ -2482,12 +2487,13 @@ public class InitialImageOperation {
     }
 
     @Override
-    public void toData(DataOutput dop) throws IOException {
-      super.toData(dop);
+    public void toData(DataOutput dop,
+        SerializationContext context) throws IOException {
+      super.toData(dop, context);
       if (versionVector != null) {
         dop.writeBoolean(true);
         dop.writeBoolean(versionVector instanceof DiskRegionVersionVector);
-        versionVector.toData(dop);
+        versionVector.toData(dop, null);
       } else {
         dop.writeBoolean(false);
       }
@@ -2504,8 +2510,9 @@ public class InitialImageOperation {
     }
 
     @Override
-    public void fromData(DataInput dip) throws IOException, ClassNotFoundException {
-      super.fromData(dip);
+    public void fromData(DataInput dip,
+        SerializationContext context) throws IOException, ClassNotFoundException {
+      super.fromData(dip, context);
       boolean has = dip.readBoolean();
       if (has) {
         boolean persistent = dip.readBoolean();
@@ -2621,16 +2628,18 @@ public class InitialImageOperation {
     }
 
     @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.processorId = in.readInt();
       this.targetReinitialized = 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);
       DataSerializer.writeString(this.regionPath, out);
       out.writeInt(this.processorId);
       out.writeBoolean(this.targetReinitialized);
@@ -2713,8 +2722,9 @@ public class InitialImageOperation {
     }
 
     @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.writeBoolean(this.lostVersionSources[0] instanceof DiskStoreID);
       out.writeInt(this.lostVersionSources.length);
@@ -2724,8 +2734,9 @@ public class InitialImageOperation {
     }
 
     @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);
       boolean persistentIDs = in.readBoolean();
       int len = in.readInt();
@@ -2862,8 +2873,9 @@ public class InitialImageOperation {
     }
 
     @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);
       ArrayList list = DataSerializer.readArrayList(in);
       Object listData = null;
       if (list != null /* fix bug 46874 */ && list.size() > 0) {
@@ -2898,8 +2910,9 @@ public class InitialImageOperation {
     }
 
     @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.entries instanceof InitialImageVersionedEntryList) {
         ArrayList list = new ArrayList(1);
         list.add(this.entries);
@@ -3064,7 +3077,8 @@ public class InitialImageOperation {
     }
 
     @Override
-    public void toData(DataOutput out) throws IOException {
+    public void toData(DataOutput out,
+        SerializationContext context) throws IOException {
       out.writeByte(this.entryBits);
       byte flags = (this.versionTag != null) ? HAS_VERSION : 0;
       flags |= (this.versionTag instanceof DiskVersionTag) ? PERSISTENT_VERSION : 0;
@@ -3083,7 +3097,8 @@ public class InitialImageOperation {
     static final byte PERSISTENT_VERSION = 0x02;
 
     @Override
-    public void fromData(DataInput in) throws IOException, ClassNotFoundException {
+    public void fromData(DataInput in,
+        SerializationContext context) throws IOException, ClassNotFoundException {
       this.entryBits = in.readByte();
       byte flags = in.readByte();
       this.key = DataSerializer.readObject(in);
@@ -3103,7 +3118,7 @@ public class InitialImageOperation {
     public int calcSerializedSize() {
       NullDataOutputStream dos = new NullDataOutputStream();
       try {
-        toData(dos);
+        toData(dos, null);
         return dos.size();
       } catch (IOException ex) {
         RuntimeException ex2 = new IllegalArgumentException(
@@ -3271,7 +3286,8 @@ public class InitialImageOperation {
     static final byte FLAG_TAG_WITH_NUMBER_ID = 3;
 
     @Override
-    public void toData(DataOutput out) throws IOException {
+    public void toData(DataOutput out,
+        SerializationContext context) throws IOException {
       int flags = 0;
       boolean hasEntries = false;
       boolean hasTags = false;
@@ -3341,7 +3357,8 @@ public class InitialImageOperation {
     }
 
     @Override
-    public void fromData(DataInput in) throws IOException, ClassNotFoundException {
+    public void fromData(DataInput in,
+        SerializationContext context) throws IOException, ClassNotFoundException {
       final boolean isGiiVersionEntryDebugEnabled =
           logger.isTraceEnabled(LogMarker.INITIAL_IMAGE_VERSIONED_VERBOSE);
 
@@ -3402,12 +3419,12 @@ public class InitialImageOperation {
 
     @Override
     public void writeExternal(ObjectOutput out) throws IOException {
-      toData(out);
+      toData(out, null);
     }
 
     @Override
     public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
-      fromData(in);
+      fromData(in, null);
     }
 
     @Override
@@ -3468,8 +3485,9 @@ public class InitialImageOperation {
     }
 
     @Override
-    public void toData(DataOutput dop) throws IOException {
-      super.toData(dop);
+    public void toData(DataOutput dop,
+        SerializationContext context) throws IOException {
+      super.toData(dop, context);
       dop.writeBoolean(isHARegion);
       if (eventState != null) {
         dop.writeBoolean(true);
@@ -3501,8 +3519,9 @@ public class InitialImageOperation {
     }
 
     @Override
-    public void fromData(DataInput dip) throws IOException, ClassNotFoundException {
-      super.fromData(dip);
+    public void fromData(DataInput dip,
+        SerializationContext context) throws IOException, ClassNotFoundException {
+      super.fromData(dip, context);
       isHARegion = dip.readBoolean();
       boolean has = dip.readBoolean();
       if (has) {
@@ -4015,8 +4034,9 @@ public class InitialImageOperation {
     }
 
     @Override
-    public void toData(DataOutput dop) throws IOException {
-      super.toData(dop);
+    public void toData(DataOutput dop,
+        SerializationContext context) throws IOException {
+      super.toData(dop, context);
       // DataSerializer.writeString(this.haRegion.getName(), dop);
       DataSerializer.writeHashMap((HashMap) this.emptyRegionMap, dop);
       // Write interest info.
@@ -4045,8 +4065,9 @@ public class InitialImageOperation {
     }
 
     @Override
-    public void fromData(DataInput dip) throws IOException, ClassNotFoundException {
-      super.fromData(dip);
+    public void fromData(DataInput dip,
+        SerializationContext context) throws IOException, ClassNotFoundException {
+      super.fromData(dip, context);
       // String regionName = DataSerializer.readString(dip);
       this.emptyRegionMap = DataSerializer.readHashMap(dip);
       // Read interest info.
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/InvalidateOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/InvalidateOperation.java
index f1b6942..5ae7ca6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/InvalidateOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/InvalidateOperation.java
@@ -31,6 +31,7 @@ import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
 import org.apache.geode.internal.cache.versions.ConcurrentCacheModificationException;
 import org.apache.geode.internal.logging.LogService;
 import org.apache.geode.internal.offheap.annotations.Retained;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 /**
  * Handles distribution messaging for invalidating an entry in a region.
@@ -126,15 +127,17 @@ public class InvalidateOperation extends DistributedCacheOperation {
     }
 
     @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.eventId = (EventID) DataSerializer.readObject(in);
       this.key = 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.eventId, out);
       DataSerializer.writeObject(this.key, out);
     }
@@ -182,14 +185,16 @@ public class InvalidateOperation extends DistributedCacheOperation {
     }
 
     @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.context = ClientProxyMembershipID.readCanonicalized(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.context, out);
     }
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/InvalidatePartitionedRegionMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/InvalidatePartitionedRegionMessage.java
index 06a4c3f..ff415da 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/InvalidatePartitionedRegionMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/InvalidatePartitionedRegionMessage.java
@@ -27,6 +27,7 @@ import org.apache.geode.distributed.internal.ClusterDistributionManager;
 import org.apache.geode.distributed.internal.ReplyProcessor21;
 import org.apache.geode.internal.Version;
 import org.apache.geode.internal.cache.partitioned.PartitionMessage;
+import org.apache.geode.internal.serialization.SerializationContext;
 
 public class InvalidatePartitionedRegionMessage extends PartitionMessage {
 
@@ -86,9 +87,10 @@ public class InvalidatePartitionedRegionMessage extends PartitionMessage {
     return INVALIDATE_PARTITIONED_REGION_MESSAGE;
... 8860 lines suppressed ...


[geode] 02/05: redoing lost work

Posted by bs...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

bschuchardt pushed a commit to branch dsfid_separation_wip
in repository https://gitbox.apache.org/repos/asf/geode.git

commit 4c4e727647a04317756cdfe11f48e5721bba2fe7
Author: Bruce Schuchardt <bs...@pivotal.io>
AuthorDate: Fri Aug 23 13:38:00 2019 -0700

    redoing lost work
---
 .../geode/ClusterCommunicationsDUnitTest.java      |   12 +-
 ...ackwardCompatibilitySerializationDUnitTest.java |   24 +-
 .../cache/client/ClientCacheFactoryJUnitTest.java  |    8 +-
 .../ResultsDataSerializabilityJUnitTest.java       |    2 +-
 .../gms/messenger/JGroupsMessengerJUnitTest.java   |    2 +-
 ...FOEvictionAlgoMemoryEnabledRegionJUnitTest.java |    2 +-
 .../apache/geode/pdx/PdxSerializableJUnitTest.java |    2 +-
 .../internal/InternalDataSerializerBenchmark.java  |    4 +-
 .../main/java/org/apache/geode/DataSerializer.java |    2 +-
 .../admin/jmx/internal/StatAlertNotification.java  |    2 +-
 .../geode/cache/client/internal/AbstractOp.java    |    2 +-
 .../cache/client/internal/AuthenticateUserOp.java  |    2 +-
 .../client/internal/ClientSideHandshakeImpl.java   |   12 +-
 .../apache/geode/cache/client/internal/PutOp.java  |    2 +-
 .../internal/locator/ClientConnectionRequest.java  |    2 +-
 .../internal/locator/ClientConnectionResponse.java |    2 +-
 .../internal/locator/ClientReplacementRequest.java |    2 +-
 .../internal/locator/GetAllServersRequest.java     |    2 +-
 .../internal/locator/GetAllServersResponse.java    |    2 +-
 .../internal/locator/LocatorListRequest.java       |    2 +-
 .../internal/locator/LocatorListResponse.java      |    2 +-
 .../internal/locator/LocatorStatusRequest.java     |    4 +-
 .../internal/locator/LocatorStatusResponse.java    |    2 +-
 .../internal/locator/QueueConnectionRequest.java   |    2 +-
 .../internal/locator/QueueConnectionResponse.java  |    2 +-
 .../internal/locator/ServerLocationRequest.java    |    2 +-
 .../internal/locator/ServerLocationResponse.java   |    2 +-
 .../apache/geode/cache/query/internal/CqEntry.java |    2 +-
 .../internal/CumulativeNonDistinctResults.java     |    4 +-
 .../cache/query/internal/LinkedResultSet.java      |    2 +-
 .../cache/query/internal/LinkedStructSet.java      |    2 +-
 .../cache/query/internal/NWayMergeResults.java     |    4 +-
 .../geode/cache/query/internal/NullToken.java      |    2 +-
 .../cache/query/internal/PRQueryTraceInfo.java     |    2 +-
 .../geode/cache/query/internal/ResultsBag.java     |    2 +-
 .../query/internal/ResultsCollectionWrapper.java   |    2 +-
 .../geode/cache/query/internal/ResultsSet.java     |    2 +-
 .../cache/query/internal/SortedResultSet.java      |    2 +-
 .../cache/query/internal/SortedStructSet.java      |    2 +-
 .../geode/cache/query/internal/StructImpl.java     |    2 +-
 .../geode/cache/query/internal/StructSet.java      |    2 +-
 .../geode/cache/query/internal/Undefined.java      |    2 +-
 .../query/internal/index/IndexCreationData.java    |    2 +-
 .../cache/query/internal/types/ObjectTypeImpl.java |    2 +-
 .../apache/geode/cache/wan/EventSequenceID.java    |    2 +-
 .../distributed/internal/DistributionAdvisor.java  |    2 +-
 .../distributed/internal/DistributionMessage.java  |    2 +-
 .../internal/InternalDistributedSystem.java        |    7 -
 .../distributed/internal/ReplyProcessor21.java     |    2 +-
 .../geode/distributed/internal/ServerLocator.java  |    2 +-
 .../internal/WaitForViewInstallation.java          |    2 +-
 .../internal/locks/DLockRemoteToken.java           |    2 +-
 .../distributed/internal/locks/DLockService.java   |    2 +-
 .../membership/InternalDistributedMember.java      |    2 +-
 .../membership/adapter/GMSMembershipManager.java   |    2 +-
 .../membership/adapter/GMSMessageAdapter.java      |    2 +-
 .../internal/membership/gms/GMSMember.java         |    2 +-
 .../internal/membership/gms/GMSMembershipView.java |    2 +-
 .../internal/membership/gms/GMSUtil.java           |    4 +-
 .../membership/gms/interfaces/Manager.java         |    2 +-
 .../gms/locator/FindCoordinatorResponse.java       |    2 +-
 .../membership/gms/locator/GetViewRequest.java     |    2 +-
 .../membership/gms/locator/GetViewResponse.java    |    2 +-
 .../membership/gms/membership/GMSJoinLeave.java    |    6 +-
 .../gms/messages/AbstractGMSMessage.java           |    2 +-
 .../membership/gms/messenger/JGroupsMessenger.java |   14 +-
 .../distributed/internal/tcpserver/TcpClient.java  |   21 +-
 .../distributed/internal/tcpserver/TcpServer.java  |   14 +-
 .../{serialization => }/ByteBufferWriter.java      |    0
 .../org/apache/geode/internal/DSFIDFactory.java    | 1104 ++++++++++++++++++--
 .../apache/geode/internal/ExternalizableDSFID.java |    2 +
 .../geode/internal/HeapDataOutputStream.java       | 1032 +-----------------
 .../geode/internal/InternalDataSerializer.java     |  122 +--
 .../org/apache/geode/internal/SystemAdmin.java     |    7 +-
 .../internal/{serialization => }/Version.java      |   13 +
 .../geode/internal/VersionedDataSerializable.java  |    1 +
 .../{serialization => }/VersionedObjectInput.java  |    9 +-
 .../{serialization => }/VersionedObjectOutput.java |    9 +-
 .../internal/admin/ClientMembershipMessage.java    |    3 +-
 .../internal/admin/remote/ClientHealthStats.java   |    2 +-
 .../admin/remote/DurableClientInfoRequest.java     |    2 +-
 .../statalerts/GaugeThresholdDecoratorImpl.java    |    2 +-
 .../statalerts/NumberThresholdDecoratorImpl.java   |    2 +-
 .../geode/internal/cache/AbstractRegion.java       |    2 +-
 .../internal/cache/CacheDistributionAdvisor.java   |    2 +-
 .../cache/CachedDeserializableFactory.java         |    2 +-
 .../internal/cache/DistTXPrecommitMessage.java     |    2 +-
 .../internal/cache/DistributedPutAllOperation.java |    4 +-
 .../cache/DistributedRemoveAllOperation.java       |    2 +-
 .../cache/DistributedTombstoneOperation.java       |    2 +-
 .../geode/internal/cache/EntryEventImpl.java       |    4 +-
 .../org/apache/geode/internal/cache/EventID.java   |    7 +-
 .../apache/geode/internal/cache/FilterProfile.java |    4 +-
 .../geode/internal/cache/FilterRoutingInfo.java    |    5 +-
 .../geode/internal/cache/GemFireCacheImpl.java     |    2 +-
 .../internal/cache/InitialImageFlowControl.java    |    2 +-
 .../internal/cache/InitialImageOperation.java      |   10 +-
 .../cache/InvalidatePartitionedRegionMessage.java  |    2 +-
 .../geode/internal/cache/NonLocalRegionEntry.java  |    2 +-
 .../org/apache/geode/internal/cache/Oplog.java     |    2 +-
 .../geode/internal/cache/PRQueryProcessor.java     |    2 +-
 .../cache/PreferBytesCachedDeserializable.java     |    2 +-
 .../geode/internal/cache/ProxyRegionMap.java       |    2 +-
 .../apache/geode/internal/cache/RegionEntry.java   |    2 +-
 .../geode/internal/cache/RegionEventImpl.java      |    2 +-
 .../cache/StoreAllCachedDeserializable.java        |    2 +-
 .../apache/geode/internal/cache/TXEntryState.java  |    2 +-
 .../org/apache/geode/internal/cache/Token.java     |    4 +-
 .../internal/cache/VMCachedDeserializable.java     |    2 +-
 .../geode/internal/cache/ValidatingDiskRegion.java |    2 +-
 .../CompressedCachedDeserializable.java            |    2 +-
 .../entries/AbstractOplogDiskRegionEntry.java      |    2 +-
 .../cache/entries/AbstractRegionEntry.java         |    2 +-
 .../geode/internal/cache/entries/DiskEntry.java    |    2 +-
 .../geode/internal/cache/ha/HARegionQueue.java     |   10 +-
 .../geode/internal/cache/ha/ThreadIdentifier.java  |    2 +-
 .../geode/internal/cache/locks/TXLockBatch.java    |    2 +-
 .../geode/internal/cache/locks/TXLockIdImpl.java   |    2 +-
 .../cache/partitioned/BucketCountLoadProbe.java    |    2 +-
 .../cache/partitioned/PRTombstoneMessage.java      |    2 +-
 .../partitioned/PRUpdateEntryVersionMessage.java   |    2 +-
 .../cache/partitioned/PutAllPRMessage.java         |    2 +-
 .../cache/partitioned/RemoveAllPRMessage.java      |    2 +-
 .../cache/partitioned/SizedBasedLoadProbe.java     |    2 +-
 .../cache/snapshot/RegionSnapshotServiceImpl.java  |    2 +-
 .../internal/cache/snapshot/SnapshotPacket.java    |    2 +-
 .../geode/internal/cache/tier/sockets/AuthIds.java |    2 +-
 .../cache/tier/sockets/CacheClientProxy.java       |    2 +-
 .../cache/tier/sockets/CacheClientUpdater.java     |    2 +-
 .../tier/sockets/ClientInterestMessageImpl.java    |    2 +-
 .../internal/cache/tier/sockets/ClientMessage.java |    2 +-
 .../tier/sockets/ClientProxyMembershipID.java      |    4 +-
 .../tier/sockets/ClientRegistrationMetadata.java   |    9 +-
 .../tier/sockets/ClientUpdateMessageImpl.java      |    4 +-
 .../internal/cache/tier/sockets/EncryptorImpl.java |    2 +-
 .../cache/tier/sockets/HAEventWrapper.java         |    4 +-
 .../tier/sockets/InterestResultPolicyImpl.java     |    2 +-
 .../cache/tier/sockets/ObjectPartList.java         |    2 +-
 .../cache/tier/sockets/ObjectPartList651.java      |    2 +-
 .../geode/internal/cache/tier/sockets/Part.java    |    2 +-
 .../tier/sockets/SerializedObjectPartList.java     |    2 +-
 .../cache/tier/sockets/ServerConnection.java       |    2 +-
 .../tier/sockets/ServerSideHandshakeImpl.java      |   17 +-
 .../cache/tier/sockets/VersionedObjectList.java    |    2 +-
 .../geode/internal/cache/tx/DistTxEntryEvent.java  |    2 +-
 .../internal/cache/tx/RemotePutAllMessage.java     |    2 +-
 .../internal/cache/tx/RemoteRemoveAllMessage.java  |    2 +-
 .../internal/cache/versions/DiskVersionTag.java    |    4 +-
 .../cache/versions/RegionVersionVector.java        |    7 +-
 .../internal/cache/versions/VersionSource.java     |    2 +-
 .../geode/internal/cache/versions/VersionTag.java  |    2 +-
 .../wan/GatewaySenderEventCallbackArgument.java    |    2 +-
 .../internal/cache/wan/GatewaySenderEventImpl.java |    6 +-
 ...aySenderQueueEntrySynchronizationOperation.java |    2 +-
 .../internal/offheap/AbstractStoredObject.java     |    4 +-
 .../apache/geode/internal/offheap/DataType.java    |   22 +-
 .../internal/offheap/OffHeapRegionEntryHelper.java |    2 +-
 .../internal/offheap/OffHeapStoredObject.java      |    2 +-
 .../serialization/BufferDataOutputStream.java      | 1029 +++++++++++++++++-
 .../{ => serialization}/ByteArrayDataInput.java    |   24 +-
 .../geode/internal/serialization/DSCODE.java       |    3 +-
 .../serialization/DSFIDNotFoundException.java      |    4 +-
 .../internal/serialization/DSFIDSerializer.java    |   36 +-
 .../serialization/DataSerializableFixedID.java     |   40 +-
 .../geode/internal/serialization/DscodeHelper.java |    3 +-
 .../serialization/SerializationVersions.java       |    4 +-
 .../serialization/VersionedDataInputStream.java    |    9 +-
 .../serialization/VersionedDataOutputStream.java   |    9 +-
 .../serialization/VersionedDataStream.java         |   11 +-
 .../apache/geode/internal/tcp/MsgDestreamer.java   |    5 +-
 .../tcp/VersionedByteBufferInputStream.java        |    9 +-
 .../geode/internal/tcp/VersionedMsgStreamer.java   |    9 +-
 .../org/apache/geode/internal/util/BlobHelper.java |    6 +-
 .../management/internal/FederationComponent.java   |    2 +-
 .../internal/JmxManagerLocatorRequest.java         |    2 +-
 .../internal/JmxManagerLocatorResponse.java        |    2 +-
 .../internal/cli/commands/ConnectCommand.java      |    6 -
 .../internal/cli/functions/CliFunctionResult.java  |    2 +-
 .../messages/ConfigurationResponse.java            |    2 +-
 .../main/java/org/apache/geode/pdx/FieldType.java  |    2 +-
 .../java/org/apache/geode/pdx/internal/EnumId.java |    2 +-
 .../org/apache/geode/pdx/internal/EnumInfo.java    |    2 +-
 .../apache/geode/pdx/internal/PdxInstanceEnum.java |    2 +-
 .../apache/geode/pdx/internal/PdxInstanceImpl.java |    2 +-
 .../apache/geode/pdx/internal/PdxReaderImpl.java   |    2 +-
 .../org/apache/geode/pdx/internal/PdxString.java   |    2 +-
 .../apache/geode/pdx/internal/PdxWriterImpl.java   |    2 +-
 .../apache/geode/pdx/internal/json/PdxToJSON.java  |    5 +-
 .../java/org/apache/geode/DataSerializerTest.java  |    6 +-
 .../cache/execute/FunctionAdapterJUnitTest.java    |    5 +-
 .../MembershipDependenciesJUnitTest.java           |    4 +-
 .../membership/gms/GMSMemberJUnitTest.java         |    4 +-
 .../geode/internal/ByteArrayDataInputTest.java     |    4 +-
 .../geode/internal/DataSerializableJUnitTest.java  |    7 +-
 .../internal/HeapDataOutputStreamJUnitTest.java    |    7 +-
 .../geode/internal/HeapDataOutputStreamTest.java   |   11 +-
 .../internal/InternalDataSerializerJUnitTest.java  |    1 +
 .../alerting/AlertListenerMessageFactoryTest.java  |    2 +-
 .../geode/internal/cache/FilterInfoTest.java       |    4 +-
 .../cache/ha/EventIdOptimizationJUnitTest.java     |    9 +-
 .../offheap/AbstractStoredObjectTestBase.java      |    2 +-
 .../geode/internal/offheap/DataTypeJUnitTest.java  |   35 +-
 .../internal/offheap/MemoryBlockNodeJUnitTest.java |    2 +-
 .../offheap/OffHeapRegionEntryHelperJUnitTest.java |    2 +-
 .../offheap/OffHeapStoredObjectJUnitTest.java      |    2 +-
 .../offheap/TinyStoredObjectJUnitTest.java         |    2 +-
 .../geode/internal/serialization/DSCODETest.java   |    2 +-
 .../internal/serialization/VersionJUnitTest.java   |    1 -
 .../apache/geode/internal/util/BlobHelperTest.java |    2 +-
 .../org/apache/geode/pdx/internal/EnumIdTest.java  |    2 +-
 .../apache/geode/pdx/internal/EnumInfoTest.java    |    2 +-
 .../geode/codeAnalysis/decode/CompiledClass.java   |    2 +-
 .../internal/cache/eviction/LRUTestEntry.java      |    2 +-
 .../lucene/internal/LuceneResultStructImpl.java    |    2 +-
 .../cache/lucene/internal/LuceneServiceImpl.java   |   44 +-
 .../cache/lucene/internal/StringQueryProvider.java |    2 +-
 .../lucene/internal/distributed/EntryScore.java    |    2 +-
 .../distributed/LuceneFunctionContext.java         |    2 +-
 .../lucene/internal/distributed/TopEntries.java    |    2 +-
 .../internal/distributed/TopEntriesCollector.java  |    2 +-
 .../distributed/TopEntriesCollectorManager.java    |    2 +-
 .../WaitUntilFlushedFunctionContext.java           |    2 +-
 .../cache/lucene/internal/filesystem/ChunkKey.java |    2 +-
 .../cache/lucene/internal/filesystem/File.java     |    2 +-
 .../cache/lucene/internal/results/PageResults.java |    2 +-
 .../LuceneQueryFunctionContextJUnitTest.java       |    2 +-
 .../internal/results/PageEntryJUnitTest.java       |    4 +-
 .../internal/results/PageResultsJUnitTest.java     |    8 +-
 .../apache/geode/OldClientSupportDUnitTest.java    |   16 +-
 .../gemstone/gemfire/OldClientSupportProvider.java |    4 +-
 .../internal/locator/wan/LocatorJoinMessage.java   |    2 +-
 .../locator/wan/RemoteLocatorJoinRequest.java      |    2 +-
 .../locator/wan/RemoteLocatorJoinResponse.java     |    2 +-
 .../locator/wan/RemoteLocatorPingRequest.java      |    2 +-
 .../locator/wan/RemoteLocatorPingResponse.java     |    2 +-
 .../internal/locator/wan/RemoteLocatorRequest.java |    2 +-
 .../locator/wan/RemoteLocatorResponse.java         |    2 +-
 .../internal/locator/wan/WANFactoryImpl.java       |   25 +-
 .../geode/rest/internal/web/util/JSONUtils.java    |   13 +-
 239 files changed, 2668 insertions(+), 1643 deletions(-)

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..a3afd62 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,7 +77,7 @@ 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.test.dunit.DistributedTestUtils;
 import org.apache.geode.test.dunit.Host;
@@ -172,8 +172,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 +191,8 @@ public class ClusterCommunicationsDUnitTest implements Serializable {
       });
     } finally {
       invokeInEveryVM(
-          () -> DSFIDFactory.registerDSFID(SERIAL_ACKED_MESSAGE, SerialAckedMessage.class));
+          () -> InternalDataSerializer.getDSFIDSerializer().registerDSFID(SERIAL_ACKED_MESSAGE,
+              SerialAckedMessage.class));
     }
   }
 
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..7a0396c 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
@@ -34,6 +34,10 @@ import org.junit.experimental.categories.Category;
 
 import org.apache.geode.cache.Cache;
 import org.apache.geode.internal.cache.DistributedPutAllOperation.EntryVersionsList;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.SerializationVersions;
+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 +70,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;
@@ -87,7 +93,7 @@ public class BackwardCompatibilitySerializationDUnitTest extends JUnit4CacheTest
   @Test
   public void testToDataFromHigherVersionToLower() throws Exception {
     DataOutputStream dos =
-        new VersionedDataOutputStream(new DataOutputStream(baos), Version.GFE_56);
+        new VersionedDataOutputStream(new DataOutputStream(baos), Version.GFE_56.ordinal());
     InternalDataSerializer.writeDSFID(msg, dos);
     assertTrue(toDataPre66Called);
     assertFalse(toDataCalled);
@@ -101,7 +107,7 @@ public class BackwardCompatibilitySerializationDUnitTest extends JUnit4CacheTest
   @Test
   public void testToDataFromLowerVersionToHigher() throws Exception {
     DataOutputStream dos =
-        new VersionedDataOutputStream(new DataOutputStream(baos), Version.GFE_701);
+        new VersionedDataOutputStream(new DataOutputStream(baos), Version.GFE_701.ordinal());
     InternalDataSerializer.writeDSFID(msg, dos);
     assertTrue(toDataCalled);
   }
@@ -116,7 +122,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.ordinal());
     Object o = InternalDataSerializer.basicReadObject(dis);
     assertTrue(o instanceof TestMessage);
     assertTrue(fromDataCalled);
@@ -132,7 +139,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.ordinal());
     Object o = InternalDataSerializer.basicReadObject(dis);
     assertTrue(o instanceof TestMessage);
     assertTrue(fromDataPre66Called);
@@ -164,7 +172,7 @@ 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 = InternalDataSerializer.getDSFIDSerializer().getDsfidmap()[i];
       if (!constdsfids.contains(i - Byte.MAX_VALUE - 1) && cons != null) {
         Object ds = cons.newInstance((Object[]) null);
         checkSupportForRollingUpgrade(ds);
@@ -173,7 +181,7 @@ public class BackwardCompatibilitySerializationDUnitTest extends JUnit4CacheTest
 
     // some msgs require distributed system
     Cache c = getCache();
-    for (Object o : DSFIDFactory.getDsfidmap2().values()) {
+    for (Object o : InternalDataSerializer.getDSFIDSerializer().getDsfidmap2().values()) {
       Constructor<?> cons = (Constructor<?>) o;
       if (cons != null) {
         DataSerializableFixedID ds = (DataSerializableFixedID) cons.newInstance((Object[]) null);
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..fbebdd6 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
@@ -60,11 +60,11 @@ 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.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_ORDINAL);
     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_ORDINAL);
     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/messenger/JGroupsMessengerJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGroupsMessengerJUnitTest.java
index 602bccb..87e56bb 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
@@ -91,10 +91,10 @@ 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.DataSerializableFixedID;
 import org.apache.geode.test.junit.categories.MembershipTest;
 
 @Category({MembershipTest.class})
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..1063deb 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,7 +49,6 @@ 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;
@@ -63,6 +62,7 @@ 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;
 
 /**
  * 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/pdx/PdxSerializableJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/pdx/PdxSerializableJUnitTest.java
index c5864c0..af9e806 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.tcp.ByteBufferInputStream.ByteSourceFactory;
 import org.apache.geode.internal.util.ArrayUtils;
 import org.apache.geode.pdx.internal.DataSize;
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..cc12370 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,8 @@ 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;
 
 
 /**
@@ -64,7 +66,7 @@ public class InternalDataSerializerBenchmark {
   @BenchmarkMode(Mode.Throughput)
   @OutputTimeUnit(TimeUnit.MILLISECONDS)
   public String readStringBenchmark() throws IOException {
-    dataInput.initialize(serializedBytes, Version.CURRENT);
+    dataInput.initialize(serializedBytes, Version.CURRENT_ORDINAL);
     String result = InternalDataSerializer.readString(dataInput, DSCODE.STRING_BYTES.toByte());
     return result;
   }
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..d7cf3c7 100644
--- a/geode-core/src/main/java/org/apache/geode/DataSerializer.java
+++ b/geode-core/src/main/java/org/apache/geode/DataSerializer.java
@@ -52,7 +52,6 @@ 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;
@@ -65,6 +64,7 @@ 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.pdx.PdxInstance;
 
 /**
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..a8f333d 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
@@ -21,10 +21,10 @@ 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;
 
 /**
  * Notification to be sent to clients (e.g GFMon2.0 ). It incorporates
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..49fec15 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,7 +22,6 @@ 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;
@@ -34,6 +33,7 @@ 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;
 
 /**
  * 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..296b757 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,7 +27,6 @@ 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;
@@ -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.tier.sockets.command.PutUserCredentials;
 import org.apache.geode.internal.logging.InternalLogWriter;
+import org.apache.geode.internal.serialization.ByteArrayDataInput;
 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/ClientSideHandshakeImpl.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientSideHandshakeImpl.java
index 6a25c0d..3a61b0d 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,10 @@ 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 +61,9 @@ 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.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;
@@ -215,7 +215,7 @@ public class ClientSideHandshakeImpl extends Handshake implements ClientSideHand
         conn.setWanSiteVersion(wanSiteVersion);
         // establish a versioned stream for the other site, if necessary
         if (wanSiteVersion < Version.CURRENT_ORDINAL) {
-          dis = new VersionedDataInputStream(dis, Version.fromOrdinalOrCurrent(wanSiteVersion));
+          dis = new VersionedDataInputStream(dis, wanSiteVersion);
         }
       }
 
@@ -270,7 +270,7 @@ public class ClientSideHandshakeImpl extends Handshake implements ClientSideHand
 
     byte[] memberBytes = DataSerializer.readByteArray(p_dis);
     Version v = InternalDataSerializer.getVersionForDataStreamOrNull(p_dis);
-    ByteArrayDataInput dis = new ByteArrayDataInput(memberBytes, v);
+    ByteArrayDataInput dis = new ByteArrayDataInput(memberBytes, v == null ? 0 : v.ordinal());
     try {
       return DataSerializer.readObject(dis);
     } catch (EOFException e) {
@@ -389,7 +389,7 @@ public class ClientSideHandshakeImpl extends Handshake implements ClientSideHand
       // we do not know the receiver's version at this point, but the on-wire
       // form of InternalDistributedMember changed in 9.0, so we must serialize
       // it using the previous version
-      DataOutput idOut = new VersionedDataOutputStream(hdos, Version.GFE_82);
+      DataOutput idOut = new VersionedDataOutputStream(hdos, Version.GFE_82.ordinal());
       DataSerializer.writeObject(this.id, idOut);
 
       if (currentClientVersion.compareTo(Version.GFE_603) >= 0) {
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/locator/ClientConnectionRequest.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/ClientConnectionRequest.java
index 7ed4617..9be89d9 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,7 @@ 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;
 
 /**
  * A request from a client to the locator asking for a server to connect to for client to server
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..d9c36bb 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,7 @@ 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;
 
 /**
  * A response from a locator to a client Indicating which server to connect to for client to server
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..c032ba9 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,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.InternalDataSerializer;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
 
 /**
  * A request from a client to the locator asking for a server to connect to for client to server
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..ce28361 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,7 @@ 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;
 
 public class GetAllServersRequest extends ServerLocationRequest {
 
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..2433195 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,7 @@ 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;
 
 public class GetAllServersResponse extends ServerLocationResponse {
 
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..7764ee1 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,7 @@ 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;
 
 public class LocatorListResponse extends ServerLocationResponse {
   /** ArrayList of ServerLocations for controllers */
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..9d09864 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,12 @@ 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.util.ArgumentRedactor;
 
 /**
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..4caf01c 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,8 @@ 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;
 
 /**
  * A request from a client to locator asking for a server to host a queue. If the durable client Id
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..022453a 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,7 @@ 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;
 
 /**
  * A response from locator to client indicating the servers to use to host the clients queue. The
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..0b8a63c 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,8 @@ 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;
 
 public abstract class ServerLocationRequest implements DataSerializableFixedID {
 
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..75bf6c0 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;
 
 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..53b11e1 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,8 @@ 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;
 
 
 /**
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..5382e71 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,10 @@ 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;
 
 /**
  * This is used as a wrapper over all the results of PR which are of non distinct type
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..f01a6e3 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,8 @@ 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;
 
 public class LinkedResultSet extends java.util.LinkedHashSet
     implements Ordered, SelectResults, DataSerializableFixedID {
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..3df19d4 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,8 @@ 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;
 
 public class LinkedStructSet extends LinkedHashSet<Struct>
     implements SelectResults<Struct>, Ordered, DataSerializableFixedID {
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..e388351 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,10 @@ 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;
 
 /**
  * The n - way merge results returns a sorted results on the cumulative sorted results for
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..75106c8 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,8 @@ 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;
 
 /**
  * A Token representing null.
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..cc798d1 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,8 @@ 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;
 
 
 public class PRQueryTraceInfo implements DataSerializableFixedID {
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..8f7f8c0 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,9 @@ 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;
 
 public class ResultsBag extends Bag implements DataSerializableFixedID {
 
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..6c65ebf 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,10 @@ 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;
 
 /**
  * Implementation of SelectResults that wraps an existing java.util.Collection and optionally adds a
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..adabcc0 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,9 @@ 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;
 
 // @todo probably should assert element type when elements added
 /**
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..d46e284 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,8 @@ 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;
 
 /**
  * Implementation of SelectResults that extends TreeSet This is the sorted version of ResultSet used
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..ccb2392 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,8 @@ 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;
 
 /**
  * A TreeSet constrained to contain Structs of all the same type. To conserve on objects, we store
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..618e63f 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,8 @@ 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.pdx.PdxInstance;
 import org.apache.geode.pdx.internal.PdxString;
 
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..baa6dc5 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,8 @@ 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;
 
 /**
  * A Set constrained to contain Structs of all the same type. To conserve on objects, we store the
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..363c691 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,8 @@ 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;
 
 /**
  * An UNDEFINED value is the result of accessing an attribute of a null-valued attribute. If you
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..f180b1d 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,8 @@ 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;
 
 /**
  *
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..ccabae1 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,9 @@ 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;
 
 /**
  * Implementation of ObjectType
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/DistributionAdvisor.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionAdvisor.java
index e551157..ad81f30 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,7 +39,6 @@ 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;
@@ -49,6 +48,7 @@ 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.util.ArrayUtils;
 
 /**
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..9ebba6b 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,12 @@ 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.tcp.Connection;
 import org.apache.geode.internal.util.Breadcrumbs;
 
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/ReplyProcessor21.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplyProcessor21.java
index 486d102..30b0897 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
@@ -34,10 +34,10 @@ 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.util.Breadcrumbs;
 import org.apache.geode.internal.util.concurrent.StoppableCountDownLatch;
 
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/WaitForViewInstallation.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/WaitForViewInstallation.java
index a813bbd..c26e055 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
@@ -78,7 +78,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() {
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..22b8ca7 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,8 @@ 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;
 
 /**
  * Represents a held lock in a member for use when initializing a new grantor. All currently held
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..54813c3 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,11 @@ 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.util.StopWatch;
 import org.apache.geode.internal.util.concurrent.FutureResult;
 
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..8c0c597 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
@@ -44,12 +44,12 @@ 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;
 
 /**
  * This is the fundamental representation of a member of a GemFire distributed system.
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..598f5a7 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,7 +82,6 @@ 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;
@@ -90,6 +89,7 @@ import org.apache.geode.internal.cache.partitioned.PartitionMessageWithDirectRep
 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.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/gms/GMSMember.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSMember.java
index 71ec3a1..f059e64 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
@@ -24,10 +24,10 @@ 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;
 
 /**
  * GMSMember is the membership identifier class for Group Membership Services.
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..a44d6e5 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
@@ -34,10 +34,10 @@ 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;
 
 /**
  * The GMSMembershipView class represents a membership view. Note that this class is not
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..ce09a5c 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
@@ -220,8 +220,8 @@ public class GMSUtil {
       DataSerializer.writeObject(id, out);
       return;
     }
-    if (InternalDataSerializer.getVersionForDataStream(out).ordinal() < Version.GEODE_1_10_0
-        .ordinal()) {
+    short ordinal = InternalDataSerializer.getVersionForDataStream(out).ordinal();
+    if (ordinal < Version.GEODE_1_10_0.ordinal()) {
       writeAsInternalDistributedMember(id, out);
     } else {
       DataSerializer.writeObject(id, out);
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/FindCoordinatorResponse.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/locator/FindCoordinatorResponse.java
index 1b05a68..0caf10c 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
@@ -27,9 +27,9 @@ 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;
 
 public class FindCoordinatorResponse extends AbstractGMSMessage
     implements DataSerializableFixedID {
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..528a1a1 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,8 @@ 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;
 
 public class GetViewRequest implements DataSerializableFixedID, PeerLocatorRequest {
 
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..136618c 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
@@ -20,8 +20,8 @@ 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;
 
 public class GetViewResponse implements DataSerializableFixedID {
 
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..4de93ae 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;
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/messenger/JGroupsMessenger.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGroupsMessenger.java
index 8b0dcf6..75385d9 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;
@@ -93,11 +93,11 @@ 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.VersionedDataInputStream;
 import org.apache.geode.internal.tcp.MemberShunnedException;
 
 @SuppressWarnings("StatementWithEmptyBody")
@@ -1005,7 +1005,7 @@ public class JGroupsMessenger implements Messenger {
       short ordinal = Version.readOrdinal(dis);
 
       if (ordinal < Version.CURRENT_ORDINAL) {
-        dis = new VersionedDataInputStream(dis, Version.fromOrdinalNoThrow(ordinal, true));
+        dis = new VersionedDataInputStream(dis, ordinal);
       }
 
       // read
@@ -1101,7 +1101,7 @@ 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));
+          in = new VersionedDataInputStream(in, ordinal);
         }
 
         GMSMessage result = deserializeMessage(in, ordinal);
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..29f0b8e 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,16 @@ 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.VersionedDataInputStream;
+import org.apache.geode.internal.serialization.VersionedDataOutputStream;
 
 /**
  * <p>
@@ -210,7 +209,7 @@ public class TcpClient {
       out = new DataOutputStream(new BufferedOutputStream(sock.getOutputStream()));
 
       if (serverVersion < Version.CURRENT_ORDINAL) {
-        out = new VersionedDataOutputStream(out, Version.fromOrdinalNoThrow(serverVersion, false));
+        out = new VersionedDataOutputStream(out, serverVersion);
       }
 
       out.writeInt(gossipVersion);
@@ -222,7 +221,7 @@ public class TcpClient {
 
       if (replyExpected) {
         DataInputStream in = new DataInputStream(sock.getInputStream());
-        in = new VersionedDataInputStream(in, Version.fromOrdinal(serverVersion, false));
+        in = new VersionedDataInputStream(in, serverVersion);
         try {
           Object response = DataSerializer.readObject(in);
           logger.debug("received response: {}", response);
@@ -237,13 +236,6 @@ public class TcpClient {
       } else {
         return null;
       }
-    } catch (UnsupportedVersionException ex) {
-      if (logger.isDebugEnabled()) {
-        logger
-            .debug("Remote TcpServer version: " + serverVersion + " is higher than local version: "
-                + Version.CURRENT_ORDINAL + ". This is never expected as remoteVersion");
-      }
-      return null;
     } finally {
       try {
         if (replyExpected) {
@@ -296,7 +288,8 @@ public class TcpClient {
     try {
       OutputStream outputStream = new BufferedOutputStream(sock.getOutputStream());
       DataOutputStream out =
-          new VersionedDataOutputStream(new DataOutputStream(outputStream), Version.GFE_57);
+          new VersionedDataOutputStream(new DataOutputStream(outputStream),
+              Version.GFE_57.ordinal());
 
       out.writeInt(gossipVersion);
 
@@ -306,7 +299,7 @@ public class TcpClient {
 
       InputStream inputStream = sock.getInputStream();
       DataInputStream in = new DataInputStream(inputStream);
-      in = new VersionedDataInputStream(in, Version.GFE_57);
+      in = new VersionedDataInputStream(in, Version.GFE_57.ordinal());
       try {
         Object readObject = DataSerializer.readObject(in);
         if (!(readObject instanceof VersionResponse)) {
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..99658d0 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
@@ -52,11 +52,8 @@ 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 +68,8 @@ 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.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;
 
@@ -464,7 +458,7 @@ public class TcpServer {
         log.debug("Locator reading request from " + socket.getInetAddress() + " with version "
             + Version.fromOrdinal(versionOrdinal, false));
       }
-      input = new VersionedDataInputStream(input, Version.fromOrdinal(versionOrdinal, false));
+      input = new VersionedDataInputStream(input, 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, versionOrdinal);
         }
         DataSerializer.writeObject(response, output);
         output.flush();
diff --git a/geode-core/src/main/java/org/apache/geode/internal/serialization/ByteBufferWriter.java b/geode-core/src/main/java/org/apache/geode/internal/ByteBufferWriter.java
similarity index 100%
rename from geode-core/src/main/java/org/apache/geode/internal/serialization/ByteBufferWriter.java
rename to geode-core/src/main/java/org/apache/geode/internal/ByteBufferWriter.java
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 2cb5ea1..7aeecfe 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
@@ -12,49 +12,961 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.apache.geode.internal.serialization;
+package org.apache.geode.internal;
 
 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.InternalGemFireError;
-import org.apache.geode.annotations.Immutable;
-import org.apache.geode.internal.InternalDataSerializer;
+import org.apache.geode.DataSerializer;
+import org.apache.geode.admin.internal.SystemMemberCacheEventProcessor;
+import org.apache.geode.admin.jmx.internal.StatAlertNotification;
+import org.apache.geode.cache.InterestResultPolicy;
+import org.apache.geode.cache.client.internal.CacheServerLoadMessage;
+import org.apache.geode.cache.client.internal.locator.ClientConnectionRequest;
+import org.apache.geode.cache.client.internal.locator.ClientConnectionResponse;
+import org.apache.geode.cache.client.internal.locator.ClientReplacementRequest;
+import org.apache.geode.cache.client.internal.locator.GetAllServersRequest;
+import org.apache.geode.cache.client.internal.locator.GetAllServersResponse;
+import org.apache.geode.cache.client.internal.locator.LocatorListRequest;
+import org.apache.geode.cache.client.internal.locator.LocatorListResponse;
+import org.apache.geode.cache.client.internal.locator.LocatorStatusRequest;
+import org.apache.geode.cache.client.internal.locator.LocatorStatusResponse;
+import org.apache.geode.cache.client.internal.locator.QueueConnectionRequest;
+import org.apache.geode.cache.client.internal.locator.QueueConnectionResponse;
+import org.apache.geode.cache.query.QueryService;
+import org.apache.geode.cache.query.internal.CqEntry;
+import org.apache.geode.cache.query.internal.CumulativeNonDistinctResults;
+import org.apache.geode.cache.query.internal.LinkedResultSet;
+import org.apache.geode.cache.query.internal.LinkedStructSet;
+import org.apache.geode.cache.query.internal.NWayMergeResults;
+import org.apache.geode.cache.query.internal.NullToken;
+import org.apache.geode.cache.query.internal.PRQueryTraceInfo;
+import org.apache.geode.cache.query.internal.ResultsBag;
+import org.apache.geode.cache.query.internal.ResultsCollectionWrapper;
+import org.apache.geode.cache.query.internal.ResultsSet;
+import org.apache.geode.cache.query.internal.SortedResultSet;
+import org.apache.geode.cache.query.internal.SortedStructSet;
+import org.apache.geode.cache.query.internal.StructBag;
+import org.apache.geode.cache.query.internal.StructImpl;
+import org.apache.geode.cache.query.internal.StructSet;
+import org.apache.geode.cache.query.internal.Undefined;
+import org.apache.geode.cache.query.internal.index.IndexCreationData;
+import org.apache.geode.cache.query.internal.index.IndexManager;
+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.distributed.internal.DistributionAdvisor;
+import org.apache.geode.distributed.internal.HighPriorityAckedMessage;
+import org.apache.geode.distributed.internal.ReplyMessage;
+import org.apache.geode.distributed.internal.SerialAckedMessage;
+import org.apache.geode.distributed.internal.ShutdownMessage;
+import org.apache.geode.distributed.internal.StartupMessage;
+import org.apache.geode.distributed.internal.StartupResponseMessage;
+import org.apache.geode.distributed.internal.StartupResponseWithVersionMessage;
+import org.apache.geode.distributed.internal.WaitForViewInstallation;
+import org.apache.geode.distributed.internal.locks.DLockQueryProcessor;
+import org.apache.geode.distributed.internal.locks.DLockRecoverGrantorProcessor.DLockRecoverGrantorMessage;
+import org.apache.geode.distributed.internal.locks.DLockRecoverGrantorProcessor.DLockRecoverGrantorReplyMessage;
+import org.apache.geode.distributed.internal.locks.DLockReleaseProcessor;
+import org.apache.geode.distributed.internal.locks.DLockRemoteToken;
+import org.apache.geode.distributed.internal.locks.DLockRequestProcessor;
+import org.apache.geode.distributed.internal.locks.DLockService;
+import org.apache.geode.distributed.internal.locks.DeposeGrantorProcessor;
+import org.apache.geode.distributed.internal.locks.ElderInitProcessor;
+import org.apache.geode.distributed.internal.locks.GrantorRequestProcessor;
+import org.apache.geode.distributed.internal.locks.NonGrantorDestroyedProcessor;
+import org.apache.geode.distributed.internal.locks.NonGrantorDestroyedProcessor.NonGrantorDestroyedReplyMessage;
+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.GMSMembershipView;
+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.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.streaming.StreamingOperation.StreamingReplyMessage;
+import org.apache.geode.internal.admin.ClientMembershipMessage;
+import org.apache.geode.internal.admin.remote.AddHealthListenerRequest;
+import org.apache.geode.internal.admin.remote.AddHealthListenerResponse;
+import org.apache.geode.internal.admin.remote.AddStatListenerRequest;
+import org.apache.geode.internal.admin.remote.AddStatListenerResponse;
+import org.apache.geode.internal.admin.remote.AdminConsoleDisconnectMessage;
+import org.apache.geode.internal.admin.remote.AdminConsoleMessage;
+import org.apache.geode.internal.admin.remote.AdminFailureResponse;
+import org.apache.geode.internal.admin.remote.AlertLevelChangeMessage;
+import org.apache.geode.internal.admin.remote.AlertListenerMessage;
+import org.apache.geode.internal.admin.remote.AlertsNotificationMessage;
+import org.apache.geode.internal.admin.remote.AppCacheSnapshotMessage;
+import org.apache.geode.internal.admin.remote.BridgeServerRequest;
+import org.apache.geode.internal.admin.remote.BridgeServerResponse;
+import org.apache.geode.internal.admin.remote.CacheConfigRequest;
+import org.apache.geode.internal.admin.remote.CacheConfigResponse;
+import org.apache.geode.internal.admin.remote.CacheInfoRequest;
+import org.apache.geode.internal.admin.remote.CacheInfoResponse;
+import org.apache.geode.internal.admin.remote.CancelStatListenerRequest;
+import org.apache.geode.internal.admin.remote.CancelStatListenerResponse;
+import org.apache.geode.internal.admin.remote.CancellationMessage;
+import org.apache.geode.internal.admin.remote.ChangeRefreshIntervalMessage;
+import org.apache.geode.internal.admin.remote.ClientHealthStats;
+import org.apache.geode.internal.admin.remote.CompactRequest;
+import org.apache.geode.internal.admin.remote.CompactResponse;
+import org.apache.geode.internal.admin.remote.DestroyEntryMessage;
+import org.apache.geode.internal.admin.remote.DestroyRegionMessage;
+import org.apache.geode.internal.admin.remote.DurableClientInfoRequest;
+import org.apache.geode.internal.admin.remote.DurableClientInfoResponse;
+import org.apache.geode.internal.admin.remote.FetchDistLockInfoRequest;
+import org.apache.geode.internal.admin.remote.FetchDistLockInfoResponse;
+import org.apache.geode.internal.admin.remote.FetchHealthDiagnosisRequest;
+import org.apache.geode.internal.admin.remote.FetchHealthDiagnosisResponse;
+import org.apache.geode.internal.admin.remote.FetchHostRequest;
+import org.apache.geode.internal.admin.remote.FetchHostResponse;
+import org.apache.geode.internal.admin.remote.FetchResourceAttributesRequest;
+import org.apache.geode.internal.admin.remote.FetchResourceAttributesResponse;
+import org.apache.geode.internal.admin.remote.FetchStatsRequest;
+import org.apache.geode.internal.admin.remote.FetchStatsResponse;
+import org.apache.geode.internal.admin.remote.FetchSysCfgRequest;
+import org.apache.geode.internal.admin.remote.FetchSysCfgResponse;
+import org.apache.geode.internal.admin.remote.FlushAppCacheSnapshotMessage;
+import org.apache.geode.internal.admin.remote.HealthListenerMessage;
+import org.apache.geode.internal.admin.remote.LicenseInfoRequest;
+import org.apache.geode.internal.admin.remote.LicenseInfoResponse;
+import org.apache.geode.internal.admin.remote.MissingPersistentIDsRequest;
+import org.apache.geode.internal.admin.remote.MissingPersistentIDsResponse;
+import org.apache.geode.internal.admin.remote.ObjectDetailsRequest;
+import org.apache.geode.internal.admin.remote.ObjectDetailsResponse;
+import org.apache.geode.internal.admin.remote.ObjectNamesRequest;
+import org.apache.geode.internal.admin.remote.ObjectNamesResponse;
+import org.apache.geode.internal.admin.remote.PrepareRevokePersistentIDRequest;
+import org.apache.geode.internal.admin.remote.RefreshMemberSnapshotRequest;
+import org.apache.geode.internal.admin.remote.RefreshMemberSnapshotResponse;
+import org.apache.geode.internal.admin.remote.RegionAttributesRequest;
+import org.apache.geode.internal.admin.remote.RegionAttributesResponse;
+import org.apache.geode.internal.admin.remote.RegionRequest;
+import org.apache.geode.internal.admin.remote.RegionResponse;
+import org.apache.geode.internal.admin.remote.RegionSizeRequest;
+import org.apache.geode.internal.admin.remote.RegionSizeResponse;
+import org.apache.geode.internal.admin.remote.RegionStatisticsRequest;
+import org.apache.geode.internal.admin.remote.RegionStatisticsResponse;
+import org.apache.geode.internal.admin.remote.RegionSubRegionSizeRequest;
+import org.apache.geode.internal.admin.remote.RegionSubRegionsSizeResponse;
+import org.apache.geode.internal.admin.remote.RemoveHealthListenerRequest;
+import org.apache.geode.internal.admin.remote.RemoveHealthListenerResponse;
+import org.apache.geode.internal.admin.remote.ResetHealthStatusRequest;
+import org.apache.geode.internal.admin.remote.ResetHealthStatusResponse;
+import org.apache.geode.internal.admin.remote.RevokePersistentIDRequest;
+import org.apache.geode.internal.admin.remote.RevokePersistentIDResponse;
+import org.apache.geode.internal.admin.remote.RootRegionRequest;
+import org.apache.geode.internal.admin.remote.RootRegionResponse;
+import org.apache.geode.internal.admin.remote.ShutdownAllGatewayHubsRequest;
+import org.apache.geode.internal.admin.remote.ShutdownAllRequest;
+import org.apache.geode.internal.admin.remote.ShutdownAllResponse;
+import org.apache.geode.internal.admin.remote.SnapshotResultMessage;
+import org.apache.geode.internal.admin.remote.StatAlertsManagerAssignMessage;
+import org.apache.geode.internal.admin.remote.StatListenerMessage;
+import org.apache.geode.internal.admin.remote.StoreSysCfgRequest;
+import org.apache.geode.internal.admin.remote.StoreSysCfgResponse;
+import org.apache.geode.internal.admin.remote.SubRegionRequest;
+import org.apache.geode.internal.admin.remote.SubRegionResponse;
+import org.apache.geode.internal.admin.remote.TailLogRequest;
+import org.apache.geode.internal.admin.remote.TailLogResponse;
+import org.apache.geode.internal.admin.remote.UpdateAlertDefinitionMessage;
+import org.apache.geode.internal.admin.remote.VersionInfoRequest;
+import org.apache.geode.internal.admin.remote.VersionInfoResponse;
+import org.apache.geode.internal.admin.statalerts.GaugeThresholdDecoratorImpl;
+import org.apache.geode.internal.admin.statalerts.NumberThresholdDecoratorImpl;
+import org.apache.geode.internal.cache.AddCacheServerProfileMessage;
+import org.apache.geode.internal.cache.BucketAdvisor;
+import org.apache.geode.internal.cache.CacheDistributionAdvisor;
+import org.apache.geode.internal.cache.CacheServerAdvisor.CacheServerProfile;
+import org.apache.geode.internal.cache.ClientRegionEventImpl;
+import org.apache.geode.internal.cache.CloseCacheMessage;
+import org.apache.geode.internal.cache.ControllerAdvisor.ControllerProfile;
+import org.apache.geode.internal.cache.CreateRegionProcessor;
+import org.apache.geode.internal.cache.DestroyOperation;
+import org.apache.geode.internal.cache.DestroyPartitionedRegionMessage;
+import org.apache.geode.internal.cache.DestroyRegionOperation;
+import org.apache.geode.internal.cache.DistTXCommitMessage;
+import org.apache.geode.internal.cache.DistTXPrecommitMessage;
+import org.apache.geode.internal.cache.DistTXPrecommitMessage.DistTxPrecommitResponse;
+import org.apache.geode.internal.cache.DistTXRollbackMessage;
+import org.apache.geode.internal.cache.DistributedClearOperation.ClearRegionMessage;
+import org.apache.geode.internal.cache.DistributedClearOperation.ClearRegionWithContextMessage;
+import org.apache.geode.internal.cache.DistributedPutAllOperation.EntryVersionsList;
+import org.apache.geode.internal.cache.DistributedPutAllOperation.PutAllMessage;
+import org.apache.geode.internal.cache.DistributedRegionFunctionStreamingMessage;
+import org.apache.geode.internal.cache.DistributedRemoveAllOperation.RemoveAllMessage;
+import org.apache.geode.internal.cache.DistributedTombstoneOperation.TombstoneMessage;
+import org.apache.geode.internal.cache.EntryEventImpl;
+import org.apache.geode.internal.cache.EventID;
+import org.apache.geode.internal.cache.ExpireDisconnectedClientTransactionsMessage;
+import org.apache.geode.internal.cache.FilterProfile;
+import org.apache.geode.internal.cache.FindDurableQueueProcessor.FindDurableQueueMessage;
+import org.apache.geode.internal.cache.FindDurableQueueProcessor.FindDurableQueueReply;
+import org.apache.geode.internal.cache.FindRemoteTXMessage;
+import org.apache.geode.internal.cache.FindRemoteTXMessage.FindRemoteTXMessageReply;
+import org.apache.geode.internal.cache.FindVersionTagOperation.FindVersionTagMessage;
+import org.apache.geode.internal.cache.FindVersionTagOperation.VersionTagReply;
+import org.apache.geode.internal.cache.FunctionStreamingOrderedReplyMessage;
+import org.apache.geode.internal.cache.FunctionStreamingReplyMessage;
+import org.apache.geode.internal.cache.HARegion;
+import org.apache.geode.internal.cache.InitialImageFlowControl.FlowControlPermitMessage;
+import org.apache.geode.internal.cache.InitialImageOperation;
+import org.apache.geode.internal.cache.InitialImageOperation.InitialImageVersionedEntryList;
+import org.apache.geode.internal.cache.InvalidateOperation;
+import org.apache.geode.internal.cache.InvalidatePartitionedRegionMessage;
+import org.apache.geode.internal.cache.InvalidateRegionOperation.InvalidateRegionMessage;
+import org.apache.geode.internal.cache.JtaAfterCompletionMessage;
+import org.apache.geode.internal.cache.JtaBeforeCompletionMessage;
+import org.apache.geode.internal.cache.LatestLastAccessTimeMessage;
+import org.apache.geode.internal.cache.MemberFunctionStreamingMessage;
+import org.apache.geode.internal.cache.Node;
+import org.apache.geode.internal.cache.PRQueryProcessor;
+import org.apache.geode.internal.cache.PartitionRegionConfig;
+import org.apache.geode.internal.cache.PreferBytesCachedDeserializable;
+import org.apache.geode.internal.cache.RegionEventImpl;
+import org.apache.geode.internal.cache.ReleaseClearLockMessage;
+import org.apache.geode.internal.cache.RemoveCacheServerProfileMessage;
+import org.apache.geode.internal.cache.RoleEventImpl;
+import org.apache.geode.internal.cache.SearchLoadAndWriteProcessor;
+import org.apache.geode.internal.cache.ServerPingMessage;
+import org.apache.geode.internal.cache.StateFlushOperation.StateMarkerMessage;
+import org.apache.geode.internal.cache.StateFlushOperation.StateStabilizationMessage;
+import org.apache.geode.internal.cache.StateFlushOperation.StateStabilizedMessage;
+import org.apache.geode.internal.cache.StoreAllCachedDeserializable;
+import org.apache.geode.internal.cache.TXCommitMessage;
+import org.apache.geode.internal.cache.TXCommitMessage.CommitProcessForLockIdMessage;
+import org.apache.geode.internal.cache.TXCommitMessage.CommitProcessForTXIdMessage;
+import org.apache.geode.internal.cache.TXCommitMessage.CommitProcessQueryMessage;
+import org.apache.geode.internal.cache.TXCommitMessage.CommitProcessQueryReplyMessage;
+import org.apache.geode.internal.cache.TXEntryState;
+import org.apache.geode.internal.cache.TXId;
+import org.apache.geode.internal.cache.TXRemoteCommitMessage;
+import org.apache.geode.internal.cache.TXRemoteCommitMessage.TXRemoteCommitReplyMessage;
+import org.apache.geode.internal.cache.TXRemoteRollbackMessage;
+import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.UpdateAttributesProcessor;
+import org.apache.geode.internal.cache.UpdateEntryVersionOperation.UpdateEntryVersionMessage;
+import org.apache.geode.internal.cache.UpdateOperation;
+import org.apache.geode.internal.cache.VMCachedDeserializable;
+import org.apache.geode.internal.cache.backup.AbortBackupRequest;
+import org.apache.geode.internal.cache.backup.BackupResponse;
+import org.apache.geode.internal.cache.backup.FinishBackupRequest;
+import org.apache.geode.internal.cache.backup.FlushToDiskRequest;
+import org.apache.geode.internal.cache.backup.FlushToDiskResponse;
+import org.apache.geode.internal.cache.backup.PrepareBackupRequest;
+import org.apache.geode.internal.cache.compression.SnappyCompressedCachedDeserializable;
+import org.apache.geode.internal.cache.control.ResourceAdvisor.ResourceManagerProfile;
+import org.apache.geode.internal.cache.control.ResourceAdvisor.ResourceProfileMessage;
+import org.apache.geode.internal.cache.ha.HARegionQueue.DispatchedAndCurrentEvents;
+import org.apache.geode.internal.cache.ha.QueueRemovalMessage;
+import org.apache.geode.internal.cache.locks.TXLockBatch;
+import org.apache.geode.internal.cache.locks.TXLockIdImpl;
+import org.apache.geode.internal.cache.locks.TXLockUpdateParticipantsMessage;
+import org.apache.geode.internal.cache.locks.TXLockUpdateParticipantsMessage.TXLockUpdateParticipantsReplyMessage;
+import org.apache.geode.internal.cache.locks.TXOriginatorRecoveryProcessor.TXOriginatorRecoveryMessage;
+import org.apache.geode.internal.cache.locks.TXOriginatorRecoveryProcessor.TXOriginatorRecoveryReplyMessage;
+import org.apache.geode.internal.cache.partitioned.AllBucketProfilesUpdateMessage;
+import org.apache.geode.internal.cache.partitioned.BecomePrimaryBucketMessage;
+import org.apache.geode.internal.cache.partitioned.BecomePrimaryBucketMessage.BecomePrimaryBucketReplyMessage;
+import org.apache.geode.internal.cache.partitioned.BucketBackupMessage;
+import org.apache.geode.internal.cache.partitioned.BucketCountLoadProbe;
+import org.apache.geode.internal.cache.partitioned.BucketProfileUpdateMessage;
+import org.apache.geode.internal.cache.partitioned.BucketSizeMessage;
+import org.apache.geode.internal.cache.partitioned.BucketSizeMessage.BucketSizeReplyMessage;
+import org.apache.geode.internal.cache.partitioned.ContainsKeyValueMessage;
+import org.apache.geode.internal.cache.partitioned.ContainsKeyValueMessage.ContainsKeyValueReplyMessage;
+import org.apache.geode.internal.cache.partitioned.CreateBucketMessage;
+import org.apache.geode.internal.cache.partitioned.CreateBucketMessage.CreateBucketReplyMessage;
+import org.apache.geode.internal.cache.partitioned.DeposePrimaryBucketMessage;
+import org.apache.geode.internal.cache.partitioned.DeposePrimaryBucketMessage.DeposePrimaryBucketReplyMessage;
+import org.apache.geode.internal.cache.partitioned.DestroyMessage;
+import org.apache.geode.internal.cache.partitioned.DestroyRegionOnDataStoreMessage;
+import org.apache.geode.internal.cache.partitioned.DumpAllPRConfigMessage;
+import org.apache.geode.internal.cache.partitioned.DumpB2NRegion;
+import org.apache.geode.internal.cache.partitioned.DumpB2NRegion.DumpB2NReplyMessage;
+import org.apache.geode.internal.cache.partitioned.DumpBucketsMessage;
+import org.apache.geode.internal.cache.partitioned.EndBucketCreationMessage;
+import org.apache.geode.internal.cache.partitioned.FetchBulkEntriesMessage;
+import org.apache.geode.internal.cache.partitioned.FetchBulkEntriesMessage.FetchBulkEntriesReplyMessage;
+import org.apache.geode.internal.cache.partitioned.FetchEntriesMessage;
+import org.apache.geode.internal.cache.partitioned.FetchEntriesMessage.FetchEntriesReplyMessage;
+import org.apache.geode.internal.cache.partitioned.FetchEntryMessage;
+import org.apache.geode.internal.cache.partitioned.FetchEntryMessage.FetchEntryReplyMessage;
+import org.apache.geode.internal.cache.partitioned.FetchKeysMessage;
+import org.apache.geode.internal.cache.partitioned.FetchKeysMessage.FetchKeysReplyMessage;
+import org.apache.geode.internal.cache.partitioned.FetchPartitionDetailsMessage;
+import org.apache.geode.internal.cache.partitioned.FetchPartitionDetailsMessage.FetchPartitionDetailsReplyMessage;
+import org.apache.geode.internal.cache.partitioned.FlushMessage;
+import org.apache.geode.internal.cache.partitioned.GetMessage;
+import org.apache.geode.internal.cache.partitioned.GetMessage.GetReplyMessage;
+import org.apache.geode.internal.cache.partitioned.IdentityRequestMessage;
+import org.apache.geode.internal.cache.partitioned.IdentityRequestMessage.IdentityReplyMessage;
+import org.apache.geode.internal.cache.partitioned.IdentityUpdateMessage;
+import org.apache.geode.internal.cache.partitioned.IndexCreationMsg;
+import org.apache.geode.internal.cache.partitioned.IndexCreationMsg.IndexCreationReplyMsg;
+import org.apache.geode.internal.cache.partitioned.InterestEventMessage;
+import org.apache.geode.internal.cache.partitioned.InterestEventMessage.InterestEventReplyMessage;
+import org.apache.geode.internal.cache.partitioned.InvalidateMessage;
+import org.apache.geode.internal.cache.partitioned.ManageBackupBucketMessage;
+import org.apache.geode.internal.cache.partitioned.ManageBackupBucketMessage.ManageBackupBucketReplyMessage;
+import org.apache.geode.internal.cache.partitioned.ManageBucketMessage;
+import org.apache.geode.internal.cache.partitioned.ManageBucketMessage.ManageBucketReplyMessage;
+import org.apache.geode.internal.cache.partitioned.MoveBucketMessage;
+import org.apache.geode.internal.cache.partitioned.MoveBucketMessage.MoveBucketReplyMessage;
+import org.apache.geode.internal.cache.partitioned.PRSanityCheckMessage;
+import org.apache.geode.internal.cache.partitioned.PRTombstoneMessage;
+import org.apache.geode.internal.cache.partitioned.PRUpdateEntryVersionMessage;
+import org.apache.geode.internal.cache.partitioned.PartitionedRegionFunctionStreamingMessage;
+import org.apache.geode.internal.cache.partitioned.PrimaryRequestMessage;
+import org.apache.geode.internal.cache.partitioned.PrimaryRequestMessage.PrimaryRequestReplyMessage;
+import org.apache.geode.internal.cache.partitioned.PutAllPRMessage;
+import org.apache.geode.internal.cache.partitioned.PutAllPRMessage.PutAllReplyMessage;
+import org.apache.geode.internal.cache.partitioned.PutMessage;
+import org.apache.geode.internal.cache.partitioned.PutMessage.PutReplyMessage;
+import org.apache.geode.internal.cache.partitioned.QueryMessage;
+import org.apache.geode.internal.cache.partitioned.RegionAdvisor;
+import org.apache.geode.internal.cache.partitioned.RemoveAllPRMessage;
+import org.apache.geode.internal.cache.partitioned.RemoveBucketMessage;
+import org.apache.geode.internal.cache.partitioned.RemoveBucketMessage.RemoveBucketReplyMessage;
+import org.apache.geode.internal.cache.partitioned.RemoveIndexesMessage;
+import org.apache.geode.internal.cache.partitioned.RemoveIndexesMessage.RemoveIndexesReplyMessage;
+import org.apache.geode.internal.cache.partitioned.SizeMessage;
+import org.apache.geode.internal.cache.partitioned.SizeMessage.SizeReplyMessage;
+import org.apache.geode.internal.cache.partitioned.SizedBasedLoadProbe;
+import org.apache.geode.internal.cache.persistence.DiskStoreID;
+import org.apache.geode.internal.cache.persistence.MembershipFlushRequest;
+import org.apache.geode.internal.cache.persistence.MembershipViewRequest;
+import org.apache.geode.internal.cache.persistence.MembershipViewRequest.MembershipViewReplyMessage;
+import org.apache.geode.internal.cache.persistence.PersistentStateQueryMessage;
+import org.apache.geode.internal.cache.persistence.PersistentStateQueryMessage.PersistentStateQueryReplyMessage;
+import org.apache.geode.internal.cache.persistence.PrepareNewPersistentMemberMessage;
+import org.apache.geode.internal.cache.persistence.RemovePersistentMemberMessage;
+import org.apache.geode.internal.cache.snapshot.FlowController.FlowControlAbortMessage;
+import org.apache.geode.internal.cache.snapshot.FlowController.FlowControlAckMessage;
+import org.apache.geode.internal.cache.snapshot.SnapshotPacket;
+import org.apache.geode.internal.cache.snapshot.SnapshotPacket.SnapshotRecord;
+import org.apache.geode.internal.cache.tier.sockets.ClientDataSerializerMessage;
+import org.apache.geode.internal.cache.tier.sockets.ClientDenylistProcessor.ClientDenylistMessage;
+import org.apache.geode.internal.cache.tier.sockets.ClientInstantiatorMessage;
+import org.apache.geode.internal.cache.tier.sockets.ClientInterestMessageImpl;
+import org.apache.geode.internal.cache.tier.sockets.ClientMarkerMessageImpl;
+import org.apache.geode.internal.cache.tier.sockets.ClientPingMessageImpl;
+import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
+import org.apache.geode.internal.cache.tier.sockets.ClientTombstoneMessage;
+import org.apache.geode.internal.cache.tier.sockets.ClientUpdateMessageImpl;
+import org.apache.geode.internal.cache.tier.sockets.HAEventWrapper;
+import org.apache.geode.internal.cache.tier.sockets.InterestResultPolicyImpl;
+import org.apache.geode.internal.cache.tier.sockets.ObjectPartList;
+import org.apache.geode.internal.cache.tier.sockets.ObjectPartList651;
+import org.apache.geode.internal.cache.tier.sockets.RemoveClientFromDenylistMessage;
+import org.apache.geode.internal.cache.tier.sockets.SerializedObjectPartList;
+import org.apache.geode.internal.cache.tier.sockets.ServerInterestRegistrationMessage;
+import org.apache.geode.internal.cache.tier.sockets.VersionedObjectList;
+import org.apache.geode.internal.cache.tx.DistTxEntryEvent;
+import org.apache.geode.internal.cache.tx.RemoteClearMessage;
+import org.apache.geode.internal.cache.tx.RemoteClearMessage.RemoteClearReplyMessage;
+import org.apache.geode.internal.cache.tx.RemoteContainsKeyValueMessage;
+import org.apache.geode.internal.cache.tx.RemoteDestroyMessage;
+import org.apache.geode.internal.cache.tx.RemoteFetchEntryMessage;
+import org.apache.geode.internal.cache.tx.RemoteFetchKeysMessage;
+import org.apache.geode.internal.cache.tx.RemoteFetchVersionMessage;
+import org.apache.geode.internal.cache.tx.RemoteGetMessage;
+import org.apache.geode.internal.cache.tx.RemoteInvalidateMessage;
+import org.apache.geode.internal.cache.tx.RemotePutAllMessage;
+import org.apache.geode.internal.cache.tx.RemotePutMessage;
+import org.apache.geode.internal.cache.tx.RemoteRemoveAllMessage;
+import org.apache.geode.internal.cache.tx.RemoteSizeMessage;
+import org.apache.geode.internal.cache.versions.DiskRegionVersionVector;
+import org.apache.geode.internal.cache.versions.DiskVersionTag;
+import org.apache.geode.internal.cache.versions.VMRegionVersionVector;
+import org.apache.geode.internal.cache.versions.VMVersionTag;
+import org.apache.geode.internal.cache.wan.GatewaySenderAdvisor;
+import org.apache.geode.internal.cache.wan.GatewaySenderEventCallbackArgument;
+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.DataSerializableFixedID;
+import org.apache.geode.management.internal.JmxManagerAdvisor.JmxManagerProfile;
+import org.apache.geode.management.internal.JmxManagerAdvisor.JmxManagerProfileMessage;
+import org.apache.geode.management.internal.JmxManagerLocatorRequest;
+import org.apache.geode.management.internal.JmxManagerLocatorResponse;
+import org.apache.geode.management.internal.ManagerStartupMessage;
+import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
+import org.apache.geode.management.internal.configuration.messages.ConfigurationResponse;
+import org.apache.geode.pdx.internal.CheckTypeRegistryState;
+import org.apache.geode.pdx.internal.EnumId;
+import org.apache.geode.pdx.internal.EnumInfo;
 
 /**
- * Factory for instances of DataSerializableFixedID instances.  Constructors must be registered
- * with this factory in order for it to deserialize anything.
+ * Factory for instances of DataSerializableFixedID instances. Note that this class implements
+ * DataSerializableFixedID to inherit constants but is not actually an instance of this interface.
+ *
+ * @since GemFire 5.7
  */
-public class DSFIDFactory {
-
-  @Immutable
-  private final Constructor<?>[] dsfidMap = new Constructor<?>[256];
-
-  @Immutable("This maybe should be wrapped in an unmodifiableMap?")
-  private final Int2ObjectOpenHashMap dsfidMap2 = new Int2ObjectOpenHashMap(800);
-
-
-  /** Register the constructor for a fixed ID class. */
-  public 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 class DSFIDFactory implements DataSerializableFixedID {
+
+  private final DSFIDSerializer serializer;
+
+  DSFIDFactory(DSFIDSerializer serializer) {
+    this.serializer = serializer;
+  }
+
+  @Override
+  public int getDSFID() {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public void toData(DataOutput out) throws IOException {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public void fromData(DataInput in) throws IOException, ClassNotFoundException {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public Version[] getSerializationVersions() {
+    throw new UnsupportedOperationException();
+  }
+
+  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);
+    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);
+    serializer.registerDSFID(NET_SEARCH_REPLY_MESSAGE,
+        SearchLoadAndWriteProcessor.NetSearchReplyMessage.class);
+    serializer.registerDSFID(NET_LOAD_REQUEST_MESSAGE,
+        SearchLoadAndWriteProcessor.NetLoadRequestMessage.class);
+    serializer.registerDSFID(NET_LOAD_REPLY_MESSAGE,
+        SearchLoadAndWriteProcessor.NetLoadReplyMessage.class);
+    serializer.registerDSFID(NET_WRITE_REQUEST_MESSAGE,
+        SearchLoadAndWriteProcessor.NetWriteRequestMessage.class);
+    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);
+    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);
+    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);
+    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);
+    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);
+    serializer.registerDSFID(DISTTX_COMMIT_REPLY_MESSAGE,
+        DistTXCommitMessage.DistTXCommitReplyMessage.class);
+    serializer.registerDSFID(DISTTX_PRE_COMMIT_REPLY_MESSAGE,
+        DistTXPrecommitMessage.DistTXPrecommitReplyMessage.class);
+    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);
+    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);
+    serializer.registerDSFID(R_CONTAINS_MESSAGE, RemoteContainsKeyValueMessage.class);
+    serializer.registerDSFID(R_CONTAINS_REPLY_MESSAGE,
+        RemoteContainsKeyValueMessage.RemoteContainsKeyValueReplyMessage.class);
+    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);
+    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);
+    serializer.registerDSFID(RESULTS_COLLECTION_WRAPPER, ResultsCollectionWrapper.class);
+    serializer.registerDSFID(RESULTS_SET, ResultsSet.class);
+    serializer.registerDSFID(SORTED_RESULT_SET, SortedResultSet.class);
+    serializer.registerDSFID(SORTED_STRUCT_SET, SortedStructSet.class);
+    serializer.registerDSFID(NWAY_MERGE_RESULTS, NWayMergeResults.class);
+    serializer.registerDSFID(CUMULATIVE_RESULTS, CumulativeNonDistinctResults.class);
+    serializer.registerDSFID(UNDEFINED, Undefined.class);
+    serializer.registerDSFID(STRUCT_IMPL, StructImpl.class);
+    serializer.registerDSFID(STRUCT_SET, StructSet.class);
+    serializer.registerDSFID(END_OF_BUCKET, PRQueryProcessor.EndOfBucket.class);
+    serializer.registerDSFID(STRUCT_BAG, StructBag.class);
+    serializer.registerDSFID(LINKED_RESULTSET, LinkedResultSet.class);
+    serializer.registerDSFID(LINKED_STRUCTSET, LinkedStructSet.class);
+    serializer.registerDSFID(PR_BUCKET_BACKUP_MESSAGE, BucketBackupMessage.class);
+    serializer.registerDSFID(PR_BUCKET_PROFILE_UPDATE_MESSAGE, BucketProfileUpdateMessage.class);
+    serializer.registerDSFID(PR_ALL_BUCKET_PROFILES_UPDATE_MESSAGE,
+        AllBucketProfilesUpdateMessage.class);
+    serializer.registerDSFID(PR_BUCKET_SIZE_MESSAGE, BucketSizeMessage.class);
+    serializer.registerDSFID(PR_CONTAINS_KEY_VALUE_MESSAGE, ContainsKeyValueMessage.class);
+    serializer.registerDSFID(PR_DUMP_ALL_PR_CONFIG_MESSAGE, DumpAllPRConfigMessage.class);
+    serializer.registerDSFID(PR_DUMP_BUCKETS_MESSAGE, DumpBucketsMessage.class);
+    serializer.registerDSFID(PR_FETCH_ENTRIES_MESSAGE, FetchEntriesMessage.class);
+    serializer.registerDSFID(PR_FETCH_ENTRY_MESSAGE, FetchEntryMessage.class);
+    serializer.registerDSFID(PR_FETCH_KEYS_MESSAGE, FetchKeysMessage.class);
+    serializer.registerDSFID(PR_FLUSH_MESSAGE, FlushMessage.class);
+    serializer.registerDSFID(PR_IDENTITY_REQUEST_MESSAGE, IdentityRequestMessage.class);
+    serializer.registerDSFID(PR_IDENTITY_UPDATE_MESSAGE, IdentityUpdateMessage.class);
+    serializer.registerDSFID(PR_INDEX_CREATION_MSG, IndexCreationMsg.class);
+    serializer.registerDSFID(PR_MANAGE_BUCKET_MESSAGE, ManageBucketMessage.class);
+    serializer.registerDSFID(PR_PRIMARY_REQUEST_MESSAGE, PrimaryRequestMessage.class);
+    serializer.registerDSFID(PR_PRIMARY_REQUEST_REPLY_MESSAGE, PrimaryRequestReplyMessage.class);
+    serializer.registerDSFID(PR_SANITY_CHECK_MESSAGE, PRSanityCheckMessage.class);
+    serializer.registerDSFID(PR_PUTALL_REPLY_MESSAGE, PutAllReplyMessage.class);
+    serializer.registerDSFID(PR_PUT_REPLY_MESSAGE, PutReplyMessage.class);
+    serializer.registerDSFID(PR_QUERY_MESSAGE, QueryMessage.class);
+    serializer.registerDSFID(PR_REMOVE_INDEXES_MESSAGE, RemoveIndexesMessage.class);
+    serializer.registerDSFID(PR_REMOVE_INDEXES_REPLY_MESSAGE, RemoveIndexesReplyMessage.class);
+    serializer.registerDSFID(PR_SIZE_MESSAGE, SizeMessage.class);
+    serializer.registerDSFID(PR_SIZE_REPLY_MESSAGE, SizeReplyMessage.class);
+    serializer.registerDSFID(PR_BUCKET_SIZE_REPLY_MESSAGE, BucketSizeReplyMessage.class);
+    serializer.registerDSFID(PR_CONTAINS_KEY_VALUE_REPLY_MESSAGE,
+        ContainsKeyValueReplyMessage.class);
+    serializer.registerDSFID(PR_FETCH_ENTRIES_REPLY_MESSAGE, FetchEntriesReplyMessage.class);
+    serializer.registerDSFID(PR_FETCH_ENTRY_REPLY_MESSAGE, FetchEntryReplyMessage.class);
+    serializer.registerDSFID(PR_IDENTITY_REPLY_MESSAGE, IdentityReplyMessage.class);
+    serializer.registerDSFID(PR_INDEX_CREATION_REPLY_MSG, IndexCreationReplyMsg.class);
+    serializer.registerDSFID(PR_MANAGE_BUCKET_REPLY_MESSAGE, ManageBucketReplyMessage.class);
+    serializer.registerDSFID(PR_FETCH_KEYS_REPLY_MESSAGE, FetchKeysReplyMessage.class);
+    serializer.registerDSFID(PR_DUMP_B2N_REGION_MSG, DumpB2NRegion.class);
+    serializer.registerDSFID(PR_DUMP_B2N_REPLY_MESSAGE, DumpB2NReplyMessage.class);
+    serializer.registerDSFID(DESTROY_PARTITIONED_REGION_MESSAGE,
+        DestroyPartitionedRegionMessage.class);
+    serializer.registerDSFID(INVALIDATE_PARTITIONED_REGION_MESSAGE,
+        InvalidatePartitionedRegionMessage.class);
+    serializer.registerDSFID(COMMIT_PROCESS_QUERY_MESSAGE, CommitProcessQueryMessage.class);
+    serializer.registerDSFID(COMMIT_PROCESS_QUERY_REPLY_MESSAGE,
+        CommitProcessQueryReplyMessage.class);
+    serializer.registerDSFID(DESTROY_REGION_WITH_CONTEXT_MESSAGE,
+        DestroyRegionOperation.DestroyRegionWithContextMessage.class);
+    serializer.registerDSFID(PUT_ALL_MESSAGE, PutAllMessage.class);
+    serializer.registerDSFID(REMOVE_ALL_MESSAGE, RemoveAllMessage.class);
+    serializer.registerDSFID(CLEAR_REGION_MESSAGE, ClearRegionMessage.class);
+    serializer.registerDSFID(TOMBSTONE_MESSAGE, TombstoneMessage.class);
+    serializer.registerDSFID(INVALIDATE_REGION_MESSAGE, InvalidateRegionMessage.class);
+    serializer.registerDSFID(STATE_MARKER_MESSAGE, StateMarkerMessage.class);
+    serializer.registerDSFID(STATE_STABILIZATION_MESSAGE, StateStabilizationMessage.class);
+    serializer.registerDSFID(STATE_STABILIZED_MESSAGE, StateStabilizedMessage.class);
+    serializer.registerDSFID(CLIENT_MARKER_MESSAGE_IMPL, ClientMarkerMessageImpl.class);
+    serializer.registerDSFID(TX_LOCK_UPDATE_PARTICIPANTS_MESSAGE,
+        TXLockUpdateParticipantsMessage.class);
+    serializer.registerDSFID(TX_ORIGINATOR_RECOVERY_MESSAGE, TXOriginatorRecoveryMessage.class);
+    serializer.registerDSFID(TX_ORIGINATOR_RECOVERY_REPLY_MESSAGE,
+        TXOriginatorRecoveryReplyMessage.class);
+    serializer.registerDSFID(TX_REMOTE_COMMIT_MESSAGE, TXRemoteCommitMessage.class);
+    serializer.registerDSFID(TX_REMOTE_ROLLBACK_MESSAGE, TXRemoteRollbackMessage.class);
+    serializer.registerDSFID(JTA_BEFORE_COMPLETION_MESSAGE, JtaBeforeCompletionMessage.class);
+    serializer.registerDSFID(JTA_AFTER_COMPLETION_MESSAGE, JtaAfterCompletionMessage.class);
+    serializer.registerDSFID(QUEUE_REMOVAL_MESSAGE, QueueRemovalMessage.class);
+    serializer.registerDSFID(DLOCK_RECOVER_GRANTOR_MESSAGE, DLockRecoverGrantorMessage.class);
+    serializer.registerDSFID(DLOCK_RECOVER_GRANTOR_REPLY_MESSAGE,
+        DLockRecoverGrantorReplyMessage.class);
+    serializer.registerDSFID(NON_GRANTOR_DESTROYED_REPLY_MESSAGE,
+        NonGrantorDestroyedReplyMessage.class);
+    serializer.registerDSFID(IDS_REGISTRATION_MESSAGE,
+        InternalDataSerializer.RegistrationMessage.class);
+    serializer.registerDSFID(PR_FETCH_PARTITION_DETAILS_MESSAGE,
+        FetchPartitionDetailsMessage.class);
+    serializer.registerDSFID(PR_FETCH_PARTITION_DETAILS_REPLY,
+        FetchPartitionDetailsReplyMessage.class);
+    serializer.registerDSFID(PR_DEPOSE_PRIMARY_BUCKET_MESSAGE, DeposePrimaryBucketMessage.class);
+    serializer.registerDSFID(PR_DEPOSE_PRIMARY_BUCKET_REPLY, DeposePrimaryBucketReplyMessage.class);
+    serializer.registerDSFID(PR_BECOME_PRIMARY_BUCKET_MESSAGE, BecomePrimaryBucketMessage.class);
+    serializer.registerDSFID(PR_BECOME_PRIMARY_BUCKET_REPLY, BecomePrimaryBucketReplyMessage.class);
+    serializer.registerDSFID(PR_REMOVE_BUCKET_MESSAGE, RemoveBucketMessage.class);
+    serializer.registerDSFID(EXPIRE_CLIENT_TRANSACTIONS,
+        ExpireDisconnectedClientTransactionsMessage.class);
+    serializer.registerDSFID(PR_REMOVE_BUCKET_REPLY, RemoveBucketReplyMessage.class);
+    serializer.registerDSFID(PR_MOVE_BUCKET_MESSAGE, MoveBucketMessage.class);
+    serializer.registerDSFID(PR_MOVE_BUCKET_REPLY, MoveBucketReplyMessage.class);
+    serializer.registerDSFID(ADD_HEALTH_LISTENER_REQUEST, AddHealthListenerRequest.class);
+    serializer.registerDSFID(ADD_HEALTH_LISTENER_RESPONSE, AddHealthListenerResponse.class);
+    serializer.registerDSFID(ADD_STAT_LISTENER_REQUEST, AddStatListenerRequest.class);
+    serializer.registerDSFID(ADD_STAT_LISTENER_RESPONSE, AddStatListenerResponse.class);
+    serializer.registerDSFID(ADMIN_CONSOLE_DISCONNECT_MESSAGE, AdminConsoleDisconnectMessage.class);
+    serializer.registerDSFID(ADMIN_CONSOLE_MESSAGE, AdminConsoleMessage.class);
+    serializer.registerDSFID(MANAGER_STARTUP_MESSAGE, ManagerStartupMessage.class);
+    serializer.registerDSFID(JMX_MANAGER_LOCATOR_REQUEST, JmxManagerLocatorRequest.class);
+    serializer.registerDSFID(JMX_MANAGER_LOCATOR_RESPONSE, JmxManagerLocatorResponse.class);
+    serializer.registerDSFID(ADMIN_FAILURE_RESPONSE, AdminFailureResponse.class);
+    serializer.registerDSFID(ALERT_LEVEL_CHANGE_MESSAGE, AlertLevelChangeMessage.class);
+    serializer.registerDSFID(ALERT_LISTENER_MESSAGE, AlertListenerMessage.class);
+    serializer.registerDSFID(APP_CACHE_SNAPSHOT_MESSAGE, AppCacheSnapshotMessage.class);
+    serializer.registerDSFID(BRIDGE_SERVER_REQUEST, BridgeServerRequest.class);
+    serializer.registerDSFID(BRIDGE_SERVER_RESPONSE, BridgeServerResponse.class);
+    serializer.registerDSFID(CACHE_CONFIG_REQUEST, CacheConfigRequest.class);
+    serializer.registerDSFID(CACHE_CONFIG_RESPONSE, CacheConfigResponse.class);
+    serializer.registerDSFID(CACHE_INFO_REQUEST, CacheInfoRequest.class);
+    serializer.registerDSFID(CACHE_INFO_RESPONSE, CacheInfoResponse.class);
+    serializer.registerDSFID(CANCELLATION_MESSAGE, CancellationMessage.class);
+    serializer.registerDSFID(CANCEL_STAT_LISTENER_REQUEST, CancelStatListenerRequest.class);
+    serializer.registerDSFID(CANCEL_STAT_LISTENER_RESPONSE, CancelStatListenerResponse.class);
+    serializer.registerDSFID(DESTROY_ENTRY_MESSAGE, DestroyEntryMessage.class);
+    serializer.registerDSFID(ADMIN_DESTROY_REGION_MESSAGE, DestroyRegionMessage.class);
+    serializer.registerDSFID(FETCH_DIST_LOCK_INFO_REQUEST, FetchDistLockInfoRequest.class);
+    serializer.registerDSFID(FETCH_DIST_LOCK_INFO_RESPONSE, FetchDistLockInfoResponse.class);
+    serializer.registerDSFID(FETCH_HEALTH_DIAGNOSIS_REQUEST, FetchHealthDiagnosisRequest.class);
+    serializer.registerDSFID(FETCH_HEALTH_DIAGNOSIS_RESPONSE, FetchHealthDiagnosisResponse.class);
+    serializer.registerDSFID(FETCH_HOST_REQUEST, FetchHostRequest.class);
+    serializer.registerDSFID(FETCH_HOST_RESPONSE, FetchHostResponse.class);
+    serializer.registerDSFID(FETCH_RESOURCE_ATTRIBUTES_REQUEST,
+        FetchResourceAttributesRequest.class);
+    serializer.registerDSFID(FETCH_RESOURCE_ATTRIBUTES_RESPONSE,
+        FetchResourceAttributesResponse.class);
+    serializer.registerDSFID(FETCH_STATS_REQUEST, FetchStatsRequest.class);
+    serializer.registerDSFID(FETCH_STATS_RESPONSE, FetchStatsResponse.class);
+    serializer.registerDSFID(FETCH_SYS_CFG_REQUEST, FetchSysCfgRequest.class);
+    serializer.registerDSFID(FETCH_SYS_CFG_RESPONSE, FetchSysCfgResponse.class);
+    serializer.registerDSFID(FLUSH_APP_CACHE_SNAPSHOT_MESSAGE, FlushAppCacheSnapshotMessage.class);
+    serializer.registerDSFID(HEALTH_LISTENER_MESSAGE, HealthListenerMessage.class);
+    serializer.registerDSFID(OBJECT_DETAILS_REQUEST, ObjectDetailsRequest.class);
+    serializer.registerDSFID(OBJECT_DETAILS_RESPONSE, ObjectDetailsResponse.class);
+    serializer.registerDSFID(OBJECT_NAMES_REQUEST, ObjectNamesRequest.class);
+    serializer.registerDSFID(LICENSE_INFO_REQUEST, LicenseInfoRequest.class);
+    serializer.registerDSFID(LICENSE_INFO_RESPONSE, LicenseInfoResponse.class);
+    serializer.registerDSFID(OBJECT_NAMES_RESPONSE, ObjectNamesResponse.class);
+    serializer.registerDSFID(REGION_ATTRIBUTES_REQUEST, RegionAttributesRequest.class);
+    serializer.registerDSFID(REGION_ATTRIBUTES_RESPONSE, RegionAttributesResponse.class);
+    serializer.registerDSFID(REGION_REQUEST, RegionRequest.class);
+    serializer.registerDSFID(REGION_RESPONSE, RegionResponse.class);
+    serializer.registerDSFID(REGION_SIZE_REQUEST, RegionSizeRequest.class);
+    serializer.registerDSFID(REGION_SIZE_RESPONSE, RegionSizeResponse.class);
+    serializer.registerDSFID(REGION_STATISTICS_REQUEST, RegionStatisticsRequest.class);
+    serializer.registerDSFID(REGION_STATISTICS_RESPONSE, RegionStatisticsResponse.class);
+    serializer.registerDSFID(REMOVE_HEALTH_LISTENER_REQUEST, RemoveHealthListenerRequest.class);
+    serializer.registerDSFID(REMOVE_HEALTH_LISTENER_RESPONSE, RemoveHealthListenerResponse.class);
+    serializer.registerDSFID(RESET_HEALTH_STATUS_REQUEST, ResetHealthStatusRequest.class);
+    serializer.registerDSFID(RESET_HEALTH_STATUS_RESPONSE, ResetHealthStatusResponse.class);
+    serializer.registerDSFID(ROOT_REGION_REQUEST, RootRegionRequest.class);
+    serializer.registerDSFID(ROOT_REGION_RESPONSE, RootRegionResponse.class);
+    serializer.registerDSFID(SNAPSHOT_RESULT_MESSAGE, SnapshotResultMessage.class);
+    serializer.registerDSFID(STAT_LISTENER_MESSAGE, StatListenerMessage.class);
+    serializer.registerDSFID(STORE_SYS_CFG_REQUEST, StoreSysCfgRequest.class);
+    serializer.registerDSFID(STORE_SYS_CFG_RESPONSE, StoreSysCfgResponse.class);
+    serializer.registerDSFID(SUB_REGION_REQUEST, SubRegionRequest.class);
+    serializer.registerDSFID(SUB_REGION_RESPONSE, SubRegionResponse.class);
+    serializer.registerDSFID(TAIL_LOG_REQUEST, TailLogRequest.class);
+    serializer.registerDSFID(TAIL_LOG_RESPONSE, TailLogResponse.class);
+    serializer.registerDSFID(VERSION_INFO_REQUEST, VersionInfoRequest.class);
+    serializer.registerDSFID(VERSION_INFO_RESPONSE, VersionInfoResponse.class);
+    serializer.registerDSFID(HIGH_PRIORITY_ACKED_MESSAGE, HighPriorityAckedMessage.class);
+    serializer.registerDSFID(SERIAL_ACKED_MESSAGE, SerialAckedMessage.class);
+    serializer.registerDSFID(BUCKET_PROFILE, BucketAdvisor.BucketProfile.class);
+    serializer.registerDSFID(SERVER_BUCKET_PROFILE, BucketAdvisor.ServerBucketProfile.class);
+    serializer.registerDSFID(PARTITION_PROFILE, RegionAdvisor.PartitionProfile.class);
+    serializer.registerDSFID(GATEWAY_SENDER_PROFILE,
+        GatewaySenderAdvisor.GatewaySenderProfile.class);
+    serializer.registerDSFID(ROLE_EVENT, RoleEventImpl.class);
+    serializer.registerDSFID(CLIENT_REGION_EVENT, ClientRegionEventImpl.class);
+    serializer.registerDSFID(PR_INVALIDATE_MESSAGE, InvalidateMessage.class);
+    serializer.registerDSFID(PR_INVALIDATE_REPLY_MESSAGE,
+        InvalidateMessage.InvalidateReplyMessage.class);
+    serializer.registerDSFID(TX_LOCK_UPDATE_PARTICIPANTS_REPLY_MESSAGE,
+        TXLockUpdateParticipantsReplyMessage.class);
+    serializer.registerDSFID(STREAMING_REPLY_MESSAGE, StreamingReplyMessage.class);
+    serializer.registerDSFID(PARTITION_REGION_CONFIG, PartitionRegionConfig.class);
+    serializer.registerDSFID(PREFER_BYTES_CACHED_DESERIALIZABLE,
+        PreferBytesCachedDeserializable.class);
+    serializer.registerDSFID(VM_CACHED_DESERIALIZABLE, VMCachedDeserializable.class);
+    serializer.registerDSFID(GATEWAY_SENDER_EVENT_IMPL, GatewaySenderEventImpl.class);
+    serializer.registerDSFID(SUSPEND_LOCKING_TOKEN, DLockService.SuspendLockingToken.class);
+    serializer.registerDSFID(OBJECT_TYPE_IMPL, ObjectTypeImpl.class);
+    serializer.registerDSFID(STRUCT_TYPE_IMPL, StructTypeImpl.class);
+    serializer.registerDSFID(COLLECTION_TYPE_IMPL, CollectionTypeImpl.class);
+    serializer.registerDSFID(TX_LOCK_BATCH, TXLockBatch.class);
+    serializer.registerDSFID(GATEWAY_SENDER_EVENT_CALLBACK_ARGUMENT,
+        GatewaySenderEventCallbackArgument.class);
+    serializer.registerDSFID(MAP_TYPE_IMPL, MapTypeImpl.class);
+    serializer.registerDSFID(STORE_ALL_CACHED_DESERIALIZABLE, StoreAllCachedDeserializable.class);
+    serializer.registerDSFID(INTEREST_EVENT_MESSAGE, InterestEventMessage.class);
+    serializer.registerDSFID(INTEREST_EVENT_REPLY_MESSAGE, InterestEventReplyMessage.class);
+    serializer.registerDSFID(HA_EVENT_WRAPPER, HAEventWrapper.class);
+    serializer.registerDSFID(STAT_ALERTS_MGR_ASSIGN_MESSAGE, StatAlertsManagerAssignMessage.class);
+    serializer.registerDSFID(UPDATE_ALERTS_DEFN_MESSAGE, UpdateAlertDefinitionMessage.class);
+    serializer.registerDSFID(REFRESH_MEMBER_SNAP_REQUEST, RefreshMemberSnapshotRequest.class);
+    serializer.registerDSFID(REFRESH_MEMBER_SNAP_RESPONSE, RefreshMemberSnapshotResponse.class);
+    serializer.registerDSFID(REGION_SUB_SIZE_REQUEST, RegionSubRegionSizeRequest.class);
+    serializer.registerDSFID(REGION_SUB_SIZE_RESPONSE, RegionSubRegionsSizeResponse.class);
+    serializer.registerDSFID(CHANGE_REFRESH_INT_MESSAGE, ChangeRefreshIntervalMessage.class);
+    serializer.registerDSFID(ALERTS_NOTIF_MESSAGE, AlertsNotificationMessage.class);
+    serializer.registerDSFID(FIND_DURABLE_QUEUE, FindDurableQueueMessage.class);
+    serializer.registerDSFID(FIND_DURABLE_QUEUE_REPLY, FindDurableQueueReply.class);
+    serializer.registerDSFID(CACHE_SERVER_LOAD_MESSAGE, CacheServerLoadMessage.class);
+    serializer.registerDSFID(CACHE_SERVER_PROFILE, CacheServerProfile.class);
+    serializer.registerDSFID(CONTROLLER_PROFILE, ControllerProfile.class);
+    serializer.registerDSFID(DLOCK_QUERY_MESSAGE, DLockQueryProcessor.DLockQueryMessage.class);
+    serializer.registerDSFID(DLOCK_QUERY_REPLY, DLockQueryProcessor.DLockQueryReplyMessage.class);
+    serializer.registerDSFID(LOCATOR_LIST_REQUEST, LocatorListRequest.class);
+    serializer.registerDSFID(LOCATOR_LIST_RESPONSE, LocatorListResponse.class);
+    serializer.registerDSFID(CLIENT_CONNECTION_REQUEST, ClientConnectionRequest.class);
+    serializer.registerDSFID(CLIENT_CONNECTION_RESPONSE, ClientConnectionResponse.class);
+    serializer.registerDSFID(QUEUE_CONNECTION_REQUEST, QueueConnectionRequest.class);
+    serializer.registerDSFID(QUEUE_CONNECTION_RESPONSE, QueueConnectionResponse.class);
+    serializer.registerDSFID(CLIENT_REPLACEMENT_REQUEST, ClientReplacementRequest.class);
+    serializer.registerDSFID(OBJECT_PART_LIST, ObjectPartList.class);
+    serializer.registerDSFID(VERSIONED_OBJECT_LIST, VersionedObjectList.class);
+    serializer.registerDSFID(OBJECT_PART_LIST66, ObjectPartList651.class);
+    serializer.registerDSFID(PUTALL_VERSIONS_LIST, EntryVersionsList.class);
+    serializer.registerDSFID(INITIAL_IMAGE_VERSIONED_OBJECT_LIST,
+        InitialImageVersionedEntryList.class);
+    serializer.registerDSFID(FIND_VERSION_TAG, FindVersionTagMessage.class);
+    serializer.registerDSFID(VERSION_TAG_REPLY, VersionTagReply.class);
+    serializer.registerDSFID(DURABLE_CLIENT_INFO_REQUEST, DurableClientInfoRequest.class);
+    serializer.registerDSFID(DURABLE_CLIENT_INFO_RESPONSE, DurableClientInfoResponse.class);
+    serializer.registerDSFID(CLIENT_INTEREST_MESSAGE, ClientInterestMessageImpl.class);
+    serializer.registerDSFID(LATEST_LAST_ACCESS_TIME_MESSAGE, LatestLastAccessTimeMessage.class);
+    serializer.registerDSFID(STAT_ALERT_DEFN_NUM_THRESHOLD, NumberThresholdDecoratorImpl.class);
+    serializer.registerDSFID(STAT_ALERT_DEFN_GAUGE_THRESHOLD, GaugeThresholdDecoratorImpl.class);
+    serializer.registerDSFID(CLIENT_HEALTH_STATS, ClientHealthStats.class);
+    serializer.registerDSFID(STAT_ALERT_NOTIFICATION, StatAlertNotification.class);
+    serializer.registerDSFID(FILTER_INFO_MESSAGE, InitialImageOperation.FilterInfoMessage.class);
+    serializer.registerDSFID(SIZED_BASED_LOAD_PROBE, SizedBasedLoadProbe.class);
+    serializer.registerDSFID(PR_MANAGE_BACKUP_BUCKET_MESSAGE, ManageBackupBucketMessage.class);
+    serializer.registerDSFID(PR_MANAGE_BACKUP_BUCKET_REPLY_MESSAGE,
+        ManageBackupBucketReplyMessage.class);
+    serializer.registerDSFID(PR_CREATE_BUCKET_MESSAGE, CreateBucketMessage.class);
+    serializer.registerDSFID(PR_CREATE_BUCKET_REPLY_MESSAGE, CreateBucketReplyMessage.class);
+    serializer.registerDSFID(RESOURCE_MANAGER_PROFILE, ResourceManagerProfile.class);
+    serializer.registerDSFID(RESOURCE_PROFILE_MESSAGE, ResourceProfileMessage.class);
+    serializer.registerDSFID(JMX_MANAGER_PROFILE, JmxManagerProfile.class);
+    serializer.registerDSFID(JMX_MANAGER_PROFILE_MESSAGE, JmxManagerProfileMessage.class);
+    serializer.registerDSFID(CLIENT_DENYLIST_MESSAGE, ClientDenylistMessage.class);
+    serializer.registerDSFID(REMOVE_CLIENT_FROM_DENYLIST_MESSAGE,
+        RemoveClientFromDenylistMessage.class);
+    serializer.registerDSFID(PR_FUNCTION_STREAMING_MESSAGE,
+        PartitionedRegionFunctionStreamingMessage.class);
+    serializer.registerDSFID(MEMBER_FUNCTION_STREAMING_MESSAGE,
+        MemberFunctionStreamingMessage.class);
+    serializer.registerDSFID(DR_FUNCTION_STREAMING_MESSAGE,
+        DistributedRegionFunctionStreamingMessage.class);
+    serializer.registerDSFID(FUNCTION_STREAMING_REPLY_MESSAGE, FunctionStreamingReplyMessage.class);
+    serializer.registerDSFID(GET_ALL_SERVERS_REQUEST, GetAllServersRequest.class);
+    serializer.registerDSFID(GET_ALL_SERVRES_RESPONSE, GetAllServersResponse.class);
+    serializer.registerDSFID(PERSISTENT_MEMBERSHIP_VIEW_REQUEST, MembershipViewRequest.class);
+    serializer.registerDSFID(PERSISTENT_MEMBERSHIP_VIEW_REPLY, MembershipViewReplyMessage.class);
+    serializer.registerDSFID(PERSISTENT_STATE_QUERY_REQUEST, PersistentStateQueryMessage.class);
+    serializer.registerDSFID(PERSISTENT_STATE_QUERY_REPLY, PersistentStateQueryReplyMessage.class);
+    serializer.registerDSFID(PREPARE_NEW_PERSISTENT_MEMBER_REQUEST,
+        PrepareNewPersistentMemberMessage.class);
+    serializer.registerDSFID(MISSING_PERSISTENT_IDS_REQUEST, MissingPersistentIDsRequest.class);
+    serializer.registerDSFID(MISSING_PERSISTENT_IDS_RESPONSE, MissingPersistentIDsResponse.class);
+    serializer.registerDSFID(REVOKE_PERSISTENT_ID_REQUEST, RevokePersistentIDRequest.class);
+    serializer.registerDSFID(REVOKE_PERSISTENT_ID_RESPONSE, RevokePersistentIDResponse.class);
+    serializer.registerDSFID(REMOVE_PERSISTENT_MEMBER_REQUEST, RemovePersistentMemberMessage.class);
+    serializer.registerDSFID(FUNCTION_STREAMING_ORDERED_REPLY_MESSAGE,
+        FunctionStreamingOrderedReplyMessage.class);
+    serializer.registerDSFID(REQUEST_SYNC_MESSAGE, InitialImageOperation.RequestSyncMessage.class);
+    serializer.registerDSFID(PERSISTENT_MEMBERSHIP_FLUSH_REQUEST, MembershipFlushRequest.class);
+    serializer.registerDSFID(SHUTDOWN_ALL_REQUEST, ShutdownAllRequest.class);
+    serializer.registerDSFID(SHUTDOWN_ALL_RESPONSE, ShutdownAllResponse.class);
+    serializer.registerDSFID(CLIENT_MEMBERSHIP_MESSAGE, ClientMembershipMessage.class);
+    serializer.registerDSFID(END_BUCKET_CREATION_MESSAGE, EndBucketCreationMessage.class);
+    serializer.registerDSFID(PREPARE_BACKUP_REQUEST, PrepareBackupRequest.class);
+    serializer.registerDSFID(BACKUP_RESPONSE, BackupResponse.class); // in older versions this was
+    // FinishBackupResponse which is
+    // compatible
+    serializer.registerDSFID(FINISH_BACKUP_REQUEST, FinishBackupRequest.class);
+    serializer.registerDSFID(FINISH_BACKUP_RESPONSE, BackupResponse.class); // for backwards
+                                                                            // compatibility map
+    // FINISH_BACKUP_RESPONSE to
+    // BackupResponse
+    serializer.registerDSFID(COMPACT_REQUEST, CompactRequest.class);
+    serializer.registerDSFID(COMPACT_RESPONSE, CompactResponse.class);
+    serializer.registerDSFID(FLOW_CONTROL_PERMIT_MESSAGE, FlowControlPermitMessage.class);
+    serializer.registerDSFID(REQUEST_FILTERINFO_MESSAGE,
+        InitialImageOperation.RequestFilterInfoMessage.class);
+    serializer.registerDSFID(PARALLEL_QUEUE_REMOVAL_MESSAGE, ParallelQueueRemovalMessage.class);
+    serializer.registerDSFID(BATCH_DESTROY_MESSAGE, BatchDestroyOperation.DestroyMessage.class);
+    serializer.registerDSFID(FIND_REMOTE_TX_MESSAGE, FindRemoteTXMessage.class);
+    serializer.registerDSFID(FIND_REMOTE_TX_REPLY, FindRemoteTXMessageReply.class);
+    serializer.registerDSFID(SERIALIZED_OBJECT_PART_LIST, SerializedObjectPartList.class);
+    serializer.registerDSFID(FLUSH_TO_DISK_REQUEST, FlushToDiskRequest.class);
+    serializer.registerDSFID(FLUSH_TO_DISK_RESPONSE, FlushToDiskResponse.class);
+    serializer.registerDSFID(ENUM_ID, EnumId.class);
+    serializer.registerDSFID(ENUM_INFO, EnumInfo.class);
+    serializer.registerDSFID(CHECK_TYPE_REGISTRY_STATE, CheckTypeRegistryState.class);
+    serializer.registerDSFID(PREPARE_REVOKE_PERSISTENT_ID_REQUEST,
+        PrepareRevokePersistentIDRequest.class);
+    serializer.registerDSFID(PERSISTENT_RVV, DiskRegionVersionVector.class);
+    serializer.registerDSFID(PERSISTENT_VERSION_TAG, DiskVersionTag.class);
+    serializer.registerDSFID(DISK_STORE_ID, DiskStoreID.class);
+    serializer.registerDSFID(CLIENT_PING_MESSAGE_IMPL, ClientPingMessageImpl.class);
+    serializer.registerDSFID(SNAPSHOT_PACKET, SnapshotPacket.class);
+    serializer.registerDSFID(SNAPSHOT_RECORD, SnapshotRecord.class);
+    serializer.registerDSFID(FLOW_CONTROL_ACK, FlowControlAckMessage.class);
+    serializer.registerDSFID(FLOW_CONTROL_ABORT, FlowControlAbortMessage.class);
+    serializer.registerDSFID(MGMT_COMPACT_REQUEST,
+        org.apache.geode.management.internal.messages.CompactRequest.class);
+    serializer.registerDSFID(MGMT_COMPACT_RESPONSE,
+        org.apache.geode.management.internal.messages.CompactResponse.class);
+    serializer.registerDSFID(MGMT_FEDERATION_COMPONENT,
+        org.apache.geode.management.internal.FederationComponent.class);
+    serializer.registerDSFID(LOCATOR_STATUS_REQUEST, LocatorStatusRequest.class);
+    serializer.registerDSFID(LOCATOR_STATUS_RESPONSE, LocatorStatusResponse.class);
+    serializer.registerDSFID(R_FETCH_VERSION_MESSAGE, RemoteFetchVersionMessage.class);
+    serializer.registerDSFID(R_FETCH_VERSION_REPLY,
+        RemoteFetchVersionMessage.FetchVersionReplyMessage.class);
+    serializer.registerDSFID(RELEASE_CLEAR_LOCK_MESSAGE, ReleaseClearLockMessage.class);
+    serializer.registerDSFID(PR_TOMBSTONE_MESSAGE, PRTombstoneMessage.class);
+    serializer.registerDSFID(REQUEST_RVV_MESSAGE, InitialImageOperation.RequestRVVMessage.class);
+    serializer.registerDSFID(RVV_REPLY_MESSAGE, InitialImageOperation.RVVReplyMessage.class);
+    serializer.registerDSFID(SNAPPY_COMPRESSED_CACHED_DESERIALIZABLE,
+        SnappyCompressedCachedDeserializable.class);
+    serializer.registerDSFID(UPDATE_ENTRY_VERSION_MESSAGE, UpdateEntryVersionMessage.class);
+    serializer.registerDSFID(PR_UPDATE_ENTRY_VERSION_MESSAGE, PRUpdateEntryVersionMessage.class);
+    serializer.registerDSFID(PR_FETCH_BULK_ENTRIES_MESSAGE, FetchBulkEntriesMessage.class);
+    serializer.registerDSFID(PR_FETCH_BULK_ENTRIES_REPLY_MESSAGE,
+        FetchBulkEntriesReplyMessage.class);
+    serializer.registerDSFID(PR_QUERY_TRACE_INFO, PRQueryTraceInfo.class);
+    serializer.registerDSFID(INDEX_CREATION_DATA, IndexCreationData.class);
+    serializer.registerDSFID(DIST_TX_OP, DistTxEntryEvent.class);
+    serializer.registerDSFID(DIST_TX_PRE_COMMIT_RESPONSE, DistTxPrecommitResponse.class);
+    serializer.registerDSFID(DIST_TX_THIN_ENTRY_STATE, TXEntryState.DistTxThinEntryState.class);
+    serializer.registerDSFID(SERVER_PING_MESSAGE, ServerPingMessage.class);
+    serializer.registerDSFID(PR_DESTROY_ON_DATA_STORE_MESSAGE,
+        DestroyRegionOnDataStoreMessage.class);
+    serializer.registerDSFID(SHUTDOWN_ALL_GATEWAYHUBS_REQUEST, ShutdownAllGatewayHubsRequest.class);
+    serializer.registerDSFID(BUCKET_COUNT_LOAD_PROBE, BucketCountLoadProbe.class);
+    serializer.registerDSFID(GATEWAY_SENDER_QUEUE_ENTRY_SYNCHRONIZATION_MESSAGE,
+        GatewaySenderQueueEntrySynchronizationOperation.GatewaySenderQueueEntrySynchronizationMessage.class);
+    serializer.registerDSFID(GATEWAY_SENDER_QUEUE_ENTRY_SYNCHRONIZATION_ENTRY,
+        GatewaySenderQueueEntrySynchronizationOperation.GatewaySenderQueueEntrySynchronizationEntry.class);
+    serializer.registerDSFID(ABORT_BACKUP_REQUEST, AbortBackupRequest.class);
   }
 
   /**
@@ -62,42 +974,102 @@ public class DSFIDFactory {
    * data input.
    */
   public Object create(int dsfid, DataInput in) throws IOException, ClassNotFoundException {
-    final Constructor<?> cons;
-    if (dsfid >= Byte.MIN_VALUE && dsfid <= Byte.MAX_VALUE) {
-      cons = dsfidMap[dsfid + Byte.MAX_VALUE + 1];
-    } else {
-      cons = (Constructor<?>) dsfidMap2.get(dsfid);
-    }
-    if (cons != null) {
-      try {
-        Object ds = cons.newInstance((Object[]) null);
-        InternalDataSerializer.invokeFromData(ds, in);
-        return ds;
-      } catch (InstantiationException ie) {
-        throw new IOException(ie.getMessage(), ie);
-      } catch (IllegalAccessException iae) {
-        throw new IOException(iae.getMessage(), iae);
-      } catch (InvocationTargetException ite) {
-        Throwable targetEx = ite.getTargetException();
-        if (targetEx instanceof IOException) {
-          throw (IOException) targetEx;
-        } else if (targetEx instanceof ClassNotFoundException) {
-          throw (ClassNotFoundException) targetEx;
-        } else {
-          throw new IOException(ite.getMessage(), targetEx);
-        }
-      }
+    switch (dsfid) {
+      case REGION:
+        return (DataSerializableFixedID) DataSerializer.readRegion(in);
+      case END_OF_STREAM_TOKEN:
+        return Token.END_OF_STREAM;
+      case DLOCK_REMOTE_TOKEN:
+        return DLockRemoteToken.createFromDataInput(in);
+      case TRANSACTION_ID:
+        return TXId.createFromData(in);
+      case INTEREST_RESULT_POLICY:
+        return readInterestResultPolicy(in);
+      case UNDEFINED:
+        return readUndefined(in);
+      case RESULTS_BAG:
+        return readResultsBag(in);
+      case TOKEN_INVALID:
+        return Token.INVALID;
+      case TOKEN_LOCAL_INVALID:
+        return Token.LOCAL_INVALID;
+      case TOKEN_DESTROYED:
+        return Token.DESTROYED;
+      case TOKEN_REMOVED:
+        return Token.REMOVED_PHASE1;
+      case TOKEN_REMOVED2:
+        return Token.REMOVED_PHASE2;
+      case TOKEN_TOMBSTONE:
+        return Token.TOMBSTONE;
+      case NULL_TOKEN:
+        return readNullToken(in);
+      case CONFIGURATION_RESPONSE:
+        return readConfigurationResponse(in);
+      case PR_DESTROY_ON_DATA_STORE_MESSAGE:
+        return readDestroyOnDataStore(in);
+      default:
+        return serializer.create(dsfid, in);
     }
-    throw new DSFIDNotFoundException("Unknown DataSerializableFixedID: " + dsfid, dsfid);
   }
 
 
-  public Constructor<?>[] getDsfidmap() {
-    return dsfidMap;
+  ////////////////// Reading Internal Objects /////////////////
+  /**
+   * Reads an instance of <code>IpAddress</code> from a <code>DataInput</code>.
+   *
+   * @throws IOException A problem occurs while reading from <code>in</code>
+   */
+  public static InternalDistributedMember readInternalDistributedMember(DataInput in)
+      throws IOException, ClassNotFoundException {
+
+    InternalDistributedMember o = new InternalDistributedMember();
+    InternalDataSerializer.invokeFromData(o, in);
+    return o;
+  }
+
+  private static ResultsBag readResultsBag(DataInput in)
+      throws IOException, ClassNotFoundException {
+    ResultsBag o = new ResultsBag(true);
+    InternalDataSerializer.invokeFromData(o, in);
+    return o;
+  }
+
+  private static Undefined readUndefined(DataInput in) throws IOException, ClassNotFoundException {
+    Undefined o = (Undefined) QueryService.UNDEFINED;
+    InternalDataSerializer.invokeFromData(o, in);
+    return o;
+  }
+
+  /**
+   * Reads an instance of <code>InterestResultPolicy</code> from a <code>DataInput</code>.
+   *
+   * @throws IOException A problem occurs while reading from <code>in</code>
+   */
+  private static InterestResultPolicyImpl readInterestResultPolicy(DataInput in)
+      throws IOException, ClassNotFoundException {
+    byte ordinal = in.readByte();
+    return (InterestResultPolicyImpl) InterestResultPolicy.fromOrdinal(ordinal);
+  }
+
+  private static DataSerializableFixedID readDestroyOnDataStore(DataInput in)
+      throws IOException, ClassNotFoundException {
+    DataSerializableFixedID serializable = new DestroyRegionOnDataStoreMessage();
+    serializable.fromData(in);
+    return serializable;
+  }
+
+  private static DataSerializableFixedID readNullToken(DataInput in)
+      throws IOException, ClassNotFoundException {
+    DataSerializableFixedID serializable = (NullToken) IndexManager.NULL;
+    serializable.fromData(in);
+    return serializable;
   }
 
-  public Int2ObjectOpenHashMap getDsfidmap2() {
-    return dsfidMap2;
+  private static DataSerializableFixedID readConfigurationResponse(DataInput in)
+      throws IOException, ClassNotFoundException {
+    DataSerializableFixedID serializable = new ConfigurationResponse();
+    serializable.fromData(in);
+    return serializable;
   }
 
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/ExternalizableDSFID.java b/geode-core/src/main/java/org/apache/geode/internal/ExternalizableDSFID.java
index d11c044..692a213 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/ExternalizableDSFID.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/ExternalizableDSFID.java
@@ -21,6 +21,8 @@ import java.io.IOException;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
 
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
+
 /**
  * Abstract class for subclasses that want to be Externalizable in addition to being
  * DataSerializableFixedID.
diff --git a/geode-core/src/main/java/org/apache/geode/internal/HeapDataOutputStream.java b/geode-core/src/main/java/org/apache/geode/internal/HeapDataOutputStream.java
index 09c117d..7f16e5c 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/HeapDataOutputStream.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/HeapDataOutputStream.java
@@ -12,29 +12,18 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.apache.geode.internal.serialization;
+package org.apache.geode.internal;
 
 import java.io.DataOutput;
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.OutputStream;
-import java.io.UTFDataFormatException;
 import java.nio.BufferOverflowException;
 import java.nio.ByteBuffer;
 import java.nio.channels.SocketChannel;
-import java.util.Iterator;
-import java.util.LinkedList;
-
-import org.apache.logging.log4j.Logger;
 
 import org.apache.geode.DataSerializer;
-import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.internal.ByteBufferWriter;
-import org.apache.geode.internal.InternalDataSerializer;
-import org.apache.geode.internal.ObjToByteArraySerializer;
 import org.apache.geode.internal.cache.BytesAndBitsForCompactor;
-import org.apache.geode.internal.logging.LogService;
-import org.apache.geode.internal.tcp.ByteBufferInputStream.ByteSource;
+import org.apache.geode.internal.tcp.ByteBufferInputStream;
 
 /**
  * HeapDataOutputStream is an OutputStream that also implements DataOutput and stores all data
@@ -53,28 +42,9 @@ import org.apache.geode.internal.tcp.ByteBufferInputStream.ByteSource;
  *
  * @since GemFire 5.0.2
  */
-public class HeapDataOutputStream extends OutputStream
-    implements ObjToByteArraySerializer, VersionedDataStream, ByteBufferWriter {
-  private static final Logger logger = LogService.getLogger();
-
-  ByteBuffer buffer;
-  protected LinkedList<ByteBuffer> chunks = null;
-  protected int size = 0;
-  /**
-   * True if this stream is currently setup for writing. Once it switches to reading then it must be
-   * reset before it can be written again.
-   */
-  private boolean writeMode = true;
-  private boolean ignoreWrites = false; // added for bug 39569
-  private final int MIN_CHUNK_SIZE;
-  private boolean disallowExpansion = false;
-  private Error expansionException = null;
-  private int memoPosition;
-  private Version version;
-  private boolean doNotCopy;
-
-  static final int SMALLEST_CHUNK_SIZE = 32;
-  private static final int INITIAL_CAPACITY = 1024;
+public class HeapDataOutputStream extends
+    org.apache.geode.internal.serialization.BufferDataOutputStream
+    implements ObjToByteArraySerializer, ByteBufferWriter {
 
   public HeapDataOutputStream(Version version) {
     this(INITIAL_CAPACITY, version);
@@ -85,16 +55,7 @@ public class HeapDataOutputStream extends OutputStream
    * be written to this stream encoded as utf.
    */
   public HeapDataOutputStream(String s) {
-    int maxStrBytes;
-    if (ASCII_STRINGS) {
-      maxStrBytes = s.length();
-    } else {
-      maxStrBytes = s.length() * 3;
-    }
-    this.MIN_CHUNK_SIZE = INITIAL_CAPACITY;
-    this.buffer = ByteBuffer.allocate(maxStrBytes);
-    this.doNotCopy = false;
-    writeUTFNoLength(s);
+    super(s);
   }
 
   public HeapDataOutputStream(int allocSize, Version version) {
@@ -106,14 +67,7 @@ public class HeapDataOutputStream extends OutputStream
    *        instead referenced.
    */
   public HeapDataOutputStream(int allocSize, Version version, boolean doNotCopy) {
-    if (allocSize < SMALLEST_CHUNK_SIZE) {
-      this.MIN_CHUNK_SIZE = SMALLEST_CHUNK_SIZE;
-    } else {
-      this.MIN_CHUNK_SIZE = allocSize;
-    }
-    this.buffer = ByteBuffer.allocate(allocSize);
-    this.version = version;
-    this.doNotCopy = doNotCopy;
+    super(allocSize, version == null ? Version.CURRENT_ORDINAL : version.ordinal(), doNotCopy);
   }
 
   /**
@@ -121,18 +75,7 @@ public class HeapDataOutputStream extends OutputStream
    *        instead referenced.
    */
   public HeapDataOutputStream(ByteBuffer initialBuffer, Version version, boolean doNotCopy) {
-    if (initialBuffer.position() != 0) {
-      initialBuffer = initialBuffer.slice();
-    }
-    int allocSize = initialBuffer.capacity();
-    if (allocSize < 32) {
-      this.MIN_CHUNK_SIZE = 32;
-    } else {
-      this.MIN_CHUNK_SIZE = allocSize;
-    }
-    this.buffer = initialBuffer;
-    this.version = version;
-    this.doNotCopy = doNotCopy;
+    super(initialBuffer, version == null ? Version.CURRENT_ORDINAL : version.ordinal(), doNotCopy);
   }
 
   /**
@@ -141,201 +84,7 @@ public class HeapDataOutputStream extends OutputStream
    *
    */
   public HeapDataOutputStream(byte[] bytes) {
-    int len = bytes.length;
-    if (len <= 0) {
-      throw new IllegalArgumentException("The byte array must not be empty");
-    }
-    if (len > 32) {
-      this.MIN_CHUNK_SIZE = len;
-    } else {
-      this.MIN_CHUNK_SIZE = 32;
-    }
-    this.buffer = ByteBuffer.wrap(bytes);
-    this.doNotCopy = false;
-  }
-
-  /**
-   * Returns true if this HDOS currently does not copy byte arrays/buffers written to it. Instead of
-   * copying a reference is kept to the original array/buffer.
-   */
-  public boolean setDoNotCopy(boolean v) {
-    boolean result = this.doNotCopy;
-    if (result != v) {
-      this.doNotCopy = v;
-    }
-    return result;
-  }
-
-  /**
-   * {@inheritDoc}
-   */
-  @Override
-  public Version getVersion() {
-    return this.version;
-  }
-
-  /*
-   * throw an exception instead of allocating a new buffer. The exception is a
-   * BufferOverflowException thrown from expand, and will restore the position to the point at which
-   * the flag was set with the disallowExpansion method.
-   *
-   * @param ee the exception to throw if expansion is needed
-   */
-  public void disallowExpansion(Error ee) {
-    this.disallowExpansion = true;
-    this.expansionException = ee;
-    this.memoPosition = this.buffer.position();
-  }
-
-  /**
-   * If this HeapDataOutputStream detects that it needs to
-   * grow then it will throw an IllegalStateException.
-   */
-  public void disallowExpansion() {
-    this.disallowExpansion = true;
-  }
-
-  /** write the low-order 8 bits of the given int */
-  @Override
-  public void write(int b) {
-    if (this.ignoreWrites)
-      return;
-    checkIfWritable();
-    ensureCapacity(1);
-    buffer.put((byte) (b & 0xff));
-  }
-
-  private void ensureCapacity(int amount) {
-    int remainingSpace = this.buffer.capacity() - this.buffer.position();
-    if (amount > remainingSpace) {
-      expand(amount);
-    }
-  }
-
-  private void expand(int amount) {
-    if (this.disallowExpansion) {
-      if (this.expansionException != null) {
-        this.ignoreWrites = true;
-        this.buffer.position(this.memoPosition);
-        throw this.expansionException;
-      } else {
-        throw new IllegalStateException("initial buffer size was exceeded");
-      }
-    }
-
-    final ByteBuffer oldBuffer = this.buffer;
-    if (this.chunks == null) {
-      this.chunks = new LinkedList<ByteBuffer>();
-    }
-    oldBuffer.flip(); // now ready for reading
-    this.size += oldBuffer.remaining();
-    this.chunks.add(oldBuffer);
-    if (amount < MIN_CHUNK_SIZE) {
-      amount = MIN_CHUNK_SIZE;
-    }
-    this.buffer = ByteBuffer.allocate(amount);
-  }
-
-  private void checkIfWritable() {
-    if (!this.writeMode) {
-      throw new IllegalStateException(
-          "not in write mode");
-    }
-  }
-
-  /** override OutputStream's write() */
-  @Override
-  public void write(byte[] source, int offset, int len) {
-    if (len == 0)
-      return;
-    if (this.ignoreWrites)
-      return;
-    checkIfWritable();
-    if (this.doNotCopy && len > MIN_TO_COPY) {
-      moveBufferToChunks();
-      addToChunks(source, offset, len);
-    } else {
-      int remainingSpace = this.buffer.capacity() - this.buffer.position();
-      if (remainingSpace < len) {
-        this.buffer.put(source, offset, remainingSpace);
-        offset += remainingSpace;
-        len -= remainingSpace;
-        ensureCapacity(len);
-      }
-      this.buffer.put(source, offset, len);
-    }
-  }
-
-  private void addToChunks(byte[] source, int offset, int len) {
-    ByteBuffer bb = ByteBuffer.wrap(source, offset, len).slice();
-    bb = bb.slice();
-    this.size += bb.remaining();
-    this.chunks.add(bb);
-  }
-
-  private void addToChunks(ByteBuffer bb) {
-    int remaining = bb.remaining();
-    if (remaining > 0) {
-      this.size += remaining;
-      if (bb.position() != 0) {
-        bb = bb.slice();
-      }
-      this.chunks.add(bb);
-    }
-  }
-
-  public int getByteBufferCount() {
-    int result = 0;
-    if (this.chunks != null) {
-      result += this.chunks.size();
-    }
-    if (this.buffer.remaining() > 0) {
-      result++;
-    }
-    return result;
-  }
-
-  public void fillByteBufferArray(ByteBuffer[] bbArray, int offset) {
-    if (this.chunks != null) {
-      for (ByteBuffer bb : this.chunks) {
-        bbArray[offset++] = bb;
-      }
-    }
-    if (this.buffer.remaining() > 0) {
-      bbArray[offset] = this.buffer;
-    }
-  }
-
-  private void moveBufferToChunks() {
-    final ByteBuffer oldBuffer = this.buffer;
-    if (this.chunks == null) {
-      this.chunks = new LinkedList<ByteBuffer>();
-    }
-    if (oldBuffer.position() == 0) {
-      // if position is zero then nothing has been written (yet) to buffer so no need to move it to
-      // chunks
-      return;
-    }
-    oldBuffer.flip();
-    this.size += oldBuffer.remaining();
-    ByteBuffer bufToAdd = oldBuffer.slice();
-    this.chunks.add(bufToAdd);
-    int newPos = oldBuffer.limit();
-    if ((oldBuffer.capacity() - newPos) <= 0) {
-      this.buffer = ByteBuffer.allocate(MIN_CHUNK_SIZE);
-    } else {
-      oldBuffer.limit(oldBuffer.capacity());
-      oldBuffer.position(newPos);
-      this.buffer = oldBuffer.slice();
-    }
-  }
-
-  public int size() {
-    if (this.writeMode) {
-      return this.size + this.buffer.position();
-    } else {
-      return this.size;
-    }
+    super(bytes);
   }
 
   /**
@@ -352,147 +101,6 @@ public class HeapDataOutputStream extends OutputStream
     }
   }
 
-  private void consolidateChunks() {
-    if (this.chunks != null) {
-      final int size = size();
-      ByteBuffer newBuffer = ByteBuffer.allocate(size);
-      for (ByteBuffer bb : this.chunks) {
-        newBuffer.put(bb);
-      }
-      this.chunks = null;
-      newBuffer.put(this.buffer);
-      this.buffer = newBuffer;
-      this.buffer.flip(); // now ready for reading
-    }
-  }
-
-  private void consolidateChunks(int startPosition) {
-    assert startPosition < SMALLEST_CHUNK_SIZE;
-    final int size = size() - startPosition;
-    ByteBuffer newBuffer = ByteBuffer.allocate(size);
-    if (this.chunks != null) {
-      this.chunks.getFirst().position(startPosition);
-      for (ByteBuffer bb : this.chunks) {
-        newBuffer.put(bb);
-      }
-      this.chunks = null;
-    } else {
-      this.buffer.position(startPosition);
-    }
-    newBuffer.put(this.buffer);
-    newBuffer.flip(); // now ready for reading
-    this.buffer = newBuffer;
-  }
-
-  /**
-   * Prepare the contents for sending again
-   */
-  public void rewind() {
-    finishWriting();
-    this.size = 0;
-    if (this.chunks != null) {
-      for (ByteBuffer bb : this.chunks) {
-        bb.rewind();
-        size += bb.remaining();
-      }
-    }
-    this.buffer.rewind();
-    size += this.buffer.remaining();
-  }
-
-  public void reset() {
-    this.size = 0;
-    if (this.chunks != null) {
-      this.chunks.clear();
-      this.chunks = null;
-    }
-    this.buffer.clear();
-    this.writeMode = true;
-    this.ignoreWrites = false;
-    this.disallowExpansion = false;
-    this.expansionException = null;
-  }
-
-  @Override
-  public void flush() {
-    // noop
-  }
-
-  public void finishWriting() {
-    if (this.writeMode) {
-      this.ignoreWrites = false;
-      this.writeMode = false;
-      this.buffer.flip();
-      this.size += this.buffer.remaining();
-    }
-  }
-
-  /**
-   * Returns a ByteBuffer of the unused buffer; returns null if the buffer was completely used.
-   */
-  public ByteBuffer finishWritingAndReturnUnusedBuffer() {
-    finishWriting();
-    ByteBuffer result = this.buffer.duplicate();
-    if (result.remaining() == 0) {
-      // buffer was never used.
-      result.limit(result.capacity());
-      return result;
-    }
-    int newPos = result.limit();
-    if ((result.capacity() - newPos) > 0) {
-      result.limit(result.capacity());
-      result.position(newPos);
-      return result.slice();
-    } else {
-      return null;
-    }
-  }
-
-  @Override
-  public void close() {
-    reset();
-  }
-
-  /**
-   * gets the contents of this stream as a ByteBuffer, ready for reading. The stream should not be
-   * written to past this point until it has been reset.
-   */
-  public ByteBuffer toByteBuffer() {
-    finishWriting();
-    consolidateChunks();
-    return this.buffer;
-  }
-
-  /**
-   * gets the contents of this stream as a ByteBuffer, ready for reading. The stream should not be
-   * written to past this point until it has been reset.
-   *
-   * @param startPosition the position of the first byte to copy into the returned buffer.
-   */
-  public ByteBuffer toByteBuffer(int startPosition) {
-    finishWriting();
-    consolidateChunks(startPosition);
-    return this.buffer;
-  }
-
-  /**
-   * gets the contents of this stream as a byte[]. The stream should not be written to past this
-   * point until it has been reset.
-   */
-  public byte[] toByteArray() {
-    ByteBuffer bb = toByteBuffer();
-    if (bb.hasArray() && bb.arrayOffset() == 0 && bb.limit() == bb.capacity()) {
-      return bb.array();
-    } else {
-      // create a new buffer of just the right size and copy the old buffer into it
-      ByteBuffer tmp = ByteBuffer.allocate(bb.remaining());
-      tmp.put(bb);
-      tmp.flip();
-      this.buffer = tmp;
-      return this.buffer.array();
-    }
-  }
-
 
   /**
    * Writes this stream to the wrapper object of BytesAndBitsForCompactor type. The byte array
@@ -597,16 +205,6 @@ public class HeapDataOutputStream extends OutputStream
     this.size -= bytesSent;
   }
 
-  private void flushBuffer(SocketChannel sc, ByteBuffer out) throws IOException {
-    if (out.position() == 0)
-      return;
-    out.flip();
-    while (out.remaining() > 0) {
-      sc.write(out);
-    }
-    out.clear();
-  }
-
   /**
    * Write the contents of this stream to the byte buffer.
    *
@@ -685,15 +283,6 @@ public class HeapDataOutputStream extends OutputStream
     return bytesToWrite;
   }
 
-  public static void flushStream(OutputStream out, ByteBuffer outBuf) throws IOException {
-    if (outBuf.position() == 0)
-      return;
-    assert outBuf.hasArray();
-    outBuf.flip();
-    out.write(outBuf.array(), outBuf.arrayOffset(), outBuf.remaining());
-    outBuf.clear();
-  }
-
   /**
    * Write the contents of this stream to the specified stream.
    */
@@ -716,129 +305,6 @@ public class HeapDataOutputStream extends OutputStream
   }
 
   /**
-   * Returns an input stream that can be used to read the contents that where written to this output
-   * stream.
-   */
-  public InputStream getInputStream() {
-    return new HDInputStream();
-  }
-
-  private class HDInputStream extends InputStream {
-    private Iterator<ByteBuffer> chunkIt;
-    private ByteBuffer bb;
-
-    public HDInputStream() {
-      finishWriting();
-      if (HeapDataOutputStream.this.chunks != null) {
-        this.chunkIt = HeapDataOutputStream.this.chunks.iterator();
-        nextChunk();
-      } else {
-        this.chunkIt = null;
-        this.bb = HeapDataOutputStream.this.buffer;
-      }
-    }
-
-    private void nextChunk() {
-      if (this.chunkIt != null) {
-        if (this.chunkIt.hasNext()) {
-          this.bb = this.chunkIt.next();
-        } else {
-          this.chunkIt = null;
-          this.bb = HeapDataOutputStream.this.buffer;
-        }
-      } else {
-        this.bb = null; // EOF
-      }
-    }
-
-    @Override
-    public int available() {
-      return size();
-    }
-
-    @Override
-    public int read() {
-      if (available() <= 0) {
-        return -1;
-      } else {
-        int remaining = this.bb.limit() - this.bb.position();
-        while (remaining == 0) {
-          nextChunk();
-          remaining = this.bb.limit() - this.bb.position();
-        }
-        consume(1);
-        return this.bb.get() & 0xFF; // fix for bug 37068
-      }
-    }
-
-    @Override
-    public int read(byte[] dst, int off, int len) {
-      if (available() <= 0) {
-        return -1;
-      } else {
-        int readCount = 0;
-        while (len > 0 && this.bb != null) {
-          if (this.bb.limit() == this.bb.position()) {
-            nextChunk();
-          } else {
-            int remaining = this.bb.limit() - this.bb.position();
-            int bytesToRead = len;
-            if (len > remaining) {
-              bytesToRead = remaining;
-            }
-            this.bb.get(dst, off, bytesToRead);
-            off += bytesToRead;
-            len -= bytesToRead;
-            readCount += bytesToRead;
-          }
-        }
-        consume(readCount);
-        return readCount;
-      }
-    }
-
-    @Override
-    public long skip(long n) {
-      int remaining = size();
-      if (remaining <= n) {
-        // just skip over bytes remaining
-        this.chunkIt = null;
-        this.bb = null;
-        consume(remaining);
-        return remaining;
-      } else {
-        long skipped = 0;
-        do {
-          long skipsRemaining = n - skipped;
-          skipped += chunkSkip(skipsRemaining);
-        } while (skipped != n);
-        return n;
-      }
-    }
-
-    private long chunkSkip(long n) {
-      int remaining = this.bb.limit() - this.bb.position();
-      if (remaining <= n) {
-        // skip this whole chunk
-        this.bb.position(this.bb.limit());
-        nextChunk();
-        consume(remaining);
-        return remaining;
-      } else {
-        // skip over just a part of this chunk
-        this.bb.position(this.bb.position() + (int) n);
-        consume((int) n);
-        return n;
-      }
-    }
-
-    private void consume(int c) {
-      HeapDataOutputStream.this.size -= c;
-    }
-
-  }
-
-  /**
    * Write the contents of this stream to the specified stream.
    * <p>
    * Note this implementation is exactly the same as writeTo(OutputStream) but they do not both
@@ -880,445 +346,6 @@ public class HeapDataOutputStream extends OutputStream
   }
 
   // DataOutput methods
-  /**
-   * Writes a <code>boolean</code> value to this output stream. If the argument <code>v</code> is
-   * <code>true</code>, the value <code>(byte)1</code> is written; if <code>v</code> is
-   * <code>false</code>, the value <code>(byte)0</code> is written. The byte written by this method
-   * may be read by the <code>readBoolean</code> method of interface <code>DataInput</code>, which
-   * will then return a <code>boolean</code> equal to <code>v</code>.
-   *
-   * @param v the boolean to be written.
-   */
-  @Override
-  public void writeBoolean(boolean v) {
-    write(v ? 1 : 0);
-  }
-
-  /**
-   * Writes to the output stream the eight low- order bits of the argument <code>v</code>. The 24
-   * high-order bits of <code>v</code> are ignored. (This means that <code>writeByte</code> does
-   * exactly the same thing as <code>write</code> for an integer argument.) The byte written by this
-   * method may be read by the <code>readByte</code> method of interface <code>DataInput</code>,
-   * which will then return a <code>byte</code> equal to <code>(byte)v</code>.
-   *
-   * @param v the byte value to be written.
-   */
-  @Override
-  public void writeByte(int v) {
-    write(v);
-  }
-
-  /**
-   * Writes two bytes to the output stream to represent the value of the argument. The byte values
-   * to be written, in the order shown, are:
-   * <p>
-   *
-   * <pre>
-   * <code>
-   * (byte)(0xff &amp; (v &gt;&gt; 8))
-   * (byte)(0xff &amp; v)
-   * </code>
-   * </pre>
-   * <p>
-   * The bytes written by this method may be read by the <code>readShort</code> method of interface
-   * <code>DataInput</code> , which will then return a <code>short</code> equal to
-   * <code>(short)v</code>.
-   *
-   * @param v the <code>short</code> value to be written.
-   */
-  @Override
-  public void writeShort(int v) {
-    if (this.ignoreWrites)
-      return;
-    checkIfWritable();
-    ensureCapacity(2);
-    buffer.putShort((short) (v & 0xffff));
-  }
-
-  /**
-   * Writes a <code>char</code> value, wich is comprised of two bytes, to the output stream. The
-   * byte values to be written, in the order shown, are:
-   * <p>
-   *
-   * <pre>
-   * <code>
-   * (byte)(0xff &amp; (v &gt;&gt; 8))
-   * (byte)(0xff &amp; v)
-   * </code>
-   * </pre>
-   * <p>
-   * The bytes written by this method may be read by the <code>readChar</code> method of interface
-   * <code>DataInput</code> , which will then return a <code>char</code> equal to
-   * <code>(char)v</code>.
-   *
-   * @param v the <code>char</code> value to be written.
-   */
-  @Override
-  public void writeChar(int v) {
-    if (this.ignoreWrites)
-      return;
-    checkIfWritable();
-    ensureCapacity(2);
-    buffer.putChar((char) v);
-  }
-
-  /**
-   * Writes an <code>int</code> value, which is comprised of four bytes, to the output stream. The
-   * byte values to be written, in the order shown, are:
-   * <p>
-   *
-   * <pre>
-   * <code>
-   * (byte)(0xff &amp; (v &gt;&gt; 24))
-   * (byte)(0xff &amp; (v &gt;&gt; 16))
-   * (byte)(0xff &amp; (v &gt;&gt; &#32; &#32;8))
-   * (byte)(0xff &amp; v)
-   * </code>
-   * </pre>
-   * <p>
-   * The bytes written by this method may be read by the <code>readInt</code> method of interface
-   * <code>DataInput</code> , which will then return an <code>int</code> equal to <code>v</code>.
-   *
-   * @param v the <code>int</code> value to be written.
-   */
-  @Override
-  public void writeInt(int v) {
-    if (this.ignoreWrites)
-      return;
-    checkIfWritable();
-    ensureCapacity(4);
-    buffer.putInt(v);
-  }
-
-  /**
-   * Writes a <code>long</code> value, which is comprised of eight bytes, to the output stream. The
-   * byte values to be written, in the order shown, are:
-   * <p>
-   *
-   * <pre>
-   * <code>
-   * (byte)(0xff &amp; (v &gt;&gt; 56))
-   * (byte)(0xff &amp; (v &gt;&gt; 48))
-   * (byte)(0xff &amp; (v &gt;&gt; 40))
-   * (byte)(0xff &amp; (v &gt;&gt; 32))
-   * (byte)(0xff &amp; (v &gt;&gt; 24))
-   * (byte)(0xff &amp; (v &gt;&gt; 16))
-   * (byte)(0xff &amp; (v &gt;&gt;  8))
-   * (byte)(0xff &amp; v)
-   * </code>
-   * </pre>
-   * <p>
-   * The bytes written by this method may be read by the <code>readLong</code> method of interface
-   * <code>DataInput</code> , which will then return a <code>long</code> equal to <code>v</code>.
-   *
-   * @param v the <code>long</code> value to be written.
-   */
-  @Override
-  public void writeLong(long v) {
-    if (this.ignoreWrites)
-      return;
-    checkIfWritable();
-    ensureCapacity(8);
-    buffer.putLong(v);
-  }
-
-  /**
-   * Reserves space in the output for a long and returns a LongUpdater than can be used to update
-   * this particular long.
-   *
-   * @return the LongUpdater that allows the long to be updated
-   */
-  public LongUpdater reserveLong() {
-    if (this.ignoreWrites)
-      return null;
-    checkIfWritable();
-    ensureCapacity(8);
-    LongUpdater result = new LongUpdater(this.buffer);
-    buffer.putLong(0L);
-    return result;
-  }
-
-  public static class LongUpdater {
-    private final ByteBuffer bb;
-    private final int pos;
-
-    public LongUpdater(ByteBuffer bb) {
-      this.bb = bb;
-      this.pos = bb.position();
-    }
-
-    public void update(long v) {
-      this.bb.putLong(this.pos, v);
-    }
-  }
-
-  /**
-   * Writes a <code>float</code> value, which is comprised of four bytes, to the output stream. It
-   * does this as if it first converts this <code>float</code> value to an <code>int</code> in
-   * exactly the manner of the <code>Float.floatToIntBits</code> method and then writes the
-   * <code>int</code> value in exactly the manner of the <code>writeInt</code> method. The bytes
-   * written by this method may be read by the <code>readFloat</code> method of interface
-   * <code>DataInput</code>, which will then return a <code>float</code> equal to <code>v</code>.
-   *
-   * @param v the <code>float</code> value to be written.
-   */
-  @Override
-  public void writeFloat(float v) {
-    if (this.ignoreWrites)
-      return;
-    checkIfWritable();
-    ensureCapacity(4);
-    buffer.putFloat(v);
-  }
-
-  /**
-   * Writes a <code>double</code> value, which is comprised of eight bytes, to the output stream. It
-   * does this as if it first converts this <code>double</code> value to a <code>long</code> in
-   * exactly the manner of the <code>Double.doubleToLongBits</code> method and then writes the
-   * <code>long</code> value in exactly the manner of the <code>writeLong</code> method. The bytes
-   * written by this method may be read by the <code>readDouble</code> method of interface
-   * <code>DataInput</code>, which will then return a <code>double</code> equal to <code>v</code>.
-   *
-   * @param v the <code>double</code> value to be written.
-   */
-  @Override
-  public void writeDouble(double v) {
-    if (this.ignoreWrites)
-      return;
-    checkIfWritable();
-    ensureCapacity(8);
-    buffer.putDouble(v);
-  }
-
-  /**
-   * Writes a string to the output stream. For every character in the string <code>s</code>, taken
-   * in order, one byte is written to the output stream. If <code>s</code> is <code>null</code>, a
-   * <code>NullPointerException</code> is thrown.
-   * <p>
-   * If <code>s.length</code> is zero, then no bytes are written. Otherwise, the character
-   * <code>s[0]</code> is written first, then <code>s[1]</code>, and so on; the last character
-   * written is <code>s[s.length-1]</code>. For each character, one byte is written, the low-order
-   * byte, in exactly the manner of the <code>writeByte</code> method . The high-order eight bits of
-   * each character in the string are ignored.
-   *
-   * @param str the string of bytes to be written.
-   */
-  @Override
-  public void writeBytes(String str) {
-    if (this.ignoreWrites)
-      return;
-    checkIfWritable();
-    int strlen = str.length();
-    if (strlen > 0) {
-      ensureCapacity(strlen);
-      // I know this is a deprecated method but it is PERFECT for this impl.
-      if (this.buffer.hasArray()) {
-        // I know this is a deprecated method but it is PERFECT for this impl.
-        int pos = this.buffer.position();
-        str.getBytes(0, strlen, this.buffer.array(), this.buffer.arrayOffset() + pos);
-        this.buffer.position(pos + strlen);
-      } else {
-        byte[] bytes = new byte[strlen];
-        str.getBytes(0, strlen, bytes, 0);
-        this.buffer.put(bytes);
-      }
-      // for (int i = 0 ; i < len ; i++) {
-      // this.buffer.put((byte)s.charAt(i));
-      // }
-    }
-  }
-
-  /**
-   * Writes every character in the string <code>s</code>, to the output stream, in order, two bytes
-   * per character. If <code>s</code> is <code>null</code>, a <code>NullPointerException</code> is
-   * thrown. If <code>s.length</code> is zero, then no characters are written. Otherwise, the
-   * character <code>s[0]</code> is written first, then <code>s[1]</code>, and so on; the last
-   * character written is <code>s[s.length-1]</code>. For each character, two bytes are actually
-   * written, high-order byte first, in exactly the manner of the <code>writeChar</code> method.
-   *
-   * @param s the string value to be written.
-   */
-  @Override
-  public void writeChars(String s) {
-    if (this.ignoreWrites)
-      return;
-    checkIfWritable();
-    int len = s.length();
-    if (len > 0) {
-      ensureCapacity(len * 2);
-      for (int i = 0; i < len; i++) {
-        this.buffer.putChar(s.charAt(i));
-      }
-    }
-  }
-
-  /**
-   * Use -Dgemfire.ASCII_STRINGS=true if all String instances contain ASCII characters. Setting this
-   * to true gives a performance improvement.
-   */
-  private static final boolean ASCII_STRINGS =
-      Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "ASCII_STRINGS");
-
-  /**
-   * Writes two bytes of length information to the output stream, followed by the Java modified UTF
-   * representation of every character in the string <code>s</code>. If <code>s</code> is
-   * <code>null</code>, a <code>NullPointerException</code> is thrown. Each character in the string
-   * <code>s</code> is converted to a group of one, two, or three bytes, depending on the value of
-   * the character.
-   * <p>
-   * If a character <code>c</code> is in the range <code>&#92;u0001</code> through
-   * <code>&#92;u007f</code>, it is represented by one byte:
-   * <p>
-   *
-   * <pre>
-   * (byte) c
-   * </pre>
-   * <p>
-   * If a character <code>c</code> is <code>&#92;u0000</code> or is in the range
-   * <code>&#92;u0080</code> through <code>&#92;u07ff</code>, then it is represented by two bytes,
-   * to be written in the order shown:
-   * <p>
-   *
-   * <pre>
-   * <code>
-   * (byte)(0xc0 | (0x1f &amp; (c &gt;&gt; 6)))
-   * (byte)(0x80 | (0x3f &amp; c))
-   *  </code>
-   * </pre>
-   * <p>
-   * If a character <code>c</code> is in the range <code>&#92;u0800</code> through
-   * <code>uffff</code>, then it is represented by three bytes, to be written in the order shown:
-   * <p>
-   *
-   * <pre>
-   * <code>
-   * (byte)(0xe0 | (0x0f &amp; (c &gt;&gt; 12)))
-   * (byte)(0x80 | (0x3f &amp; (c &gt;&gt;  6)))
-   * (byte)(0x80 | (0x3f &amp; c))
-   *  </code>
-   * </pre>
-   * <p>
-   * First, the total number of bytes needed to represent all the characters of <code>s</code> is
-   * calculated. If this number is larger than <code>65535</code>, then a
-   * <code>UTFDataFormatException</code> is thrown. Otherwise, this length is written to the output
-   * stream in exactly the manner of the <code>writeShort</code> method; after this, the one-, two-,
-   * or three-byte representation of each character in the string <code>s</code> is written.
-   * <p>
-   * The bytes written by this method may be read by the <code>readUTF</code> method of interface
-   * <code>DataInput</code> , which will then return a <code>String</code> equal to <code>s</code>.
-   *
-   * @param str the string value to be written.
-   */
-  @Override
-  public void writeUTF(String str) throws UTFDataFormatException {
-    if (this.ignoreWrites)
-      return;
-    checkIfWritable();
-    if (ASCII_STRINGS) {
-      writeAsciiUTF(str, true);
-    } else {
-      writeFullUTF(str, true);
-    }
-  }
-
-  private void writeAsciiUTF(String str, boolean encodeLength) throws UTFDataFormatException {
-    int strlen = str.length();
-    if (encodeLength && strlen > 65535) {
-      throw new UTFDataFormatException();
-    }
-
-    int maxLen = strlen;
-    if (encodeLength) {
-      maxLen += 2;
-    }
-    ensureCapacity(maxLen);
-
-    if (encodeLength) {
-      this.buffer.putShort((short) strlen);
-    }
-    if (this.buffer.hasArray()) {
-      // I know this is a deprecated method but it is PERFECT for this impl.
-      int pos = this.buffer.position();
-      str.getBytes(0, strlen, this.buffer.array(), this.buffer.arrayOffset() + pos);
-      this.buffer.position(pos + strlen);
-    } else {
-      for (int i = 0; i < strlen; i++) {
-        this.buffer.put((byte) str.charAt(i));
-      }
-      // byte[] bytes = new byte[strlen];
-      // str.getBytes(0, strlen, bytes, 0);
-      // this.buffer.put(bytes);
-    }
-  }
-
-  /**
-   * The logic used here is based on java's DataOutputStream.writeUTF() from the version 1.6.0_10.
-   * The reader code should use the logic similar to DataOutputStream.readUTF() from the version
-   * 1.6.0_10 to decode this properly.
-   */
-  private void writeFullUTF(String str, boolean encodeLength) throws UTFDataFormatException {
-    int strlen = str.length();
-    if (encodeLength && strlen > 65535) {
-      throw new UTFDataFormatException();
-    }
-    // make room for worst case space 3 bytes for each char and 2 for len
-    {
-      int maxLen = (strlen * 3);
-      if (encodeLength) {
-        maxLen += 2;
-      }
-      ensureCapacity(maxLen);
-    }
-    int utfSizeIdx = this.buffer.position();
-    if (encodeLength) {
-      // skip bytes reserved for length
-      this.buffer.position(utfSizeIdx + 2);
-    }
-    for (int i = 0; i < strlen; i++) {
-      int c = str.charAt(i);
-      if ((c >= 0x0001) && (c <= 0x007F)) {
-        this.buffer.put((byte) c);
-      } else if (c > 0x07FF) {
-        this.buffer.put((byte) (0xE0 | ((c >> 12) & 0x0F)));
-        this.buffer.put((byte) (0x80 | ((c >> 6) & 0x3F)));
-        this.buffer.put((byte) (0x80 | ((c >> 0) & 0x3F)));
-      } else {
-        this.buffer.put((byte) (0xC0 | ((c >> 6) & 0x1F)));
-        this.buffer.put((byte) (0x80 | ((c >> 0) & 0x3F)));
-      }
-    }
-    int utflen = this.buffer.position() - utfSizeIdx;
-    if (encodeLength) {
-      utflen -= 2;
-      if (utflen > 65535) {
-        // act as if we wrote nothing to this buffer
-        this.buffer.position(utfSizeIdx);
-        throw new UTFDataFormatException();
-      }
-      this.buffer.putShort(utfSizeIdx, (short) utflen);
-    }
-  }
-
-  /**
-   * Same as {@link #writeUTF} but it does not encode the length in the first two bytes and allows
-   * strings longer than 65k to be encoded.
-   */
-  public void writeUTFNoLength(String str) {
-    if (this.ignoreWrites)
-      return;
-    checkIfWritable();
-    try {
-      if (ASCII_STRINGS) {
-        writeAsciiUTF(str, false);
-      } else {
-        writeFullUTF(str, false);
-      }
-    } catch (UTFDataFormatException ex) {
-      // this shouldn't happen since we did not encode the length
-      throw new IllegalStateException(
-          String.format("unexpected %s", ex));
-    }
-  }
 
   /**
    * Writes the given object to this stream as a byte array. The byte array is produced by
@@ -1358,48 +385,11 @@ public class HeapDataOutputStream extends OutputStream
   }
 
   /**
-   * We set "doNotCopy" to prevent wasting time by copying bytes. But to do this we create either a
-   * HeapByteBuffer to DirectByteBuffer to reference the byte array or off-heap memory. The
-   * ByteBuffer instance itself uses up memory that needs to be initialized and eventually gc'd so
-   * for smaller sizes it is better to just copy it. Public for unit test access.
-   */
-  public static final int MIN_TO_COPY = 128;
-
-  /**
-   * Write a byte buffer to this HeapDataOutputStream,
-   *
-   * the contents of the buffer between the position and the limit are copied to the output stream.
-   */
-  @Override
-  public void write(ByteBuffer bb) {
-    if (this.ignoreWrites)
-      return;
-    checkIfWritable();
-    int remaining = bb.remaining();
-    if (remaining == 0)
-      return;
-    if (this.doNotCopy && remaining > MIN_TO_COPY) {
-      moveBufferToChunks();
-      addToChunks(bb);
-    } else {
-      int remainingSpace = this.buffer.remaining();
-      if (remainingSpace < remaining) {
-        int oldLimit = bb.limit();
-        bb.limit(bb.position() + remainingSpace);
-        this.buffer.put(bb);
-        bb.limit(oldLimit);
-        ensureCapacity(bb.remaining());
-      }
-      this.buffer.put(bb);
-    }
-  }
-
-  /**
    * Write a byte source to this HeapDataOutputStream,
    *
    * the contents of the buffer between the position and the limit are copied to the output stream.
    */
-  public void write(ByteSource source) {
+  public void write(ByteBufferInputStream.ByteSource source) {
     ByteBuffer bb = source.getBackingByteBuffer();
     if (bb != null) {
       write(bb);
@@ -1418,4 +408,6 @@ public class HeapDataOutputStream extends OutputStream
     }
     source.sendTo(this.buffer);
   }
+
+
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/InternalDataSerializer.java b/geode-core/src/main/java/org/apache/geode/internal/InternalDataSerializer.java
index 3edfc8e..a6ec1a9 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/InternalDataSerializer.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/InternalDataSerializer.java
@@ -108,7 +108,12 @@ import org.apache.geode.internal.cache.tier.sockets.Part;
 import org.apache.geode.internal.lang.ClassUtils;
 import org.apache.geode.internal.logging.LogService;
 import org.apache.geode.internal.logging.log4j.LogMarker;
-import org.apache.geode.internal.util.DscodeHelper;
+import org.apache.geode.internal.serialization.DSCODE;
+import org.apache.geode.internal.serialization.DSFIDSerializer;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.DscodeHelper;
+import org.apache.geode.internal.serialization.SerializationVersions;
+import org.apache.geode.internal.serialization.VersionedDataStream;
 import org.apache.geode.internal.util.concurrent.CopyOnWriteHashMap;
 import org.apache.geode.pdx.NonPortableClassException;
 import org.apache.geode.pdx.PdxInstance;
@@ -287,6 +292,11 @@ public abstract class InternalDataSerializer extends DataSerializer {
    */
   @MakeNotStatic
   private static OldClientSupportService oldClientSupportService;
+
+  private static final DSFIDSerializer dsfidSerializer = new DSFIDSerializer();
+
+  private static DSFIDFactory dsfidFactory;
+
   /**
    * {@code RegistrationListener}s that receive callbacks when {@code DataSerializer}s and {@code
    * Instantiator}s are registered. Note: copy-on-write access used for this set
@@ -296,6 +306,8 @@ public abstract class InternalDataSerializer extends DataSerializer {
 
   static {
     initializeWellKnownSerializers();
+    dsfidFactory = new DSFIDFactory(dsfidSerializer);
+    dsfidFactory.registerDSFIDTypes();
   }
 
   /**
@@ -339,7 +351,7 @@ public abstract class InternalDataSerializer extends DataSerializer {
     }
     if (out instanceof VersionedDataStream) {
       VersionedDataStream vout = (VersionedDataStream) out;
-      Version version = vout.getVersion();
+      Version version = Version.getVersionForDataStream(vout);
       if (null != version) {
         if (version.compareTo(Version.GEODE_1_9_0) < 0) {
           if (name.equals(POST_GEODE_190_SERVER_CQIMPL)) {
@@ -1471,28 +1483,12 @@ public abstract class InternalDataSerializer extends DataSerializer {
 
   public static void writeDSFID(DataSerializableFixedID o, int dsfid, DataOutput out)
       throws IOException {
-    if (dsfidToClassMap != null
-        && logger.isTraceEnabled(LogMarker.SERIALIZER_WRITE_DSFID_VERBOSE)) {
-      logger.trace(LogMarker.SERIALIZER_WRITE_DSFID_VERBOSE, "writeDSFID {} class={}", dsfid,
-          o.getClass());
-      if (dsfid != DataSerializableFixedID.NO_FIXED_ID
-          && dsfid != DataSerializableFixedID.ILLEGAL) {
-        // consistency check to make sure that the same DSFID is not used
-        // for two different classes
-        String newClassName = o.getClass().getName();
-        String existingClassName = dsfidToClassMap.putIfAbsent(dsfid, newClassName);
-        if (existingClassName != null && !existingClassName.equals(newClassName)) {
-          logger.trace(LogMarker.SERIALIZER_WRITE_DSFID_VERBOSE,
-              "dsfid={} is used for class {} and class {}", dsfid, existingClassName, newClassName);
-        }
-      }
-    }
-    if (dsfid == DataSerializableFixedID.NO_FIXED_ID) {
-      out.writeByte(DSCODE.DS_NO_FIXED_ID.toByte());
-      DataSerializer.writeClass(o.getClass(), out);
-    } else {
-      writeDSFIDHeader(dsfid, out);
+    if (dsfid != DataSerializableFixedID.NO_FIXED_ID) {
+      dsfidSerializer.writeDSFID(o, dsfid, out);
+      return;
     }
+    out.writeByte(DSCODE.DS_NO_FIXED_ID.toByte());
+    DataSerializer.writeClass(o.getClass(), out);
     try {
       invokeToData(o, out);
     } catch (IOException | CancelException | ToDataException | GemFireRethrowable io) {
@@ -2069,7 +2065,7 @@ public abstract class InternalDataSerializer extends DataSerializer {
     } else if (o instanceof DataSerializableFixedID) {
       checkPdxCompatible(o, ensurePdxCompatibility);
       DataSerializableFixedID dsfid = (DataSerializableFixedID) o;
-      writeDSFID(dsfid, out);
+      dsfidSerializer.writeDSFID(dsfid, out);
     } else if (autoSerialized(o, out)) {
       // all done
     } else if (o instanceof DataSerializable.Replaceable) {
@@ -2246,7 +2242,7 @@ public abstract class InternalDataSerializer extends DataSerializer {
       try {
         ObjectOutput oos = new ObjectOutputStream(stream);
         if (stream instanceof VersionedDataStream) {
-          Version v = ((VersionedDataStream) stream).getVersion();
+          Version v = Version.getVersionForDataStream((VersionedDataStream) stream);
           if (v != null && v != Version.CURRENT) {
             oos = new VersionedObjectOutput(oos, v);
           }
@@ -2274,6 +2270,10 @@ public abstract class InternalDataSerializer extends DataSerializer {
    */
   public static void invokeToData(Object ds, DataOutput out) throws IOException {
     boolean isDSFID = ds instanceof DataSerializableFixedID;
+    if (isDSFID) {
+      dsfidSerializer.invokeToData(ds, out);
+      return;
+    }
     try {
       boolean invoked = false;
       Version v = InternalDataSerializer.getVersionForDataStreamOrNull(out);
@@ -2301,22 +2301,10 @@ public abstract class InternalDataSerializer extends DataSerializer {
       }
 
       if (!invoked) {
-        if (isDSFID) {
-          ((DataSerializableFixedID) ds).toData(out);
-        } else {
-          ((DataSerializable) ds).toData(out);
-        }
+        ((DataSerializable) ds).toData(out);
       }
     } catch (IOException io) {
-      // DSFID serialization expects an IOException but otherwise
-      // we want to catch it and transform into a ToDataException
-      // since it might be in user code and we want to report it
-      // as a problem with the plugin code
-      if (isDSFID) {
-        throw io;
-      } else {
-        throw new ToDataException("toData failed on DataSerializable " + ds.getClass(), io);
-      }
+      throw new ToDataException("toData failed on DataSerializable " + ds.getClass(), io);
     } catch (CancelException | ToDataException | GemFireRethrowable ex) {
       // Serializing a PDX can result in a cache closed exception. Just rethrow
       throw ex;
@@ -2348,6 +2336,10 @@ public abstract class InternalDataSerializer extends DataSerializer {
    */
   public static void invokeFromData(Object ds, DataInput in)
       throws IOException, ClassNotFoundException {
+    if (ds instanceof DataSerializableFixedID) {
+      dsfidSerializer.invokeFromData(ds, in);
+      return;
+    }
     try {
       boolean invoked = false;
       Version v = InternalDataSerializer.getVersionForDataStreamOrNull(in);
@@ -2373,11 +2365,7 @@ public abstract class InternalDataSerializer extends DataSerializer {
         }
       }
       if (!invoked) {
-        if (ds instanceof DataSerializableFixedID) {
-          ((DataSerializableFixedID) ds).fromData(in);
-        } else {
-          ((DataSerializable) ds).fromData(in);
-        }
+        ((DataSerializable) ds).fromData(in);
 
         if (logger.isTraceEnabled(LogMarker.SERIALIZER_VERBOSE)) {
           logger.trace(LogMarker.SERIALIZER_VERBOSE, "Read {} {}",
@@ -2426,7 +2414,7 @@ public abstract class InternalDataSerializer extends DataSerializer {
   public static Version getVersionForDataStream(DataInput in) {
     // check if this is a versioned data input
     if (in instanceof VersionedDataStream) {
-      final Version v = ((VersionedDataStream) in).getVersion();
+      final Version v = Version.getVersionForDataStream((VersionedDataStream) in);
       return v != null ? v : Version.CURRENT;
     } else {
       // assume latest version
@@ -2441,7 +2429,7 @@ public abstract class InternalDataSerializer extends DataSerializer {
   public static Version getVersionForDataStreamOrNull(DataInput in) {
     // check if this is a versioned data input
     if (in instanceof VersionedDataStream) {
-      return ((VersionedDataStream) in).getVersion();
+      return Version.getVersionForDataStream((VersionedDataStream) in);
     } else {
       // assume latest version
       return null;
@@ -2454,7 +2442,7 @@ public abstract class InternalDataSerializer extends DataSerializer {
   public static Version getVersionForDataStream(DataOutput out) {
     // check if this is a versioned data output
     if (out instanceof VersionedDataStream) {
-      final Version v = ((VersionedDataStream) out).getVersion();
+      final Version v = Version.getVersionForDataStream((VersionedDataStream) out);
       return v != null ? v : Version.CURRENT;
     } else {
       // assume latest version
@@ -2469,7 +2457,7 @@ public abstract class InternalDataSerializer extends DataSerializer {
   public static Version getVersionForDataStreamOrNull(DataOutput out) {
     // check if this is a versioned data output
     if (out instanceof VersionedDataStream) {
-      return ((VersionedDataStream) out).getVersion();
+      return Version.getVersionForDataStream((VersionedDataStream) out);
     } else {
       // assume latest version
       return null;
@@ -2516,13 +2504,13 @@ public abstract class InternalDataSerializer extends DataSerializer {
     }
     switch (dscode) {
       case DS_FIXED_ID_BYTE:
-        return DSFIDFactory.create(in.readByte(), in);
+        return dsfidFactory.create(in.readByte(), in);
       case DS_FIXED_ID_SHORT:
-        return DSFIDFactory.create(in.readShort(), in);
+        return dsfidFactory.create(in.readShort(), in);
       case DS_NO_FIXED_ID:
         return readDataSerializable(in);
       case DS_FIXED_ID_INT:
-        return DSFIDFactory.create(in.readInt(), in);
+        return dsfidFactory.create(in.readInt(), in);
       default:
         throw new IllegalStateException("unexpected byte: " + dscode + " while reading dsfid");
     }
@@ -2533,22 +2521,8 @@ public abstract class InternalDataSerializer extends DataSerializer {
     return readDSFID(in, DscodeHelper.toDSCODE(in.readByte()));
   }
 
-  private static int readDSFIDHeader(final DataInput in, DSCODE dscode) throws IOException {
-    switch (dscode) {
-      case DS_FIXED_ID_BYTE:
-        return in.readByte();
-      case DS_FIXED_ID_SHORT:
-        return in.readShort();
-      case DS_FIXED_ID_INT:
-        return in.readInt();
-      default:
-        throw new IllegalStateException("unexpected byte: " + dscode + " while reading dsfid");
-    }
-  }
-
   public static int readDSFIDHeader(final DataInput in) throws IOException {
-    checkIn(in);
-    return readDSFIDHeader(in, DscodeHelper.toDSCODE(in.readByte()));
+    return dsfidSerializer.readDSFIDHeader(in);
   }
 
   /**
@@ -2668,11 +2642,11 @@ public abstract class InternalDataSerializer extends DataSerializer {
 
     switch (headerDSCode) {
       case DS_FIXED_ID_BYTE:
-        return DSFIDFactory.create(in.readByte(), in);
+        return dsfidFactory.create(in.readByte(), in);
       case DS_FIXED_ID_SHORT:
-        return DSFIDFactory.create(in.readShort(), in);
+        return dsfidFactory.create(in.readShort(), in);
       case DS_FIXED_ID_INT:
-        return DSFIDFactory.create(in.readInt(), in);
+        return dsfidFactory.create(in.readInt(), in);
       case DS_NO_FIXED_ID:
       case DATA_SERIALIZABLE:
         return readDataSerializable(in);
@@ -2842,7 +2816,7 @@ public abstract class InternalDataSerializer extends DataSerializer {
       ObjectInput ois = new DSObjectInputStream(stream);
       serializationFilter.setFilterOn((ObjectInputStream) ois);
       if (stream instanceof VersionedDataStream) {
-        Version v = ((VersionedDataStream) stream).getVersion();
+        Version v = Version.getVersionForDataStream((VersionedDataStream) stream);
         if (Version.CURRENT != v && v != null) {
           ois = new VersionedObjectInput(ois, v);
         }
@@ -3306,6 +3280,14 @@ public abstract class InternalDataSerializer extends DataSerializer {
     }
   }
 
+  public static DSFIDSerializer getDSFIDSerializer() {
+    return dsfidSerializer;
+  }
+
+  public static DSFIDFactory getDSFIDFactory() {
+    return dsfidFactory;
+  }
+
   /**
    * Any time new serialization format is added then a new enum needs to be added here.
    *
diff --git a/geode-core/src/main/java/org/apache/geode/internal/SystemAdmin.java b/geode-core/src/main/java/org/apache/geode/internal/SystemAdmin.java
index f70b3ad..66034b6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/SystemAdmin.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/SystemAdmin.java
@@ -1279,12 +1279,7 @@ public class SystemAdmin {
     }
   }
 
-  public SystemAdmin() {
-    // 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();
-  }
+  public SystemAdmin() {}
 
   private static final String[] helpTopics =
       new String[] {"all", "overview", "commands", "options", "usage", "configuration"};
diff --git a/geode-core/src/main/java/org/apache/geode/internal/serialization/Version.java b/geode-core/src/main/java/org/apache/geode/internal/Version.java
similarity index 98%
rename from geode-core/src/main/java/org/apache/geode/internal/serialization/Version.java
rename to geode-core/src/main/java/org/apache/geode/internal/Version.java
index 74da825..75f6a59 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/serialization/Version.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/Version.java
@@ -26,6 +26,7 @@ import java.util.stream.Collectors;
 import org.apache.geode.annotations.Immutable;
 import org.apache.geode.cache.UnsupportedVersionException;
 import org.apache.geode.internal.cache.tier.sockets.CommandInitializer;
+import org.apache.geode.internal.serialization.VersionedDataStream;
 
 /**
  * Enumerated type for client / server and p2p version.
@@ -620,4 +621,16 @@ public class Version implements Comparable<Version> {
     return Arrays.asList(VALUES).stream().filter(x -> x != null && x != TEST_VERSION)
         .collect(Collectors.toList());
   }
+
+  public static Version getVersionForDataStream(VersionedDataStream input) {
+    try {
+      short ordinal = input.getVersionOrdinal();
+      if (ordinal <= 0) {
+        return null;
+      }
+      return fromOrdinal(ordinal, false);
+    } catch (UnsupportedVersionException e) {
+      return null;
+    }
+  }
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/VersionedDataSerializable.java b/geode-core/src/main/java/org/apache/geode/internal/VersionedDataSerializable.java
index dce8a3b..422371d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/VersionedDataSerializable.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/VersionedDataSerializable.java
@@ -15,6 +15,7 @@
 package org.apache.geode.internal;
 
 import org.apache.geode.DataSerializable;
+import org.apache.geode.internal.serialization.SerializationVersions;
 
 /**
  * An extension of DataSerializable that can support multiple serialized forms for backward
diff --git a/geode-core/src/main/java/org/apache/geode/internal/serialization/VersionedObjectInput.java b/geode-core/src/main/java/org/apache/geode/internal/VersionedObjectInput.java
similarity index 95%
rename from geode-core/src/main/java/org/apache/geode/internal/serialization/VersionedObjectInput.java
rename to geode-core/src/main/java/org/apache/geode/internal/VersionedObjectInput.java
index 46f7156..73b79d7 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/serialization/VersionedObjectInput.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/VersionedObjectInput.java
@@ -18,7 +18,7 @@ package org.apache.geode.internal;
 import java.io.IOException;
 import java.io.ObjectInput;
 
-import org.apache.geode.internal.serialization.Version;
+import org.apache.geode.internal.serialization.VersionedDataStream;
 
 /**
  * An extension to {@link ObjectInput} that implements {@link VersionedDataStream} wrapping given
@@ -46,8 +46,11 @@ public class VersionedObjectInput implements ObjectInput, VersionedDataStream {
    * {@inheritDoc}
    */
   @Override
-  public Version getVersion() {
-    return this.version;
+  public short getVersionOrdinal() {
+    if (version == null) {
+      return Version.CURRENT_ORDINAL;
+    }
+    return this.version.ordinal();
   }
 
   /**
diff --git a/geode-core/src/main/java/org/apache/geode/internal/serialization/VersionedObjectOutput.java b/geode-core/src/main/java/org/apache/geode/internal/VersionedObjectOutput.java
similarity index 94%
rename from geode-core/src/main/java/org/apache/geode/internal/serialization/VersionedObjectOutput.java
rename to geode-core/src/main/java/org/apache/geode/internal/VersionedObjectOutput.java
index a1f8ce3..e8d44ff 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/serialization/VersionedObjectOutput.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/VersionedObjectOutput.java
@@ -18,7 +18,7 @@ package org.apache.geode.internal;
 import java.io.IOException;
 import java.io.ObjectOutput;
 
-import org.apache.geode.internal.serialization.Version;
+import org.apache.geode.internal.serialization.VersionedDataStream;
 
 /**
  * An extension to {@link ObjectOutput} that implements {@link VersionedDataStream} wrapping given
@@ -49,8 +49,11 @@ public class VersionedObjectOutput implements ObjectOutput, VersionedDataStream
    * {@inheritDoc}
    */
   @Override
-  public Version getVersion() {
-    return this.version;
+  public short getVersionOrdinal() {
+    if (version == null) {
+      return Version.CURRENT_ORDINAL;
+    }
+    return this.version.ordinal();
   }
 
   /**
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/ClientMembershipMessage.java b/geode-core/src/main/java/org/apache/geode/internal/admin/ClientMembershipMessage.java
index 3e8243b..9f4a71c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/ClientMembershipMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/ClientMembershipMessage.java
@@ -23,6 +23,7 @@ import org.apache.geode.admin.internal.AdminDistributedSystemImpl;
 import org.apache.geode.distributed.internal.ClusterDistributionManager;
 import org.apache.geode.distributed.internal.PooledDistributionMessage;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
 
 /**
  * A PooledDistributionMessage for notifying admin members about changes in Client Membership
@@ -85,7 +86,7 @@ public class ClientMembershipMessage extends PooledDistributionMessage {
 
   /**
    *
-   * @see org.apache.geode.internal.DataSerializableFixedID#getDSFID()
+   * @see DataSerializableFixedID#getDSFID()
    */
   @Override
   public int getDSFID() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ClientHealthStats.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ClientHealthStats.java
index 6f2337d..8e36bc4 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ClientHealthStats.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ClientHealthStats.java
@@ -25,8 +25,8 @@ import java.util.Map.Entry;
 
 import org.apache.geode.DataSerializer;
 import org.apache.geode.annotations.Immutable;
-import org.apache.geode.internal.DataSerializableFixedID;
 import org.apache.geode.internal.Version;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
 
 /**
  * Bean class act as container for client stats
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/DurableClientInfoRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/DurableClientInfoRequest.java
index c5f9f0a..9d1fd7f 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/DurableClientInfoRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/DurableClientInfoRequest.java
@@ -86,7 +86,7 @@ public class DurableClientInfoRequest extends AdminRequest {
   /*
    * (non-Javadoc)
    *
-   * @see org.apache.geode.internal.DataSerializableFixedID#getDSFID()
+   * @see org.apache.geode.internal.serialization.DataSerializableFixedID#getDSFID()
    */
   @Override
   public int getDSFID() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/GaugeThresholdDecoratorImpl.java b/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/GaugeThresholdDecoratorImpl.java
index ad598dc..8c4f798 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/GaugeThresholdDecoratorImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/GaugeThresholdDecoratorImpl.java
@@ -20,10 +20,10 @@ import java.io.IOException;
 
 import org.apache.geode.DataSerializer;
 import org.apache.geode.StatisticsFactory;
-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;
 
 /**
  * Implementation of {@link StatAlertDefinition}, represents threshold as data range
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/NumberThresholdDecoratorImpl.java b/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/NumberThresholdDecoratorImpl.java
index b1b2ff0..da8b2ec 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/NumberThresholdDecoratorImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/NumberThresholdDecoratorImpl.java
@@ -20,10 +20,10 @@ import java.io.IOException;
 
 import org.apache.geode.DataSerializer;
 import org.apache.geode.StatisticsFactory;
-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;
 
 /**
  * Implementation of {@link StatAlertDefinition}, represents threshold as number
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegion.java
index 9e3141a..ee7dfd2 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegion.java
@@ -88,13 +88,13 @@ import org.apache.geode.distributed.internal.DistributionAdvisor;
 import org.apache.geode.distributed.internal.DistributionConfig;
 import org.apache.geode.distributed.internal.DistributionManager;
 import org.apache.geode.distributed.internal.InternalDistributedSystem;
-import org.apache.geode.internal.DataSerializableFixedID;
 import org.apache.geode.internal.cache.LocalRegion.InitializationLevel;
 import org.apache.geode.internal.cache.extension.Extensible;
 import org.apache.geode.internal.cache.extension.ExtensionPoint;
 import org.apache.geode.internal.cache.extension.SimpleExtensionPoint;
 import org.apache.geode.internal.cache.snapshot.RegionSnapshotServiceImpl;
 import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
 import org.apache.geode.internal.statistics.StatisticsClock;
 import org.apache.geode.internal.util.ArrayUtils;
 import org.apache.geode.pdx.internal.PeerTypeRegistration;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheDistributionAdvisor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheDistributionAdvisor.java
index 21ac9eb..95ab059 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheDistributionAdvisor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheDistributionAdvisor.java
@@ -43,7 +43,6 @@ import org.apache.geode.distributed.internal.DistributionAdvisor;
 import org.apache.geode.distributed.internal.MembershipListener;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
 import org.apache.geode.internal.Assert;
-import org.apache.geode.internal.DSCODE;
 import org.apache.geode.internal.InternalDataSerializer;
 import org.apache.geode.internal.cache.LocalRegion.InitializationLevel;
 import org.apache.geode.internal.cache.partitioned.PRLocallyDestroyedException;
@@ -51,6 +50,7 @@ import org.apache.geode.internal.cache.persistence.DiskStoreID;
 import org.apache.geode.internal.cache.persistence.PersistentMemberID;
 import org.apache.geode.internal.logging.LogService;
 import org.apache.geode.internal.logging.log4j.LogMarker;
+import org.apache.geode.internal.serialization.DSCODE;
 
 /**
  * Adds bookkeeping info and cache-specific behavior to DistributionAdvisor. Adds bit-encoded flags
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/CachedDeserializableFactory.java b/geode-core/src/main/java/org/apache/geode/internal/cache/CachedDeserializableFactory.java
index 9490fe8..6a07f05 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/CachedDeserializableFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/CachedDeserializableFactory.java
@@ -21,9 +21,9 @@ import org.apache.geode.DataSerializer;
 import org.apache.geode.annotations.internal.MutableForTesting;
 import org.apache.geode.cache.util.ObjectSizer;
 import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.internal.DSCODE;
 import org.apache.geode.internal.HeapDataOutputStream;
 import org.apache.geode.internal.NullDataOutputStream;
+import org.apache.geode.internal.serialization.DSCODE;
 import org.apache.geode.internal.size.Sizeable;
 import org.apache.geode.pdx.PdxInstance;
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXPrecommitMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXPrecommitMessage.java
index 59ec991..38b4ba6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXPrecommitMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXPrecommitMessage.java
@@ -44,13 +44,13 @@ import org.apache.geode.distributed.internal.ReplyProcessor21;
 import org.apache.geode.distributed.internal.ReplySender;
 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.TXEntryState.DistTxThinEntryState;
 import org.apache.geode.internal.cache.locks.TXLockService;
 import org.apache.geode.internal.cache.tx.DistTxEntryEvent;
 import org.apache.geode.internal.logging.LogService;
 import org.apache.geode.internal.logging.log4j.LogMarker;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
 
 public class DistTXPrecommitMessage extends TXMessage {
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedPutAllOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedPutAllOperation.java
index 8d24700..6e9554e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedPutAllOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedPutAllOperation.java
@@ -42,8 +42,6 @@ import org.apache.geode.cache.query.internal.cq.CqService;
 import org.apache.geode.distributed.DistributedMember;
 import org.apache.geode.distributed.internal.DirectReplyProcessor;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.internal.ByteArrayDataInput;
-import org.apache.geode.internal.DataSerializableFixedID;
 import org.apache.geode.internal.InternalDataSerializer;
 import org.apache.geode.internal.Version;
 import org.apache.geode.internal.cache.FilterRoutingInfo.FilterInfo;
@@ -60,6 +58,8 @@ import org.apache.geode.internal.logging.log4j.LogMarker;
 import org.apache.geode.internal.offheap.annotations.Released;
 import org.apache.geode.internal.offheap.annotations.Retained;
 import org.apache.geode.internal.offheap.annotations.Unretained;
+import org.apache.geode.internal.serialization.ByteArrayDataInput;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
 
 /**
  * Handles distribution of a Region.putall operation.
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRemoveAllOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRemoveAllOperation.java
index 0d94271..acca29a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRemoveAllOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRemoveAllOperation.java
@@ -35,7 +35,6 @@ import org.apache.geode.cache.persistence.PersistentReplicatesOfflineException;
 import org.apache.geode.cache.query.internal.cq.CqService;
 import org.apache.geode.distributed.internal.DirectReplyProcessor;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.internal.ByteArrayDataInput;
 import org.apache.geode.internal.InternalDataSerializer;
 import org.apache.geode.internal.Version;
 import org.apache.geode.internal.cache.DistributedPutAllOperation.EntryVersionsList;
@@ -55,6 +54,7 @@ import org.apache.geode.internal.logging.LogService;
 import org.apache.geode.internal.offheap.annotations.Released;
 import org.apache.geode.internal.offheap.annotations.Retained;
 import org.apache.geode.internal.offheap.annotations.Unretained;
+import org.apache.geode.internal.serialization.ByteArrayDataInput;
 
 /**
  * Handles distribution of a Region.removeAll operation.
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedTombstoneOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedTombstoneOperation.java
index 3973601..9c847f2 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedTombstoneOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedTombstoneOperation.java
@@ -30,11 +30,11 @@ import org.apache.geode.cache.Operation;
 import org.apache.geode.distributed.internal.ClusterDistributionManager;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
 import org.apache.geode.internal.InternalDataSerializer;
-import org.apache.geode.internal.SerializationVersions;
 import org.apache.geode.internal.Version;
 import org.apache.geode.internal.cache.FilterRoutingInfo.FilterInfo;
 import org.apache.geode.internal.cache.persistence.DiskStoreID;
 import org.apache.geode.internal.cache.versions.VersionSource;
+import org.apache.geode.internal.serialization.SerializationVersions;
 
 public class DistributedTombstoneOperation extends DistributedCacheOperation {
   private enum TOperation {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/EntryEventImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/EntryEventImpl.java
index 0dfa798..0b94d4a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/EntryEventImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/EntryEventImpl.java
@@ -50,9 +50,7 @@ import org.apache.geode.distributed.internal.DistributionMessage;
 import org.apache.geode.distributed.internal.InternalDistributedSystem;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
 import org.apache.geode.internal.Assert;
-import org.apache.geode.internal.ByteArrayDataInput;
 import org.apache.geode.internal.DSFIDFactory;
-import org.apache.geode.internal.DataSerializableFixedID;
 import org.apache.geode.internal.HeapDataOutputStream;
 import org.apache.geode.internal.InternalDataSerializer;
 import org.apache.geode.internal.Sendable;
@@ -79,6 +77,8 @@ import org.apache.geode.internal.offheap.StoredObject;
 import org.apache.geode.internal.offheap.annotations.Released;
 import org.apache.geode.internal.offheap.annotations.Retained;
 import org.apache.geode.internal.offheap.annotations.Unretained;
+import org.apache.geode.internal.serialization.ByteArrayDataInput;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
 import org.apache.geode.internal.size.Sizeable;
 import org.apache.geode.internal.util.ArrayUtils;
 import org.apache.geode.internal.util.BlobHelper;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/EventID.java b/geode-core/src/main/java/org/apache/geode/internal/cache/EventID.java
index 04d1343..5d26919 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/EventID.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/EventID.java
@@ -37,8 +37,6 @@ import org.apache.geode.distributed.DistributedMember;
 import org.apache.geode.distributed.DistributedSystem;
 import org.apache.geode.distributed.internal.DistributionConfig;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.internal.ByteArrayDataInput;
-import org.apache.geode.internal.DataSerializableFixedID;
 import org.apache.geode.internal.HeapDataOutputStream;
 import org.apache.geode.internal.InternalDataSerializer;
 import org.apache.geode.internal.Version;
@@ -46,6 +44,8 @@ import org.apache.geode.internal.cache.ha.HARegionQueue;
 import org.apache.geode.internal.cache.ha.ThreadIdentifier;
 import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
 import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.serialization.ByteArrayDataInput;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
 import org.apache.geode.internal.util.Breadcrumbs;
 
 /**
@@ -314,7 +314,8 @@ public class EventID implements DataSerializableFixedID, Serializable, Externali
       // read if the stream's version is 1.0.0-incubating
       disVersion = Version.GFE_90;
     }
-    ByteArrayDataInput dis = new ByteArrayDataInput(membershipID, disVersion);
+    ByteArrayDataInput dis =
+        new ByteArrayDataInput(membershipID, disVersion == null ? 0 : disVersion.ordinal());
     InternalDistributedMember result = null;
     try {
       result = InternalDistributedMember.readEssentialData(dis);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/FilterProfile.java b/geode-core/src/main/java/org/apache/geode/internal/cache/FilterProfile.java
index b0d8b45..29d2da1 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/FilterProfile.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/FilterProfile.java
@@ -62,7 +62,6 @@ import org.apache.geode.distributed.internal.ReplyProcessor21;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
 import org.apache.geode.internal.ClassLoadUtil;
 import org.apache.geode.internal.CopyOnWriteHashSet;
-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;
@@ -77,6 +76,7 @@ import org.apache.geode.internal.cache.tier.sockets.UnregisterAllInterest;
 import org.apache.geode.internal.logging.LogService;
 import org.apache.geode.internal.logging.log4j.LogMarker;
 import org.apache.geode.internal.offheap.annotations.Unretained;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
 import org.apache.geode.internal.util.concurrent.CopyOnWriteHashMap;
 
 /**
@@ -1977,7 +1977,7 @@ public class FilterProfile implements DataSerializableFixedID {
     /*
      * (non-Javadoc)
      *
-     * @see org.apache.geode.internal.DataSerializableFixedID#getDSFID()
+     * @see org.apache.geode.internal.serialization.DataSerializableFixedID#getDSFID()
      */
     @Override
     public int getDSFID() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/FilterRoutingInfo.java b/geode-core/src/main/java/org/apache/geode/internal/cache/FilterRoutingInfo.java
index 7d9e7ef..9a33a06 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/FilterRoutingInfo.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/FilterRoutingInfo.java
@@ -29,12 +29,12 @@ import org.apache.geode.annotations.Immutable;
 import org.apache.geode.distributed.DistributedMember;
 import org.apache.geode.distributed.internal.InternalDistributedSystem;
 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.ObjToByteArraySerializer;
 import org.apache.geode.internal.Version;
 import org.apache.geode.internal.VersionedDataSerializable;
+import org.apache.geode.internal.serialization.ByteArrayDataInput;
 
 /**
  * This class is used to hold the information about the servers and their Filters (CQs and Interest
@@ -485,7 +485,8 @@ public class FilterRoutingInfo implements VersionedDataSerializable {
      */
     private void deserialize() {
       try {
-        ByteArrayDataInput dis = new ByteArrayDataInput(myData, myDataVersion);
+        ByteArrayDataInput dis =
+            new ByteArrayDataInput(myData, myDataVersion == null ? 0 : myDataVersion.ordinal());
         boolean hasCQs = dis.readBoolean();
         if (hasCQs) {
           int numEntries = InternalDataSerializer.readArrayLength(dis);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
index 9bf2d76..c5a77b1 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
@@ -177,7 +177,6 @@ import org.apache.geode.distributed.internal.membership.InternalDistributedMembe
 import org.apache.geode.i18n.LogWriterI18n;
 import org.apache.geode.internal.Assert;
 import org.apache.geode.internal.ClassPathLoader;
-import org.apache.geode.internal.DSCODE;
 import org.apache.geode.internal.SystemTimer;
 import org.apache.geode.internal.Version;
 import org.apache.geode.internal.cache.LocalRegion.InitializationLevel;
@@ -232,6 +231,7 @@ import org.apache.geode.internal.security.SecurableCommunicationChannel;
 import org.apache.geode.internal.security.SecurityService;
 import org.apache.geode.internal.security.SecurityServiceFactory;
 import org.apache.geode.internal.sequencelog.SequenceLoggerImpl;
+import org.apache.geode.internal.serialization.DSCODE;
 import org.apache.geode.internal.shared.StringPrintWriter;
 import org.apache.geode.internal.statistics.StatisticsClock;
 import org.apache.geode.internal.statistics.StatisticsClockFactory;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/InitialImageFlowControl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/InitialImageFlowControl.java
index 3684ba6..f8c1ab6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/InitialImageFlowControl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/InitialImageFlowControl.java
@@ -32,8 +32,8 @@ import org.apache.geode.distributed.internal.DistributionMessage;
 import org.apache.geode.distributed.internal.MembershipListener;
 import org.apache.geode.distributed.internal.ProcessorKeeper21;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.internal.DataSerializableFixedID;
 import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
 
 /**
  * This class keeps track of how many InitialImageMessages are in flight between the initial image
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/InitialImageOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/InitialImageOperation.java
index 61add26..fc126bd 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/InitialImageOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/InitialImageOperation.java
@@ -67,8 +67,6 @@ import org.apache.geode.distributed.internal.ReplyMessage;
 import org.apache.geode.distributed.internal.ReplyProcessor21;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
 import org.apache.geode.internal.Assert;
-import org.apache.geode.internal.ByteArrayDataInput;
-import org.apache.geode.internal.DataSerializableFixedID;
 import org.apache.geode.internal.InternalDataSerializer;
 import org.apache.geode.internal.NullDataOutputStream;
 import org.apache.geode.internal.Version;
@@ -96,6 +94,8 @@ import org.apache.geode.internal.logging.LoggingThread;
 import org.apache.geode.internal.logging.log4j.LogMarker;
 import org.apache.geode.internal.sequencelog.EntryLogger;
 import org.apache.geode.internal.sequencelog.RegionLogger;
+import org.apache.geode.internal.serialization.ByteArrayDataInput;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
 import org.apache.geode.internal.util.ObjectIntProcedure;
 
 /**
@@ -2516,7 +2516,7 @@ public class InitialImageOperation {
     /*
      * (non-Javadoc)
      *
-     * @see org.apache.geode.internal.DataSerializableFixedID#getDSFID()
+     * @see org.apache.geode.internal.serialization.DataSerializableFixedID#getDSFID()
      */
     @Override
     public int getDSFID() {
@@ -3518,7 +3518,7 @@ public class InitialImageOperation {
     /*
      * (non-Javadoc)
      *
-     * @see org.apache.geode.internal.DataSerializableFixedID#getDSFID()
+     * @see org.apache.geode.internal.serialization.DataSerializableFixedID#getDSFID()
      */
     @Override
     public int getDSFID() {
@@ -4075,7 +4075,7 @@ public class InitialImageOperation {
     /*
      * (non-Javadoc)
      *
-     * @see org.apache.geode.internal.DataSerializableFixedID#getDSFID()
+     * @see org.apache.geode.internal.serialization.DataSerializableFixedID#getDSFID()
      */
     @Override
     public int getDSFID() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/InvalidatePartitionedRegionMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/InvalidatePartitionedRegionMessage.java
index 3e4d3cf..06a4c3f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/InvalidatePartitionedRegionMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/InvalidatePartitionedRegionMessage.java
@@ -79,7 +79,7 @@ public class InvalidatePartitionedRegionMessage extends PartitionMessage {
   /*
    * (non-Javadoc)
    *
-   * @see org.apache.geode.internal.DataSerializableFixedID#getDSFID()
+   * @see org.apache.geode.internal.serialization.DataSerializableFixedID#getDSFID()
    */
   @Override
   public int getDSFID() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/NonLocalRegionEntry.java b/geode-core/src/main/java/org/apache/geode/internal/cache/NonLocalRegionEntry.java
index bc8603f..e144ba7 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/NonLocalRegionEntry.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/NonLocalRegionEntry.java
@@ -29,13 +29,13 @@ import org.apache.geode.distributed.DistributedMember;
 import org.apache.geode.distributed.internal.DistributionManager;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
 import org.apache.geode.internal.Assert;
-import org.apache.geode.internal.ByteArrayDataInput;
 import org.apache.geode.internal.Version;
 import org.apache.geode.internal.cache.InitialImageOperation.Entry;
 import org.apache.geode.internal.cache.eviction.EvictionList;
 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;
 
 public class NonLocalRegionEntry implements RegionEntry, VersionStamp {
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/Oplog.java b/geode-core/src/main/java/org/apache/geode/internal/cache/Oplog.java
index e22703e..0675ecc 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/Oplog.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/Oplog.java
@@ -72,7 +72,6 @@ import org.apache.geode.distributed.OplogCancelledException;
 import org.apache.geode.distributed.internal.DistributionConfig;
 import org.apache.geode.distributed.internal.DistributionManager;
 import org.apache.geode.internal.Assert;
-import org.apache.geode.internal.ByteArrayDataInput;
 import org.apache.geode.internal.HeapDataOutputStream;
 import org.apache.geode.internal.InternalDataSerializer;
 import org.apache.geode.internal.InternalStatisticsDisabledException;
@@ -108,6 +107,7 @@ import org.apache.geode.internal.offheap.StoredObject;
 import org.apache.geode.internal.offheap.annotations.Released;
 import org.apache.geode.internal.offheap.annotations.Retained;
 import org.apache.geode.internal.sequencelog.EntryLogger;
+import org.apache.geode.internal.serialization.ByteArrayDataInput;
 import org.apache.geode.internal.shared.NativeCalls;
 import org.apache.geode.internal.util.BlobHelper;
 import org.apache.geode.pdx.internal.PdxWriterImpl;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PRQueryProcessor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PRQueryProcessor.java
index 4182a38..0812b07 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/PRQueryProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PRQueryProcessor.java
@@ -51,11 +51,11 @@ import org.apache.geode.cache.query.internal.QueryMonitor;
 import org.apache.geode.cache.query.types.ObjectType;
 import org.apache.geode.distributed.internal.DistributionConfig;
 import org.apache.geode.internal.Assert;
-import org.apache.geode.internal.DataSerializableFixedID;
 import org.apache.geode.internal.Version;
 import org.apache.geode.internal.cache.execute.BucketMovedException;
 import org.apache.geode.internal.logging.LogService;
 import org.apache.geode.internal.logging.LoggingExecutors;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
 
 /**
  * This class takes the responsibility of executing the query on a data store for the buckets
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PreferBytesCachedDeserializable.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PreferBytesCachedDeserializable.java
index da840a6..225c76a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/PreferBytesCachedDeserializable.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PreferBytesCachedDeserializable.java
@@ -21,9 +21,9 @@ import java.io.IOException;
 
 import org.apache.geode.DataSerializer;
 import org.apache.geode.cache.Region;
-import org.apache.geode.internal.DataSerializableFixedID;
 import org.apache.geode.internal.Version;
 import org.apache.geode.internal.lang.StringUtils;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
 
 /**
  * This cache deserializable always keeps its byte[] in serialized form. You can ask it for its
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ProxyRegionMap.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ProxyRegionMap.java
index 8f051bc..6a441f4 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/ProxyRegionMap.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ProxyRegionMap.java
@@ -31,7 +31,6 @@ import org.apache.geode.cache.TimeoutException;
 import org.apache.geode.cache.TransactionId;
 import org.apache.geode.distributed.internal.DistributionManager;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.internal.ByteArrayDataInput;
 import org.apache.geode.internal.InternalStatisticsDisabledException;
 import org.apache.geode.internal.Version;
 import org.apache.geode.internal.cache.InitialImageOperation.Entry;
@@ -44,6 +43,7 @@ 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.offheap.annotations.Released;
+import org.apache.geode.internal.serialization.ByteArrayDataInput;
 import org.apache.geode.internal.util.concurrent.ConcurrentMapWithReusableEntries;
 
 /**
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionEntry.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionEntry.java
index c3ab74c..50bf27b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionEntry.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionEntry.java
@@ -22,7 +22,6 @@ import org.apache.geode.cache.EntryEvent;
 import org.apache.geode.cache.EntryNotFoundException;
 import org.apache.geode.cache.TimeoutException;
 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.InitialImageOperation.Entry;
@@ -34,6 +33,7 @@ import org.apache.geode.internal.offheap.StoredObject;
 import org.apache.geode.internal.offheap.annotations.Released;
 import org.apache.geode.internal.offheap.annotations.Retained;
 import org.apache.geode.internal.offheap.annotations.Unretained;
+import org.apache.geode.internal.serialization.ByteArrayDataInput;
 
 /**
  * Internal interface for a region entry. Note that a region is implemented with a ConcurrentHashMap
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionEventImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionEventImpl.java
index fc339cd..94dbf51 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionEventImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionEventImpl.java
@@ -27,12 +27,12 @@ import org.apache.geode.distributed.DistributedMember;
 import org.apache.geode.distributed.DistributedSystem;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
 import org.apache.geode.internal.DSFIDFactory;
-import org.apache.geode.internal.DataSerializableFixedID;
 import org.apache.geode.internal.InternalDataSerializer;
 import org.apache.geode.internal.Version;
 import org.apache.geode.internal.cache.FilterRoutingInfo.FilterInfo;
 import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
 import org.apache.geode.internal.cache.versions.VersionTag;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
 
 /**
  * Implementation of a region event
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/StoreAllCachedDeserializable.java b/geode-core/src/main/java/org/apache/geode/internal/cache/StoreAllCachedDeserializable.java
index 98893c3..4bcf82f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/StoreAllCachedDeserializable.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/StoreAllCachedDeserializable.java
@@ -21,9 +21,9 @@ import java.io.IOException;
 
 import org.apache.geode.DataSerializer;
 import org.apache.geode.cache.Region;
-import org.apache.geode.internal.DataSerializableFixedID;
 import org.apache.geode.internal.Version;
 import org.apache.geode.internal.lang.StringUtils;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
 
 /**
  * This cache deserializable always keeps its byte[] in serialized form and the object form.
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TXEntryState.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TXEntryState.java
index 67b0768..0f7dac9 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/TXEntryState.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TXEntryState.java
@@ -42,7 +42,6 @@ import org.apache.geode.cache.TimeoutException;
 import org.apache.geode.distributed.internal.DistributionConfig;
 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.versions.VersionTag;
 import org.apache.geode.internal.lang.StringUtils;
@@ -53,6 +52,7 @@ import org.apache.geode.internal.offheap.StoredObject;
 import org.apache.geode.internal.offheap.annotations.Released;
 import org.apache.geode.internal.offheap.annotations.Retained;
 import org.apache.geode.internal.offheap.annotations.Unretained;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
 import org.apache.geode.pdx.PdxSerializationException;
 
 /**
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/Token.java b/geode-core/src/main/java/org/apache/geode/internal/cache/Token.java
index 80b5918..33ea6d1 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/Token.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/Token.java
@@ -22,9 +22,9 @@ import java.io.Serializable;
 import java.nio.ByteBuffer;
 
 import org.apache.geode.annotations.Immutable;
-import org.apache.geode.internal.DSCODE;
-import org.apache.geode.internal.DataSerializableFixedID;
 import org.apache.geode.internal.Version;
+import org.apache.geode.internal.serialization.DSCODE;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
 
 /**
  * Internal tokens used as region values. These tokens are never seen from the public API.
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMCachedDeserializable.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMCachedDeserializable.java
index 5413602..9da40ed 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMCachedDeserializable.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMCachedDeserializable.java
@@ -22,10 +22,10 @@ import java.io.IOException;
 import org.apache.geode.CopyHelper;
 import org.apache.geode.DataSerializer;
 import org.apache.geode.cache.Region;
-import org.apache.geode.internal.DataSerializableFixedID;
 import org.apache.geode.internal.Version;
 import org.apache.geode.internal.cache.eviction.EvictableEntry;
 import org.apache.geode.internal.lang.StringUtils;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
 import org.apache.geode.pdx.PdxInstance;
 
 /**
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ValidatingDiskRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ValidatingDiskRegion.java
index 6d02593..699cb62 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/ValidatingDiskRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ValidatingDiskRegion.java
@@ -25,7 +25,6 @@ import org.apache.geode.cache.EntryEvent;
 import org.apache.geode.cache.EntryNotFoundException;
 import org.apache.geode.cache.TimeoutException;
 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;
@@ -39,6 +38,7 @@ import org.apache.geode.internal.cache.persistence.DiskRegionView;
 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;
 
 /**
  * A disk region that is created when doing offline validation.
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/compression/CompressedCachedDeserializable.java b/geode-core/src/main/java/org/apache/geode/internal/cache/compression/CompressedCachedDeserializable.java
index 6c5031c..f1a019c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/compression/CompressedCachedDeserializable.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/compression/CompressedCachedDeserializable.java
@@ -22,13 +22,13 @@ import java.io.IOException;
 import org.apache.geode.DataSerializer;
 import org.apache.geode.cache.Region;
 import org.apache.geode.compression.Compressor;
-import org.apache.geode.internal.DataSerializableFixedID;
 import org.apache.geode.internal.cache.BytesAndBitsForCompactor;
 import org.apache.geode.internal.cache.CachedDeserializable;
 import org.apache.geode.internal.cache.CachedDeserializableFactory;
 import org.apache.geode.internal.cache.EntryEventImpl;
 import org.apache.geode.internal.cache.RegionEntry;
 import org.apache.geode.internal.lang.StringUtils;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
 import org.apache.geode.internal.size.Sizeable;
 
 /**
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/AbstractOplogDiskRegionEntry.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/AbstractOplogDiskRegionEntry.java
index 9d2ee11..ee77fbf 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/AbstractOplogDiskRegionEntry.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/AbstractOplogDiskRegionEntry.java
@@ -17,7 +17,6 @@ package org.apache.geode.internal.cache.entries;
 import org.apache.geode.cache.EntryEvent;
 import org.apache.geode.cache.EntryNotFoundException;
 import org.apache.geode.distributed.internal.DistributionManager;
-import org.apache.geode.internal.ByteArrayDataInput;
 import org.apache.geode.internal.Version;
 import org.apache.geode.internal.cache.DiskId;
 import org.apache.geode.internal.cache.DistributedRegion;
@@ -30,6 +29,7 @@ import org.apache.geode.internal.cache.RegionEntryContext;
 import org.apache.geode.internal.cache.Token;
 import org.apache.geode.internal.cache.versions.VersionTag;
 import org.apache.geode.internal.offheap.annotations.Retained;
+import org.apache.geode.internal.serialization.ByteArrayDataInput;
 
 /**
  * Abstract implementation class of RegionEntry interface. This is adds Disk support behavior
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/AbstractRegionEntry.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/AbstractRegionEntry.java
index b044fc3..c676a0f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/AbstractRegionEntry.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/AbstractRegionEntry.java
@@ -39,7 +39,6 @@ import org.apache.geode.distributed.internal.DistributionConfig;
 import org.apache.geode.distributed.internal.DistributionManager;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
 import org.apache.geode.internal.Assert;
-import org.apache.geode.internal.ByteArrayDataInput;
 import org.apache.geode.internal.HeapDataOutputStream;
 import org.apache.geode.internal.InternalStatisticsDisabledException;
 import org.apache.geode.internal.Version;
@@ -81,6 +80,7 @@ import org.apache.geode.internal.offheap.StoredObject;
 import org.apache.geode.internal.offheap.annotations.Released;
 import org.apache.geode.internal.offheap.annotations.Retained;
 import org.apache.geode.internal.offheap.annotations.Unretained;
+import org.apache.geode.internal.serialization.ByteArrayDataInput;
 import org.apache.geode.internal.util.BlobHelper;
 import org.apache.geode.internal.util.Versionable;
 import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/DiskEntry.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/DiskEntry.java
index 5a0d4fa..ae4bdce 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/DiskEntry.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/DiskEntry.java
@@ -24,7 +24,6 @@ import org.apache.geode.cache.CacheClosedException;
 import org.apache.geode.cache.DiskAccessException;
 import org.apache.geode.distributed.internal.DistributionManager;
 import org.apache.geode.internal.Assert;
-import org.apache.geode.internal.ByteArrayDataInput;
 import org.apache.geode.internal.HeapDataOutputStream;
 import org.apache.geode.internal.Version;
 import org.apache.geode.internal.cache.AbstractDiskRegion;
@@ -61,6 +60,7 @@ import org.apache.geode.internal.offheap.StoredObject;
 import org.apache.geode.internal.offheap.annotations.Released;
 import org.apache.geode.internal.offheap.annotations.Retained;
 import org.apache.geode.internal.offheap.annotations.Unretained;
+import org.apache.geode.internal.serialization.ByteArrayDataInput;
 import org.apache.geode.internal.util.BlobHelper;
 
 /**
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ha/HARegionQueue.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ha/HARegionQueue.java
index 97fe7fe..46fc472 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/ha/HARegionQueue.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ha/HARegionQueue.java
@@ -79,7 +79,6 @@ import org.apache.geode.distributed.internal.DistributionManager;
 import org.apache.geode.distributed.internal.InternalDistributedSystem;
 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.CacheServerImpl;
 import org.apache.geode.internal.cache.CachedDeserializable;
@@ -100,6 +99,7 @@ import org.apache.geode.internal.cache.tier.sockets.Handshake;
 import org.apache.geode.internal.logging.LogService;
 import org.apache.geode.internal.logging.LoggingThread;
 import org.apache.geode.internal.logging.log4j.LogMarker;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
 import org.apache.geode.internal.statistics.StatisticsClock;
 import org.apache.geode.internal.util.BlobHelper;
 import org.apache.geode.internal.util.concurrent.StoppableCondition;
@@ -3305,7 +3305,8 @@ public class HARegionQueue implements RegionQueue {
     /*
      * (non-Javadoc)
      *
-     * @see org.apache.geode.internal.DataSerializableFixedID#fromData(java.io.DataInput)
+     * @see
+     * org.apache.geode.internal.serialization.DataSerializableFixedID#fromData(java.io.DataInput)
      */
     @Override
     public void fromData(DataInput in) throws IOException, ClassNotFoundException {
@@ -3318,7 +3319,7 @@ public class HARegionQueue implements RegionQueue {
     /*
      * (non-Javadoc)
      *
-     * @see org.apache.geode.internal.DataSerializableFixedID#getDSFID()
+     * @see org.apache.geode.internal.serialization.DataSerializableFixedID#getDSFID()
      */
     @Override
     public int getDSFID() {
@@ -3328,7 +3329,8 @@ public class HARegionQueue implements RegionQueue {
     /*
      * (non-Javadoc)
      *
-     * @see org.apache.geode.internal.DataSerializableFixedID#toData(java.io.DataOutput)
+     * @see
+     * org.apache.geode.internal.serialization.DataSerializableFixedID#toData(java.io.DataOutput)
      */
     @Override
     public void toData(DataOutput out) throws IOException {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ha/ThreadIdentifier.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ha/ThreadIdentifier.java
index ed7af75..377d6bf 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/ha/ThreadIdentifier.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ha/ThreadIdentifier.java
@@ -22,8 +22,8 @@ import java.util.Arrays;
 import org.apache.geode.DataSerializable;
 import org.apache.geode.DataSerializer;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.internal.ByteArrayDataInput;
 import org.apache.geode.internal.cache.EventID;
+import org.apache.geode.internal.serialization.ByteArrayDataInput;
 
 /**
  * Class identifying a Thread uniquely across the distributed system. It is composed of two fields
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockBatch.java b/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockBatch.java
index bac2381..5b224cb 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockBatch.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockBatch.java
@@ -26,11 +26,11 @@ import org.apache.geode.distributed.internal.locks.DLockBatch;
 import org.apache.geode.distributed.internal.locks.DLockBatchId;
 import org.apache.geode.distributed.internal.locks.LockGrantorId;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.internal.DataSerializableFixedID;
 import org.apache.geode.internal.InternalDataSerializer;
 import org.apache.geode.internal.Version;
 import org.apache.geode.internal.cache.IdentityArrayList;
 import org.apache.geode.internal.cache.TXRegionLockRequestImpl;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
 
 /**
  * Adapts multiple TXRegionLockRequests to one DLockBatch for DLock to use.
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockIdImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockIdImpl.java
index 06bde3e..762631f 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockIdImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockIdImpl.java
@@ -22,8 +22,8 @@ import org.apache.geode.DataSerializer;
 import org.apache.geode.annotations.internal.MakeNotStatic;
 import org.apache.geode.distributed.internal.locks.LockGrantorId;
 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;
 
 /**
  * Identifies a group of transaction locks.
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/BucketCountLoadProbe.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/BucketCountLoadProbe.java
index 5c5d99d..4c652b7 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/BucketCountLoadProbe.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/BucketCountLoadProbe.java
@@ -18,11 +18,11 @@ 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.cache.BucketAdvisor;
 import org.apache.geode.internal.cache.PartitionedRegion;
 import org.apache.geode.internal.cache.PartitionedRegionDataStore;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
 
 /**
  * A load probe which calculates the load of a pr using the just the number of buckets on a member.
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PRTombstoneMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PRTombstoneMessage.java
index f34fd90..cc2ed46 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PRTombstoneMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PRTombstoneMessage.java
@@ -32,7 +32,6 @@ import org.apache.geode.distributed.internal.DistributionMessage;
 import org.apache.geode.distributed.internal.InternalDistributedSystem;
 import org.apache.geode.distributed.internal.ReplyMessage;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.internal.SerializationVersions;
 import org.apache.geode.internal.Version;
 import org.apache.geode.internal.cache.BucketRegion;
 import org.apache.geode.internal.cache.EventID;
@@ -45,6 +44,7 @@ import org.apache.geode.internal.cache.tier.sockets.ClientTombstoneMessage;
 import org.apache.geode.internal.cache.tier.sockets.ClientUpdateMessage;
 import org.apache.geode.internal.logging.LogService;
 import org.apache.geode.internal.logging.log4j.LogMarker;
+import org.apache.geode.internal.serialization.SerializationVersions;
 
 /**
  * This message class sends tombstone GC information to other PR holders
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PRUpdateEntryVersionMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PRUpdateEntryVersionMessage.java
index d37b488..c1e1f31 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PRUpdateEntryVersionMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PRUpdateEntryVersionMessage.java
@@ -89,7 +89,7 @@ public class PRUpdateEntryVersionMessage extends PartitionMessageWithDirectReply
   /*
    * (non-Javadoc)
    *
-   * @see org.apache.geode.internal.DataSerializableFixedID#getDSFID()
+   * @see org.apache.geode.internal.serialization.DataSerializableFixedID#getDSFID()
    */
   @Override
   public int getDSFID() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PutAllPRMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PutAllPRMessage.java
index e6db258..6c572a1 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PutAllPRMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PutAllPRMessage.java
@@ -44,7 +44,6 @@ import org.apache.geode.distributed.internal.ReplyProcessor21;
 import org.apache.geode.distributed.internal.ReplySender;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
 import org.apache.geode.internal.Assert;
-import org.apache.geode.internal.ByteArrayDataInput;
 import org.apache.geode.internal.InternalDataSerializer;
 import org.apache.geode.internal.NanoTimer;
 import org.apache.geode.internal.Version;
@@ -71,6 +70,7 @@ import org.apache.geode.internal.logging.LogService;
 import org.apache.geode.internal.logging.log4j.LogMarker;
 import org.apache.geode.internal.offheap.annotations.Released;
 import org.apache.geode.internal.offheap.annotations.Retained;
+import org.apache.geode.internal.serialization.ByteArrayDataInput;
 
 /**
  * A Partitioned Region update message. Meant to be sent only to a bucket's primary owner. In
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RemoveAllPRMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RemoveAllPRMessage.java
index 2e6e196..f377683 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RemoveAllPRMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RemoveAllPRMessage.java
@@ -44,7 +44,6 @@ import org.apache.geode.distributed.internal.ReplyProcessor21;
 import org.apache.geode.distributed.internal.ReplySender;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
 import org.apache.geode.internal.Assert;
-import org.apache.geode.internal.ByteArrayDataInput;
 import org.apache.geode.internal.InternalDataSerializer;
 import org.apache.geode.internal.NanoTimer;
 import org.apache.geode.internal.Version;
@@ -71,6 +70,7 @@ import org.apache.geode.internal.logging.LogService;
 import org.apache.geode.internal.logging.log4j.LogMarker;
 import org.apache.geode.internal.offheap.annotations.Released;
 import org.apache.geode.internal.offheap.annotations.Retained;
+import org.apache.geode.internal.serialization.ByteArrayDataInput;
 
 /**
  * PR removeAll
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/SizedBasedLoadProbe.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/SizedBasedLoadProbe.java
index 85371b9..ae66d0a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/SizedBasedLoadProbe.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/SizedBasedLoadProbe.java
@@ -19,11 +19,11 @@ import java.io.DataOutput;
 import java.io.IOException;
 
 import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.internal.DataSerializableFixedID;
 import org.apache.geode.internal.Version;
 import org.apache.geode.internal.cache.BucketAdvisor;
 import org.apache.geode.internal.cache.PartitionedRegion;
 import org.apache.geode.internal.cache.PartitionedRegionDataStore;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
 
 /**
  * A load probe which calculates the load of a pr using the size of the buckets in bytes.
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/RegionSnapshotServiceImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/RegionSnapshotServiceImpl.java
index b565da2..3f8bff7 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/RegionSnapshotServiceImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/RegionSnapshotServiceImpl.java
@@ -48,7 +48,6 @@ import org.apache.geode.cache.snapshot.SnapshotOptions;
 import org.apache.geode.cache.snapshot.SnapshotOptions.SnapshotFormat;
 import org.apache.geode.distributed.DistributedMember;
 import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.internal.DSCODE;
 import org.apache.geode.internal.InternalEntity;
 import org.apache.geode.internal.cache.CachedDeserializable;
 import org.apache.geode.internal.cache.CachedDeserializableFactory;
@@ -60,6 +59,7 @@ import org.apache.geode.internal.cache.execute.InternalFunction;
 import org.apache.geode.internal.cache.snapshot.GFSnapshot.GFSnapshotImporter;
 import org.apache.geode.internal.cache.snapshot.GFSnapshot.SnapshotWriter;
 import org.apache.geode.internal.cache.snapshot.SnapshotPacket.SnapshotRecord;
+import org.apache.geode.internal.serialization.DSCODE;
 
 /**
  * Provides an implementation for region snapshots.
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/SnapshotPacket.java b/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/SnapshotPacket.java
index bf8809f..6ab1db3 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/SnapshotPacket.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/SnapshotPacket.java
@@ -23,7 +23,6 @@ import java.util.UUID;
 
 import org.apache.geode.cache.EntryDestroyedException;
 import org.apache.geode.distributed.DistributedMember;
-import org.apache.geode.internal.DataSerializableFixedID;
 import org.apache.geode.internal.InternalDataSerializer;
 import org.apache.geode.internal.Version;
 import org.apache.geode.internal.cache.CachedDeserializable;
@@ -32,6 +31,7 @@ import org.apache.geode.internal.cache.NonTXEntry;
 import org.apache.geode.internal.cache.Token;
 import org.apache.geode.internal.offheap.OffHeapHelper;
 import org.apache.geode.internal.offheap.annotations.Released;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
 import org.apache.geode.internal.util.BlobHelper;
 
 /**
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/AuthIds.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/AuthIds.java
index 9bf4b3e..f1647d7 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/AuthIds.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/AuthIds.java
@@ -17,7 +17,7 @@
 package org.apache.geode.internal.cache.tier.sockets;
 
 
-import org.apache.geode.internal.ByteArrayDataInput;
+import org.apache.geode.internal.serialization.ByteArrayDataInput;
 
 public class AuthIds {
   private long connectionId;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxy.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxy.java
index cb235bf..5e7d4f3 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxy.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxy.java
@@ -68,7 +68,6 @@ import org.apache.geode.distributed.DistributedMember;
 import org.apache.geode.distributed.internal.ClusterDistributionManager;
 import org.apache.geode.distributed.internal.DistributionConfig;
 import org.apache.geode.distributed.internal.InternalDistributedSystem;
-import org.apache.geode.internal.ByteArrayDataInput;
 import org.apache.geode.internal.SystemTimer;
 import org.apache.geode.internal.SystemTimer.SystemTimerTask;
 import org.apache.geode.internal.Version;
@@ -100,6 +99,7 @@ import org.apache.geode.internal.logging.LoggingThread;
 import org.apache.geode.internal.logging.log4j.LogMarker;
 import org.apache.geode.internal.security.AuthorizeRequestPP;
 import org.apache.geode.internal.security.SecurityService;
+import org.apache.geode.internal.serialization.ByteArrayDataInput;
 import org.apache.geode.internal.statistics.StatisticsClock;
 import org.apache.geode.security.AccessControl;
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientUpdater.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientUpdater.java
index c335e88..aa454e1 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientUpdater.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientUpdater.java
@@ -63,7 +63,6 @@ import org.apache.geode.distributed.internal.ServerLocation;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
 import org.apache.geode.distributed.internal.membership.MemberAttributes;
 import org.apache.geode.internal.Assert;
-import org.apache.geode.internal.ByteArrayDataInput;
 import org.apache.geode.internal.InternalDataSerializer;
 import org.apache.geode.internal.InternalInstantiator;
 import org.apache.geode.internal.Version;
@@ -87,6 +86,7 @@ import org.apache.geode.internal.logging.log4j.LogMarker;
 import org.apache.geode.internal.net.SocketCreator;
 import org.apache.geode.internal.offheap.annotations.Released;
 import org.apache.geode.internal.sequencelog.EntryLogger;
+import org.apache.geode.internal.serialization.ByteArrayDataInput;
 import org.apache.geode.internal.statistics.StatisticsTypeFactoryImpl;
 import org.apache.geode.security.AuthenticationFailedException;
 import org.apache.geode.security.AuthenticationRequiredException;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientInterestMessageImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientInterestMessageImpl.java
index f9fa525..64cf9d0 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientInterestMessageImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientInterestMessageImpl.java
@@ -23,11 +23,11 @@ import java.io.ObjectOutput;
 
 import org.apache.geode.DataSerializer;
 import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.internal.DataSerializableFixedID;
 import org.apache.geode.internal.Version;
 import org.apache.geode.internal.cache.EventID;
 import org.apache.geode.internal.cache.tier.InterestType;
 import org.apache.geode.internal.cache.tier.MessageType;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
 
 /**
  * Class <code>ClientInterestMessageImpl</code> represents an update to the a client's interest
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientMessage.java
index 5bef40b..962d154 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientMessage.java
@@ -17,8 +17,8 @@ package org.apache.geode.internal.cache.tier.sockets;
 
 import java.io.IOException;
 
-import org.apache.geode.internal.DataSerializableFixedID;
 import org.apache.geode.internal.cache.Conflatable;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
 
 /**
  * Interface <code>ClientMessage</code> is a message representing a cache operation that is sent
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientProxyMembershipID.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientProxyMembershipID.java
index bf242b7..671442a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientProxyMembershipID.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientProxyMembershipID.java
@@ -36,11 +36,11 @@ import org.apache.geode.distributed.DurableClientAttributes;
 import org.apache.geode.distributed.internal.DistributionConfig;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
 import org.apache.geode.internal.Assert;
-import org.apache.geode.internal.ByteArrayDataInput;
-import org.apache.geode.internal.DataSerializableFixedID;
 import org.apache.geode.internal.HeapDataOutputStream;
 import org.apache.geode.internal.Version;
 import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.serialization.ByteArrayDataInput;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
 
 /**
  * This class represents a ConnectionProxy of the CacheClient
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientRegistrationMetadata.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientRegistrationMetadata.java
index 3c83905..2a6e073 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientRegistrationMetadata.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientRegistrationMetadata.java
@@ -26,11 +26,11 @@ import org.apache.logging.log4j.Logger;
 
 import org.apache.geode.cache.UnsupportedVersionException;
 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.tier.CommunicationMode;
 import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.serialization.VersionedDataInputStream;
+import org.apache.geode.internal.serialization.VersionedDataOutputStream;
 
 class ClientRegistrationMetadata {
   private static final Logger logger = LogService.getLogger();
@@ -57,9 +57,10 @@ class ClientRegistrationMetadata {
     if (getAndValidateClientVersion(socket, unversionedDataInputStream,
         unversionedDataOutputStream)) {
       if (oldClientRequiresVersionedStreams(clientVersion)) {
-        dataInputStream = new VersionedDataInputStream(unversionedDataInputStream, clientVersion);
+        dataInputStream =
+            new VersionedDataInputStream(unversionedDataInputStream, clientVersion.ordinal());
         dataOutputStream =
-            new VersionedDataOutputStream(unversionedDataOutputStream, clientVersion);
+            new VersionedDataOutputStream(unversionedDataOutputStream, clientVersion.ordinal());
       } else {
         dataInputStream = unversionedDataInputStream;
         dataOutputStream = unversionedDataOutputStream;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientUpdateMessageImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientUpdateMessageImpl.java
index 731c952..719d4ff 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientUpdateMessageImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientUpdateMessageImpl.java
@@ -33,8 +33,6 @@ import org.apache.geode.InternalGemFireError;
 import org.apache.geode.annotations.VisibleForTesting;
 import org.apache.geode.cache.query.internal.cq.InternalCqQuery;
 import org.apache.geode.cache.util.ObjectSizer;
-import org.apache.geode.internal.ByteArrayDataInput;
-import org.apache.geode.internal.DSCODE;
 import org.apache.geode.internal.InternalDataSerializer;
 import org.apache.geode.internal.Sendable;
 import org.apache.geode.internal.Version;
@@ -49,6 +47,8 @@ import org.apache.geode.internal.cache.tier.MessageType;
 import org.apache.geode.internal.cache.versions.VersionTag;
 import org.apache.geode.internal.concurrent.ConcurrentHashSet;
 import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.serialization.ByteArrayDataInput;
+import org.apache.geode.internal.serialization.DSCODE;
 import org.apache.geode.internal.size.Sizeable;
 
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/EncryptorImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/EncryptorImpl.java
index abe74fa..e66d977 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/EncryptorImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/EncryptorImpl.java
@@ -65,11 +65,11 @@ import org.apache.geode.LogWriter;
 import org.apache.geode.annotations.internal.MakeNotStatic;
 import org.apache.geode.distributed.DistributedSystem;
 import org.apache.geode.distributed.internal.DistributionConfig;
-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.Encryptor;
 import org.apache.geode.internal.logging.InternalLogWriter;
+import org.apache.geode.internal.serialization.ByteArrayDataInput;
 import org.apache.geode.security.AuthenticationFailedException;
 import org.apache.geode.security.GemFireSecurityException;
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/HAEventWrapper.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/HAEventWrapper.java
index e1f55ba..4e21a3f 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/HAEventWrapper.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/HAEventWrapper.java
@@ -24,8 +24,6 @@ import java.util.concurrent.atomic.AtomicLongFieldUpdater;
 import org.apache.logging.log4j.Logger;
 
 import org.apache.geode.DataSerializer;
-import org.apache.geode.internal.DSCODE;
-import org.apache.geode.internal.DataSerializableFixedID;
 import org.apache.geode.internal.InternalDataSerializer;
 import org.apache.geode.internal.Version;
 import org.apache.geode.internal.cache.Conflatable;
@@ -36,6 +34,8 @@ import org.apache.geode.internal.cache.tier.sockets.ClientUpdateMessageImpl.CqNa
 import org.apache.geode.internal.cache.tier.sockets.ClientUpdateMessageImpl.CqNameToOpHashMap;
 import org.apache.geode.internal.cache.tier.sockets.ClientUpdateMessageImpl.CqNameToOpSingleEntry;
 import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.serialization.DSCODE;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
 import org.apache.geode.internal.size.Sizeable;
 
 /**
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/InterestResultPolicyImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/InterestResultPolicyImpl.java
index fea3be2..7e2c51a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/InterestResultPolicyImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/InterestResultPolicyImpl.java
@@ -21,8 +21,8 @@ import java.io.DataOutput;
 import java.io.IOException;
 
 import org.apache.geode.cache.InterestResultPolicy;
-import org.apache.geode.internal.DataSerializableFixedID;
 import org.apache.geode.internal.Version;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
 
 /**
  * Used to make InterestResultPolicy implement DataSerializableFixedID
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ObjectPartList.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ObjectPartList.java
index 5fd245a..d73da80 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ObjectPartList.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ObjectPartList.java
@@ -25,12 +25,12 @@ import java.util.List;
 import org.apache.logging.log4j.Logger;
 
 import org.apache.geode.DataSerializer;
-import org.apache.geode.internal.DataSerializableFixedID;
 import org.apache.geode.internal.Version;
 import org.apache.geode.internal.cache.versions.VersionTag;
 import org.apache.geode.internal.logging.LogService;
 import org.apache.geode.internal.offheap.OffHeapHelper;
 import org.apache.geode.internal.offheap.Releasable;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
 
 /**
  * Encapsulates list containing objects, serialized objects, raw byte arrays, or exceptions. It can
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ObjectPartList651.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ObjectPartList651.java
index 649ac88..e27b84c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ObjectPartList651.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ObjectPartList651.java
@@ -20,7 +20,7 @@ import java.io.IOException;
 import java.util.ArrayList;
 
 import org.apache.geode.DataSerializer;
-import org.apache.geode.internal.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
 
 /**
  * Adds one more object type which indicates that the key is not present at the server.
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/Part.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/Part.java
index 67035a9..4cebf66 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/Part.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/Part.java
@@ -25,11 +25,11 @@ import java.util.concurrent.ConcurrentHashMap;
 import org.apache.geode.annotations.Immutable;
 import org.apache.geode.annotations.internal.MakeNotStatic;
 import org.apache.geode.internal.Assert;
-import org.apache.geode.internal.DSCODE;
 import org.apache.geode.internal.HeapDataOutputStream;
 import org.apache.geode.internal.Version;
 import org.apache.geode.internal.offheap.AddressableMemoryManager;
 import org.apache.geode.internal.offheap.StoredObject;
+import org.apache.geode.internal.serialization.DSCODE;
 
 /**
  * Represents one unit of information (essentially a <code>byte</code> array) in the wire protocol.
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/SerializedObjectPartList.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/SerializedObjectPartList.java
index af51aa2..8f6afc5 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/SerializedObjectPartList.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/SerializedObjectPartList.java
@@ -20,7 +20,7 @@ import java.io.IOException;
 import java.util.ArrayList;
 
 import org.apache.geode.DataSerializer;
-import org.apache.geode.internal.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
 
 /**
  * A variant of the ObjectPartList which deserializes the values as byte arrays of serialized
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnection.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnection.java
index 11e9adc..93e6bb5 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnection.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnection.java
@@ -53,7 +53,6 @@ import org.apache.geode.cache.UnsupportedVersionException;
 import org.apache.geode.cache.client.internal.Connection;
 import org.apache.geode.distributed.DistributedSystem;
 import org.apache.geode.internal.Assert;
-import org.apache.geode.internal.ByteArrayDataInput;
 import org.apache.geode.internal.HeapDataOutputStream;
 import org.apache.geode.internal.Version;
 import org.apache.geode.internal.cache.EventID;
@@ -71,6 +70,7 @@ import org.apache.geode.internal.logging.LogService;
 import org.apache.geode.internal.security.AuthorizeRequest;
 import org.apache.geode.internal.security.AuthorizeRequestPP;
 import org.apache.geode.internal.security.SecurityService;
+import org.apache.geode.internal.serialization.ByteArrayDataInput;
 import org.apache.geode.internal.util.Breadcrumbs;
 import org.apache.geode.security.AuthenticationFailedException;
 import org.apache.geode.security.AuthenticationRequiredException;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerSideHandshakeImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerSideHandshakeImpl.java
index c92a2eb..c4a06b9 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerSideHandshakeImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerSideHandshakeImpl.java
@@ -31,13 +31,13 @@ import org.apache.geode.distributed.DistributedSystem;
 import org.apache.geode.distributed.internal.InternalDistributedSystem;
 import org.apache.geode.internal.HeapDataOutputStream;
 import org.apache.geode.internal.Version;
-import org.apache.geode.internal.VersionedDataInputStream;
-import org.apache.geode.internal.VersionedDataOutputStream;
-import org.apache.geode.internal.VersionedDataStream;
 import org.apache.geode.internal.cache.tier.CommunicationMode;
 import org.apache.geode.internal.cache.tier.Encryptor;
 import org.apache.geode.internal.cache.tier.ServerSideHandshake;
 import org.apache.geode.internal.security.SecurityService;
+import org.apache.geode.internal.serialization.VersionedDataInputStream;
+import org.apache.geode.internal.serialization.VersionedDataOutputStream;
+import org.apache.geode.internal.serialization.VersionedDataStream;
 import org.apache.geode.pdx.internal.PeerTypeRegistration;
 import org.apache.geode.security.AuthenticationRequiredException;
 
@@ -87,8 +87,9 @@ public class ServerSideHandshakeImpl extends Handshake implements ServerSideHand
         this.clientReadTimeout = dataInputStream.readInt();
         if (clientVersion.compareTo(Version.CURRENT) < 0) {
           // versioned streams allow object serialization code to deal with older clients
-          dataInputStream = new VersionedDataInputStream(dataInputStream, clientVersion);
-          dataOutputStream = new VersionedDataOutputStream(dataOutputStream, clientVersion);
+          dataInputStream = new VersionedDataInputStream(dataInputStream, clientVersion.ordinal());
+          dataOutputStream =
+              new VersionedDataOutputStream(dataOutputStream, clientVersion.ordinal());
         }
         this.id = ClientProxyMembershipID.readCanonicalized(dataInputStream);
         // Note: credentials should always be the last piece in handshake for
@@ -133,8 +134,8 @@ public class ServerSideHandshakeImpl extends Handshake implements ServerSideHand
     DataOutputStream dos = new DataOutputStream(out);
     DataInputStream dis;
     if (clientVersion.compareTo(Version.CURRENT) < 0) {
-      dis = new VersionedDataInputStream(in, clientVersion);
-      dos = new VersionedDataOutputStream(dos, clientVersion);
+      dis = new VersionedDataInputStream(in, clientVersion.ordinal());
+      dos = new VersionedDataOutputStream(dos, clientVersion.ordinal());
     } else {
       dis = new DataInputStream(in);
     }
@@ -159,7 +160,7 @@ public class ServerSideHandshakeImpl extends Handshake implements ServerSideHand
 
     Version v = Version.CURRENT;
     if (dos instanceof VersionedDataStream) {
-      v = ((VersionedDataStream) dos).getVersion();
+      v = Version.getVersionForDataStream((VersionedDataStream) dos);
     }
     HeapDataOutputStream hdos = new HeapDataOutputStream(v);
     DataSerializer.writeObject(member, hdos);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/VersionedObjectList.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/VersionedObjectList.java
index a63d3a0..e5d3930 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/VersionedObjectList.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/VersionedObjectList.java
@@ -39,7 +39,6 @@ import org.apache.geode.distributed.DistributedMember;
 import org.apache.geode.distributed.internal.DistributionManager;
 import org.apache.geode.distributed.internal.InternalDistributedSystem;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.internal.DataSerializableFixedID;
 import org.apache.geode.internal.InternalDataSerializer;
 import org.apache.geode.internal.Version;
 import org.apache.geode.internal.cache.versions.DiskVersionTag;
@@ -47,6 +46,7 @@ import org.apache.geode.internal.cache.versions.VersionSource;
 import org.apache.geode.internal.cache.versions.VersionTag;
 import org.apache.geode.internal.logging.LogService;
 import org.apache.geode.internal.logging.log4j.LogMarker;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
 
 /**
  * A refinement of ObjectPartList that adds per-entry versionTags and has its own serialized form to
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tx/DistTxEntryEvent.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tx/DistTxEntryEvent.java
index eb8e46a..1ddcb45 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tx/DistTxEntryEvent.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tx/DistTxEntryEvent.java
@@ -21,7 +21,6 @@ import java.io.IOException;
 import org.apache.geode.DataSerializer;
 import org.apache.geode.cache.Operation;
 import org.apache.geode.distributed.DistributedMember;
-import org.apache.geode.internal.ByteArrayDataInput;
 import org.apache.geode.internal.InternalDataSerializer;
 import org.apache.geode.internal.Version;
 import org.apache.geode.internal.cache.DistributedPutAllOperation;
@@ -33,6 +32,7 @@ import org.apache.geode.internal.cache.EntryEventImpl;
 import org.apache.geode.internal.cache.EventID;
 import org.apache.geode.internal.cache.versions.VersionTag;
 import org.apache.geode.internal.offheap.annotations.Retained;
+import org.apache.geode.internal.serialization.ByteArrayDataInput;
 
 public class DistTxEntryEvent extends EntryEventImpl {
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tx/RemotePutAllMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tx/RemotePutAllMessage.java
index e628559..bb17891 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tx/RemotePutAllMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tx/RemotePutAllMessage.java
@@ -43,7 +43,6 @@ import org.apache.geode.distributed.internal.ReplyProcessor21;
 import org.apache.geode.distributed.internal.ReplySender;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
 import org.apache.geode.internal.Assert;
-import org.apache.geode.internal.ByteArrayDataInput;
 import org.apache.geode.internal.InternalDataSerializer;
 import org.apache.geode.internal.NanoTimer;
 import org.apache.geode.internal.Version;
@@ -63,6 +62,7 @@ import org.apache.geode.internal.cache.versions.VersionTag;
 import org.apache.geode.internal.logging.LogService;
 import org.apache.geode.internal.logging.log4j.LogMarker;
 import org.apache.geode.internal.offheap.annotations.Released;
+import org.apache.geode.internal.serialization.ByteArrayDataInput;
 
 /**
  * A Replicate Region putAll message. Meant to be sent only to the peer who hosts transactional
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tx/RemoteRemoveAllMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tx/RemoteRemoveAllMessage.java
index 9806d20..500204d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tx/RemoteRemoveAllMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tx/RemoteRemoveAllMessage.java
@@ -44,7 +44,6 @@ import org.apache.geode.distributed.internal.ReplyProcessor21;
 import org.apache.geode.distributed.internal.ReplySender;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
 import org.apache.geode.internal.Assert;
-import org.apache.geode.internal.ByteArrayDataInput;
 import org.apache.geode.internal.InternalDataSerializer;
 import org.apache.geode.internal.NanoTimer;
 import org.apache.geode.internal.Version;
@@ -64,6 +63,7 @@ import org.apache.geode.internal.cache.versions.VersionTag;
 import org.apache.geode.internal.logging.LogService;
 import org.apache.geode.internal.logging.log4j.LogMarker;
 import org.apache.geode.internal.offheap.annotations.Released;
+import org.apache.geode.internal.serialization.ByteArrayDataInput;
 
 /**
  * A Replicate Region removeAll message. Meant to be sent only to the peer who hosts transactional
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/versions/DiskVersionTag.java b/geode-core/src/main/java/org/apache/geode/internal/cache/versions/DiskVersionTag.java
index aa6c453..ab1e98a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/versions/DiskVersionTag.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/versions/DiskVersionTag.java
@@ -18,9 +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.cache.persistence.DiskStoreID;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
 
 /**
  * The version tag class for version tags for persistent regions. The VersionSource held in these
@@ -51,7 +51,7 @@ public class DiskVersionTag extends VersionTag<DiskStoreID> {
   /*
    * (non-Javadoc)
    *
-   * @see org.apache.geode.internal.DataSerializableFixedID#getDSFID()
+   * @see org.apache.geode.internal.serialization.DataSerializableFixedID#getDSFID()
    */
   @Override
   public int getDSFID() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/versions/RegionVersionVector.java b/geode-core/src/main/java/org/apache/geode/internal/cache/versions/RegionVersionVector.java
index b645f55..679fd19 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/versions/RegionVersionVector.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/versions/RegionVersionVector.java
@@ -42,13 +42,13 @@ import org.apache.geode.distributed.internal.InternalDistributedSystem;
 import org.apache.geode.distributed.internal.MembershipListener;
 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.LocalRegion;
 import org.apache.geode.internal.cache.persistence.DiskStoreID;
 import org.apache.geode.internal.logging.LogService;
 import org.apache.geode.internal.logging.log4j.LogMarker;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
 
 /**
  * RegionVersionVector tracks the highest region-level version number of operations applied to a
@@ -1184,7 +1184,7 @@ public abstract class RegionVersionVector<T extends VersionSource<?>>
   /*
    * (non-Javadoc)
    *
-   * @see org.apache.geode.internal.DataSerializableFixedID#toData(java.io.DataOutput)
+   * @see org.apache.geode.internal.serialization.DataSerializableFixedID#toData(java.io.DataOutput)
    */
   @Override
   public void toData(DataOutput out) throws IOException {
@@ -1215,7 +1215,8 @@ public abstract class RegionVersionVector<T extends VersionSource<?>>
   /*
    * (non-Javadoc)
    *
-   * @see org.apache.geode.internal.DataSerializableFixedID#fromData(java.io.DataInput)
+   * @see
+   * org.apache.geode.internal.serialization.DataSerializableFixedID#fromData(java.io.DataInput)
    */
   @Override
   public void fromData(DataInput in) throws IOException, ClassNotFoundException {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/versions/VersionSource.java b/geode-core/src/main/java/org/apache/geode/internal/cache/versions/VersionSource.java
index 7d349d9..f0d15f4 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/versions/VersionSource.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/versions/VersionSource.java
@@ -17,7 +17,7 @@ package org.apache.geode.internal.cache.versions;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.geode.internal.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
 
 /**
  * The member that originated an update that is stored in the version information of a region entry,
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/versions/VersionTag.java b/geode-core/src/main/java/org/apache/geode/internal/cache/versions/VersionTag.java
index 2329cd6..50b7ed3 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/versions/VersionTag.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/versions/VersionTag.java
@@ -22,11 +22,11 @@ import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import org.apache.logging.log4j.Logger;
 
 import org.apache.geode.distributed.internal.DistributionManager;
-import org.apache.geode.internal.DataSerializableFixedID;
 import org.apache.geode.internal.InternalDataSerializer;
 import org.apache.geode.internal.cache.persistence.DiskStoreID;
 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.size.ReflectionSingleObjectSizer;
 
 /**
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventCallbackArgument.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventCallbackArgument.java
index 2d4fcfa..62306f5 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventCallbackArgument.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventCallbackArgument.java
@@ -24,9 +24,9 @@ import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
 
 import org.apache.geode.DataSerializer;
 import org.apache.geode.cache.wan.GatewaySender;
-import org.apache.geode.internal.DataSerializableFixedID;
 import org.apache.geode.internal.Version;
 import org.apache.geode.internal.cache.WrappedCallbackArgument;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
 
 /**
  * Class <code>GatewayEventCallbackArgument</code> is a wrapper on a callback arg plus the id of the
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventImpl.java
index 21bac12..d32fd50 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventImpl.java
@@ -30,10 +30,8 @@ import org.apache.geode.cache.Region;
 import org.apache.geode.cache.asyncqueue.AsyncEvent;
 import org.apache.geode.cache.util.ObjectSizer;
 import org.apache.geode.cache.wan.EventSequenceID;
-import org.apache.geode.internal.DataSerializableFixedID;
 import org.apache.geode.internal.InternalDataSerializer;
 import org.apache.geode.internal.Version;
-import org.apache.geode.internal.VersionedDataInputStream;
 import org.apache.geode.internal.VersionedDataSerializable;
 import org.apache.geode.internal.cache.CachedDeserializable;
 import org.apache.geode.internal.cache.CachedDeserializableFactory;
@@ -54,6 +52,8 @@ import org.apache.geode.internal.offheap.annotations.OffHeapIdentifier;
 import org.apache.geode.internal.offheap.annotations.Released;
 import org.apache.geode.internal.offheap.annotations.Retained;
 import org.apache.geode.internal.offheap.annotations.Unretained;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.VersionedDataInputStream;
 import org.apache.geode.internal.size.Sizeable;
 
 /**
@@ -735,7 +735,7 @@ public class GatewaySenderEventImpl
     // this._id = in.readUTF();
     if (version < 0x11 && (in instanceof InputStream)
         && InternalDataSerializer.getVersionForDataStream(in) == Version.CURRENT) {
-      in = new VersionedDataInputStream((InputStream) in, Version.GFE_701);
+      in = new VersionedDataInputStream((InputStream) in, Version.GFE_701.ordinal());
     }
     this.id = (EventID) DataSerializer.readObject(in);
     // TODO:Asif ; Check if this violates Barry's logic of not assiging VM
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderQueueEntrySynchronizationOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderQueueEntrySynchronizationOperation.java
index 1f4c2a2..e3b3e2d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderQueueEntrySynchronizationOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderQueueEntrySynchronizationOperation.java
@@ -39,7 +39,6 @@ import org.apache.geode.distributed.internal.ReplyException;
 import org.apache.geode.distributed.internal.ReplyMessage;
 import org.apache.geode.distributed.internal.ReplyProcessor21;
 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.cache.GemFireCacheImpl;
 import org.apache.geode.internal.cache.InitialImageOperation;
@@ -47,6 +46,7 @@ import org.apache.geode.internal.cache.InternalRegion;
 import org.apache.geode.internal.cache.LocalRegion;
 import org.apache.geode.internal.cache.versions.VersionTag;
 import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
 
 public class GatewaySenderQueueEntrySynchronizationOperation {
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/offheap/AbstractStoredObject.java b/geode-core/src/main/java/org/apache/geode/internal/offheap/AbstractStoredObject.java
index 028e431..038c6d0 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/offheap/AbstractStoredObject.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/offheap/AbstractStoredObject.java
@@ -19,11 +19,11 @@ import java.io.IOException;
 
 import org.apache.geode.DataSerializer;
 import org.apache.geode.cache.Region;
-import org.apache.geode.internal.DSCODE;
-import org.apache.geode.internal.DataSerializableFixedID;
 import org.apache.geode.internal.InternalDataSerializer;
 import org.apache.geode.internal.cache.RegionEntry;
 import org.apache.geode.internal.lang.StringUtils;
+import org.apache.geode.internal.serialization.DSCODE;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
 
 public abstract class AbstractStoredObject implements StoredObject {
   @Override
diff --git a/geode-core/src/main/java/org/apache/geode/internal/offheap/DataType.java b/geode-core/src/main/java/org/apache/geode/internal/offheap/DataType.java
index e4c495f..5c1239e 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/offheap/DataType.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/offheap/DataType.java
@@ -19,11 +19,10 @@ import java.io.IOException;
 
 import org.apache.geode.DataSerializer;
 import org.apache.geode.Instantiator;
-import org.apache.geode.internal.ByteArrayDataInput;
-import org.apache.geode.internal.DSCODE;
-import org.apache.geode.internal.DSFIDFactory;
 import org.apache.geode.internal.InternalDataSerializer;
 import org.apache.geode.internal.InternalInstantiator;
+import org.apache.geode.internal.serialization.ByteArrayDataInput;
+import org.apache.geode.internal.serialization.DSCODE;
 
 /**
  * Determines the data type of the bytes in an off-heap MemoryBlock. This is used by the tests for
@@ -43,19 +42,22 @@ public class DataType {
     }
     try {
       if (header == DSCODE.DS_FIXED_ID_BYTE.toByte()) {
-        return "org.apache.geode.internal.DataSerializableFixedID:"
-            + DSFIDFactory.create(in.readByte(), in).getClass().getName();
+        return "org.apache.geode.internal.serialization.DataSerializableFixedID:"
+            + InternalDataSerializer.getDSFIDFactory().create(in.readByte(), in).getClass()
+                .getName();
       }
       if (header == DSCODE.DS_FIXED_ID_SHORT.toByte()) {
-        return "org.apache.geode.internal.DataSerializableFixedID:"
-            + DSFIDFactory.create(in.readShort(), in).getClass().getName();
+        return "org.apache.geode.internal.serialization.DataSerializableFixedID:"
+            + InternalDataSerializer.getDSFIDFactory().create(in.readShort(), in).getClass()
+                .getName();
       }
       if (header == DSCODE.DS_FIXED_ID_INT.toByte()) {
-        return "org.apache.geode.internal.DataSerializableFixedID:"
-            + DSFIDFactory.create(in.readInt(), in).getClass().getName();
+        return "org.apache.geode.internal.serialization.DataSerializableFixedID:"
+            + InternalDataSerializer.getDSFIDFactory().create(in.readInt(), in).getClass()
+                .getName();
       }
       if (header == DSCODE.DS_NO_FIXED_ID.toByte()) {
-        return "org.apache.geode.internal.DataSerializableFixedID:"
+        return "org.apache.geode.internal.serialization.DataSerializableFixedID:"
             + DataSerializer.readClass(in).getName();
       }
       if (header == DSCODE.NULL.toByte()) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/offheap/OffHeapRegionEntryHelper.java b/geode-core/src/main/java/org/apache/geode/internal/offheap/OffHeapRegionEntryHelper.java
index 765117b..0d10311 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/offheap/OffHeapRegionEntryHelper.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/offheap/OffHeapRegionEntryHelper.java
@@ -15,7 +15,6 @@
 package org.apache.geode.internal.offheap;
 
 import org.apache.geode.annotations.Immutable;
-import org.apache.geode.internal.DSCODE;
 import org.apache.geode.internal.cache.CachedDeserializableFactory;
 import org.apache.geode.internal.cache.DiskId;
 import org.apache.geode.internal.cache.EntryEventImpl;
@@ -26,6 +25,7 @@ import org.apache.geode.internal.cache.entries.OffHeapRegionEntry;
 import org.apache.geode.internal.offheap.annotations.Released;
 import org.apache.geode.internal.offheap.annotations.Retained;
 import org.apache.geode.internal.offheap.annotations.Unretained;
+import org.apache.geode.internal.serialization.DSCODE;
 
 /**
  * The class just has static methods that operate on instances of {@link OffHeapRegionEntry}. It
diff --git a/geode-core/src/main/java/org/apache/geode/internal/offheap/OffHeapStoredObject.java b/geode-core/src/main/java/org/apache/geode/internal/offheap/OffHeapStoredObject.java
index 88ff7e9..b7b1af0 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/offheap/OffHeapStoredObject.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/offheap/OffHeapStoredObject.java
@@ -19,7 +19,6 @@ import java.io.IOException;
 import java.nio.ByteBuffer;
 
 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.cache.BytesAndBitsForCompactor;
@@ -28,6 +27,7 @@ import org.apache.geode.internal.cache.EntryEventImpl;
 import org.apache.geode.internal.cache.RegionEntry;
 import org.apache.geode.internal.cache.RegionEntryContext;
 import org.apache.geode.internal.offheap.annotations.Unretained;
+import org.apache.geode.internal.serialization.DSCODE;
 
 /**
  * A class that stores a Java object in off-heap memory. See {@link AddressableMemoryManager} for
diff --git a/geode-core/src/main/java/org/apache/geode/internal/serialization/BufferDataOutputStream.java b/geode-core/src/main/java/org/apache/geode/internal/serialization/BufferDataOutputStream.java
index 4bfef78..20f336b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/serialization/BufferDataOutputStream.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/serialization/BufferDataOutputStream.java
@@ -14,5 +14,1032 @@
  */
 package org.apache.geode.internal.serialization;
 
-public class BufferDataOutputStream {
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.UTFDataFormatException;
+import java.nio.ByteBuffer;
+import java.nio.channels.SocketChannel;
+import java.util.Iterator;
+import java.util.LinkedList;
+
+public class BufferDataOutputStream extends OutputStream implements VersionedDataStream {
+  /**
+   * We set "doNotCopy" to prevent wasting time by copying bytes. But to do this we create either a
+   * HeapByteBuffer to DirectByteBuffer to reference the byte array or off-heap memory. The
+   * ByteBuffer instance itself uses up memory that needs to be initialized and eventually gc'd so
+   * for smaller sizes it is better to just copy it. Public for unit test access.
+   */
+  public static final int MIN_TO_COPY = 128;
+  protected static final int INITIAL_CAPACITY = 1024;
+  /**
+   * Use -Dgemfire.ASCII_STRINGS=true if all String instances contain ASCII characters. Setting this
+   * to true gives a performance improvement.
+   */
+  protected static final boolean ASCII_STRINGS =
+      Boolean.getBoolean("gemfire.ASCII_STRINGS");
+  public static final int SMALLEST_CHUNK_SIZE = 32;
+  protected int MIN_CHUNK_SIZE;
+  protected LinkedList<ByteBuffer> chunks = null;
+  protected int size = 0;
+  protected boolean ignoreWrites = false; // added for bug 39569
+  protected short version;
+  protected boolean doNotCopy;
+  protected ByteBuffer buffer;
+  /**
+   * True if this stream is currently setup for writing. Once it switches to reading then it must be
+   * reset before it can be written again.
+   */
+  private boolean writeMode = true;
+  private boolean disallowExpansion = false;
+  private Error expansionException = null;
+  private int memoPosition;
+
+  public BufferDataOutputStream(int allocSize, short version) {
+    this(allocSize, version, false);
+  }
+
+  /**
+   * Create a BufferDataOutputStream optimized to contain just the specified string. The string will
+   * be written to this stream encoded as utf.
+   */
+  public BufferDataOutputStream(String s) {
+    int maxStrBytes;
+    if (ASCII_STRINGS) {
+      maxStrBytes = s.length();
+    } else {
+      maxStrBytes = s.length() * 3;
+    }
+    this.MIN_CHUNK_SIZE = INITIAL_CAPACITY;
+    this.buffer = ByteBuffer.allocate(maxStrBytes);
+    this.doNotCopy = false;
+    writeUTFNoLength(s);
+  }
+
+  /**
+   * @param doNotCopy if true then byte arrays/buffers/sources will not be copied to this hdos but
+   *        instead referenced.
+   */
+  public BufferDataOutputStream(int allocSize, short version, boolean doNotCopy) {
+    if (allocSize < SMALLEST_CHUNK_SIZE) {
+      this.MIN_CHUNK_SIZE = SMALLEST_CHUNK_SIZE;
+    } else {
+      this.MIN_CHUNK_SIZE = allocSize;
+    }
+    this.buffer = ByteBuffer.allocate(allocSize);
+    this.version = version;
+    this.doNotCopy = doNotCopy;
+  }
+
+  public BufferDataOutputStream(ByteBuffer initialBuffer, short version, boolean doNotCopy) {
+    if (initialBuffer.position() != 0) {
+      initialBuffer = initialBuffer.slice();
+    }
+    int allocSize = initialBuffer.capacity();
+    if (allocSize < 32) {
+      this.MIN_CHUNK_SIZE = 32;
+    } else {
+      this.MIN_CHUNK_SIZE = allocSize;
+    }
+    this.buffer = initialBuffer;
+    this.version = version;
+    this.doNotCopy = doNotCopy;
+  }
+
+  /**
+   * Construct a BufferDataOutputStream which uses the byte array provided as its underlying
+   * ByteBuffer
+   *
+   */
+  public BufferDataOutputStream(byte[] bytes) {
+    int len = bytes.length;
+    if (len <= 0) {
+      throw new IllegalArgumentException("The byte array must not be empty");
+    }
+    if (len > 32) {
+      this.MIN_CHUNK_SIZE = len;
+    } else {
+      this.MIN_CHUNK_SIZE = 32;
+    }
+    this.buffer = ByteBuffer.wrap(bytes);
+    this.doNotCopy = false;
+  }
+
+
+  public static void flushStream(OutputStream out, ByteBuffer outBuf) throws IOException {
+    if (outBuf.position() == 0)
+      return;
+    assert outBuf.hasArray();
+    outBuf.flip();
+    out.write(outBuf.array(), outBuf.arrayOffset(), outBuf.remaining());
+    outBuf.clear();
+  }
+
+  /**
+   * Returns true if this HDOS currently does not copy byte arrays/buffers written to it. Instead of
+   * copying a reference is kept to the original array/buffer.
+   */
+  public boolean setDoNotCopy(boolean v) {
+    boolean result = this.doNotCopy;
+    if (result != v) {
+      this.doNotCopy = v;
+    }
+    return result;
+  }
+
+  /**
+   * {@inheritDoc}
+   */
+  @Override
+  public short getVersionOrdinal() {
+    return version;
+  }
+
+  /*
+   * throw an exception instead of allocating a new buffer. The exception is a
+   * BufferOverflowException thrown from expand, and will restore the position to the point at which
+   * the flag was set with the disallowExpansion method.
+   *
+   * @param ee the exception to throw if expansion is needed
+   */
+  public void disallowExpansion(Error ee) {
+    this.disallowExpansion = true;
+    this.expansionException = ee;
+    this.memoPosition = this.buffer.position();
+  }
+
+  /**
+   * If this BufferDataOutputStream detects that it needs to
+   * grow then it will throw an IllegalStateException.
+   */
+  public void disallowExpansion() {
+    this.disallowExpansion = true;
+  }
+
+  /** write the low-order 8 bits of the given int */
+  @Override
+  public void write(int b) {
+    if (this.ignoreWrites)
+      return;
+    checkIfWritable();
+    ensureCapacity(1);
+    buffer.put((byte) (b & 0xff));
+  }
+
+  protected void ensureCapacity(int amount) {
+    int remainingSpace = this.buffer.capacity() - this.buffer.position();
+    if (amount > remainingSpace) {
+      expand(amount);
+    }
+  }
+
+  private void expand(int amount) {
+    if (this.disallowExpansion) {
+      if (this.expansionException != null) {
+        this.ignoreWrites = true;
+        this.buffer.position(this.memoPosition);
+        throw this.expansionException;
+      } else {
+        throw new IllegalStateException("initial buffer size was exceeded");
+      }
+    }
+
+    final ByteBuffer oldBuffer = this.buffer;
+    if (this.chunks == null) {
+      this.chunks = new LinkedList<ByteBuffer>();
+    }
+    oldBuffer.flip(); // now ready for reading
+    this.size += oldBuffer.remaining();
+    this.chunks.add(oldBuffer);
+    if (amount < MIN_CHUNK_SIZE) {
+      amount = MIN_CHUNK_SIZE;
+    }
+    this.buffer = ByteBuffer.allocate(amount);
+  }
+
+  protected void checkIfWritable() {
+    if (!this.writeMode) {
+      throw new IllegalStateException(
+          "not in write mode");
+    }
+  }
+
+  /** override OutputStream's write() */
+  @Override
+  public void write(byte[] source, int offset, int len) {
+    if (len == 0)
+      return;
+    if (this.ignoreWrites)
+      return;
+    checkIfWritable();
+    if (this.doNotCopy && len > MIN_TO_COPY) {
+      moveBufferToChunks();
+      addToChunks(source, offset, len);
+    } else {
+      int remainingSpace = this.buffer.capacity() - this.buffer.position();
+      if (remainingSpace < len) {
+        this.buffer.put(source, offset, remainingSpace);
+        offset += remainingSpace;
+        len -= remainingSpace;
+        ensureCapacity(len);
+      }
+      this.buffer.put(source, offset, len);
+    }
+  }
+
+  private void addToChunks(byte[] source, int offset, int len) {
+    ByteBuffer bb = ByteBuffer.wrap(source, offset, len).slice();
+    bb = bb.slice();
+    this.size += bb.remaining();
+    this.chunks.add(bb);
+  }
+
+  private void addToChunks(ByteBuffer bb) {
+    int remaining = bb.remaining();
+    if (remaining > 0) {
+      this.size += remaining;
+      if (bb.position() != 0) {
+        bb = bb.slice();
+      }
+      this.chunks.add(bb);
+    }
+  }
+
+  public int getByteBufferCount() {
+    int result = 0;
+    if (this.chunks != null) {
+      result += this.chunks.size();
+    }
+    if (this.buffer.remaining() > 0) {
+      result++;
+    }
+    return result;
+  }
+
+  public void fillByteBufferArray(ByteBuffer[] bbArray, int offset) {
+    if (this.chunks != null) {
+      for (ByteBuffer bb : this.chunks) {
+        bbArray[offset++] = bb;
+      }
+    }
+    if (this.buffer.remaining() > 0) {
+      bbArray[offset] = this.buffer;
+    }
+  }
+
+  private void moveBufferToChunks() {
+    final ByteBuffer oldBuffer = this.buffer;
+    if (this.chunks == null) {
+      this.chunks = new LinkedList<ByteBuffer>();
+    }
+    if (oldBuffer.position() == 0) {
+      // if position is zero then nothing has been written (yet) to buffer so no need to move it to
+      // chunks
+      return;
+    }
+    oldBuffer.flip();
+    this.size += oldBuffer.remaining();
+    ByteBuffer bufToAdd = oldBuffer.slice();
+    this.chunks.add(bufToAdd);
+    int newPos = oldBuffer.limit();
+    if ((oldBuffer.capacity() - newPos) <= 0) {
+      this.buffer = ByteBuffer.allocate(MIN_CHUNK_SIZE);
+    } else {
+      oldBuffer.limit(oldBuffer.capacity());
+      oldBuffer.position(newPos);
+      this.buffer = oldBuffer.slice();
+    }
+  }
+
+  public int size() {
+    if (this.writeMode) {
+      return this.size + this.buffer.position();
+    } else {
+      return this.size;
+    }
+  }
+
+  private void consolidateChunks() {
+    if (this.chunks != null) {
+      final int size = size();
+      ByteBuffer newBuffer = ByteBuffer.allocate(size);
+      for (ByteBuffer bb : this.chunks) {
+        newBuffer.put(bb);
+      }
+      this.chunks = null;
+      newBuffer.put(this.buffer);
+      this.buffer = newBuffer;
+      this.buffer.flip(); // now ready for reading
+    }
+  }
+
+  private void consolidateChunks(int startPosition) {
+    assert startPosition < SMALLEST_CHUNK_SIZE;
+    final int size = size() - startPosition;
+    ByteBuffer newBuffer = ByteBuffer.allocate(size);
+    if (this.chunks != null) {
+      this.chunks.getFirst().position(startPosition);
+      for (ByteBuffer bb : this.chunks) {
+        newBuffer.put(bb);
+      }
+      this.chunks = null;
+    } else {
+      this.buffer.position(startPosition);
+    }
+    newBuffer.put(this.buffer);
+    newBuffer.flip(); // now ready for reading
+    this.buffer = newBuffer;
+  }
+
+  /**
+   * Prepare the contents for sending again
+   */
+  public void rewind() {
+    finishWriting();
+    this.size = 0;
+    if (this.chunks != null) {
+      for (ByteBuffer bb : this.chunks) {
+        bb.rewind();
+        size += bb.remaining();
+      }
+    }
+    this.buffer.rewind();
+    size += this.buffer.remaining();
+  }
+
+  public void reset() {
+    this.size = 0;
+    if (this.chunks != null) {
+      this.chunks.clear();
+      this.chunks = null;
+    }
+    this.buffer.clear();
+    this.writeMode = true;
+    this.ignoreWrites = false;
+    this.disallowExpansion = false;
+    this.expansionException = null;
+  }
+
+  @Override
+  public void flush() {
+    // noop
+  }
+
+  public void finishWriting() {
+    if (this.writeMode) {
+      this.ignoreWrites = false;
+      this.writeMode = false;
+      this.buffer.flip();
+      this.size += this.buffer.remaining();
+    }
+  }
+
+  /**
+   * Returns a ByteBuffer of the unused buffer; returns null if the buffer was completely used.
+   */
+  public ByteBuffer finishWritingAndReturnUnusedBuffer() {
+    finishWriting();
+    ByteBuffer result = this.buffer.duplicate();
+    if (result.remaining() == 0) {
+      // buffer was never used.
+      result.limit(result.capacity());
+      return result;
+    }
+    int newPos = result.limit();
+    if ((result.capacity() - newPos) > 0) {
+      result.limit(result.capacity());
+      result.position(newPos);
+      return result.slice();
+    } else {
+      return null;
+    }
+  }
+
+  @Override
+  public void close() {
+    reset();
+  }
+
+  /**
+   * gets the contents of this stream as a ByteBuffer, ready for reading. The stream should not be
+   * written to past this point until it has been reset.
+   */
+  public ByteBuffer toByteBuffer() {
+    finishWriting();
+    consolidateChunks();
+    return this.buffer;
+  }
+
+  /**
+   * gets the contents of this stream as a ByteBuffer, ready for reading. The stream should not be
+   * written to past this point until it has been reset.
+   *
+   * @param startPosition the position of the first byte to copy into the returned buffer.
+   */
+  public ByteBuffer toByteBuffer(int startPosition) {
+    finishWriting();
+    consolidateChunks(startPosition);
+    return this.buffer;
+  }
+
+  /**
+   * gets the contents of this stream as a byte[]. The stream should not be written to past this
+   * point until it has been reset.
+   */
+  public byte[] toByteArray() {
+    ByteBuffer bb = toByteBuffer();
+    if (bb.hasArray() && bb.arrayOffset() == 0 && bb.limit() == bb.capacity()) {
+      return bb.array();
+    } else {
+      // create a new buffer of just the right size and copy the old buffer into it
+      ByteBuffer tmp = ByteBuffer.allocate(bb.remaining());
+      tmp.put(bb);
+      tmp.flip();
+      this.buffer = tmp;
+      return this.buffer.array();
+    }
+  }
+
+  protected void flushBuffer(SocketChannel sc, ByteBuffer out) throws IOException {
+    if (out.position() == 0)
+      return;
+    out.flip();
+    while (out.remaining() > 0) {
+      sc.write(out);
+    }
+    out.clear();
+  }
+
+  /**
+   * Returns an input stream that can be used to read the contents that where written to this output
+   * stream.
+   */
+  public InputStream getInputStream() {
+    return new HDInputStream();
+  }
+
+  /**
+   * Writes a <code>boolean</code> value to this output stream. If the argument <code>v</code> is
+   * <code>true</code>, the value <code>(byte)1</code> is written; if <code>v</code> is
+   * <code>false</code>, the value <code>(byte)0</code> is written. The byte written by this method
+   * may be read by the <code>readBoolean</code> method of interface <code>DataInput</code>, which
+   * will then return a <code>boolean</code> equal to <code>v</code>.
+   *
+   * @param v the boolean to be written.
+   */
+  public void writeBoolean(boolean v) {
+    write(v ? 1 : 0);
+  }
+
+  /**
+   * Writes to the output stream the eight low- order bits of the argument <code>v</code>. The 24
+   * high-order bits of <code>v</code> are ignored. (This means that <code>writeByte</code> does
+   * exactly the same thing as <code>write</code> for an integer argument.) The byte written by this
+   * method may be read by the <code>readByte</code> method of interface <code>DataInput</code>,
+   * which will then return a <code>byte</code> equal to <code>(byte)v</code>.
+   *
+   * @param v the byte value to be written.
+   */
+  public void writeByte(int v) {
+    write(v);
+  }
+
+  /**
+   * Writes two bytes to the output stream to represent the value of the argument. The byte values
+   * to be written, in the order shown, are:
+   * <p>
+   *
+   * <pre>
+   * <code>
+   * (byte)(0xff &amp; (v &gt;&gt; 8))
+   * (byte)(0xff &amp; v)
+   * </code>
+   * </pre>
+   * <p>
+   * The bytes written by this method may be read by the <code>readShort</code> method of interface
+   * <code>DataInput</code> , which will then return a <code>short</code> equal to
+   * <code>(short)v</code>.
+   *
+   * @param v the <code>short</code> value to be written.
+   */
+  public void writeShort(int v) {
+    if (this.ignoreWrites)
+      return;
+    checkIfWritable();
+    ensureCapacity(2);
+    buffer.putShort((short) (v & 0xffff));
+  }
+
+  /**
+   * Writes a <code>char</code> value, wich is comprised of two bytes, to the output stream. The
+   * byte values to be written, in the order shown, are:
+   * <p>
+   *
+   * <pre>
+   * <code>
+   * (byte)(0xff &amp; (v &gt;&gt; 8))
+   * (byte)(0xff &amp; v)
+   * </code>
+   * </pre>
+   * <p>
+   * The bytes written by this method may be read by the <code>readChar</code> method of interface
+   * <code>DataInput</code> , which will then return a <code>char</code> equal to
+   * <code>(char)v</code>.
+   *
+   * @param v the <code>char</code> value to be written.
+   */
+  public void writeChar(int v) {
+    if (this.ignoreWrites)
+      return;
+    checkIfWritable();
+    ensureCapacity(2);
+    buffer.putChar((char) v);
+  }
+
+  /**
+   * Writes an <code>int</code> value, which is comprised of four bytes, to the output stream. The
+   * byte values to be written, in the order shown, are:
+   * <p>
+   *
+   * <pre>
+   * <code>
+   * (byte)(0xff &amp; (v &gt;&gt; 24))
+   * (byte)(0xff &amp; (v &gt;&gt; 16))
+   * (byte)(0xff &amp; (v &gt;&gt; &#32; &#32;8))
+   * (byte)(0xff &amp; v)
+   * </code>
+   * </pre>
+   * <p>
+   * The bytes written by this method may be read by the <code>readInt</code> method of interface
+   * <code>DataInput</code> , which will then return an <code>int</code> equal to <code>v</code>.
+   *
+   * @param v the <code>int</code> value to be written.
+   */
+  public void writeInt(int v) {
+    if (this.ignoreWrites)
+      return;
+    checkIfWritable();
+    ensureCapacity(4);
+    buffer.putInt(v);
+  }
+
+  /**
+   * Writes a <code>long</code> value, which is comprised of eight bytes, to the output stream. The
+   * byte values to be written, in the order shown, are:
+   * <p>
+   *
+   * <pre>
+   * <code>
+   * (byte)(0xff &amp; (v &gt;&gt; 56))
+   * (byte)(0xff &amp; (v &gt;&gt; 48))
+   * (byte)(0xff &amp; (v &gt;&gt; 40))
+   * (byte)(0xff &amp; (v &gt;&gt; 32))
+   * (byte)(0xff &amp; (v &gt;&gt; 24))
+   * (byte)(0xff &amp; (v &gt;&gt; 16))
+   * (byte)(0xff &amp; (v &gt;&gt;  8))
+   * (byte)(0xff &amp; v)
+   * </code>
+   * </pre>
+   * <p>
+   * The bytes written by this method may be read by the <code>readLong</code> method of interface
+   * <code>DataInput</code> , which will then return a <code>long</code> equal to <code>v</code>.
+   *
+   * @param v the <code>long</code> value to be written.
+   */
+  public void writeLong(long v) {
+    if (this.ignoreWrites)
+      return;
+    checkIfWritable();
+    ensureCapacity(8);
+    buffer.putLong(v);
+  }
+
+  /**
+   * Reserves space in the output for a long and returns a LongUpdater than can be used to update
+   * this particular long.
+   *
+   * @return the LongUpdater that allows the long to be updated
+   */
+  public LongUpdater reserveLong() {
+    if (this.ignoreWrites)
+      return null;
+    checkIfWritable();
+    ensureCapacity(8);
+    LongUpdater result = new LongUpdater(this.buffer);
+    buffer.putLong(0L);
+    return result;
+  }
+
+  /**
+   * Writes a <code>float</code> value, which is comprised of four bytes, to the output stream. It
+   * does this as if it first converts this <code>float</code> value to an <code>int</code> in
+   * exactly the manner of the <code>Float.floatToIntBits</code> method and then writes the
+   * <code>int</code> value in exactly the manner of the <code>writeInt</code> method. The bytes
+   * written by this method may be read by the <code>readFloat</code> method of interface
+   * <code>DataInput</code>, which will then return a <code>float</code> equal to <code>v</code>.
+   *
+   * @param v the <code>float</code> value to be written.
+   */
+  public void writeFloat(float v) {
+    if (this.ignoreWrites)
+      return;
+    checkIfWritable();
+    ensureCapacity(4);
+    buffer.putFloat(v);
+  }
+
+  /**
+   * Writes a <code>double</code> value, which is comprised of eight bytes, to the output stream. It
+   * does this as if it first converts this <code>double</code> value to a <code>long</code> in
+   * exactly the manner of the <code>Double.doubleToLongBits</code> method and then writes the
+   * <code>long</code> value in exactly the manner of the <code>writeLong</code> method. The bytes
+   * written by this method may be read by the <code>readDouble</code> method of interface
+   * <code>DataInput</code>, which will then return a <code>double</code> equal to <code>v</code>.
+   *
+   * @param v the <code>double</code> value to be written.
+   */
+  public void writeDouble(double v) {
+    if (this.ignoreWrites)
+      return;
+    checkIfWritable();
+    ensureCapacity(8);
+    buffer.putDouble(v);
+  }
+
+  /**
+   * Writes a string to the output stream. For every character in the string <code>s</code>, taken
+   * in order, one byte is written to the output stream. If <code>s</code> is <code>null</code>, a
+   * <code>NullPointerException</code> is thrown.
+   * <p>
+   * If <code>s.length</code> is zero, then no bytes are written. Otherwise, the character
+   * <code>s[0]</code> is written first, then <code>s[1]</code>, and so on; the last character
+   * written is <code>s[s.length-1]</code>. For each character, one byte is written, the low-order
+   * byte, in exactly the manner of the <code>writeByte</code> method . The high-order eight bits of
+   * each character in the string are ignored.
+   *
+   * @param str the string of bytes to be written.
+   */
+  public void writeBytes(String str) {
+    if (this.ignoreWrites)
+      return;
+    checkIfWritable();
+    int strlen = str.length();
+    if (strlen > 0) {
+      ensureCapacity(strlen);
+      // I know this is a deprecated method but it is PERFECT for this impl.
+      if (this.buffer.hasArray()) {
+        // I know this is a deprecated method but it is PERFECT for this impl.
+        int pos = this.buffer.position();
+        str.getBytes(0, strlen, this.buffer.array(), this.buffer.arrayOffset() + pos);
+        this.buffer.position(pos + strlen);
+      } else {
+        byte[] bytes = new byte[strlen];
+        str.getBytes(0, strlen, bytes, 0);
+        this.buffer.put(bytes);
+      }
+      // for (int i = 0 ; i < len ; i++) {
+      // this.buffer.put((byte)s.charAt(i));
+      // }
+    }
+  }
+
+  /**
+   * Writes every character in the string <code>s</code>, to the output stream, in order, two bytes
+   * per character. If <code>s</code> is <code>null</code>, a <code>NullPointerException</code> is
+   * thrown. If <code>s.length</code> is zero, then no characters are written. Otherwise, the
+   * character <code>s[0]</code> is written first, then <code>s[1]</code>, and so on; the last
+   * character written is <code>s[s.length-1]</code>. For each character, two bytes are actually
+   * written, high-order byte first, in exactly the manner of the <code>writeChar</code> method.
+   *
+   * @param s the string value to be written.
+   */
+  public void writeChars(String s) {
+    if (this.ignoreWrites)
+      return;
+    checkIfWritable();
+    int len = s.length();
+    if (len > 0) {
+      ensureCapacity(len * 2);
+      for (int i = 0; i < len; i++) {
+        this.buffer.putChar(s.charAt(i));
+      }
+    }
+  }
+
+  /**
+   * Writes two bytes of length information to the output stream, followed by the Java modified UTF
+   * representation of every character in the string <code>s</code>. If <code>s</code> is
+   * <code>null</code>, a <code>NullPointerException</code> is thrown. Each character in the string
+   * <code>s</code> is converted to a group of one, two, or three bytes, depending on the value of
+   * the character.
+   * <p>
+   * If a character <code>c</code> is in the range <code>&#92;u0001</code> through
+   * <code>&#92;u007f</code>, it is represented by one byte:
+   * <p>
+   *
+   * <pre>
+   * (byte) c
+   * </pre>
+   * <p>
+   * If a character <code>c</code> is <code>&#92;u0000</code> or is in the range
+   * <code>&#92;u0080</code> through <code>&#92;u07ff</code>, then it is represented by two bytes,
+   * to be written in the order shown:
+   * <p>
+   *
+   * <pre>
+   * <code>
+   * (byte)(0xc0 | (0x1f &amp; (c &gt;&gt; 6)))
+   * (byte)(0x80 | (0x3f &amp; c))
+   *  </code>
+   * </pre>
+   * <p>
+   * If a character <code>c</code> is in the range <code>&#92;u0800</code> through
+   * <code>uffff</code>, then it is represented by three bytes, to be written in the order shown:
+   * <p>
+   *
+   * <pre>
+   * <code>
+   * (byte)(0xe0 | (0x0f &amp; (c &gt;&gt; 12)))
+   * (byte)(0x80 | (0x3f &amp; (c &gt;&gt;  6)))
+   * (byte)(0x80 | (0x3f &amp; c))
+   *  </code>
+   * </pre>
+   * <p>
+   * First, the total number of bytes needed to represent all the characters of <code>s</code> is
+   * calculated. If this number is larger than <code>65535</code>, then a
+   * <code>UTFDataFormatException</code> is thrown. Otherwise, this length is written to the output
+   * stream in exactly the manner of the <code>writeShort</code> method; after this, the one-, two-,
+   * or three-byte representation of each character in the string <code>s</code> is written.
+   * <p>
+   * The bytes written by this method may be read by the <code>readUTF</code> method of interface
+   * <code>DataInput</code> , which will then return a <code>String</code> equal to <code>s</code>.
+   *
+   * @param str the string value to be written.
+   */
+  public void writeUTF(String str) throws UTFDataFormatException {
+    if (this.ignoreWrites)
+      return;
+    checkIfWritable();
+    if (ASCII_STRINGS) {
+      writeAsciiUTF(str, true);
+    } else {
+      writeFullUTF(str, true);
+    }
+  }
+
+  private void writeAsciiUTF(String str, boolean encodeLength) throws UTFDataFormatException {
+    int strlen = str.length();
+    if (encodeLength && strlen > 65535) {
+      throw new UTFDataFormatException();
+    }
+
+    int maxLen = strlen;
+    if (encodeLength) {
+      maxLen += 2;
+    }
+    ensureCapacity(maxLen);
+
+    if (encodeLength) {
+      this.buffer.putShort((short) strlen);
+    }
+    if (this.buffer.hasArray()) {
+      // I know this is a deprecated method but it is PERFECT for this impl.
+      int pos = this.buffer.position();
+      str.getBytes(0, strlen, this.buffer.array(), this.buffer.arrayOffset() + pos);
+      this.buffer.position(pos + strlen);
+    } else {
+      for (int i = 0; i < strlen; i++) {
+        this.buffer.put((byte) str.charAt(i));
+      }
+      // byte[] bytes = new byte[strlen];
+      // str.getBytes(0, strlen, bytes, 0);
+      // this.buffer.put(bytes);
+    }
+  }
+
+  /**
+   * The logic used here is based on java's DataOutputStream.writeUTF() from the version 1.6.0_10.
+   * The reader code should use the logic similar to DataOutputStream.readUTF() from the version
+   * 1.6.0_10 to decode this properly.
+   */
+  private void writeFullUTF(String str, boolean encodeLength) throws UTFDataFormatException {
+    int strlen = str.length();
+    if (encodeLength && strlen > 65535) {
+      throw new UTFDataFormatException();
+    }
+    // make room for worst case space 3 bytes for each char and 2 for len
+    {
+      int maxLen = (strlen * 3);
+      if (encodeLength) {
+        maxLen += 2;
+      }
+      ensureCapacity(maxLen);
+    }
+    int utfSizeIdx = this.buffer.position();
+    if (encodeLength) {
+      // skip bytes reserved for length
+      this.buffer.position(utfSizeIdx + 2);
+    }
+    for (int i = 0; i < strlen; i++) {
+      int c = str.charAt(i);
+      if ((c >= 0x0001) && (c <= 0x007F)) {
+        this.buffer.put((byte) c);
+      } else if (c > 0x07FF) {
+        this.buffer.put((byte) (0xE0 | ((c >> 12) & 0x0F)));
+        this.buffer.put((byte) (0x80 | ((c >> 6) & 0x3F)));
+        this.buffer.put((byte) (0x80 | ((c >> 0) & 0x3F)));
+      } else {
+        this.buffer.put((byte) (0xC0 | ((c >> 6) & 0x1F)));
+        this.buffer.put((byte) (0x80 | ((c >> 0) & 0x3F)));
+      }
+    }
+    int utflen = this.buffer.position() - utfSizeIdx;
+    if (encodeLength) {
+      utflen -= 2;
+      if (utflen > 65535) {
+        // act as if we wrote nothing to this buffer
+        this.buffer.position(utfSizeIdx);
+        throw new UTFDataFormatException();
+      }
+      this.buffer.putShort(utfSizeIdx, (short) utflen);
+    }
+  }
+
+  /**
+   * Same as {@link #writeUTF} but it does not encode the length in the first two bytes and allows
+   * strings longer than 65k to be encoded.
+   */
+  public void writeUTFNoLength(String str) {
+    if (this.ignoreWrites)
+      return;
+    checkIfWritable();
+    try {
+      if (ASCII_STRINGS) {
+        writeAsciiUTF(str, false);
+      } else {
+        writeFullUTF(str, false);
+      }
+    } catch (UTFDataFormatException ex) {
+      // this shouldn't happen since we did not encode the length
+      throw new IllegalStateException(
+          String.format("unexpected %s", ex));
+    }
+  }
+
+  /**
+   * Write a byte buffer to this BufferDataOutputStream,
+   *
+   * the contents of the buffer between the position and the limit are copied to the output stream.
+   */
+  public void write(ByteBuffer bb) {
+    if (this.ignoreWrites)
+      return;
+    checkIfWritable();
+    int remaining = bb.remaining();
+    if (remaining == 0)
+      return;
+    if (this.doNotCopy && remaining > MIN_TO_COPY) {
+      moveBufferToChunks();
+      addToChunks(bb);
+    } else {
+      int remainingSpace = this.buffer.remaining();
+      if (remainingSpace < remaining) {
+        int oldLimit = bb.limit();
+        bb.limit(bb.position() + remainingSpace);
+        this.buffer.put(bb);
+        bb.limit(oldLimit);
+        ensureCapacity(bb.remaining());
+      }
+      this.buffer.put(bb);
+    }
+  }
+
+  public static class LongUpdater {
+    private final ByteBuffer bb;
+    private final int pos;
+
+    public LongUpdater(ByteBuffer bb) {
+      this.bb = bb;
+      this.pos = bb.position();
+    }
+
+    public void update(long v) {
+      this.bb.putLong(this.pos, v);
+    }
+  }
+
+  private class HDInputStream extends InputStream {
+    private Iterator<ByteBuffer> chunkIt;
+    private ByteBuffer bb;
+
+    public HDInputStream() {
+      finishWriting();
+      if (BufferDataOutputStream.this.chunks != null) {
+        this.chunkIt = BufferDataOutputStream.this.chunks.iterator();
+        nextChunk();
+      } else {
+        this.chunkIt = null;
+        this.bb = BufferDataOutputStream.this.buffer;
+      }
+    }
+
+    private void nextChunk() {
+      if (this.chunkIt != null) {
+        if (this.chunkIt.hasNext()) {
+          this.bb = this.chunkIt.next();
+        } else {
+          this.chunkIt = null;
+          this.bb = BufferDataOutputStream.this.buffer;
+        }
+      } else {
+        this.bb = null; // EOF
+      }
+    }
+
+    @Override
+    public int available() {
+      return size();
+    }
+
+    @Override
+    public int read() {
+      if (available() <= 0) {
+        return -1;
+      } else {
+        int remaining = this.bb.limit() - this.bb.position();
+        while (remaining == 0) {
+          nextChunk();
+          remaining = this.bb.limit() - this.bb.position();
+        }
+        consume(1);
+        return this.bb.get() & 0xFF; // fix for bug 37068
+      }
+    }
+
+    @Override
+    public int read(byte[] dst, int off, int len) {
+      if (available() <= 0) {
+        return -1;
+      } else {
+        int readCount = 0;
+        while (len > 0 && this.bb != null) {
+          if (this.bb.limit() == this.bb.position()) {
+            nextChunk();
+          } else {
+            int remaining = this.bb.limit() - this.bb.position();
+            int bytesToRead = len;
+            if (len > remaining) {
+              bytesToRead = remaining;
+            }
+            this.bb.get(dst, off, bytesToRead);
+            off += bytesToRead;
+            len -= bytesToRead;
+            readCount += bytesToRead;
+          }
+        }
+        consume(readCount);
+        return readCount;
+      }
+    }
+
+    @Override
+    public long skip(long n) {
+      int remaining = size();
+      if (remaining <= n) {
+        // just skip over bytes remaining
+        this.chunkIt = null;
+        this.bb = null;
+        consume(remaining);
+        return remaining;
+      } else {
+        long skipped = 0;
+        do {
+          long skipsRemaining = n - skipped;
+          skipped += chunkSkip(skipsRemaining);
+        } while (skipped != n);
+        return n;
+      }
+    }
+
+    private long chunkSkip(long n) {
+      int remaining = this.bb.limit() - this.bb.position();
+      if (remaining <= n) {
+        // skip this whole chunk
+        this.bb.position(this.bb.limit());
+        nextChunk();
+        consume(remaining);
+        return remaining;
+      } else {
+        // skip over just a part of this chunk
+        this.bb.position(this.bb.position() + (int) n);
+        consume((int) n);
+        return n;
+      }
+    }
+
+    private void consume(int c) {
+      BufferDataOutputStream.this.size -= c;
+    }
+
+  }
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/ByteArrayDataInput.java b/geode-core/src/main/java/org/apache/geode/internal/serialization/ByteArrayDataInput.java
similarity index 95%
rename from geode-core/src/main/java/org/apache/geode/internal/ByteArrayDataInput.java
rename to geode-core/src/main/java/org/apache/geode/internal/serialization/ByteArrayDataInput.java
index f132673..20d5f2f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/ByteArrayDataInput.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/serialization/ByteArrayDataInput.java
@@ -13,7 +13,7 @@
  * the License.
  */
 
-package org.apache.geode.internal;
+package org.apache.geode.internal.serialization;
 
 import java.io.DataInput;
 import java.io.EOFException;
@@ -23,8 +23,8 @@ import java.io.UTFDataFormatException;
 
 /**
  * A reusable {@link DataInput} implementation that wraps a given byte array. It also implements
- * {@link org.apache.geode.internal.VersionedDataStream} for a stream coming from a different
- * product version.
+ * {@link org.apache.geode.internal.serialization.VersionedDataStream} for a stream coming from a
+ * different product version.
  *
  * @since GemFire 7.1
  */
@@ -35,7 +35,7 @@ public class ByteArrayDataInput extends InputStream implements DataInput, Versio
   private int pos;
   /** reusable buffer for readUTF */
   private char[] charBuf;
-  private Version version;
+  private short version;
 
   /**
    * Create a {@link DataInput} whose contents are empty.
@@ -43,10 +43,10 @@ public class ByteArrayDataInput extends InputStream implements DataInput, Versio
   public ByteArrayDataInput() {}
 
   public ByteArrayDataInput(byte[] bytes) {
-    initialize(bytes, null);
+    initialize(bytes, (short) 0);
   }
 
-  public ByteArrayDataInput(byte[] bytes, Version version) {
+  public ByteArrayDataInput(byte[] bytes, short version) {
     initialize(bytes, version);
   }
 
@@ -57,19 +57,19 @@ public class ByteArrayDataInput extends InputStream implements DataInput, Versio
    *        (a copy is not made) so it should not be changed externally.
    * @param version the product version that serialized the object on given bytes
    */
-  public void initialize(byte[] bytes, Version version) {
+  public void initialize(byte[] bytes, int version) {
     this.bytes = bytes;
     this.nBytes = bytes.length;
     this.pos = 0;
-    this.version = version;
+    this.version = (short) version;
   }
 
   /**
    * {@inheritDoc}
    */
   @Override
-  public Version getVersion() {
-    return this.version;
+  public short getVersionOrdinal() {
+    return version;
   }
 
   private int skipOver(long n) {
@@ -463,7 +463,7 @@ public class ByteArrayDataInput extends InputStream implements DataInput, Versio
     this.bytes = null;
     this.nBytes = 0;
     this.pos = 0;
-    this.version = null;
+    this.version = 0;
   }
 
   /**
@@ -471,7 +471,7 @@ public class ByteArrayDataInput extends InputStream implements DataInput, Versio
    */
   @Override
   public String toString() {
-    return this.version == null ? super.toString() : (super.toString() + " (" + this.version + ')');
+    return this.version == 0 ? super.toString() : (super.toString() + " (v" + this.version + ')');
   }
 
   private void throwUTFEncodingError(int index, int char1, int char2, Integer char3, int enc)
diff --git a/geode-core/src/main/java/org/apache/geode/internal/serialization/DSCODE.java b/geode-core/src/main/java/org/apache/geode/internal/serialization/DSCODE.java
index 3a534f5..2da672f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/serialization/DSCODE.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/serialization/DSCODE.java
@@ -12,10 +12,9 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.apache.geode.internal;
+package org.apache.geode.internal.serialization;
 
 import org.apache.geode.DataSerializer;
-import org.apache.geode.internal.serialization.DataSerializableFixedID;
 
 /**
  * An enumeration that contains a bunch of pre-defined values for use in the implementation of
diff --git a/geode-core/src/main/java/org/apache/geode/internal/serialization/DSFIDNotFoundException.java b/geode-core/src/main/java/org/apache/geode/internal/serialization/DSFIDNotFoundException.java
index 3b3643a..cefc237 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/serialization/DSFIDNotFoundException.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/serialization/DSFIDNotFoundException.java
@@ -13,10 +13,12 @@
  * the License.
  */
 
-package org.apache.geode.internal;
+package org.apache.geode.internal.serialization;
 
 import java.io.NotSerializableException;
 
+import org.apache.geode.internal.Version;
+
 /**
  * Exception to indicate that a specified DSFID type could not be found (e.g. due to class being
  * absent in lower product versions).
diff --git a/geode-core/src/main/java/org/apache/geode/internal/serialization/DSFIDSerializer.java b/geode-core/src/main/java/org/apache/geode/internal/serialization/DSFIDSerializer.java
index afae242..37cd5a7 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/serialization/DSFIDSerializer.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/serialization/DSFIDSerializer.java
@@ -28,7 +28,6 @@ import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 import org.apache.logging.log4j.Logger;
 
 import org.apache.geode.CancelException;
-import org.apache.geode.DataSerializable;
 import org.apache.geode.GemFireRethrowable;
 import org.apache.geode.InternalGemFireError;
 import org.apache.geode.SerializationException;
@@ -37,10 +36,11 @@ import org.apache.geode.ToDataException;
 import org.apache.geode.annotations.Immutable;
 import org.apache.geode.cache.CacheClosedException;
 import org.apache.geode.internal.InternalDataSerializer;
+import org.apache.geode.internal.Version;
 import org.apache.geode.internal.logging.LogService;
 import org.apache.geode.internal.logging.log4j.LogMarker;
 
-public class BasicDSFIDSerializer {
+public class DSFIDSerializer {
   private static final Logger logger = LogService.getLogger();
 
   @Immutable
@@ -77,7 +77,9 @@ public class BasicDSFIDSerializer {
   public void writeDSFID(DataSerializableFixedID o, int dsfid, DataOutput out)
       throws IOException {
     if (dsfid == NO_FIXED_ID) {
-      throw new IllegalArgumentException("NO_FIXED_ID is not supported by BasicDSFIDSerializer - use InternalDataSerializer instead: " + o.getClass().getName());
+      throw new IllegalArgumentException(
+          "NO_FIXED_ID is not supported by BasicDSFIDSerializer - use InternalDataSerializer instead: "
+              + o.getClass().getName());
     }
     writeDSFIDHeader(dsfid, out);
     try {
@@ -117,7 +119,8 @@ public class BasicDSFIDSerializer {
   public void invokeToData(Object ds, DataOutput out) throws IOException {
     boolean isDSFID = ds instanceof DataSerializableFixedID;
     if (!isDSFID) {
-      throw new IllegalArgumentException("Expected a DataSerializableFixedID but found " + ds.getClass().getName());
+      throw new IllegalArgumentException(
+          "Expected a DataSerializableFixedID but found " + ds.getClass().getName());
     }
     try {
       boolean invoked = false;
@@ -125,11 +128,8 @@ public class BasicDSFIDSerializer {
 
       if (Version.CURRENT != v && v != null) {
         // get versions where DataOutput was upgraded
-        Version[] versions = null;
-        if (ds instanceof SerializationVersions) {
-          SerializationVersions sv = (SerializationVersions) ds;
-          versions = sv.getSerializationVersions();
-        }
+        SerializationVersions sv = (SerializationVersions) ds;
+        Version[] versions = sv.getSerializationVersions();
         // check if the version of the peer or diskstore is different and
         // there has been a change in the message
         if (versions != null) {
@@ -170,21 +170,24 @@ public class BasicDSFIDSerializer {
       // is still usable:
       SystemFailure.checkFailure();
       throw new ToDataException(
-          "toData failed on DataSerializableFixedID " + null == ds ? "null" : ds.getClass().toString(), t);
+          "toData failed on DataSerializableFixedID " + null == ds ? "null"
+              : ds.getClass().toString(),
+          t);
     }
   }
 
   /**
-   * Get the {@link Version} of the peer or disk store that created this {@link DataOutput}. Returns
-   * null if the version is same as this member's.
+   * Get the {@link Version} ordinal of the peer or disk store that created this {@link DataOutput}.
+   * Returns
+   * zero if the version is same as this member's.
    */
-  public Version getVersionForDataStreamOrNull(DataOutput out) {
+  public short getVersionForDataStreamOrZero(DataOutput out) {
     // check if this is a versioned data output
     if (out instanceof VersionedDataStream) {
-      return ((VersionedDataStream) out).getVersion();
+      return ((VersionedDataStream) out).getVersionOrdinal();
     } else {
       // assume latest version
-      return null;
+      return 0;
     }
   }
 
@@ -200,7 +203,8 @@ public class BasicDSFIDSerializer {
       case DS_FIXED_ID_SHORT:
         return create(in.readShort(), in);
       case DS_NO_FIXED_ID:
-        throw new IllegalStateException("DS_NO_FIXED_ID is not supported in readDSFID - use InternalDataSerializer instead");
+        throw new IllegalStateException(
+            "DS_NO_FIXED_ID is not supported in readDSFID - use InternalDataSerializer instead");
       case DS_FIXED_ID_INT:
         return create(in.readInt(), in);
       default:
diff --git a/geode-core/src/main/java/org/apache/geode/internal/serialization/DataSerializableFixedID.java b/geode-core/src/main/java/org/apache/geode/internal/serialization/DataSerializableFixedID.java
index 8536013..8f2b2bd 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/serialization/DataSerializableFixedID.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/serialization/DataSerializableFixedID.java
@@ -12,14 +12,13 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.apache.geode.internal;
+package org.apache.geode.internal.serialization;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.geode.DataSerializer;
-import org.apache.geode.Instantiator;
+import org.apache.geode.internal.Version;
 
 /**
  * An interface that implements data serialization for internal GemFire product classes that have a
@@ -30,8 +29,7 @@ import org.apache.geode.Instantiator;
  * Implementors MUST have a public zero-arg constructor.
  *
  * <p>
- * Note that this class is for internal use only. Customer classes that want to do something
- * similar should implement a subclass of {@link DataSerializer} or {@link Instantiator}.
+ * Note that this class is for internal use only.
  *
  * <p>
  * To add a new DataSerializableFixedID do this following:
@@ -42,19 +40,12 @@ import org.apache.geode.Instantiator;
  * should use {@link #NO_FIXED_ID}. In this case you can skip steps 3 and 4.
  * <li>Define a method in the class that implements <code>DataSerializableFixedID</code> named
  * {@link #getDSFID} that returns the constant from step 1.
- * <li>Define a private static method in {@link DSFIDFactory} that returns an instance of the class
- * from step 2 usually be calling its zero-arg constructor and then calling fromData(in). See the
- * end of {@link DSFIDFactory} for examples.
- * <li>Add a case statement in {@link DSFIDFactory#create} for the constant from step 1 that calls
- * the method from step 3.
+ * <li>Add registration of your class to DSFIDFactory's registration method.
  * <li>Implement {@link #toData} and {@link #fromData} just like you would on a
- * <code>DataSerializer</code>. Make sure you follow the javadocs for these methods to add support
+ * DataSerializable class. Make sure you follow the javadocs for these methods to add support
  * for rolling upgrades.
  * </ol>
  *
- * @see DataSerializer
- *
- * @since GemFire 5.7
  */
 public interface DataSerializableFixedID extends SerializationVersions {
 
@@ -845,10 +836,11 @@ public interface DataSerializableFixedID extends SerializationVersions {
    * Writes the state of this object as primitive data to the given <code>DataOutput</code>.<br>
    * <br>
    * Note: For rolling upgrades, if there is a change in the object format from previous version,
-   * add a new toDataPre_GFE_X_X_X_X() method and add an entry for the current {@link Version} in
-   * the getSerializationVersions array of the implementing class. e.g. if msg format changed in
-   * version 80, create toDataPre_GFE_8_0_0_0, add Version.GFE_80 to the getSerializationVersions
-   * array and copy previous toData contents to this newly created toDataPre_GFE_X_X_X_X() method.
+   * add a new toDataPre_GFE_X_X_X_X() method and add an entry for the current {@link
+   * Version} in the getSerializationVersions array of the
+   * implementing class. e.g. if msg format changed in version 80, create toDataPre_GFE_8_0_0_0, add
+   * Version.GFE_80 to the getSerializationVersions array and copy previous toData contents to this
+   * newly created toDataPre_GFE_X_X_X_X() method.
    *
    * @throws IOException A problem occurs while writing to <code>out</code>
    */
@@ -858,16 +850,14 @@ public interface DataSerializableFixedID extends SerializationVersions {
    * Reads the state of this object as primitive data from the given <code>DataInput</code>. <br>
    * <br>
    * Note: For rolling upgrades, if there is a change in the object format from previous version,
-   * add a new fromDataPre_GFE_X_X_X_X() method and add an entry for the current {@link Version} in
-   * the getSerializationVersions array of the implementing class. e.g. if msg format changed in
-   * version 80, create fromDataPre_GFE_8_0_0_0, add Version.GFE_80 to the getSerializationVersions
-   * array and copy previous fromData contents to this newly created fromDataPre_GFE_X_X_X_X()
-   * method.
+   * add a new fromDataPre_GFE_X_X_X_X() method and add an entry for the current {@link
+   * Version} in the getSerializationVersions array of the
+   * implementing class. e.g. if msg format changed in version 80, create fromDataPre_GFE_8_0_0_0,
+   * add Version.GFE_80 to the getSerializationVersions array and copy previous fromData contents to
+   * this newly created fromDataPre_GFE_X_X_X_X() method.
    *
    * @throws IOException A problem occurs while reading from <code>in</code>
    * @throws ClassNotFoundException A class could not be loaded while reading from <code>in</code>
    */
   void fromData(DataInput in) throws IOException, ClassNotFoundException;
-
-
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/serialization/DscodeHelper.java b/geode-core/src/main/java/org/apache/geode/internal/serialization/DscodeHelper.java
index dd592e8..6d2db1a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/serialization/DscodeHelper.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/serialization/DscodeHelper.java
@@ -12,13 +12,12 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.apache.geode.internal.util;
+package org.apache.geode.internal.serialization;
 
 import java.io.IOException;
 import java.util.Arrays;
 
 import org.apache.geode.annotations.Immutable;
-import org.apache.geode.internal.serialization.DSCODE;
 
 public class DscodeHelper {
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/serialization/SerializationVersions.java b/geode-core/src/main/java/org/apache/geode/internal/serialization/SerializationVersions.java
index 4a3f898..1d9d2d3 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/serialization/SerializationVersions.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/serialization/SerializationVersions.java
@@ -12,9 +12,9 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.apache.geode.internal;
+package org.apache.geode.internal.serialization;
 
-import org.apache.geode.internal.serialization.Version;
+import org.apache.geode.internal.Version;
 
 /**
  * This interface is extended by DataSerializableFixedID and VersionedDataSerializable in order to
diff --git a/geode-core/src/main/java/org/apache/geode/internal/serialization/VersionedDataInputStream.java b/geode-core/src/main/java/org/apache/geode/internal/serialization/VersionedDataInputStream.java
index a9a5c9d..ff0fc2f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/serialization/VersionedDataInputStream.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/serialization/VersionedDataInputStream.java
@@ -13,12 +13,11 @@
  * the License.
  */
 
-package org.apache.geode.internal;
+package org.apache.geode.internal.serialization;
 
 import java.io.DataInputStream;
 import java.io.InputStream;
 
-import org.apache.geode.internal.serialization.Version;
 
 
 /**
@@ -29,7 +28,7 @@ import org.apache.geode.internal.serialization.Version;
  */
 public class VersionedDataInputStream extends DataInputStream implements VersionedDataStream {
 
-  private final Version version;
+  private final short version;
 
   /**
    * Creates a VersionedDataInputStream that uses the specified underlying InputStream.
@@ -37,7 +36,7 @@ public class VersionedDataInputStream extends DataInputStream implements Version
    * @param in the specified input stream
    * @param version the product version that serialized object on the given input stream
    */
-  public VersionedDataInputStream(InputStream in, Version version) {
+  public VersionedDataInputStream(InputStream in, short version) {
     super(in);
     this.version = version;
   }
@@ -46,7 +45,7 @@ public class VersionedDataInputStream extends DataInputStream implements Version
    * {@inheritDoc}
    */
   @Override
-  public Version getVersion() {
+  public short getVersionOrdinal() {
     return this.version;
   }
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/serialization/VersionedDataOutputStream.java b/geode-core/src/main/java/org/apache/geode/internal/serialization/VersionedDataOutputStream.java
index 1c1f185..ddbba6e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/serialization/VersionedDataOutputStream.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/serialization/VersionedDataOutputStream.java
@@ -13,12 +13,11 @@
  * the License.
  */
 
-package org.apache.geode.internal;
+package org.apache.geode.internal.serialization;
 
 import java.io.DataOutputStream;
 import java.io.OutputStream;
 
-import org.apache.geode.internal.serialization.Version;
 
 /**
  * An extension of {@link DataOutputStream} that implements {@link VersionedDataStream}.
@@ -27,7 +26,7 @@ import org.apache.geode.internal.serialization.Version;
  */
 public class VersionedDataOutputStream extends DataOutputStream implements VersionedDataStream {
 
-  private final Version version;
+  private final short version;
 
   /**
    * Creates a VersionedDataOutputStream that wraps the specified underlying OutputStream.
@@ -35,7 +34,7 @@ public class VersionedDataOutputStream extends DataOutputStream implements Versi
    * @param out the underlying output stream
    * @param version the product version that serialized object on the given {@link OutputStream}
    */
-  public VersionedDataOutputStream(OutputStream out, Version version) {
+  public VersionedDataOutputStream(OutputStream out, short version) {
     super(out);
     this.version = version;
   }
@@ -44,7 +43,7 @@ public class VersionedDataOutputStream extends DataOutputStream implements Versi
    * {@inheritDoc}
    */
   @Override
-  public Version getVersion() {
+  public short getVersionOrdinal() {
     return this.version;
   }
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/serialization/VersionedDataStream.java b/geode-core/src/main/java/org/apache/geode/internal/serialization/VersionedDataStream.java
index d68bc84..d7f7b7a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/serialization/VersionedDataStream.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/serialization/VersionedDataStream.java
@@ -13,14 +13,14 @@
  * the License.
  */
 
-package org.apache.geode.internal;
+package org.apache.geode.internal.serialization;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 
 import org.apache.geode.DataSerializable;
-import org.apache.geode.internal.serialization.DataSerializableFixedID;
-import org.apache.geode.internal.serialization.Version;
+import org.apache.geode.internal.InternalDataSerializer;
+import org.apache.geode.internal.Version;
 
 /**
  * An extension to {@link DataOutput}, {@link DataInput} used internally in product to indicate that
@@ -37,9 +37,10 @@ public interface VersionedDataStream {
 
   /**
    * If the remote peer to which this input/output is connected has a lower version that this
-   * member, then this returns the {@link Version} of the peer else null. If the peer has a higher
+   * member, then this returns the {@link Version} ordinal of the peer else 0. If the peer has a
+   * higher
    * {@link Version}, then this member cannot do any adjustment to serialization and its the remote
    * peer's responsibility to adjust the serialization/deserialization according to this peer.
    */
-  Version getVersion();
+  short getVersionOrdinal();
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgDestreamer.java b/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgDestreamer.java
index 2a1db17..814ce1f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgDestreamer.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgDestreamer.java
@@ -30,7 +30,7 @@ import org.apache.geode.distributed.internal.InternalDistributedSystem;
 import org.apache.geode.distributed.internal.ReplyProcessor21;
 import org.apache.geode.internal.InternalDataSerializer;
 import org.apache.geode.internal.Version;
-import org.apache.geode.internal.VersionedDataInputStream;
+import org.apache.geode.internal.serialization.VersionedDataInputStream;
 
 /**
  * <p>
@@ -239,7 +239,8 @@ public class MsgDestreamer {
           ReplyProcessor21.initMessageRPId();
           final Version v = version;
           DataInputStream dis =
-              v == null ? new DataInputStream(this.is) : new VersionedDataInputStream(this.is, v);
+              v == null ? new DataInputStream(this.is)
+                  : new VersionedDataInputStream(this.is, v.ordinal());
           long startSer = this.stats.startMsgDeserialization();
           setResult((DistributionMessage) InternalDataSerializer.readDSFID(dis));
           this.stats.endMsgDeserialization(startSer);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/tcp/VersionedByteBufferInputStream.java b/geode-core/src/main/java/org/apache/geode/internal/tcp/VersionedByteBufferInputStream.java
index 6a5a196..0945afe 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/tcp/VersionedByteBufferInputStream.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/tcp/VersionedByteBufferInputStream.java
@@ -18,7 +18,7 @@ package org.apache.geode.internal.tcp;
 import java.nio.ByteBuffer;
 
 import org.apache.geode.internal.Version;
-import org.apache.geode.internal.VersionedDataStream;
+import org.apache.geode.internal.serialization.VersionedDataStream;
 
 /**
  * An extension to {@link ByteBufferInputStream} that implements {@link VersionedDataStream} for a
@@ -57,8 +57,11 @@ public class VersionedByteBufferInputStream extends ByteBufferInputStream
    * {@inheritDoc}
    */
   @Override
-  public Version getVersion() {
-    return this.version;
+  public short getVersionOrdinal() {
+    if (version == null) {
+      return Version.CURRENT_ORDINAL;
+    }
+    return this.version.ordinal();
   }
 
   /**
diff --git a/geode-core/src/main/java/org/apache/geode/internal/tcp/VersionedMsgStreamer.java b/geode-core/src/main/java/org/apache/geode/internal/tcp/VersionedMsgStreamer.java
index 72b68f1..9eed78c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/tcp/VersionedMsgStreamer.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/tcp/VersionedMsgStreamer.java
@@ -20,8 +20,8 @@ import java.util.List;
 import org.apache.geode.distributed.internal.DMStats;
 import org.apache.geode.distributed.internal.DistributionMessage;
 import org.apache.geode.internal.Version;
-import org.apache.geode.internal.VersionedDataStream;
 import org.apache.geode.internal.net.BufferPool;
+import org.apache.geode.internal.serialization.VersionedDataStream;
 
 /**
  * An extension of {@link MsgStreamer} that implements {@link VersionedDataStream}.
@@ -42,8 +42,11 @@ class VersionedMsgStreamer extends MsgStreamer implements VersionedDataStream {
    * {@inheritDoc}
    */
   @Override
-  public Version getVersion() {
-    return this.version;
+  public short getVersionOrdinal() {
+    if (version == null) {
+      return Version.CURRENT_ORDINAL;
+    }
+    return this.version.ordinal();
   }
 
   /**
diff --git a/geode-core/src/main/java/org/apache/geode/internal/util/BlobHelper.java b/geode-core/src/main/java/org/apache/geode/internal/util/BlobHelper.java
index 8f7ae40..f045151 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/util/BlobHelper.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/util/BlobHelper.java
@@ -19,12 +19,12 @@ import java.io.IOException;
 import org.apache.geode.DataSerializer;
 import org.apache.geode.distributed.internal.DMStats;
 import org.apache.geode.distributed.internal.InternalDistributedSystem;
-import org.apache.geode.internal.ByteArrayDataInput;
-import org.apache.geode.internal.DSCODE;
 import org.apache.geode.internal.HeapDataOutputStream;
 import org.apache.geode.internal.Version;
 import org.apache.geode.internal.offheap.StoredObject;
 import org.apache.geode.internal.offheap.annotations.Unretained;
+import org.apache.geode.internal.serialization.ByteArrayDataInput;
+import org.apache.geode.internal.serialization.DSCODE;
 import org.apache.geode.pdx.internal.PdxInputStream;
 
 /**
@@ -95,7 +95,7 @@ public class BlobHelper {
       if (in == null) {
         in = new ByteArrayDataInput();
       }
-      in.initialize(blob, version);
+      in.initialize(blob, version == null ? 0 : version.ordinal());
       result = DataSerializer.readObject(in);
     }
     endDeserialization(start, blob.length);
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/FederationComponent.java b/geode-core/src/main/java/org/apache/geode/management/internal/FederationComponent.java
index e49491e..32baef8 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/FederationComponent.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/FederationComponent.java
@@ -27,9 +27,9 @@ import org.apache.logging.log4j.Logger;
 
 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.logging.LogService;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
 
 /**
  * Central component for federation It consists of an Object State as well as some meta data for the
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/JmxManagerLocatorRequest.java b/geode-core/src/main/java/org/apache/geode/management/internal/JmxManagerLocatorRequest.java
index cf8e502..d7ef63e 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/JmxManagerLocatorRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/JmxManagerLocatorRequest.java
@@ -24,12 +24,12 @@ import java.util.Properties;
 import org.apache.geode.annotations.Immutable;
 import org.apache.geode.distributed.internal.tcpserver.LocatorCancelException;
 import org.apache.geode.distributed.internal.tcpserver.TcpClient;
-import org.apache.geode.internal.DataSerializableFixedID;
 import org.apache.geode.internal.Version;
 import org.apache.geode.internal.admin.SSLConfig;
 import org.apache.geode.internal.net.SSLConfigurationFactory;
 import org.apache.geode.internal.net.SocketCreator;
 import org.apache.geode.internal.security.SecurableCommunicationChannel;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
 
 /**
  * Sent to a locator to request it to find (and possibly start) a jmx manager for us. It returns a
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/JmxManagerLocatorResponse.java b/geode-core/src/main/java/org/apache/geode/management/internal/JmxManagerLocatorResponse.java
index ebb8d9a..1e35b8a 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/JmxManagerLocatorResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/JmxManagerLocatorResponse.java
@@ -21,8 +21,8 @@ import java.net.InetAddress;
 import java.net.UnknownHostException;
 
 import org.apache.geode.DataSerializer;
-import org.apache.geode.internal.DataSerializableFixedID;
 import org.apache.geode.internal.Version;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
 
 /**
  * Sent to a locator to request it to find (and possibly start) a jmx manager for us. It returns a
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ConnectCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ConnectCommand.java
index a2ac1d5..c84e0fb 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ConnectCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ConnectCommand.java
@@ -38,7 +38,6 @@ import org.springframework.shell.core.annotation.CliCommand;
 import org.springframework.shell.core.annotation.CliOption;
 
 import org.apache.geode.annotations.Immutable;
-import org.apache.geode.internal.DSFIDFactory;
 import org.apache.geode.internal.admin.SSLConfig;
 import org.apache.geode.internal.net.SSLConfigurationFactory;
 import org.apache.geode.internal.security.SecurableCommunicationChannel;
@@ -391,11 +390,6 @@ public class ConnectCommand extends OfflineGfshCommand {
 
   public static ConnectToLocatorResult connectToLocator(String host, int port, int timeout,
       Properties props) throws IOException, ClassNotFoundException {
-    // 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();
-
     JmxManagerLocatorResponse locatorResponse =
         JmxManagerLocatorRequest.send(host, port, timeout, props);
 
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CliFunctionResult.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CliFunctionResult.java
index 424ffc4..a41f490 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CliFunctionResult.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CliFunctionResult.java
@@ -24,8 +24,8 @@ import java.util.Collections;
 import java.util.List;
 
 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.management.internal.configuration.domain.XmlEntity;
 
 public class CliFunctionResult implements Comparable<CliFunctionResult>, DataSerializableFixedID {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/messages/ConfigurationResponse.java b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/messages/ConfigurationResponse.java
index 1ea801e..5bc0b76 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/messages/ConfigurationResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/messages/ConfigurationResponse.java
@@ -33,8 +33,8 @@ import org.xml.sax.SAXException;
 import org.apache.geode.DataSerializer;
 import org.apache.geode.InternalGemFireError;
 import org.apache.geode.distributed.DistributedMember;
-import org.apache.geode.internal.DataSerializableFixedID;
 import org.apache.geode.internal.Version;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
 import org.apache.geode.management.internal.configuration.domain.Configuration;
 import org.apache.geode.management.internal.configuration.utils.XmlUtils;
 
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/FieldType.java b/geode-core/src/main/java/org/apache/geode/pdx/FieldType.java
index 5c56c86..98fb53c 100644
--- a/geode-core/src/main/java/org/apache/geode/pdx/FieldType.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/FieldType.java
@@ -17,8 +17,8 @@ package org.apache.geode.pdx;
 import java.nio.ByteBuffer;
 import java.util.Date;
 
-import org.apache.geode.internal.DSCODE;
 import org.apache.geode.internal.InternalDataSerializer;
+import org.apache.geode.internal.serialization.DSCODE;
 import org.apache.geode.pdx.internal.DataSize;
 
 /**
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/internal/EnumId.java b/geode-core/src/main/java/org/apache/geode/pdx/internal/EnumId.java
index 62cd2e2..190299e 100644
--- a/geode-core/src/main/java/org/apache/geode/pdx/internal/EnumId.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/internal/EnumId.java
@@ -18,8 +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.Version;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
 
 public class EnumId implements DataSerializableFixedID {
 
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/internal/EnumInfo.java b/geode-core/src/main/java/org/apache/geode/pdx/internal/EnumInfo.java
index b75d005..bb4fde7 100644
--- a/geode-core/src/main/java/org/apache/geode/pdx/internal/EnumInfo.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/internal/EnumInfo.java
@@ -25,10 +25,10 @@ import java.util.List;
 
 import org.apache.geode.DataSerializer;
 import org.apache.geode.annotations.Immutable;
-import org.apache.geode.internal.DataSerializableFixedID;
 import org.apache.geode.internal.HeapDataOutputStream;
 import org.apache.geode.internal.InternalDataSerializer;
 import org.apache.geode.internal.Version;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
 import org.apache.geode.pdx.PdxInstance;
 import org.apache.geode.pdx.PdxSerializationException;
 import org.apache.geode.pdx.WritablePdxInstance;
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxInstanceEnum.java b/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxInstanceEnum.java
index d166539..8c269e5 100644
--- a/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxInstanceEnum.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxInstanceEnum.java
@@ -22,10 +22,10 @@ import java.util.List;
 
 import org.apache.geode.DataSerializer;
 import org.apache.geode.annotations.Immutable;
-import org.apache.geode.internal.DSCODE;
 import org.apache.geode.internal.HeapDataOutputStream;
 import org.apache.geode.internal.InternalDataSerializer;
 import org.apache.geode.internal.Version;
+import org.apache.geode.internal.serialization.DSCODE;
 import org.apache.geode.pdx.PdxSerializationException;
 import org.apache.geode.pdx.WritablePdxInstance;
 
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxInstanceImpl.java b/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxInstanceImpl.java
index 2a76272..24f07c7 100644
--- a/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxInstanceImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxInstanceImpl.java
@@ -34,10 +34,10 @@ import org.apache.geode.InternalGemFireException;
 import org.apache.geode.annotations.Immutable;
 import org.apache.geode.distributed.internal.DMStats;
 import org.apache.geode.internal.ClassPathLoader;
-import org.apache.geode.internal.DSCODE;
 import org.apache.geode.internal.InternalDataSerializer;
 import org.apache.geode.internal.cache.GemFireCacheImpl;
 import org.apache.geode.internal.cache.InternalCache;
+import org.apache.geode.internal.serialization.DSCODE;
 import org.apache.geode.internal.tcp.ByteBufferInputStream;
 import org.apache.geode.internal.tcp.ByteBufferInputStream.ByteSource;
 import org.apache.geode.internal.tcp.ByteBufferInputStream.ByteSourceFactory;
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxReaderImpl.java b/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxReaderImpl.java
index 5ee2fa3..b4b7196 100644
--- a/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxReaderImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxReaderImpl.java
@@ -22,10 +22,10 @@ import java.util.Date;
 
 import org.apache.geode.InternalGemFireException;
 import org.apache.geode.annotations.internal.MutableForTesting;
-import org.apache.geode.internal.DSCODE;
 import org.apache.geode.internal.InternalDataSerializer;
 import org.apache.geode.internal.cache.GemFireCacheImpl;
 import org.apache.geode.internal.cache.InternalCache;
+import org.apache.geode.internal.serialization.DSCODE;
 import org.apache.geode.internal.tcp.ByteBufferInputStream;
 import org.apache.geode.internal.tcp.ByteBufferInputStream.ByteSource;
 import org.apache.geode.pdx.FieldType;
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxString.java b/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxString.java
index 9f3a636..d9baacd 100644
--- a/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxString.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxString.java
@@ -21,8 +21,8 @@ import java.io.IOException;
 import java.nio.ByteBuffer;
 
 import org.apache.geode.DataSerializer;
-import org.apache.geode.internal.DSCODE;
 import org.apache.geode.internal.Sendable;
+import org.apache.geode.internal.serialization.DSCODE;
 import org.apache.geode.internal.tcp.ByteBufferInputStream;
 
 /**
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxWriterImpl.java b/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxWriterImpl.java
index ea74414..1b36e6b 100644
--- a/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxWriterImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxWriterImpl.java
@@ -21,10 +21,10 @@ import java.util.Date;
 
 import org.apache.geode.InternalGemFireException;
 import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.internal.DSCODE;
 import org.apache.geode.internal.HeapDataOutputStream;
 import org.apache.geode.internal.InternalDataSerializer;
 import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.serialization.DSCODE;
 import org.apache.geode.internal.tcp.ByteBufferInputStream.ByteSource;
 import org.apache.geode.pdx.FieldType;
 import org.apache.geode.pdx.PdxFieldAlreadyExistsException;
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/internal/json/PdxToJSON.java b/geode-core/src/main/java/org/apache/geode/pdx/internal/json/PdxToJSON.java
index 9ad21a8..54f5c71 100644
--- a/geode-core/src/main/java/org/apache/geode/pdx/internal/json/PdxToJSON.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/internal/json/PdxToJSON.java
@@ -30,6 +30,7 @@ import com.fasterxml.jackson.core.JsonGenerator.Feature;
 
 import org.apache.geode.annotations.internal.MutableForTesting;
 import org.apache.geode.internal.HeapDataOutputStream;
+import org.apache.geode.internal.Version;
 import org.apache.geode.pdx.JSONFormatter;
 import org.apache.geode.pdx.PdxInstance;
 import org.apache.geode.pdx.internal.EnumInfo;
@@ -51,7 +52,7 @@ public class PdxToJSON {
 
   public String getJSON() {
     JsonFactory jf = new JsonFactory();
-    HeapDataOutputStream hdos = new HeapDataOutputStream(org.apache.geode.internal.Version.CURRENT);
+    HeapDataOutputStream hdos = new HeapDataOutputStream(Version.CURRENT);
     try {
       JsonGenerator jg = jf.createJsonGenerator(hdos, JsonEncoding.UTF8);
       enableDisableJSONGeneratorFeature(jg);
@@ -67,7 +68,7 @@ public class PdxToJSON {
 
   public byte[] getJSONByteArray() {
     JsonFactory jf = new JsonFactory();
-    HeapDataOutputStream hdos = new HeapDataOutputStream(org.apache.geode.internal.Version.CURRENT);
+    HeapDataOutputStream hdos = new HeapDataOutputStream(Version.CURRENT);
     try {
       JsonGenerator jg = jf.createJsonGenerator(hdos, JsonEncoding.UTF8);
       enableDisableJSONGeneratorFeature(jg);
diff --git a/geode-core/src/test/java/org/apache/geode/DataSerializerTest.java b/geode-core/src/test/java/org/apache/geode/DataSerializerTest.java
index eaa085d..823ee30 100644
--- a/geode-core/src/test/java/org/apache/geode/DataSerializerTest.java
+++ b/geode-core/src/test/java/org/apache/geode/DataSerializerTest.java
@@ -25,9 +25,9 @@ import java.io.IOException;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import org.apache.geode.internal.ByteArrayDataInput;
 import org.apache.geode.internal.cache.EventID;
 import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
+import org.apache.geode.internal.serialization.ByteArrayDataInput;
 import org.apache.geode.internal.util.BlobHelper;
 import org.apache.geode.test.junit.categories.SerializationTest;
 
@@ -57,9 +57,9 @@ public class DataSerializerTest {
   public void readStringShouldReturnCanonicalEmptyString() throws IOException {
     byte[] serializedEmptyStringBytes = BlobHelper.serializeToBlob("");
     ByteArrayDataInput dataInput1 = new ByteArrayDataInput();
-    dataInput1.initialize(serializedEmptyStringBytes, null);
+    dataInput1.initialize(serializedEmptyStringBytes, 0);
     ByteArrayDataInput dataInput2 = new ByteArrayDataInput();
-    dataInput2.initialize(serializedEmptyStringBytes, null);
+    dataInput2.initialize(serializedEmptyStringBytes, 0);
 
     String firstRead = DataSerializer.readString(dataInput1);
     String secondRead = DataSerializer.readString(dataInput2);
diff --git a/geode-core/src/test/java/org/apache/geode/cache/execute/FunctionAdapterJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/execute/FunctionAdapterJUnitTest.java
index f792a6b..734c9e9 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/execute/FunctionAdapterJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/execute/FunctionAdapterJUnitTest.java
@@ -28,7 +28,7 @@ import org.junit.Test;
 
 import org.apache.geode.internal.InternalDataSerializer;
 import org.apache.geode.internal.Version;
-import org.apache.geode.internal.VersionedDataInputStream;
+import org.apache.geode.internal.serialization.VersionedDataInputStream;
 
 public class FunctionAdapterJUnitTest {
 
@@ -76,7 +76,8 @@ public class FunctionAdapterJUnitTest {
             createTempFileFromResource(getClass(), getClass().getSimpleName() + "."
                 + "serializedFunctionAdapterWithDifferentSerialVersionUID.ser").getAbsolutePath());
 
-    DataInputStream dis = new VersionedDataInputStream(new DataInputStream(fis), Version.GFE_82);
+    DataInputStream dis =
+        new VersionedDataInputStream(new DataInputStream(fis), Version.GFE_82.ordinal());
     Object o = InternalDataSerializer.basicReadObject(dis);
     assertTrue(o instanceof FunctionAdapter);
   }
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/MembershipDependenciesJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/MembershipDependenciesJUnitTest.java
index 28f636c..c7bdd8a 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/MembershipDependenciesJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/MembershipDependenciesJUnitTest.java
@@ -42,12 +42,10 @@ import org.apache.geode.distributed.internal.OverflowQueueWithDMStats;
 import org.apache.geode.distributed.internal.tcpserver.TcpClient;
 import org.apache.geode.internal.ClassPathLoader;
 import org.apache.geode.internal.ConnectionWatcher;
-import org.apache.geode.internal.DataSerializableFixedID;
 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.VersionedObjectInput;
 import org.apache.geode.internal.admin.remote.DistributionLocatorId;
 import org.apache.geode.internal.admin.remote.RemoteTransportConfig;
@@ -59,6 +57,8 @@ 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.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.VersionedDataInputStream;
 import org.apache.geode.internal.tcp.ConnectExceptions;
 import org.apache.geode.internal.util.Breadcrumbs;
 import org.apache.geode.internal.util.JavaWorkarounds;
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/GMSMemberJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/GMSMemberJUnitTest.java
index b22d90d..29f7dac 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/GMSMemberJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/GMSMemberJUnitTest.java
@@ -36,7 +36,7 @@ import org.junit.experimental.categories.Category;
 
 import org.apache.geode.internal.HeapDataOutputStream;
 import org.apache.geode.internal.Version;
-import org.apache.geode.internal.VersionedDataInputStream;
+import org.apache.geode.internal.serialization.VersionedDataInputStream;
 import org.apache.geode.test.junit.categories.SecurityTest;
 
 @Category({SecurityTest.class})
@@ -202,7 +202,7 @@ public class GMSMemberJUnitTest {
     dataOutput = new HeapDataOutputStream(Version.GFE_90);
     member.writeEssentialData(dataOutput);
     bais = new ByteArrayInputStream(baos.toByteArray());
-    dataInput = new VersionedDataInputStream(new DataInputStream(bais), Version.GFE_90);
+    dataInput = new VersionedDataInputStream(new DataInputStream(bais), Version.GFE_90.ordinal());
     newMember = new GMSMember();
     newMember.readEssentialData(dataInput);
     assertEquals(0, newMember.getVmKind());
diff --git a/geode-core/src/test/java/org/apache/geode/internal/ByteArrayDataInputTest.java b/geode-core/src/test/java/org/apache/geode/internal/ByteArrayDataInputTest.java
index 8e8c56b..015f949 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/ByteArrayDataInputTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/ByteArrayDataInputTest.java
@@ -23,6 +23,8 @@ import java.io.IOException;
 
 import org.junit.Test;
 
+import org.apache.geode.internal.serialization.ByteArrayDataInput;
+
 public class ByteArrayDataInputTest {
   @Test
   public void readFullyThatReadsPastEndOfDataThrowsEOFException() throws IOException {
@@ -237,7 +239,7 @@ public class ByteArrayDataInputTest {
       return new java.io.DataInputStream(new java.io.ByteArrayInputStream(inputBytes));
     } else {
       ByteArrayDataInput input = new ByteArrayDataInput();
-      input.initialize(inputBytes, null);
+      input.initialize(inputBytes, 0);
       return input;
     }
   }
diff --git a/geode-core/src/test/java/org/apache/geode/internal/DataSerializableJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/DataSerializableJUnitTest.java
index 0df787e..bb53fe4 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/DataSerializableJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/DataSerializableJUnitTest.java
@@ -68,6 +68,8 @@ import org.apache.geode.DataSerializable;
 import org.apache.geode.DataSerializer;
 import org.apache.geode.Instantiator;
 import org.apache.geode.SystemFailure;
+import org.apache.geode.internal.serialization.VersionedDataInputStream;
+import org.apache.geode.internal.serialization.VersionedDataOutputStream;
 import org.apache.geode.internal.statistics.StatArchiveWriter;
 import org.apache.geode.internal.tcp.ByteBufferInputStream;
 import org.apache.geode.test.junit.categories.SerializationTest;
@@ -1162,13 +1164,14 @@ public class DataSerializableJUnitTest implements Serializable {
   public void testVersionedDataSerializable() throws Exception {
     VersionedDataSerializableImpl ds = new VersionedDataSerializableImpl(getRandom());
 
-    VersionedDataOutputStream v = new VersionedDataOutputStream(this.baos, Version.GFE_70);
+    VersionedDataOutputStream v =
+        new VersionedDataOutputStream(this.baos, Version.GFE_70.ordinal());
     DataSerializer.writeObject(ds, v);
     v.flush();
 
     ByteBuffer bb = ByteBuffer.wrap(this.baos.toByteArray());
     ByteBufferInputStream bbis = new ByteBufferInputStream(bb);
-    VersionedDataInputStream vin = new VersionedDataInputStream(bbis, Version.GFE_70);
+    VersionedDataInputStream vin = new VersionedDataInputStream(bbis, Version.GFE_70.ordinal());
     VersionedDataSerializableImpl ds2 =
         (VersionedDataSerializableImpl) DataSerializer.readObject(vin);
 
diff --git a/geode-core/src/test/java/org/apache/geode/internal/HeapDataOutputStreamJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/HeapDataOutputStreamJUnitTest.java
index 74ce53a..ce4e05a 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/HeapDataOutputStreamJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/HeapDataOutputStreamJUnitTest.java
@@ -12,7 +12,7 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.apache.geode.internal.serialization;
+package org.apache.geode.internal;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
@@ -28,8 +28,7 @@ import org.junit.experimental.categories.Category;
 
 import org.apache.geode.DataSerializer;
 import org.apache.geode.internal.cache.UnitTestValueHolder;
-import org.apache.geode.internal.serialization.HeapDataOutputStream;
-import org.apache.geode.internal.serialization.Version;
+import org.apache.geode.internal.serialization.BufferDataOutputStream;
 import org.apache.geode.pdx.internal.TypeRegistry;
 import org.apache.geode.test.junit.categories.SerializationTest;
 
@@ -112,7 +111,7 @@ public class HeapDataOutputStreamJUnitTest {
 
     out.write(0);
 
-    byte[] bytes = new byte[HeapDataOutputStream.MIN_TO_COPY + 1];
+    byte[] bytes = new byte[BufferDataOutputStream.MIN_TO_COPY + 1];
     for (int i = 0; i < bytes.length; i++) {
       bytes[i] = (byte) ((i + 1) % 128);
     }
diff --git a/geode-core/src/test/java/org/apache/geode/internal/HeapDataOutputStreamTest.java b/geode-core/src/test/java/org/apache/geode/internal/HeapDataOutputStreamTest.java
index 86f5604..fa3e96e 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/HeapDataOutputStreamTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/HeapDataOutputStreamTest.java
@@ -12,14 +12,15 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.apache.geode.internal.serialization;
+package org.apache.geode.internal;
 
-import static org.apache.geode.internal.serialization.HeapDataOutputStream.SMALLEST_CHUNK_SIZE;
+import static org.apache.geode.internal.HeapDataOutputStream.SMALLEST_CHUNK_SIZE;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.nio.ByteBuffer;
 
 import org.junit.Test;
@@ -33,9 +34,9 @@ public class HeapDataOutputStreamTest {
   @Test
   public void shouldBeMockable() throws Exception {
     HeapDataOutputStream mockHeapDataOutputStream = mock(HeapDataOutputStream.class);
-    Version mockVersion = mock(Version.class);
-    when(mockHeapDataOutputStream.getVersion()).thenReturn(mockVersion);
-    assertThat(mockHeapDataOutputStream.getVersion()).isEqualTo(mockVersion);
+    InputStream mockInputStream = mock(InputStream.class);
+    when(mockHeapDataOutputStream.getInputStream()).thenReturn(mockInputStream);
+    assertThat(mockHeapDataOutputStream.getInputStream()).isEqualTo(mockInputStream);
   }
 
   @Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/InternalDataSerializerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/InternalDataSerializerJUnitTest.java
index f787141..f9a48d1 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/InternalDataSerializerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/InternalDataSerializerJUnitTest.java
@@ -38,6 +38,7 @@ import org.apache.geode.InternalGemFireException;
 import org.apache.geode.cache.execute.Function;
 import org.apache.geode.cache.execute.FunctionContext;
 import org.apache.geode.examples.security.ExampleSecurityManager;
+import org.apache.geode.internal.serialization.DSCODE;
 import org.apache.geode.test.junit.categories.SerializationTest;
 
 /**
diff --git a/geode-core/src/test/java/org/apache/geode/internal/alerting/AlertListenerMessageFactoryTest.java b/geode-core/src/test/java/org/apache/geode/internal/alerting/AlertListenerMessageFactoryTest.java
index 92c2353..4c875b4 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/alerting/AlertListenerMessageFactoryTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/alerting/AlertListenerMessageFactoryTest.java
@@ -14,7 +14,7 @@
  */
 package org.apache.geode.internal.alerting;
 
-import static org.apache.geode.internal.DataSerializableFixedID.ALERT_LISTENER_MESSAGE;
+import static org.apache.geode.internal.serialization.DataSerializableFixedID.ALERT_LISTENER_MESSAGE;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.catchThrowable;
 import static org.mockito.Mockito.mock;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/FilterInfoTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/FilterInfoTest.java
index 40ad820..014f94d 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/FilterInfoTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/FilterInfoTest.java
@@ -23,10 +23,10 @@ import java.util.Set;
 
 import org.junit.Test;
 
-import org.apache.geode.internal.ByteArrayDataInput;
 import org.apache.geode.internal.HeapDataOutputStream;
 import org.apache.geode.internal.Version;
 import org.apache.geode.internal.cache.FilterRoutingInfo.FilterInfo;
+import org.apache.geode.internal.serialization.ByteArrayDataInput;
 
 /**
  * Unit test for FilterRoutingInfo.FilterInfo
@@ -52,7 +52,7 @@ public class FilterInfoTest {
     byte[] outputBytes = dataOut.toByteArray();
     FilterInfo deserialized = new FilterInfo();
     ByteArrayDataInput dataInput = new ByteArrayDataInput();
-    dataInput.initialize(outputBytes, Version.CURRENT);
+    dataInput.initialize(outputBytes, Version.CURRENT_ORDINAL);
     deserialized.fromData(dataInput);
     assertThat(deserialized.getCQs()).isEqualTo(cqs);
     assertThat(deserialized.getInterestedClients()).isEqualTo(clients);
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/EventIdOptimizationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/EventIdOptimizationJUnitTest.java
index e04feab..d185e9d 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/EventIdOptimizationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/EventIdOptimizationJUnitTest.java
@@ -26,9 +26,9 @@ import org.junit.experimental.categories.Category;
 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.VersionedDataInputStream;
-import org.apache.geode.internal.VersionedDataOutputStream;
 import org.apache.geode.internal.cache.EventID;
+import org.apache.geode.internal.serialization.VersionedDataInputStream;
+import org.apache.geode.internal.serialization.VersionedDataOutputStream;
 import org.apache.geode.test.junit.categories.ClientServerTest;
 
 /**
@@ -180,14 +180,15 @@ public class EventIdOptimizationJUnitTest {
 
 
     HeapDataOutputStream hdos90 = new HeapDataOutputStream(256, Version.GFE_90);
-    VersionedDataOutputStream dop = new VersionedDataOutputStream(hdos90, Version.GFE_90);
+    VersionedDataOutputStream dop = new VersionedDataOutputStream(hdos90, Version.GFE_90.ordinal());
 
     eventID.toData(dop);
 
     ByteArrayInputStream bais = new ByteArrayInputStream(hdos90.toByteArray());
 
 
-    VersionedDataInputStream dataInputStream = new VersionedDataInputStream(bais, Version.GFE_90);
+    VersionedDataInputStream dataInputStream =
+        new VersionedDataInputStream(bais, Version.GFE_90.ordinal());
 
     EventID eventID2 = new EventID();
     eventID2.fromData(dataInputStream);
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/AbstractStoredObjectTestBase.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/AbstractStoredObjectTestBase.java
index 6a867bc..bb50a92 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/AbstractStoredObjectTestBase.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/AbstractStoredObjectTestBase.java
@@ -25,7 +25,7 @@ import java.io.IOException;
 
 import org.junit.Test;
 
-import org.apache.geode.internal.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
 
 public abstract class AbstractStoredObjectTestBase {
 
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/DataTypeJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/DataTypeJUnitTest.java
index b0ee6be..ea9ef3c 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/DataTypeJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/DataTypeJUnitTest.java
@@ -14,7 +14,6 @@
  */
 package org.apache.geode.internal.offheap;
 
-import static org.apache.geode.internal.DSFIDFactory.registerDSFID;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -57,15 +56,14 @@ import org.apache.geode.DataSerializable;
 import org.apache.geode.DataSerializer;
 import org.apache.geode.Instantiator;
 import org.apache.geode.distributed.internal.ReplyMessage;
-import org.apache.geode.internal.DSCODE;
-import org.apache.geode.internal.DSFIDFactory;
-import org.apache.geode.internal.DataSerializableFixedID;
 import org.apache.geode.internal.DataSerializableJUnitTest.DataSerializableImpl;
 import org.apache.geode.internal.InternalDataSerializer;
 import org.apache.geode.internal.InternalInstantiator;
 import org.apache.geode.internal.Version;
 import org.apache.geode.internal.admin.remote.ShutdownAllResponse;
 import org.apache.geode.internal.cache.execute.data.CustId;
+import org.apache.geode.internal.serialization.DSCODE;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
 
 /**
  * Tests the DataType support for off-heap MemoryInspector.
@@ -95,7 +93,9 @@ public class DataTypeJUnitTest {
     byte[] bytes = baos.toByteArray();
     String type = DataType.getDataType(bytes);
     assertEquals(
-        "org.apache.geode.internal.DataSerializableFixedID:" + ReplyMessage.class.getName(), type);
+        "org.apache.geode.internal.serialization.DataSerializableFixedID:"
+            + ReplyMessage.class.getName(),
+        type);
   }
 
   @Test
@@ -107,19 +107,23 @@ public class DataTypeJUnitTest {
     byte[] bytes = baos.toByteArray();
     String type = DataType.getDataType(bytes);
     assertEquals(
-        "org.apache.geode.internal.DataSerializableFixedID:" + ShutdownAllResponse.class
-            .getName(),
+        "org.apache.geode.internal.serialization.DataSerializableFixedID:"
+            + ShutdownAllResponse.class
+                .getName(),
         type);
   }
 
   @Test
   public void testDataSerializableFixedIDInt() throws IOException, ClassNotFoundException {
     assertFalse(
-        DSFIDFactory.getDsfidmap2().containsKey(DummyIntDataSerializableFixedID.INT_SIZE_id));
-    registerDSFID(DummyIntDataSerializableFixedID.INT_SIZE_id,
+        InternalDataSerializer.getDSFIDSerializer().getDsfidmap2()
+            .containsKey(DummyIntDataSerializableFixedID.INT_SIZE_id));
+    InternalDataSerializer.getDSFIDSerializer().registerDSFID(
+        DummyIntDataSerializableFixedID.INT_SIZE_id,
         DummyIntDataSerializableFixedID.class);
     assertTrue(
-        DSFIDFactory.getDsfidmap2().containsKey(DummyIntDataSerializableFixedID.INT_SIZE_id));
+        InternalDataSerializer.getDSFIDSerializer().getDsfidmap2()
+            .containsKey(DummyIntDataSerializableFixedID.INT_SIZE_id));
 
     try {
       DummyIntDataSerializableFixedID dummyObj = new DummyIntDataSerializableFixedID();
@@ -130,13 +134,15 @@ public class DataTypeJUnitTest {
       byte[] bytes = baos.toByteArray();
 
       String type = DataType.getDataType(bytes);
-      assertEquals("org.apache.geode.internal.DataSerializableFixedID:"
+      assertEquals("org.apache.geode.internal.serialization.DataSerializableFixedID:"
           + DummyIntDataSerializableFixedID.class.getName(),
           type);
     } finally {
-      DSFIDFactory.getDsfidmap2().remove(DummyIntDataSerializableFixedID.INT_SIZE_id);
+      InternalDataSerializer.getDSFIDSerializer().getDsfidmap2()
+          .remove(DummyIntDataSerializableFixedID.INT_SIZE_id);
       assertFalse(
-          DSFIDFactory.getDsfidmap2().containsKey(DummyIntDataSerializableFixedID.INT_SIZE_id));
+          InternalDataSerializer.getDSFIDSerializer().getDsfidmap2()
+              .containsKey(DummyIntDataSerializableFixedID.INT_SIZE_id));
     }
   }
 
@@ -148,7 +154,8 @@ public class DataTypeJUnitTest {
     DataSerializer.writeClass(Integer.class, out);
     byte[] bytes = baos.toByteArray();
     String type = DataType.getDataType(bytes);
-    assertEquals("org.apache.geode.internal.DataSerializableFixedID:" + Integer.class.getName(),
+    assertEquals("org.apache.geode.internal.serialization.DataSerializableFixedID:"
+        + Integer.class.getName(),
         type);
   }
 
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryBlockNodeJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryBlockNodeJUnitTest.java
index 7b8c460..5d54d96 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryBlockNodeJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryBlockNodeJUnitTest.java
@@ -36,9 +36,9 @@ import org.junit.rules.ExpectedException;
 
 import org.apache.geode.cache.CacheClosedException;
 import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.internal.DSCODE;
 import org.apache.geode.internal.cache.EntryEventImpl;
 import org.apache.geode.internal.offheap.MemoryBlock.State;
+import org.apache.geode.internal.serialization.DSCODE;
 
 public class MemoryBlockNodeJUnitTest {
 
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapRegionEntryHelperJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapRegionEntryHelperJUnitTest.java
index b210e82..3c219ff 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapRegionEntryHelperJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapRegionEntryHelperJUnitTest.java
@@ -35,7 +35,6 @@ import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
 import org.apache.geode.compression.Compressor;
-import org.apache.geode.internal.DSCODE;
 import org.apache.geode.internal.cache.CachePerfStats;
 import org.apache.geode.internal.cache.DiskId;
 import org.apache.geode.internal.cache.EntryEventImpl;
@@ -45,6 +44,7 @@ import org.apache.geode.internal.cache.VMCachedDeserializable;
 import org.apache.geode.internal.cache.entries.DiskEntry;
 import org.apache.geode.internal.cache.entries.OffHeapRegionEntry;
 import org.apache.geode.internal.cache.entries.VersionedStatsDiskRegionEntryOffHeap;
+import org.apache.geode.internal.serialization.DSCODE;
 
 @RunWith(PowerMockRunner.class)
 @PowerMockIgnore("*.UnitTest")
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStoredObjectJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStoredObjectJUnitTest.java
index 87b5f1f..cdd25f3 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStoredObjectJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStoredObjectJUnitTest.java
@@ -37,7 +37,6 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 
 import org.apache.geode.compression.Compressor;
-import org.apache.geode.internal.DSCODE;
 import org.apache.geode.internal.HeapDataOutputStream;
 import org.apache.geode.internal.Version;
 import org.apache.geode.internal.cache.BytesAndBitsForCompactor;
@@ -45,6 +44,7 @@ import org.apache.geode.internal.cache.CachePerfStats;
 import org.apache.geode.internal.cache.EntryEventImpl;
 import org.apache.geode.internal.cache.RegionEntryContext;
 import org.apache.geode.internal.offheap.MemoryBlock.State;
+import org.apache.geode.internal.serialization.DSCODE;
 
 public class OffHeapStoredObjectJUnitTest extends AbstractStoredObjectTestBase {
 
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/TinyStoredObjectJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/TinyStoredObjectJUnitTest.java
index d4f311c..8a9632f 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/TinyStoredObjectJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/TinyStoredObjectJUnitTest.java
@@ -29,11 +29,11 @@ import java.nio.ByteBuffer;
 import org.junit.Test;
 
 import org.apache.geode.compression.Compressor;
-import org.apache.geode.internal.DSCODE;
 import org.apache.geode.internal.cache.BytesAndBitsForCompactor;
 import org.apache.geode.internal.cache.CachePerfStats;
 import org.apache.geode.internal.cache.EntryEventImpl;
 import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.serialization.DSCODE;
 
 public class TinyStoredObjectJUnitTest extends AbstractStoredObjectTestBase {
 
diff --git a/geode-core/src/test/java/org/apache/geode/internal/serialization/DSCODETest.java b/geode-core/src/test/java/org/apache/geode/internal/serialization/DSCODETest.java
index 7100470..1721875 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/serialization/DSCODETest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/serialization/DSCODETest.java
@@ -27,7 +27,7 @@ import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
 import org.apache.geode.internal.serialization.DSCODE;
-import org.apache.geode.internal.util.DscodeHelper;
+import org.apache.geode.internal.serialization.DscodeHelper;
 import org.apache.geode.test.junit.categories.SerializationTest;
 
 @Category({SerializationTest.class})
diff --git a/geode-core/src/test/java/org/apache/geode/internal/serialization/VersionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/serialization/VersionJUnitTest.java
index 83494bd..529f1bf 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/serialization/VersionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/serialization/VersionJUnitTest.java
@@ -21,7 +21,6 @@ import org.junit.Test;
 
 import org.apache.geode.cache.UnsupportedVersionException;
 import org.apache.geode.internal.cache.tier.sockets.CommandInitializer;
-import org.apache.geode.internal.serialization.Version;
 
 public class VersionJUnitTest {
   @Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/BlobHelperTest.java b/geode-core/src/test/java/org/apache/geode/internal/util/BlobHelperTest.java
index b2f9030..c3d1710 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/util/BlobHelperTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/util/BlobHelperTest.java
@@ -31,10 +31,10 @@ import org.junit.Before;
 import org.junit.Test;
 
 import org.apache.geode.DataSerializer;
-import org.apache.geode.internal.ByteArrayDataInput;
 import org.apache.geode.internal.HeapDataOutputStream;
 import org.apache.geode.internal.Version;
 import org.apache.geode.internal.offheap.StoredObject;
+import org.apache.geode.internal.serialization.ByteArrayDataInput;
 
 /**
  * Unit Tests for {@link BlobHelper}.
diff --git a/geode-core/src/test/java/org/apache/geode/pdx/internal/EnumIdTest.java b/geode-core/src/test/java/org/apache/geode/pdx/internal/EnumIdTest.java
index 681ebcd..640923a 100644
--- a/geode-core/src/test/java/org/apache/geode/pdx/internal/EnumIdTest.java
+++ b/geode-core/src/test/java/org/apache/geode/pdx/internal/EnumIdTest.java
@@ -14,7 +14,7 @@
  */
 package org.apache.geode.pdx.internal;
 
-import static org.apache.geode.internal.DataSerializableFixedID.ENUM_ID;
+import static org.apache.geode.internal.serialization.DataSerializableFixedID.ENUM_ID;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotEquals;
diff --git a/geode-core/src/test/java/org/apache/geode/pdx/internal/EnumInfoTest.java b/geode-core/src/test/java/org/apache/geode/pdx/internal/EnumInfoTest.java
index 805c4ab..ffaaeec 100644
--- a/geode-core/src/test/java/org/apache/geode/pdx/internal/EnumInfoTest.java
+++ b/geode-core/src/test/java/org/apache/geode/pdx/internal/EnumInfoTest.java
@@ -14,7 +14,7 @@
  */
 package org.apache.geode.pdx.internal;
 
-import static org.apache.geode.internal.DataSerializableFixedID.ENUM_INFO;
+import static org.apache.geode.internal.serialization.DataSerializableFixedID.ENUM_INFO;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotEquals;
diff --git a/geode-junit/src/main/java/org/apache/geode/codeAnalysis/decode/CompiledClass.java b/geode-junit/src/main/java/org/apache/geode/codeAnalysis/decode/CompiledClass.java
index 00b9cb6..af55f1d 100644
--- a/geode-junit/src/main/java/org/apache/geode/codeAnalysis/decode/CompiledClass.java
+++ b/geode-junit/src/main/java/org/apache/geode/codeAnalysis/decode/CompiledClass.java
@@ -29,9 +29,9 @@ import org.apache.geode.codeAnalysis.decode.cp.Cp;
 import org.apache.geode.codeAnalysis.decode.cp.CpClass;
 import org.apache.geode.codeAnalysis.decode.cp.CpDouble;
 import org.apache.geode.codeAnalysis.decode.cp.CpLong;
-import org.apache.geode.internal.DataSerializableFixedID;
 import org.apache.geode.internal.ExitCode;
 import org.apache.geode.internal.logging.PureLogWriter;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
 
 
 /**
diff --git a/geode-junit/src/main/java/org/apache/geode/internal/cache/eviction/LRUTestEntry.java b/geode-junit/src/main/java/org/apache/geode/internal/cache/eviction/LRUTestEntry.java
index 1abb9be..5f0fabe 100644
--- a/geode-junit/src/main/java/org/apache/geode/internal/cache/eviction/LRUTestEntry.java
+++ b/geode-junit/src/main/java/org/apache/geode/internal/cache/eviction/LRUTestEntry.java
@@ -19,7 +19,6 @@ import org.apache.geode.cache.EntryEvent;
 import org.apache.geode.cache.EntryNotFoundException;
 import org.apache.geode.cache.TimeoutException;
 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;
@@ -33,6 +32,7 @@ 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;
 
 class LRUTestEntry implements EvictableEntry {
 
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneResultStructImpl.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneResultStructImpl.java
index 25a6a78..825bbc9 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneResultStructImpl.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneResultStructImpl.java
@@ -21,8 +21,8 @@ import java.io.IOException;
 
 import org.apache.geode.DataSerializer;
 import org.apache.geode.cache.lucene.LuceneResultStruct;
-import org.apache.geode.internal.DataSerializableFixedID;
 import org.apache.geode.internal.Version;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
 
 public class LuceneResultStructImpl<K, V>
     implements LuceneResultStruct<K, V>, DataSerializableFixedID {
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneServiceImpl.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneServiceImpl.java
index 6c07361..f7a1941 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneServiceImpl.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneServiceImpl.java
@@ -15,7 +15,7 @@
 
 package org.apache.geode.cache.lucene.internal;
 
-import static org.apache.geode.internal.DataSerializableFixedID.CREATE_REGION_MESSAGE_LUCENE;
+import static org.apache.geode.internal.serialization.DataSerializableFixedID.CREATE_REGION_MESSAGE_LUCENE;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -69,8 +69,7 @@ import org.apache.geode.cache.lucene.internal.results.PageResults;
 import org.apache.geode.cache.lucene.internal.xml.LuceneServiceXmlGenerator;
 import org.apache.geode.distributed.internal.DistributionConfig;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.internal.DSFIDFactory;
-import org.apache.geode.internal.DataSerializableFixedID;
+import org.apache.geode.internal.InternalDataSerializer;
 import org.apache.geode.internal.Version;
 import org.apache.geode.internal.cache.BucketNotFoundException;
 import org.apache.geode.internal.cache.BucketRegion;
@@ -82,6 +81,7 @@ import org.apache.geode.internal.cache.RegionListener;
 import org.apache.geode.internal.cache.extension.Extensible;
 import org.apache.geode.internal.cache.xmlcache.XmlGenerator;
 import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
 import org.apache.geode.management.internal.beans.CacheServiceMBeanBase;
 
 /**
@@ -601,37 +601,49 @@ public class LuceneServiceImpl implements InternalLuceneService {
 
   /** Public for test purposes */
   public static void registerDataSerializables() {
-    DSFIDFactory.registerDSFID(CREATE_REGION_MESSAGE_LUCENE,
+    InternalDataSerializer.getDSFIDSerializer().registerDSFID(CREATE_REGION_MESSAGE_LUCENE,
         CreateRegionProcessorForLucene.CreateRegionMessage.class);
-    DSFIDFactory.registerDSFID(DataSerializableFixedID.LUCENE_CHUNK_KEY, ChunkKey.class);
+    InternalDataSerializer.getDSFIDSerializer()
+        .registerDSFID(DataSerializableFixedID.LUCENE_CHUNK_KEY, ChunkKey.class);
 
-    DSFIDFactory.registerDSFID(DataSerializableFixedID.LUCENE_FILE, File.class);
+    InternalDataSerializer.getDSFIDSerializer().registerDSFID(DataSerializableFixedID.LUCENE_FILE,
+        File.class);
 
-    DSFIDFactory.registerDSFID(DataSerializableFixedID.LUCENE_FUNCTION_CONTEXT,
+    InternalDataSerializer.getDSFIDSerializer().registerDSFID(
+        DataSerializableFixedID.LUCENE_FUNCTION_CONTEXT,
         LuceneFunctionContext.class);
 
-    DSFIDFactory.registerDSFID(DataSerializableFixedID.LUCENE_STRING_QUERY_PROVIDER,
+    InternalDataSerializer.getDSFIDSerializer().registerDSFID(
+        DataSerializableFixedID.LUCENE_STRING_QUERY_PROVIDER,
         StringQueryProvider.class);
 
-    DSFIDFactory.registerDSFID(DataSerializableFixedID.LUCENE_TOP_ENTRIES_COLLECTOR_MANAGER,
+    InternalDataSerializer.getDSFIDSerializer().registerDSFID(
+        DataSerializableFixedID.LUCENE_TOP_ENTRIES_COLLECTOR_MANAGER,
         TopEntriesCollectorManager.class);
 
-    DSFIDFactory.registerDSFID(DataSerializableFixedID.LUCENE_ENTRY_SCORE, EntryScore.class);
+    InternalDataSerializer.getDSFIDSerializer()
+        .registerDSFID(DataSerializableFixedID.LUCENE_ENTRY_SCORE, EntryScore.class);
 
-    DSFIDFactory.registerDSFID(DataSerializableFixedID.LUCENE_TOP_ENTRIES, TopEntries.class);
+    InternalDataSerializer.getDSFIDSerializer()
+        .registerDSFID(DataSerializableFixedID.LUCENE_TOP_ENTRIES, TopEntries.class);
 
-    DSFIDFactory.registerDSFID(DataSerializableFixedID.LUCENE_TOP_ENTRIES_COLLECTOR,
+    InternalDataSerializer.getDSFIDSerializer().registerDSFID(
+        DataSerializableFixedID.LUCENE_TOP_ENTRIES_COLLECTOR,
         TopEntriesCollector.class);
 
-    DSFIDFactory.registerDSFID(DataSerializableFixedID.WAIT_UNTIL_FLUSHED_FUNCTION_CONTEXT,
+    InternalDataSerializer.getDSFIDSerializer().registerDSFID(
+        DataSerializableFixedID.WAIT_UNTIL_FLUSHED_FUNCTION_CONTEXT,
         WaitUntilFlushedFunctionContext.class);
 
-    DSFIDFactory.registerDSFID(DataSerializableFixedID.DESTROY_LUCENE_INDEX_MESSAGE,
+    InternalDataSerializer.getDSFIDSerializer().registerDSFID(
+        DataSerializableFixedID.DESTROY_LUCENE_INDEX_MESSAGE,
         DestroyLuceneIndexMessage.class);
 
-    DSFIDFactory.registerDSFID(DataSerializableFixedID.LUCENE_PAGE_RESULTS, PageResults.class);
+    InternalDataSerializer.getDSFIDSerializer()
+        .registerDSFID(DataSerializableFixedID.LUCENE_PAGE_RESULTS, PageResults.class);
 
-    DSFIDFactory.registerDSFID(DataSerializableFixedID.LUCENE_RESULT_STRUCT,
+    InternalDataSerializer.getDSFIDSerializer().registerDSFID(
+        DataSerializableFixedID.LUCENE_RESULT_STRUCT,
         LuceneResultStructImpl.class);
   }
 
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/StringQueryProvider.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/StringQueryProvider.java
index 830c5ad..568fc8a 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/StringQueryProvider.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/StringQueryProvider.java
@@ -28,9 +28,9 @@ import org.apache.geode.DataSerializer;
 import org.apache.geode.cache.lucene.LuceneIndex;
 import org.apache.geode.cache.lucene.LuceneQueryException;
 import org.apache.geode.cache.lucene.LuceneQueryProvider;
-import org.apache.geode.internal.DataSerializableFixedID;
 import org.apache.geode.internal.Version;
 import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
 
 /**
  * Constructs a Lucene Query object by parsing a search string. The class uses
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/EntryScore.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/EntryScore.java
index 788e101..9c004f4 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/EntryScore.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/EntryScore.java
@@ -20,8 +20,8 @@ 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;
 
 /**
  * Holds one entry matching search query and its metadata
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/LuceneFunctionContext.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/LuceneFunctionContext.java
index e28378c..94e0a66 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/LuceneFunctionContext.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/LuceneFunctionContext.java
@@ -24,8 +24,8 @@ import org.apache.geode.cache.lucene.LuceneQueryFactory;
 import org.apache.geode.cache.lucene.LuceneQueryProvider;
 import org.apache.geode.cache.lucene.internal.repository.IndexRepository;
 import org.apache.geode.cache.lucene.internal.repository.IndexResultCollector;
-import org.apache.geode.internal.DataSerializableFixedID;
 import org.apache.geode.internal.Version;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
 
 /**
  * Contains function arguments for text / lucene search
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/TopEntries.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/TopEntries.java
index 88417c3..79c2ed7 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/TopEntries.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/TopEntries.java
@@ -24,8 +24,8 @@ import java.util.List;
 
 import org.apache.geode.DataSerializer;
 import org.apache.geode.cache.lucene.LuceneQueryFactory;
-import org.apache.geode.internal.DataSerializableFixedID;
 import org.apache.geode.internal.Version;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
 
 /**
  * Holds a ordered collection of entries matching a search query.
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/TopEntriesCollector.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/TopEntriesCollector.java
index d9904da..44fd680 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/TopEntriesCollector.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/TopEntriesCollector.java
@@ -22,8 +22,8 @@ import java.io.IOException;
 import org.apache.geode.DataSerializer;
 import org.apache.geode.cache.lucene.LuceneQueryFactory;
 import org.apache.geode.cache.lucene.internal.repository.IndexResultCollector;
-import org.apache.geode.internal.DataSerializableFixedID;
 import org.apache.geode.internal.Version;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
 
 /**
  * An implementation of {@link IndexResultCollector} to collect {@link EntryScore}. It is expected
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/TopEntriesCollectorManager.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/TopEntriesCollectorManager.java
index 325e586..cb65f80 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/TopEntriesCollectorManager.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/TopEntriesCollectorManager.java
@@ -30,9 +30,9 @@ import org.apache.geode.DataSerializer;
 import org.apache.geode.cache.lucene.LuceneQueryFactory;
 import org.apache.geode.cache.lucene.internal.distributed.TopEntries.EntryScoreComparator;
 import org.apache.geode.cache.lucene.internal.repository.IndexResultCollector;
-import org.apache.geode.internal.DataSerializableFixedID;
 import org.apache.geode.internal.Version;
 import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
 
 /**
  * An implementation of {@link CollectorManager} for managing {@link TopEntriesCollector}. This is
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/WaitUntilFlushedFunctionContext.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/WaitUntilFlushedFunctionContext.java
index 74fa1fe..6d568a3 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/WaitUntilFlushedFunctionContext.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/WaitUntilFlushedFunctionContext.java
@@ -21,8 +21,8 @@ import java.io.IOException;
 import java.util.concurrent.TimeUnit;
 
 import org.apache.geode.DataSerializer;
-import org.apache.geode.internal.DataSerializableFixedID;
 import org.apache.geode.internal.Version;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
 
 /**
  * Contains function arguments for WaitUntilFlushed
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/filesystem/ChunkKey.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/filesystem/ChunkKey.java
index b96f3cf..36a31e1 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/filesystem/ChunkKey.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/filesystem/ChunkKey.java
@@ -20,8 +20,8 @@ import java.io.DataOutput;
 import java.io.IOException;
 import java.util.UUID;
 
-import org.apache.geode.internal.DataSerializableFixedID;
 import org.apache.geode.internal.Version;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
 
 /**
  * The key for a single chunk on a file stored within a region.
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/filesystem/File.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/filesystem/File.java
index df86f7c..ef406a0 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/filesystem/File.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/filesystem/File.java
@@ -24,8 +24,8 @@ import java.util.UUID;
 
 import org.apache.geode.DataSerializer;
 import org.apache.geode.InternalGemFireError;
-import org.apache.geode.internal.DataSerializableFixedID;
 import org.apache.geode.internal.Version;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
 
 /**
  * A file that is stored in a Apache Geode region.
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/results/PageResults.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/results/PageResults.java
index b6885ea..b8604bf 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/results/PageResults.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/results/PageResults.java
@@ -19,8 +19,8 @@ import java.io.DataOutput;
 import java.io.IOException;
 import java.util.ArrayList;
 
-import org.apache.geode.internal.DataSerializableFixedID;
 import org.apache.geode.internal.Version;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
 
 public class PageResults extends ArrayList<PageEntry> implements DataSerializableFixedID {
 
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/LuceneQueryFunctionContextJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/LuceneQueryFunctionContextJUnitTest.java
index 872812a..38fc379 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/LuceneQueryFunctionContextJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/LuceneQueryFunctionContextJUnitTest.java
@@ -27,7 +27,7 @@ import org.apache.geode.cache.lucene.LuceneQueryProvider;
 import org.apache.geode.cache.lucene.internal.LuceneServiceImpl;
 import org.apache.geode.cache.lucene.internal.StringQueryProvider;
 import org.apache.geode.cache.lucene.internal.repository.IndexResultCollector;
-import org.apache.geode.internal.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
 import org.apache.geode.test.junit.categories.LuceneTest;
 
 @Category({LuceneTest.class})
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/results/PageEntryJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/results/PageEntryJUnitTest.java
index f2e5ae6..88f9e4e 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/results/PageEntryJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/results/PageEntryJUnitTest.java
@@ -24,11 +24,11 @@ import java.util.Arrays;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import org.apache.geode.internal.ByteArrayDataInput;
 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.PreferBytesCachedDeserializable;
+import org.apache.geode.internal.serialization.ByteArrayDataInput;
 import org.apache.geode.test.junit.categories.LuceneTest;
 
 @Category({LuceneTest.class})
@@ -84,7 +84,7 @@ public class PageEntryJUnitTest {
     entry.toData(out);
     final byte[] bytes = out.toByteArray();
     ByteArrayDataInput in = new ByteArrayDataInput();
-    in.initialize(bytes, null);
+    in.initialize(bytes, (short) 0);
     PageEntry newEntry = new PageEntry();
     newEntry.fromData(in);
     return newEntry;
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/results/PageResultsJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/results/PageResultsJUnitTest.java
index 393b2e7..2c1289b 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/results/PageResultsJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/results/PageResultsJUnitTest.java
@@ -21,8 +21,8 @@ import java.io.IOException;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import org.apache.geode.internal.DSFIDFactory;
-import org.apache.geode.internal.DataSerializableFixedID;
+import org.apache.geode.internal.InternalDataSerializer;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
 import org.apache.geode.internal.util.BlobHelper;
 import org.apache.geode.test.junit.categories.LuceneTest;
 
@@ -31,7 +31,9 @@ public class PageResultsJUnitTest {
 
   @Test
   public void serializationShouldNotChangeObject() throws IOException, ClassNotFoundException {
-    DSFIDFactory.registerDSFID(DataSerializableFixedID.LUCENE_PAGE_RESULTS, PageResults.class);
+    InternalDataSerializer
+        .getDSFIDSerializer()
+        .registerDSFID(DataSerializableFixedID.LUCENE_PAGE_RESULTS, PageResults.class);
     PageResults results = new PageResults();
     results.add(new PageEntry("key1", "value1"));
     results.add(new PageEntry("key2", "value2"));
diff --git a/geode-old-client-support/src/distributedTest/java/org/apache/geode/OldClientSupportDUnitTest.java b/geode-old-client-support/src/distributedTest/java/org/apache/geode/OldClientSupportDUnitTest.java
index 2fbf452..4d21631 100644
--- a/geode-old-client-support/src/distributedTest/java/org/apache/geode/OldClientSupportDUnitTest.java
+++ b/geode-old-client-support/src/distributedTest/java/org/apache/geode/OldClientSupportDUnitTest.java
@@ -34,14 +34,14 @@ import org.apache.geode.distributed.ConfigurationProperties;
 import org.apache.geode.distributed.internal.DistributedSystemService;
 import org.apache.geode.distributed.internal.DistributionConfig;
 import org.apache.geode.distributed.internal.DistributionConfigImpl;
-import org.apache.geode.internal.ByteArrayDataInput;
 import org.apache.geode.internal.HeapDataOutputStream;
 import org.apache.geode.internal.InternalDataSerializer;
 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.tier.sockets.OldClientSupportService;
+import org.apache.geode.internal.serialization.ByteArrayDataInput;
+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;
 
@@ -109,7 +109,7 @@ public class OldClientSupportDUnitTest extends JUnit4CacheTestCase {
 
     Version oldClientVersion = Version.GFE_82;
     VersionedDataOutputStream dout = new VersionedDataOutputStream(
-        new HeapDataOutputStream(10, oldClientVersion), oldClientVersion);
+        new HeapDataOutputStream(10, oldClientVersion), oldClientVersion.ordinal());
 
     for (String geodeClassName : newArrayClassNames) {
       String newName = oldClientSupport.processOutgoingClassName(geodeClassName, dout);
@@ -122,7 +122,7 @@ public class OldClientSupportDUnitTest extends JUnit4CacheTestCase {
     }
 
     VersionedDataInputStream din = new VersionedDataInputStream(
-        new DataInputStream(new ByteArrayInputStream(new byte[10])), oldClientVersion);
+        new DataInputStream(new ByteArrayInputStream(new byte[10])), oldClientVersion.ordinal());
 
     for (String oldClassName : oldArrayClassNames) {
       String newName = oldClientSupport.processIncomingClassName(oldClassName, din);
@@ -198,7 +198,7 @@ public class OldClientSupportDUnitTest extends JUnit4CacheTestCase {
     byte[] serializedForm = byteStream.toByteArray();
 
     ByteArrayDataInput byteDataInput = new ByteArrayDataInput();
-    byteDataInput.initialize(serializedForm, Version.GFE_82);
+    byteDataInput.initialize(serializedForm, Version.GFE_82.ordinal());
     ClientSerializableObject result = DataSerializer.readObject(byteDataInput);
     Assert.assertEquals("Expected an org.apache.geode exception but found " + result,
         result.getClass().getName().substring(0, "org.apache.geode".length()), "org.apache.geode");
@@ -225,7 +225,7 @@ public class OldClientSupportDUnitTest extends JUnit4CacheTestCase {
     byte[] serializedForm = byteStream.toByteArray();
 
     ByteArrayDataInput byteDataInput = new ByteArrayDataInput();
-    byteDataInput.initialize(serializedForm, Version.GFE_82);
+    byteDataInput.initialize(serializedForm, Version.GFE_82.ordinal());
     Object result = DataSerializer.readObject(byteDataInput);
     Assert.assertEquals("Expected an org.apache.geode object but found " + result,
         result.getClass().getName().substring(0, "org.apache.geode".length()), "org.apache.geode");
@@ -249,7 +249,7 @@ public class OldClientSupportDUnitTest extends JUnit4CacheTestCase {
     byte[] serializedForm = byteStream.toByteArray();
 
     ByteArrayDataInput byteDataInput = new ByteArrayDataInput();
-    byteDataInput.initialize(serializedForm, Version.GFE_82);
+    byteDataInput.initialize(serializedForm, Version.GFE_82.ordinal());
     Object result = DataSerializer.readObject(byteDataInput);
     Assert.assertEquals("Expected an org.apache.geode object but found " + result,
         result.getClass().getName().substring(0, "org.apache.geode".length()), "org.apache.geode");
diff --git a/geode-old-client-support/src/main/java/com/gemstone/gemfire/OldClientSupportProvider.java b/geode-old-client-support/src/main/java/com/gemstone/gemfire/OldClientSupportProvider.java
index 1b3a9d2..d6878e4 100644
--- a/geode-old-client-support/src/main/java/com/gemstone/gemfire/OldClientSupportProvider.java
+++ b/geode-old-client-support/src/main/java/com/gemstone/gemfire/OldClientSupportProvider.java
@@ -23,10 +23,10 @@ import org.apache.geode.cache.Cache;
 import org.apache.geode.distributed.internal.DistributionConfig;
 import org.apache.geode.internal.InternalDataSerializer;
 import org.apache.geode.internal.Version;
-import org.apache.geode.internal.VersionedDataOutputStream;
 import org.apache.geode.internal.cache.CacheService;
 import org.apache.geode.internal.cache.InternalCache;
 import org.apache.geode.internal.cache.tier.sockets.OldClientSupportService;
+import org.apache.geode.internal.serialization.VersionedDataOutputStream;
 import org.apache.geode.management.internal.beans.CacheServiceMBeanBase;
 
 import com.gemstone.gemfire.cache.execute.EmtpyRegionFunctionException;
@@ -106,7 +106,7 @@ public class OldClientSupportProvider implements OldClientSupportService {
     // if the client is old then it needs com.gemstone.gemfire package names
     if (out instanceof VersionedDataOutputStream) {
       VersionedDataOutputStream vout = (VersionedDataOutputStream) out;
-      Version version = vout.getVersion();
+      Version version = Version.getVersionForDataStream(vout);
       if (version != null && version.compareTo(Version.GFE_90) < 0) {
         return processClassName(name, GEODE, GEMFIRE, newClassNamesToOld);
       }
diff --git a/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/LocatorJoinMessage.java b/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/LocatorJoinMessage.java
index 68462aa..9cf87c8 100644
--- a/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/LocatorJoinMessage.java
+++ b/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/LocatorJoinMessage.java
@@ -20,8 +20,8 @@ import java.io.IOException;
 
 import org.apache.geode.DataSerializer;
 import org.apache.geode.cache.client.internal.locator.ServerLocationRequest;
-import org.apache.geode.internal.DataSerializableFixedID;
 import org.apache.geode.internal.admin.remote.DistributionLocatorId;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
 
 public class LocatorJoinMessage extends ServerLocationRequest {
 
diff --git a/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/RemoteLocatorJoinRequest.java b/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/RemoteLocatorJoinRequest.java
index 1be44ed..07666af 100644
--- a/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/RemoteLocatorJoinRequest.java
+++ b/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/RemoteLocatorJoinRequest.java
@@ -19,9 +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.admin.remote.DistributionLocatorId;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
 
 /**
  * Requests remote locators of a remote WAN site
diff --git a/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/RemoteLocatorJoinResponse.java b/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/RemoteLocatorJoinResponse.java
index bcc7832..c57d897 100644
--- a/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/RemoteLocatorJoinResponse.java
+++ b/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/RemoteLocatorJoinResponse.java
@@ -23,9 +23,9 @@ import java.util.Set;
 
 import org.apache.geode.DataSerializer;
 import org.apache.geode.internal.CopyOnWriteHashSet;
-import org.apache.geode.internal.DataSerializableFixedID;
 import org.apache.geode.internal.Version;
 import org.apache.geode.internal.admin.remote.DistributionLocatorId;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
 
 /**
  * List of remote locators as a response
diff --git a/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/RemoteLocatorPingRequest.java b/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/RemoteLocatorPingRequest.java
index 939ff3b..a5d49aa 100644
--- a/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/RemoteLocatorPingRequest.java
+++ b/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/RemoteLocatorPingRequest.java
@@ -18,8 +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.Version;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
 
 public class RemoteLocatorPingRequest implements DataSerializableFixedID {
 
diff --git a/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/RemoteLocatorPingResponse.java b/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/RemoteLocatorPingResponse.java
index 7e735f5..64c58f3 100644
--- a/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/RemoteLocatorPingResponse.java
+++ b/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/RemoteLocatorPingResponse.java
@@ -18,8 +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.Version;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
 
 public class RemoteLocatorPingResponse implements DataSerializableFixedID {
 
diff --git a/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/RemoteLocatorRequest.java b/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/RemoteLocatorRequest.java
index dc6fa8c..9f60127 100644
--- a/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/RemoteLocatorRequest.java
+++ b/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/RemoteLocatorRequest.java
@@ -18,8 +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.Version;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
 
 public class RemoteLocatorRequest implements DataSerializableFixedID {
   private int distributedSystemId;
diff --git a/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/RemoteLocatorResponse.java b/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/RemoteLocatorResponse.java
index 434a5fb..113d00c 100644
--- a/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/RemoteLocatorResponse.java
+++ b/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/RemoteLocatorResponse.java
@@ -20,8 +20,8 @@ import java.io.IOException;
 import java.util.Set;
 
 import org.apache.geode.DataSerializer;
-import org.apache.geode.internal.DataSerializableFixedID;
 import org.apache.geode.internal.Version;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
 
 public class RemoteLocatorResponse implements DataSerializableFixedID {
 
diff --git a/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/WANFactoryImpl.java b/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/WANFactoryImpl.java
index 1687c5d..e026569 100644
--- a/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/WANFactoryImpl.java
+++ b/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/WANFactoryImpl.java
@@ -17,30 +17,37 @@ package org.apache.geode.cache.client.internal.locator.wan;
 import org.apache.geode.cache.wan.GatewayReceiverFactory;
 import org.apache.geode.cache.wan.GatewaySenderFactory;
 import org.apache.geode.distributed.internal.WanLocatorDiscoverer;
-import org.apache.geode.internal.DSFIDFactory;
-import org.apache.geode.internal.DataSerializableFixedID;
+import org.apache.geode.internal.InternalDataSerializer;
 import org.apache.geode.internal.cache.InternalCache;
 import org.apache.geode.internal.cache.wan.GatewayReceiverFactoryImpl;
 import org.apache.geode.internal.cache.wan.GatewaySenderFactoryImpl;
 import org.apache.geode.internal.cache.wan.spi.WANFactory;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
 
 public class WANFactoryImpl implements WANFactory {
 
   @Override
   public void initialize() {
-    DSFIDFactory.registerDSFID(DataSerializableFixedID.REMOTE_LOCATOR_JOIN_REQUEST,
+    InternalDataSerializer.getDSFIDSerializer().registerDSFID(
+        DataSerializableFixedID.REMOTE_LOCATOR_JOIN_REQUEST,
         RemoteLocatorJoinRequest.class);
-    DSFIDFactory.registerDSFID(DataSerializableFixedID.REMOTE_LOCATOR_JOIN_RESPONSE,
+    InternalDataSerializer.getDSFIDSerializer().registerDSFID(
+        DataSerializableFixedID.REMOTE_LOCATOR_JOIN_RESPONSE,
         RemoteLocatorJoinResponse.class);
-    DSFIDFactory.registerDSFID(DataSerializableFixedID.REMOTE_LOCATOR_REQUEST,
+    InternalDataSerializer.getDSFIDSerializer().registerDSFID(
+        DataSerializableFixedID.REMOTE_LOCATOR_REQUEST,
         RemoteLocatorRequest.class);
-    DSFIDFactory.registerDSFID(DataSerializableFixedID.LOCATOR_JOIN_MESSAGE,
+    InternalDataSerializer.getDSFIDSerializer().registerDSFID(
+        DataSerializableFixedID.LOCATOR_JOIN_MESSAGE,
         LocatorJoinMessage.class);
-    DSFIDFactory.registerDSFID(DataSerializableFixedID.REMOTE_LOCATOR_PING_REQUEST,
+    InternalDataSerializer.getDSFIDSerializer().registerDSFID(
+        DataSerializableFixedID.REMOTE_LOCATOR_PING_REQUEST,
         RemoteLocatorPingRequest.class);
-    DSFIDFactory.registerDSFID(DataSerializableFixedID.REMOTE_LOCATOR_PING_RESPONSE,
+    InternalDataSerializer.getDSFIDSerializer().registerDSFID(
+        DataSerializableFixedID.REMOTE_LOCATOR_PING_RESPONSE,
         RemoteLocatorPingResponse.class);
-    DSFIDFactory.registerDSFID(DataSerializableFixedID.REMOTE_LOCATOR_RESPONSE,
+    InternalDataSerializer.getDSFIDSerializer().registerDSFID(
+        DataSerializableFixedID.REMOTE_LOCATOR_RESPONSE,
         RemoteLocatorResponse.class);
   }
 
diff --git a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/util/JSONUtils.java b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/util/JSONUtils.java
index 7a1c2e4..690f785 100644
--- a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/util/JSONUtils.java
+++ b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/util/JSONUtils.java
@@ -30,6 +30,7 @@ import org.springframework.util.Assert;
 
 import org.apache.geode.cache.Region;
 import org.apache.geode.internal.HeapDataOutputStream;
+import org.apache.geode.internal.Version;
 
 /**
  * The JSONUtils class is a utility class for getting JSON equivalent from Java types.
@@ -59,7 +60,7 @@ public abstract class JSONUtils {
 
   public static String formulateJsonForListFunctionsCall(Set<String> functionIds) {
     HeapDataOutputStream outputStream =
-        new HeapDataOutputStream(org.apache.geode.internal.Version.CURRENT);
+        new HeapDataOutputStream(Version.CURRENT);
     try {
       JsonGenerator generator = enableDisableJSONGeneratorFeature(getObjectMapper().getFactory()
           .createGenerator((OutputStream) outputStream, JsonEncoding.UTF8));
@@ -78,7 +79,7 @@ public abstract class JSONUtils {
 
   public static String formulateJsonForListKeys(Object[] keys, String fieldName) {
     HeapDataOutputStream outputStream =
-        new HeapDataOutputStream(org.apache.geode.internal.Version.CURRENT);
+        new HeapDataOutputStream(Version.CURRENT);
 
     try {
       JsonGenerator generator = enableDisableJSONGeneratorFeature(getObjectMapper().getFactory()
@@ -98,7 +99,7 @@ public abstract class JSONUtils {
 
   public static String formulateJsonForListRegions(Set<Region<?, ?>> regions, String fieldName) {
     HeapDataOutputStream outputStream =
-        new HeapDataOutputStream(org.apache.geode.internal.Version.CURRENT);
+        new HeapDataOutputStream(Version.CURRENT);
 
     try {
       JsonGenerator generator = enableDisableJSONGeneratorFeature(getObjectMapper().getFactory()
@@ -119,7 +120,7 @@ public abstract class JSONUtils {
 
   public static String formulateJsonForListQueriesCall(Region<String, String> queryRegion) {
     HeapDataOutputStream outputStream =
-        new HeapDataOutputStream(org.apache.geode.internal.Version.CURRENT);
+        new HeapDataOutputStream(Version.CURRENT);
     try {
       JsonGenerator generator = enableDisableJSONGeneratorFeature(getObjectMapper().getFactory()
           .createGenerator((OutputStream) outputStream, JsonEncoding.UTF8));
@@ -135,7 +136,7 @@ public abstract class JSONUtils {
 
   public static String formulateJsonForExistingQuery(String queryId, String oql) {
     HeapDataOutputStream outputStream =
-        new HeapDataOutputStream(org.apache.geode.internal.Version.CURRENT);
+        new HeapDataOutputStream(Version.CURRENT);
 
     try {
       JsonGenerator generator = enableDisableJSONGeneratorFeature(getObjectMapper().getFactory()
@@ -152,7 +153,7 @@ public abstract class JSONUtils {
 
   public static String convertCollectionToJson(Collection<Object> collection) {
     HeapDataOutputStream outputStream =
-        new HeapDataOutputStream(org.apache.geode.internal.Version.CURRENT);
+        new HeapDataOutputStream(Version.CURRENT);
 
     try {
       JsonGenerator generator = enableDisableJSONGeneratorFeature(getObjectMapper().getFactory()


[geode] 05/05: fixed rebase conflict compilation error

Posted by bs...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

bschuchardt pushed a commit to branch dsfid_separation_wip
in repository https://gitbox.apache.org/repos/asf/geode.git

commit ab7af10f63d691a90694f4cac308230d4653061d
Author: Bruce Schuchardt <bs...@pivotal.io>
AuthorDate: Mon Aug 26 16:03:03 2019 -0700

    fixed rebase conflict compilation error
---
 .../org/apache/geode/internal/serialization/SerializationVersion.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/geode-core/src/main/java/org/apache/geode/internal/serialization/SerializationVersion.java b/geode-core/src/main/java/org/apache/geode/internal/serialization/SerializationVersion.java
index e066458..9b3addb 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/serialization/SerializationVersion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/serialization/SerializationVersion.java
@@ -26,7 +26,7 @@ public class SerializationVersion implements Comparable<SerializationVersion> {
   // We need access to them in GMS for backward-compatibility
   public static final byte GFE_90_ORDINAL = 45; // this is also GEODE 1.0.0-incubating
   public static final byte GEODE_1_2_0_ORDINAL = 65;
-  public static final byte GEODE_1_3_0_ORDINAL = 70;
+  public static final byte GEODE_1_4_0_ORDINAL = 75;
   public static final byte GEODE_1_10_0_ORDINAL = 105;
 
   /**


[geode] 03/05: introduction of SerializationVersion, a superclass of Version

Posted by bs...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

bschuchardt pushed a commit to branch dsfid_separation_wip
in repository https://gitbox.apache.org/repos/asf/geode.git

commit 26e6aabf9729de216d726f135f707d4dfdce94c9
Author: Bruce Schuchardt <bs...@pivotal.io>
AuthorDate: Fri Aug 23 15:50:31 2019 -0700

    introduction of SerializationVersion, a superclass of Version
---
 ...ackwardCompatibilitySerializationDUnitTest.java |  11 +-
 .../cache/client/ClientCacheFactoryJUnitTest.java  |   4 +-
 .../internal/InternalDataSerializerBenchmark.java  |   2 +-
 .../client/internal/ClientSideHandshakeImpl.java   |  16 +--
 .../membership/InternalDistributedMember.java      |  13 +-
 .../internal/membership/gms/GMSMember.java         |  15 ++-
 .../membership/gms/messenger/JGroupsMessenger.java |   7 +-
 .../distributed/internal/tcpserver/TcpClient.java  |  17 ++-
 .../distributed/internal/tcpserver/TcpServer.java  |   4 +-
 .../geode/internal/HeapDataOutputStream.java       |   4 +-
 .../geode/internal/InternalDataSerializer.java     |  35 +++---
 .../java/org/apache/geode/internal/Version.java    | 130 ++-----------------
 .../geode/internal/VersionedObjectInput.java       |   8 +-
 .../geode/internal/VersionedObjectOutput.java      |   8 +-
 .../apache/geode/internal/cache/DiskInitFile.java  |   3 +-
 .../org/apache/geode/internal/cache/EventID.java   |   2 +-
 .../geode/internal/cache/FilterRoutingInfo.java    |   2 +-
 .../org/apache/geode/internal/cache/Oplog.java     |  10 +-
 .../cache/persistence/DiskInitFileParser.java      |   3 +-
 .../tier/sockets/ClientRegistrationMetadata.java   |   7 +-
 .../tier/sockets/ServerSideHandshakeFactory.java   |   3 +-
 .../tier/sockets/ServerSideHandshakeImpl.java      |  19 +--
 .../internal/cache/wan/GatewaySenderEventImpl.java |   2 +-
 .../serialization/BufferDataOutputStream.java      |  11 +-
 .../internal/serialization/ByteArrayDataInput.java |  17 +--
 .../internal/serialization/DSFIDSerializer.java    |  15 ++-
 .../serialization/SerializationVersion.java        | 140 +++++++++++++++++++++
 .../serialization/SerializationVersions.java       |   4 +-
 .../serialization/VersionedDataInputStream.java    |   6 +-
 .../serialization/VersionedDataOutputStream.java   |   6 +-
 .../serialization/VersionedDataStream.java         |   4 +-
 .../org/apache/geode/internal/tcp/Connection.java  |   4 +-
 .../apache/geode/internal/tcp/MsgDestreamer.java   |   2 +-
 .../tcp/VersionedByteBufferInputStream.java        |   8 +-
 .../geode/internal/tcp/VersionedMsgStreamer.java   |   8 +-
 .../org/apache/geode/internal/util/BlobHelper.java |   2 +-
 .../java/org/apache/geode/DataSerializerTest.java  |   4 +-
 .../cache/execute/FunctionAdapterJUnitTest.java    |   2 +-
 .../membership/gms/GMSMemberJUnitTest.java         |   2 +-
 .../geode/internal/ByteArrayDataInputTest.java     |   2 +-
 .../geode/internal/DataSerializableJUnitTest.java  |   4 +-
 .../geode/internal/cache/FilterInfoTest.java       |   2 +-
 .../cache/ha/EventIdOptimizationJUnitTest.java     |   4 +-
 .../internal/results/PageEntryJUnitTest.java       |   2 +-
 .../apache/geode/OldClientSupportDUnitTest.java    |  10 +-
 .../gemstone/gemfire/OldClientSupportProvider.java |   3 +-
 46 files changed, 319 insertions(+), 268 deletions(-)

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 7a0396c..b6a774c 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
@@ -35,6 +35,7 @@ import org.junit.experimental.categories.Category;
 import org.apache.geode.cache.Cache;
 import org.apache.geode.internal.cache.DistributedPutAllOperation.EntryVersionsList;
 import org.apache.geode.internal.serialization.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.SerializationVersion;
 import org.apache.geode.internal.serialization.SerializationVersions;
 import org.apache.geode.internal.serialization.VersionedDataInputStream;
 import org.apache.geode.internal.serialization.VersionedDataOutputStream;
@@ -93,7 +94,7 @@ public class BackwardCompatibilitySerializationDUnitTest extends JUnit4CacheTest
   @Test
   public void testToDataFromHigherVersionToLower() throws Exception {
     DataOutputStream dos =
-        new VersionedDataOutputStream(new DataOutputStream(baos), Version.GFE_56.ordinal());
+        new VersionedDataOutputStream(new DataOutputStream(baos), Version.GFE_56);
     InternalDataSerializer.writeDSFID(msg, dos);
     assertTrue(toDataPre66Called);
     assertFalse(toDataCalled);
@@ -107,7 +108,7 @@ public class BackwardCompatibilitySerializationDUnitTest extends JUnit4CacheTest
   @Test
   public void testToDataFromLowerVersionToHigher() throws Exception {
     DataOutputStream dos =
-        new VersionedDataOutputStream(new DataOutputStream(baos), Version.GFE_701.ordinal());
+        new VersionedDataOutputStream(new DataOutputStream(baos), Version.GFE_701);
     InternalDataSerializer.writeDSFID(msg, dos);
     assertTrue(toDataCalled);
   }
@@ -123,7 +124,7 @@ public class BackwardCompatibilitySerializationDUnitTest extends JUnit4CacheTest
     this.bais = new ByteArrayInputStream(baos.toByteArray());
 
     DataInputStream dis =
-        new VersionedDataInputStream(new DataInputStream(bais), Version.GFE_701.ordinal());
+        new VersionedDataInputStream(new DataInputStream(bais), Version.GFE_701);
     Object o = InternalDataSerializer.basicReadObject(dis);
     assertTrue(o instanceof TestMessage);
     assertTrue(fromDataCalled);
@@ -140,7 +141,7 @@ public class BackwardCompatibilitySerializationDUnitTest extends JUnit4CacheTest
     this.bais = new ByteArrayInputStream(baos.toByteArray());
 
     DataInputStream dis =
-        new VersionedDataInputStream(new DataInputStream(bais), Version.GFE_56.ordinal());
+        new VersionedDataInputStream(new DataInputStream(bais), Version.GFE_56);
     Object o = InternalDataSerializer.basicReadObject(dis);
     assertTrue(o instanceof TestMessage);
     assertTrue(fromDataPre66Called);
@@ -192,7 +193,7 @@ public class BackwardCompatibilitySerializationDUnitTest extends JUnit4CacheTest
   }
 
   private void checkSupportForRollingUpgrade(Object ds) {
-    Version[] versions = null;
+    SerializationVersion[] versions = null;
     if (ds instanceof SerializationVersions) {
       versions = ((SerializationVersions) ds).getSerializationVersions();
     }
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 fbebdd6..cfa5ee0 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
@@ -356,7 +356,7 @@ public class ClientCacheFactoryJUnitTest {
 
     DataInputStream in =
         new VersionedDataInputStream(new ByteArrayInputStream(out.toByteArray()),
-            Version.CURRENT_ORDINAL);
+            Version.CURRENT);
     ClientProxyMembershipID newID = DataSerializer.readObject(in);
     InternalDistributedMember newMemberID =
         (InternalDistributedMember) newID.getDistributedMember();
@@ -374,7 +374,7 @@ public class ClientCacheFactoryJUnitTest {
     DataSerializer.writeObject(clientID, out);
 
     in = new VersionedDataInputStream(new ByteArrayInputStream(out.toByteArray()),
-        Version.CURRENT_ORDINAL);
+        Version.CURRENT);
     newID = DataSerializer.readObject(in);
     newMemberID = (InternalDistributedMember) newID.getDistributedMember();
     assertThat(newMemberID.getVersionObject()).isEqualTo(Version.CURRENT);
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 cc12370..cddc566 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
@@ -66,7 +66,7 @@ public class InternalDataSerializerBenchmark {
   @BenchmarkMode(Mode.Throughput)
   @OutputTimeUnit(TimeUnit.MILLISECONDS)
   public String readStringBenchmark() throws IOException {
-    dataInput.initialize(serializedBytes, Version.CURRENT_ORDINAL);
+    dataInput.initialize(serializedBytes, Version.CURRENT);
     String result = InternalDataSerializer.readString(dataInput, DSCODE.STRING_BYTES.toByte());
     return result;
   }
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 3a61b0d..4dd4cf8 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
@@ -62,6 +62,7 @@ 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.SerializationVersion;
 import org.apache.geode.internal.serialization.VersionedDataInputStream;
 import org.apache.geode.internal.serialization.VersionedDataOutputStream;
 import org.apache.geode.security.AuthenticationFailedException;
@@ -211,11 +212,11 @@ public class ClientSideHandshakeImpl extends Handshake implements ClientSideHand
       // Successful handshake for GATEWAY_TO_GATEWAY mode sets the peer version in connection
       if (communicationMode.isWAN() && !(acceptanceCode == REPLY_EXCEPTION_AUTHENTICATION_REQUIRED
           || acceptanceCode == REPLY_EXCEPTION_AUTHENTICATION_FAILED)) {
-        short wanSiteVersion = Version.readOrdinal(dis);
+        short wanSiteVersion = SerializationVersion.readOrdinal(dis);
         conn.setWanSiteVersion(wanSiteVersion);
         // establish a versioned stream for the other site, if necessary
         if (wanSiteVersion < Version.CURRENT_ORDINAL) {
-          dis = new VersionedDataInputStream(dis, wanSiteVersion);
+          dis = new VersionedDataInputStream(dis, Version.fromOrdinalOrCurrent(wanSiteVersion));
         }
       }
 
@@ -234,7 +235,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());
       }
 
@@ -270,7 +272,7 @@ public class ClientSideHandshakeImpl extends Handshake implements ClientSideHand
 
     byte[] memberBytes = DataSerializer.readByteArray(p_dis);
     Version v = InternalDataSerializer.getVersionForDataStreamOrNull(p_dis);
-    ByteArrayDataInput dis = new ByteArrayDataInput(memberBytes, v == null ? 0 : v.ordinal());
+    ByteArrayDataInput dis = new ByteArrayDataInput(memberBytes, v);
     try {
       return DataSerializer.readObject(dis);
     } catch (EOFException e) {
@@ -372,9 +374,9 @@ public class ClientSideHandshakeImpl extends Handshake implements ClientSideHand
       hdos.writeByte(communicationMode.getModeNumber());
       if (overrideClientVersion > 0) {
         // for testing
-        Version.writeOrdinal(hdos, overrideClientVersion, true);
+        SerializationVersion.writeOrdinal(hdos, overrideClientVersion, true);
       } else {
-        Version.writeOrdinal(hdos, currentClientVersion.ordinal(), true);
+        SerializationVersion.writeOrdinal(hdos, currentClientVersion.ordinal(), true);
       }
 
       hdos.writeByte(replyCode);
@@ -389,7 +391,7 @@ public class ClientSideHandshakeImpl extends Handshake implements ClientSideHand
       // we do not know the receiver's version at this point, but the on-wire
       // form of InternalDistributedMember changed in 9.0, so we must serialize
       // it using the previous version
-      DataOutput idOut = new VersionedDataOutputStream(hdos, Version.GFE_82.ordinal());
+      DataOutput idOut = new VersionedDataOutputStream(hdos, Version.GFE_82);
       DataSerializer.writeObject(this.id, idOut);
 
       if (currentClientVersion.compareTo(Version.GFE_603) >= 0) {
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 8c0c597..df93ba7 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
@@ -50,6 +50,7 @@ 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.SerializationVersion;
 
 /**
  * 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());
@@ -743,7 +745,7 @@ public class InternalDistributedMember implements DistributedMember, Externaliza
 
   private short readVersion(int flags, DataInput in) throws IOException {
     if ((flags & VERSION_BIT) != 0) {
-      short version = Version.readOrdinal(in);
+      short version = SerializationVersion.readOrdinal(in);
       this.versionObj = Version.fromOrdinalNoThrow(version, false);
       return version;
     } else {
@@ -799,7 +801,7 @@ public class InternalDistributedMember implements DistributedMember, Externaliza
     DataSerializer.writeString(attributes == null ? "" : attributes.getId(), out);
     DataSerializer.writeInteger(Integer.valueOf(attributes == null ? 300 : attributes.getTimeout()),
         out);
-    Version.writeOrdinal(out, netMbr.getVersionOrdinal(), true);
+    SerializationVersion.writeOrdinal(out, netMbr.getVersionOrdinal(), true);
     netMbr.writeAdditionalData(out);
   }
 
@@ -908,7 +910,7 @@ public class InternalDistributedMember implements DistributedMember, Externaliza
         durableClientAttributes == null ? 300 : durableClientAttributes.getTimeout()), out);
 
     short version = netMbr.getVersionOrdinal();
-    Version.writeOrdinal(out, version, true);
+    SerializationVersion.writeOrdinal(out, version, true);
   }
 
   public void toDataPre_GFE_7_1_0_0(DataOutput out) throws IOException {
@@ -1100,7 +1102,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/gms/GMSMember.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSMember.java
index f059e64..0b8b996 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
@@ -28,6 +28,7 @@ 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.SerializationVersion;
 
 /**
  * GMSMember is the membership identifier class for Group Membership Services.
@@ -521,7 +522,7 @@ public class GMSMember implements DataSerializableFixedID {
         .writeString(durableId == null ? "" : durableId, out);
     DataSerializer.writeInteger(durableId == null ? 300 : durableTimeout, out);
 
-    Version.writeOrdinal(out, versionOrdinal, true);
+    SerializationVersion.writeOrdinal(out, versionOrdinal, true);
 
     if (versionOrdinal >= Version.GFE_90.ordinal()) {
       writeAdditionalData(out);
@@ -529,7 +530,7 @@ public class GMSMember implements DataSerializableFixedID {
   }
 
   public void writeEssentialData(DataOutput out) throws IOException {
-    Version.writeOrdinal(out, this.versionOrdinal, true);
+    SerializationVersion.writeOrdinal(out, this.versionOrdinal, true);
 
     int flags = 0;
     if (networkPartitionDetectionEnabled)
@@ -543,7 +544,8 @@ public class GMSMember implements DataSerializableFixedID {
     out.writeInt(vmViewId);
     out.writeLong(uuidMSBs);
     out.writeLong(uuidLSBs);
-    if (InternalDataSerializer.getVersionForDataStream(out).compareTo(Version.GEODE_1_2_0) >= 0) {
+    if (InternalDataSerializer.getVersionForDataStream(out).compareTo(
+        Version.GEODE_1_2_0) >= 0) {
       out.writeByte(vmKind);
     }
   }
@@ -587,7 +589,7 @@ public class GMSMember implements DataSerializableFixedID {
 
   private short readVersion(int flags, DataInput in) throws IOException {
     if ((flags & VERSION_BIT) != 0) {
-      return Version.readOrdinal(in);
+      return SerializationVersion.readOrdinal(in);
     } else {
       // prior to 7.1 member IDs did not serialize their version information
       Version v = InternalDataSerializer.getVersionForDataStreamOrNull(in);
@@ -607,7 +609,7 @@ public class GMSMember implements DataSerializableFixedID {
   }
 
   public void readEssentialData(DataInput in) throws IOException, ClassNotFoundException {
-    this.versionOrdinal = Version.readOrdinal(in);
+    this.versionOrdinal = SerializationVersion.readOrdinal(in);
 
     int flags = in.readShort();
     this.networkPartitionDetectionEnabled = (flags & NPD_ENABLED_BIT) != 0;
@@ -623,7 +625,8 @@ 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 (InternalDataSerializer.getVersionForDataStream(in).compareTo(
+        Version.GEODE_1_2_0) >= 0) {
       this.vmKind = in.readByte();
     }
     this.isPartial = true;
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 75385d9..305a857 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
@@ -97,6 +97,7 @@ 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.SerializationVersion;
 import org.apache.geode.internal.serialization.VersionedDataInputStream;
 import org.apache.geode.internal.tcp.MemberShunnedException;
 
@@ -1002,10 +1003,10 @@ public class JGroupsMessenger implements Messenger {
       DataInputStream dis =
           new DataInputStream(new ByteArrayInputStream(buf, jgmsg.getOffset(), jgmsg.getLength()));
 
-      short ordinal = Version.readOrdinal(dis);
+      short ordinal = SerializationVersion.readOrdinal(dis);
 
       if (ordinal < Version.CURRENT_ORDINAL) {
-        dis = new VersionedDataInputStream(dis, ordinal);
+        dis = new VersionedDataInputStream(dis, Version.fromOrdinalNoThrow(ordinal, true));
       }
 
       // read
@@ -1101,7 +1102,7 @@ public class JGroupsMessenger implements Messenger {
         DataInputStream in = new DataInputStream(new ByteArrayInputStream(data));
 
         if (ordinal < Version.CURRENT_ORDINAL) {
-          in = new VersionedDataInputStream(in, ordinal);
+          in = new VersionedDataInputStream(in, Version.fromOrdinalNoThrow(ordinal, true));
         }
 
         GMSMessage result = deserializeMessage(in, ordinal);
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 29f0b8e..230b0c9 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,6 +34,7 @@ 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.admin.SSLConfig;
@@ -209,7 +210,7 @@ public class TcpClient {
       out = new DataOutputStream(new BufferedOutputStream(sock.getOutputStream()));
 
       if (serverVersion < Version.CURRENT_ORDINAL) {
-        out = new VersionedDataOutputStream(out, serverVersion);
+        out = new VersionedDataOutputStream(out, Version.fromOrdinalNoThrow(serverVersion, false));
       }
 
       out.writeInt(gossipVersion);
@@ -221,7 +222,7 @@ public class TcpClient {
 
       if (replyExpected) {
         DataInputStream in = new DataInputStream(sock.getInputStream());
-        in = new VersionedDataInputStream(in, serverVersion);
+        in = new VersionedDataInputStream(in, Version.fromOrdinal(serverVersion, false));
         try {
           Object response = DataSerializer.readObject(in);
           logger.debug("received response: {}", response);
@@ -236,6 +237,13 @@ public class TcpClient {
       } else {
         return null;
       }
+    } catch (UnsupportedVersionException ex) {
+      if (logger.isDebugEnabled()) {
+        logger
+            .debug("Remote TcpServer version: " + serverVersion + " is higher than local version: "
+                + Version.CURRENT_ORDINAL + ". This is never expected as remoteVersion");
+      }
+      return null;
     } finally {
       try {
         if (replyExpected) {
@@ -288,8 +296,7 @@ public class TcpClient {
     try {
       OutputStream outputStream = new BufferedOutputStream(sock.getOutputStream());
       DataOutputStream out =
-          new VersionedDataOutputStream(new DataOutputStream(outputStream),
-              Version.GFE_57.ordinal());
+          new VersionedDataOutputStream(new DataOutputStream(outputStream), Version.GFE_57);
 
       out.writeInt(gossipVersion);
 
@@ -299,7 +306,7 @@ public class TcpClient {
 
       InputStream inputStream = sock.getInputStream();
       DataInputStream in = new DataInputStream(inputStream);
-      in = new VersionedDataInputStream(in, Version.GFE_57.ordinal());
+      in = new VersionedDataInputStream(in, Version.GFE_57);
       try {
         Object readObject = DataSerializer.readObject(in);
         if (!(readObject instanceof VersionResponse)) {
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 99658d0..42f5150 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
@@ -458,7 +458,7 @@ public class TcpServer {
         log.debug("Locator reading request from " + socket.getInetAddress() + " with version "
             + Version.fromOrdinal(versionOrdinal, false));
       }
-      input = new VersionedDataInputStream(input, versionOrdinal);
+      input = new VersionedDataInputStream(input, Version.fromOrdinal(versionOrdinal, false));
       request = DataSerializer.readObject(input);
       if (log.isDebugEnabled()) {
         log.debug("Locator received request " + request + " from " + socket.getInetAddress());
@@ -484,7 +484,7 @@ public class TcpServer {
         DataOutputStream output = new DataOutputStream(socket.getOutputStream());
         if (versionOrdinal != Version.CURRENT_ORDINAL) {
           output =
-              new VersionedDataOutputStream(output, versionOrdinal);
+              new VersionedDataOutputStream(output, Version.fromOrdinal(versionOrdinal, false));
         }
         DataSerializer.writeObject(response, output);
         output.flush();
diff --git a/geode-core/src/main/java/org/apache/geode/internal/HeapDataOutputStream.java b/geode-core/src/main/java/org/apache/geode/internal/HeapDataOutputStream.java
index 7f16e5c..f99f371 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/HeapDataOutputStream.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/HeapDataOutputStream.java
@@ -67,7 +67,7 @@ public class HeapDataOutputStream extends
    *        instead referenced.
    */
   public HeapDataOutputStream(int allocSize, Version version, boolean doNotCopy) {
-    super(allocSize, version == null ? Version.CURRENT_ORDINAL : version.ordinal(), doNotCopy);
+    super(allocSize, version, doNotCopy);
   }
 
   /**
@@ -75,7 +75,7 @@ public class HeapDataOutputStream extends
    *        instead referenced.
    */
   public HeapDataOutputStream(ByteBuffer initialBuffer, Version version, boolean doNotCopy) {
-    super(initialBuffer, version == null ? Version.CURRENT_ORDINAL : version.ordinal(), doNotCopy);
+    super(initialBuffer, version, doNotCopy);
   }
 
   /**
diff --git a/geode-core/src/main/java/org/apache/geode/internal/InternalDataSerializer.java b/geode-core/src/main/java/org/apache/geode/internal/InternalDataSerializer.java
index a6ec1a9..af742fe 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/InternalDataSerializer.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/InternalDataSerializer.java
@@ -112,6 +112,7 @@ import org.apache.geode.internal.serialization.DSCODE;
 import org.apache.geode.internal.serialization.DSFIDSerializer;
 import org.apache.geode.internal.serialization.DataSerializableFixedID;
 import org.apache.geode.internal.serialization.DscodeHelper;
+import org.apache.geode.internal.serialization.SerializationVersion;
 import org.apache.geode.internal.serialization.SerializationVersions;
 import org.apache.geode.internal.serialization.VersionedDataStream;
 import org.apache.geode.internal.util.concurrent.CopyOnWriteHashMap;
@@ -351,7 +352,7 @@ public abstract class InternalDataSerializer extends DataSerializer {
     }
     if (out instanceof VersionedDataStream) {
       VersionedDataStream vout = (VersionedDataStream) out;
-      Version version = Version.getVersionForDataStream(vout);
+      Version version = (Version) vout.getVersion();
       if (null != version) {
         if (version.compareTo(Version.GEODE_1_9_0) < 0) {
           if (name.equals(POST_GEODE_190_SERVER_CQIMPL)) {
@@ -2242,7 +2243,7 @@ public abstract class InternalDataSerializer extends DataSerializer {
       try {
         ObjectOutput oos = new ObjectOutputStream(stream);
         if (stream instanceof VersionedDataStream) {
-          Version v = Version.getVersionForDataStream((VersionedDataStream) stream);
+          Version v = (Version) ((VersionedDataStream) stream).getVersion();
           if (v != null && v != Version.CURRENT) {
             oos = new VersionedObjectOutput(oos, v);
           }
@@ -2280,7 +2281,7 @@ public abstract class InternalDataSerializer extends DataSerializer {
 
       if (Version.CURRENT != v && v != null) {
         // get versions where DataOutput was upgraded
-        Version[] versions = null;
+        SerializationVersion[] versions = null;
         if (ds instanceof SerializationVersions) {
           SerializationVersions sv = (SerializationVersions) ds;
           versions = sv.getSerializationVersions();
@@ -2288,7 +2289,7 @@ public abstract class InternalDataSerializer extends DataSerializer {
         // check if the version of the peer or diskstore is different and
         // there has been a change in the message
         if (versions != null) {
-          for (Version version : versions) {
+          for (SerializationVersion version : versions) {
             // if peer version is less than the greatest upgraded version
             if (v.compareTo(version) < 0) {
               ds.getClass().getMethod("toDataPre_" + version.getMethodSuffix(),
@@ -2345,7 +2346,7 @@ public abstract class InternalDataSerializer extends DataSerializer {
       Version v = InternalDataSerializer.getVersionForDataStreamOrNull(in);
       if (Version.CURRENT != v && v != null) {
         // get versions where DataOutput was upgraded
-        Version[] versions = null;
+        SerializationVersion[] versions = null;
         if (ds instanceof SerializationVersions) {
           SerializationVersions vds = (SerializationVersions) ds;
           versions = vds.getSerializationVersions();
@@ -2353,7 +2354,7 @@ public abstract class InternalDataSerializer extends DataSerializer {
         // check if the version of the peer or diskstore is different and
         // there has been a change in the message
         if (versions != null) {
-          for (Version version : versions) {
+          for (SerializationVersion version : versions) {
             // if peer version is less than the greatest upgraded version
             if (v.compareTo(version) < 0) {
               ds.getClass().getMethod("fromDataPre" + '_' + version.getMethodSuffix(),
@@ -2409,12 +2410,13 @@ public abstract class InternalDataSerializer extends DataSerializer {
   }
 
   /**
-   * Get the {@link Version} of the peer or disk store that created this {@link DataInput}.
+   * Get the {@link org.apache.geode.internal.Version} of the peer or disk store that created this
+   * {@link DataInput}.
    */
   public static Version getVersionForDataStream(DataInput in) {
     // check if this is a versioned data input
     if (in instanceof VersionedDataStream) {
-      final Version v = Version.getVersionForDataStream((VersionedDataStream) in);
+      final Version v = (Version) ((VersionedDataStream) in).getVersion();
       return v != null ? v : Version.CURRENT;
     } else {
       // assume latest version
@@ -2423,13 +2425,14 @@ public abstract class InternalDataSerializer extends DataSerializer {
   }
 
   /**
-   * Get the {@link Version} of the peer or disk store that created this {@link DataInput}. Returns
+   * Get the {@link org.apache.geode.internal.Version} of the peer or disk store that created this
+   * {@link DataInput}. Returns
    * null if the version is same as this member's.
    */
   public static Version getVersionForDataStreamOrNull(DataInput in) {
     // check if this is a versioned data input
     if (in instanceof VersionedDataStream) {
-      return Version.getVersionForDataStream((VersionedDataStream) in);
+      return (Version) ((VersionedDataStream) in).getVersion();
     } else {
       // assume latest version
       return null;
@@ -2437,12 +2440,13 @@ public abstract class InternalDataSerializer extends DataSerializer {
   }
 
   /**
-   * Get the {@link Version} of the peer or disk store that created this {@link DataOutput}.
+   * Get the {@link org.apache.geode.internal.Version} of the peer or disk store that created this
+   * {@link DataOutput}.
    */
   public static Version getVersionForDataStream(DataOutput out) {
     // check if this is a versioned data output
     if (out instanceof VersionedDataStream) {
-      final Version v = Version.getVersionForDataStream((VersionedDataStream) out);
+      final Version v = (Version) ((VersionedDataStream) out).getVersion();
       return v != null ? v : Version.CURRENT;
     } else {
       // assume latest version
@@ -2451,13 +2455,14 @@ public abstract class InternalDataSerializer extends DataSerializer {
   }
 
   /**
-   * Get the {@link Version} of the peer or disk store that created this {@link DataOutput}. Returns
+   * Get the {@link org.apache.geode.internal.Version} of the peer or disk store that created this
+   * {@link DataOutput}. Returns
    * null if the version is same as this member's.
    */
   public static Version getVersionForDataStreamOrNull(DataOutput out) {
     // check if this is a versioned data output
     if (out instanceof VersionedDataStream) {
-      return Version.getVersionForDataStream((VersionedDataStream) out);
+      return (Version) ((VersionedDataStream) out).getVersion();
     } else {
       // assume latest version
       return null;
@@ -2816,7 +2821,7 @@ public abstract class InternalDataSerializer extends DataSerializer {
       ObjectInput ois = new DSObjectInputStream(stream);
       serializationFilter.setFilterOn((ObjectInputStream) ois);
       if (stream instanceof VersionedDataStream) {
-        Version v = Version.getVersionForDataStream((VersionedDataStream) stream);
+        Version v = (Version) ((VersionedDataStream) stream).getVersion();
         if (Version.CURRENT != v && v != null) {
           ois = new VersionedObjectInput(ois, v);
         }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/Version.java b/geode-core/src/main/java/org/apache/geode/internal/Version.java
index 75f6a59..71243ea 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/Version.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/Version.java
@@ -18,15 +18,13 @@ package org.apache.geode.internal;
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
-import java.io.InputStream;
-import java.nio.ByteBuffer;
 import java.util.Arrays;
 import java.util.stream.Collectors;
 
 import org.apache.geode.annotations.Immutable;
 import org.apache.geode.cache.UnsupportedVersionException;
 import org.apache.geode.internal.cache.tier.sockets.CommandInitializer;
-import org.apache.geode.internal.serialization.VersionedDataStream;
+import org.apache.geode.internal.serialization.SerializationVersion;
 
 /**
  * Enumerated type for client / server and p2p version.
@@ -38,7 +36,7 @@ import org.apache.geode.internal.serialization.VersionedDataStream;
  * @since GemFire 5.7
  */
 @Immutable
-public class Version implements Comparable<Version> {
+public class Version extends SerializationVersion {
 
   /** The name of this version */
   private final transient String name;
@@ -55,20 +53,11 @@ public class Version implements Comparable<Version> {
   private final byte release;
   private final byte patch;
 
-  /** byte used as ordinal to represent this <code>Version</code> */
-  private final short ordinal;
-
   public static final int HIGHEST_VERSION = 107;
 
   @Immutable
   private static final Version[] VALUES = new Version[HIGHEST_VERSION + 1];
 
-  /**
-   * Reserved token that cannot be used for product version but as a flag in internal contexts.
-   */
-  private static final byte TOKEN_ORDINAL = -1;
-  private static final int TOKEN_ORDINAL_INT = (TOKEN_ORDINAL & 0xFF);
-
   @Immutable
   public static final Version TOKEN =
       new Version("", "TOKEN", (byte) -1, (byte) 0, (byte) 0, (byte) 0, TOKEN_ORDINAL);
@@ -309,13 +298,13 @@ public class Version implements Comparable<Version> {
   /** Creates a new instance of <code>Version</code> */
   private Version(String product, String name, byte major, byte minor, byte release, byte patch,
       byte ordinal) {
+    super(ordinal);
     this.productName = product;
     this.name = name;
     this.majorVersion = major;
     this.minorVersion = minor;
     this.release = release;
     this.patch = patch;
-    this.ordinal = ordinal;
     this.methodSuffix = this.productName + "_" + this.majorVersion + "_" + this.minorVersion + "_"
         + this.release + "_" + this.patch;
     if (ordinal != TOKEN_ORDINAL) {
@@ -357,42 +346,19 @@ public class Version implements Comparable<Version> {
   }
 
   /**
-   * Write the given ordinal (result of {@link #ordinal()}) to given {@link DataOutput}. This keeps
-   * the serialization of ordinal compatible with previous versions writing a single byte to
-   * DataOutput when possible, and a token with 2 bytes if it is large.
-   *
-   * @param out the {@link DataOutput} to write the ordinal write to
-   * @param ordinal the version to be written
-   * @param compressed if true, then use single byte for ordinal < 128, and three bytes for beyond
-   *        that, else always use three bytes where the first byte is {@link #TOKEN_ORDINAL}; former
-   *        mode is useful for interoperatibility with previous versions while latter to use fixed
-   *        size for writing version; typically former will be used for P2P/client-server
-   *        communications while latter for persisting to disk; we use the token to ensure that
-   *        {@link #readOrdinal(DataInput)} can deal with both compressed/uncompressed cases
-   *        seemlessly
-   */
-  public static void writeOrdinal(DataOutput out, short ordinal, boolean compressed)
-      throws IOException {
-    if (compressed && ordinal <= Byte.MAX_VALUE) {
-      out.writeByte(ordinal);
-    } else {
-      out.writeByte(TOKEN_ORDINAL);
-      out.writeShort(ordinal);
-    }
-  }
-
-  /**
    * Write this {@link Version}'s ordinal (result of {@link #ordinal()}) to given
    * {@link DataOutput}. This keeps the serialization of ordinal compatible with previous versions
    * writing a single byte to DataOutput when possible, and a token with 2 bytes if it is large.
    *
    * @param out the {@link DataOutput} to write the ordinal write to
    * @param compressed if true, then use single byte for ordinal < 128, and three bytes for beyond
-   *        that, else always use three bytes where the first byte is {@link #TOKEN_ORDINAL}; former
+   *        that, else always use three bytes where the first byte is
+   *        {@link SerializationVersion#TOKEN_ORDINAL}; former
    *        mode is useful for interoperatibility with previous versions while latter to use fixed
    *        size for writing version; typically former will be used for P2P/client-server
    *        communications while latter for persisting to disk; we use the token to ensure that
-   *        {@link #readOrdinal(DataInput)} can deal with both compressed/uncompressed cases
+   *        {@link SerializationVersion#readOrdinal(DataInput)} can deal with both
+   *        compressed/uncompressed cases
    *        seemlessly
    */
   public void writeOrdinal(DataOutput out, boolean compressed) throws IOException {
@@ -400,37 +366,6 @@ public class Version implements Comparable<Version> {
   }
 
   /**
-   * Write the given ordinal (result of {@link #ordinal()}) to given {@link ByteBuffer}. This keeps
-   * the serialization of ordinal compatible with previous versions writing a single byte to
-   * DataOutput when possible, and a token with 2 bytes if it is large.
-   *
-   * @param buffer the {@link ByteBuffer} to write the ordinal write to
-   * @param ordinal the version to be written
-   * @param compressed if true, then use single byte for ordinal < 128, and three bytes for beyond
-   *        that, else always use three bytes where the first byte is {@link #TOKEN_ORDINAL}
-   */
-  public static void writeOrdinal(ByteBuffer buffer, short ordinal, boolean compressed) {
-    if (compressed && ordinal <= Byte.MAX_VALUE) {
-      buffer.put((byte) ordinal);
-    } else {
-      buffer.put(TOKEN_ORDINAL);
-      buffer.putShort(ordinal);
-    }
-  }
-
-  /**
-   * Reads ordinal as written by {@link #writeOrdinal} from given {@link DataInput}.
-   */
-  public static short readOrdinal(DataInput in) throws IOException {
-    final byte ordinal = in.readByte();
-    if (ordinal != TOKEN_ORDINAL) {
-      return ordinal;
-    } else {
-      return in.readShort();
-    }
-  }
-
-  /**
    * Return the <code>Version</code> reading from given {@link DataInput} as serialized by
    * {@link #writeOrdinal(DataOutput, boolean)}.
    *
@@ -451,6 +386,7 @@ public class Version implements Comparable<Version> {
     return fromOrdinalNoThrow(readOrdinal(in), returnNullForCurrent);
   }
 
+
   /**
    * Return the <code>Version</code> represented by specified ordinal while not throwing exception
    * if given ordinal is higher than any known ones or does not map to an actual Version instance
@@ -466,30 +402,6 @@ public class Version implements Comparable<Version> {
     return VALUES[ordinal];
   }
 
-  /**
-   * Reads ordinal as written by {@link #writeOrdinal} from given {@link InputStream}. Returns -1 on
-   * end of stream.
-   */
-  public static short readOrdinalFromInputStream(InputStream is) throws IOException {
-    final int ordinal = is.read();
-    if (ordinal != -1) {
-      if (ordinal != TOKEN_ORDINAL_INT) {
-        return (short) ordinal;
-      } else {
-        // two byte ordinal
-        final int ordinalPart1 = is.read();
-        final int ordinalPart2 = is.read();
-        if ((ordinalPart1 | ordinalPart2) >= 0) {
-          return (short) ((ordinalPart1 << 8) | ordinalPart2);
-        } else {
-          return -1;
-        }
-      }
-    } else {
-      return -1;
-    }
-  }
-
   public String getMethodSuffix() {
     return this.methodSuffix;
   }
@@ -548,21 +460,6 @@ public class Version implements Comparable<Version> {
   }
 
   /**
-   * {@inheritDoc}
-   */
-  @Override
-  public int compareTo(Version other) {
-    if (other != null) {
-      // byte min/max can't overflow int, so use (a-b)
-      final int thisOrdinal = this.ordinal;
-      final int otherOrdinal = other.ordinal;
-      return (thisOrdinal - otherOrdinal);
-    } else {
-      return 1;
-    }
-  }
-
-  /**
    * Returns a string representation for this <code>Version</code>.
    *
    * @return the name of this operation.
@@ -622,15 +519,4 @@ public class Version implements Comparable<Version> {
         .collect(Collectors.toList());
   }
 
-  public static Version getVersionForDataStream(VersionedDataStream input) {
-    try {
-      short ordinal = input.getVersionOrdinal();
-      if (ordinal <= 0) {
-        return null;
-      }
-      return fromOrdinal(ordinal, false);
-    } catch (UnsupportedVersionException e) {
-      return null;
-    }
-  }
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/VersionedObjectInput.java b/geode-core/src/main/java/org/apache/geode/internal/VersionedObjectInput.java
index 73b79d7..8ef654f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/VersionedObjectInput.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/VersionedObjectInput.java
@@ -18,6 +18,7 @@ package org.apache.geode.internal;
 import java.io.IOException;
 import java.io.ObjectInput;
 
+import org.apache.geode.internal.serialization.SerializationVersion;
 import org.apache.geode.internal.serialization.VersionedDataStream;
 
 /**
@@ -46,11 +47,8 @@ public class VersionedObjectInput implements ObjectInput, VersionedDataStream {
    * {@inheritDoc}
    */
   @Override
-  public short getVersionOrdinal() {
-    if (version == null) {
-      return Version.CURRENT_ORDINAL;
-    }
-    return this.version.ordinal();
+  public SerializationVersion getVersion() {
+    return this.version;
   }
 
   /**
diff --git a/geode-core/src/main/java/org/apache/geode/internal/VersionedObjectOutput.java b/geode-core/src/main/java/org/apache/geode/internal/VersionedObjectOutput.java
index e8d44ff..8d025d8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/VersionedObjectOutput.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/VersionedObjectOutput.java
@@ -18,6 +18,7 @@ package org.apache.geode.internal;
 import java.io.IOException;
 import java.io.ObjectOutput;
 
+import org.apache.geode.internal.serialization.SerializationVersion;
 import org.apache.geode.internal.serialization.VersionedDataStream;
 
 /**
@@ -49,11 +50,8 @@ public class VersionedObjectOutput implements ObjectOutput, VersionedDataStream
    * {@inheritDoc}
    */
   @Override
-  public short getVersionOrdinal() {
-    if (version == null) {
-      return Version.CURRENT_ORDINAL;
-    }
-    return this.version.ordinal();
+  public SerializationVersion getVersion() {
+    return this.version;
   }
 
   /**
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskInitFile.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskInitFile.java
index 7cf2d51..67affe0 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskInitFile.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskInitFile.java
@@ -81,6 +81,7 @@ import org.apache.geode.internal.cache.versions.RegionVersionVector;
 import org.apache.geode.internal.concurrent.ConcurrentHashSet;
 import org.apache.geode.internal.logging.LogService;
 import org.apache.geode.internal.logging.log4j.LogMarker;
+import org.apache.geode.internal.serialization.SerializationVersion;
 
 /**
  * Does all the IF file work for a DiskStoreImpl.
@@ -2794,7 +2795,7 @@ public class DiskInitFile implements DiskInitFileInterpreter {
     try {
       ByteBuffer bb = getIFWriteBuffer(1 + 3 + 1);
       bb.put(IFREC_GEMFIRE_VERSION);
-      Version.writeOrdinal(bb, version.ordinal(), false);
+      SerializationVersion.writeOrdinal(bb, version.ordinal(), false);
       bb.put(END_OF_RECORD_ID);
       writeIFRecord(bb, false); // don't do stats for these small records
     } catch (IOException ex) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/EventID.java b/geode-core/src/main/java/org/apache/geode/internal/cache/EventID.java
index 5d26919..5e08365 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/EventID.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/EventID.java
@@ -315,7 +315,7 @@ public class EventID implements DataSerializableFixedID, Serializable, Externali
       disVersion = Version.GFE_90;
     }
     ByteArrayDataInput dis =
-        new ByteArrayDataInput(membershipID, disVersion == null ? 0 : disVersion.ordinal());
+        new ByteArrayDataInput(membershipID, disVersion);
     InternalDistributedMember result = null;
     try {
       result = InternalDistributedMember.readEssentialData(dis);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/FilterRoutingInfo.java b/geode-core/src/main/java/org/apache/geode/internal/cache/FilterRoutingInfo.java
index 9a33a06..f227aba 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/FilterRoutingInfo.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/FilterRoutingInfo.java
@@ -486,7 +486,7 @@ public class FilterRoutingInfo implements VersionedDataSerializable {
     private void deserialize() {
       try {
         ByteArrayDataInput dis =
-            new ByteArrayDataInput(myData, myDataVersion == null ? 0 : myDataVersion.ordinal());
+            new ByteArrayDataInput(myData, myDataVersion);
         boolean hasCQs = dis.readBoolean();
         if (hasCQs) {
           int numEntries = InternalDataSerializer.readArrayLength(dis);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/Oplog.java b/geode-core/src/main/java/org/apache/geode/internal/cache/Oplog.java
index 0675ecc..035f61d 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/Oplog.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/Oplog.java
@@ -108,6 +108,7 @@ import org.apache.geode.internal.offheap.annotations.Released;
 import org.apache.geode.internal.offheap.annotations.Retained;
 import org.apache.geode.internal.sequencelog.EntryLogger;
 import org.apache.geode.internal.serialization.ByteArrayDataInput;
+import org.apache.geode.internal.serialization.SerializationVersion;
 import org.apache.geode.internal.shared.NativeCalls;
 import org.apache.geode.internal.util.BlobHelper;
 import org.apache.geode.pdx.internal.PdxWriterImpl;
@@ -2071,7 +2072,7 @@ public class Oplog implements CompactableOplog, Flushable {
 
   private Version readProductVersionRecord(DataInput dis, File f) throws IOException {
     Version recoveredGFVersion;
-    short ver = Version.readOrdinal(dis);
+    short ver = SerializationVersion.readOrdinal(dis);
     try {
       recoveredGFVersion = Version.fromOrdinal(ver, false);
     } catch (UnsupportedVersionException e) {
@@ -6362,7 +6363,8 @@ public class Oplog implements CompactableOplog, Flushable {
   }
 
   /**
-   * If this OpLog is from an older version of the product, then return that {@link Version} else
+   * If this OpLog is from an older version of the product, then return that
+   * {@link org.apache.geode.internal.Version} else
    * return null.
    */
   public Version getProductVersionIfOld() {
@@ -6385,7 +6387,7 @@ public class Oplog implements CompactableOplog, Flushable {
 
   /**
    * If this OpLog has data that was written by an older version of the product, then return that
-   * {@link Version} else return null.
+   * {@link org.apache.geode.internal.Version} else return null.
    */
   public Version getDataVersionIfOld() {
     final Version version = this.dataVersion;
@@ -6574,7 +6576,7 @@ public class Oplog implements CompactableOplog, Flushable {
         flushNoSync(olf);
       }
       // don't compress since we setup fixed size of buffers
-      Version.writeOrdinal(bb, ordinal, false);
+      SerializationVersion.writeOrdinal(bb, ordinal, false);
     }
 
     private void writeInt(OplogFile olf, int v) throws IOException {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/DiskInitFileParser.java b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/DiskInitFileParser.java
index 5350a90..d595a92 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/DiskInitFileParser.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/DiskInitFileParser.java
@@ -45,6 +45,7 @@ import org.apache.geode.internal.cache.ProxyBucketRegion;
 import org.apache.geode.internal.cache.versions.RegionVersionHolder;
 import org.apache.geode.internal.logging.LogService;
 import org.apache.geode.internal.logging.log4j.LogMarker;
+import org.apache.geode.internal.serialization.SerializationVersion;
 
 public class DiskInitFileParser {
   private static final Logger logger = LogService.getLogger();
@@ -426,7 +427,7 @@ public class DiskInitFileParser {
         }
           break;
         case DiskInitFile.IFREC_GEMFIRE_VERSION: {
-          short ver = Version.readOrdinal(dis);
+          short ver = SerializationVersion.readOrdinal(dis);
           readEndOfRecord(dis);
           if (logger.isTraceEnabled(LogMarker.PERSIST_RECOVERY_VERBOSE)) {
             logger.trace(LogMarker.PERSIST_RECOVERY_VERBOSE, "IFREC_GEMFIRE_VERSION version={}",
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientRegistrationMetadata.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientRegistrationMetadata.java
index 2a6e073..637f2c6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientRegistrationMetadata.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientRegistrationMetadata.java
@@ -29,6 +29,7 @@ import org.apache.geode.internal.Version;
 import org.apache.geode.internal.cache.InternalCache;
 import org.apache.geode.internal.cache.tier.CommunicationMode;
 import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.serialization.SerializationVersion;
 import org.apache.geode.internal.serialization.VersionedDataInputStream;
 import org.apache.geode.internal.serialization.VersionedDataOutputStream;
 
@@ -58,9 +59,9 @@ class ClientRegistrationMetadata {
         unversionedDataOutputStream)) {
       if (oldClientRequiresVersionedStreams(clientVersion)) {
         dataInputStream =
-            new VersionedDataInputStream(unversionedDataInputStream, clientVersion.ordinal());
+            new VersionedDataInputStream(unversionedDataInputStream, clientVersion);
         dataOutputStream =
-            new VersionedDataOutputStream(unversionedDataOutputStream, clientVersion.ordinal());
+            new VersionedDataOutputStream(unversionedDataOutputStream, clientVersion);
       } else {
         dataInputStream = unversionedDataInputStream;
         dataOutputStream = unversionedDataOutputStream;
@@ -113,7 +114,7 @@ class ClientRegistrationMetadata {
   private boolean getAndValidateClientVersion(final Socket socket,
       final DataInputStream dataInputStream, final DataOutputStream dataOutputStream)
       throws IOException {
-    short clientVersionOrdinal = Version.readOrdinal(dataInputStream);
+    short clientVersionOrdinal = SerializationVersion.readOrdinal(dataInputStream);
 
     try {
       clientVersion = Version.fromOrdinal(clientVersionOrdinal, true);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerSideHandshakeFactory.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerSideHandshakeFactory.java
index 387c741..5f793e2 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerSideHandshakeFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerSideHandshakeFactory.java
@@ -32,6 +32,7 @@ import org.apache.geode.internal.cache.tier.CommunicationMode;
 import org.apache.geode.internal.cache.tier.ServerSideHandshake;
 import org.apache.geode.internal.logging.LogService;
 import org.apache.geode.internal.security.SecurityService;
+import org.apache.geode.internal.serialization.SerializationVersion;
 
 class ServerSideHandshakeFactory {
   private static final Logger logger = LogService.getLogger();
@@ -64,7 +65,7 @@ class ServerSideHandshakeFactory {
       soTimeout = socket.getSoTimeout();
       socket.setSoTimeout(timeout);
       InputStream is = socket.getInputStream();
-      short clientVersionOrdinal = Version.readOrdinalFromInputStream(is);
+      short clientVersionOrdinal = SerializationVersion.readOrdinalFromInputStream(is);
       if (clientVersionOrdinal == -1) {
         throw new EOFException(
             "HandShakeReader: EOF reached before client version could be read");
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerSideHandshakeImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerSideHandshakeImpl.java
index c4a06b9..624cde3 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerSideHandshakeImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerSideHandshakeImpl.java
@@ -35,6 +35,7 @@ import org.apache.geode.internal.cache.tier.CommunicationMode;
 import org.apache.geode.internal.cache.tier.Encryptor;
 import org.apache.geode.internal.cache.tier.ServerSideHandshake;
 import org.apache.geode.internal.security.SecurityService;
+import org.apache.geode.internal.serialization.SerializationVersion;
 import org.apache.geode.internal.serialization.VersionedDataInputStream;
 import org.apache.geode.internal.serialization.VersionedDataOutputStream;
 import org.apache.geode.internal.serialization.VersionedDataStream;
@@ -87,9 +88,9 @@ public class ServerSideHandshakeImpl extends Handshake implements ServerSideHand
         this.clientReadTimeout = dataInputStream.readInt();
         if (clientVersion.compareTo(Version.CURRENT) < 0) {
           // versioned streams allow object serialization code to deal with older clients
-          dataInputStream = new VersionedDataInputStream(dataInputStream, clientVersion.ordinal());
+          dataInputStream = new VersionedDataInputStream(dataInputStream, clientVersion);
           dataOutputStream =
-              new VersionedDataOutputStream(dataOutputStream, clientVersion.ordinal());
+              new VersionedDataOutputStream(dataOutputStream, clientVersion);
         }
         this.id = ClientProxyMembershipID.readCanonicalized(dataInputStream);
         // Note: credentials should always be the last piece in handshake for
@@ -134,8 +135,8 @@ public class ServerSideHandshakeImpl extends Handshake implements ServerSideHand
     DataOutputStream dos = new DataOutputStream(out);
     DataInputStream dis;
     if (clientVersion.compareTo(Version.CURRENT) < 0) {
-      dis = new VersionedDataInputStream(in, clientVersion.ordinal());
-      dos = new VersionedDataOutputStream(dos, clientVersion.ordinal());
+      dis = new VersionedDataInputStream(in, clientVersion);
+      dos = new VersionedDataOutputStream(dos, clientVersion);
     } else {
       dis = new DataInputStream(in);
     }
@@ -149,7 +150,7 @@ public class ServerSideHandshakeImpl extends Handshake implements ServerSideHand
 
     // additional byte of wan site needs to send for Gateway BC
     if (communicationMode.isWAN()) {
-      Version.writeOrdinal(dos, currentServerVersion.ordinal(), true);
+      SerializationVersion.writeOrdinal(dos, currentServerVersion.ordinal(), true);
     }
 
     dos.writeByte(endpointType);
@@ -160,7 +161,7 @@ public class ServerSideHandshakeImpl extends Handshake implements ServerSideHand
 
     Version v = Version.CURRENT;
     if (dos instanceof VersionedDataStream) {
-      v = Version.getVersionForDataStream((VersionedDataStream) dos);
+      v = (Version) ((VersionedDataStream) dos).getVersion();
     }
     HeapDataOutputStream hdos = new HeapDataOutputStream(v);
     DataSerializer.writeObject(member, hdos);
@@ -171,7 +172,8 @@ public class ServerSideHandshakeImpl extends Handshake implements ServerSideHand
     dos.writeUTF("");
 
     // Write delta-propagation property value if this is not WAN.
-    if (!communicationMode.isWAN() && this.clientVersion.compareTo(Version.GFE_61) >= 0) {
+    if (!communicationMode.isWAN() && this.clientVersion.compareTo(
+        Version.GFE_61) >= 0) {
       dos.writeBoolean(((InternalDistributedSystem) this.system).getConfig().getDeltaPropagation());
     }
 
@@ -189,7 +191,8 @@ public class ServerSideHandshakeImpl extends Handshake implements ServerSideHand
           .getDistributedSystemId());
     }
 
-    if ((communicationMode.isWAN()) && this.clientVersion.compareTo(Version.GFE_80) >= 0
+    if ((communicationMode.isWAN()) && this.clientVersion.compareTo(
+        Version.GFE_80) >= 0
         && currentServerVersion.compareTo(Version.GFE_80) >= 0) {
       int pdxSize = PeerTypeRegistration.getPdxRegistrySize();
       dos.writeInt(pdxSize);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventImpl.java
index d32fd50..a9abf34 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventImpl.java
@@ -735,7 +735,7 @@ public class GatewaySenderEventImpl
     // this._id = in.readUTF();
     if (version < 0x11 && (in instanceof InputStream)
         && InternalDataSerializer.getVersionForDataStream(in) == Version.CURRENT) {
-      in = new VersionedDataInputStream((InputStream) in, Version.GFE_701.ordinal());
+      in = new VersionedDataInputStream((InputStream) in, Version.GFE_701);
     }
     this.id = (EventID) DataSerializer.readObject(in);
     // TODO:Asif ; Check if this violates Barry's logic of not assiging VM
diff --git a/geode-core/src/main/java/org/apache/geode/internal/serialization/BufferDataOutputStream.java b/geode-core/src/main/java/org/apache/geode/internal/serialization/BufferDataOutputStream.java
index 20f336b..245b286 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/serialization/BufferDataOutputStream.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/serialization/BufferDataOutputStream.java
@@ -43,7 +43,7 @@ public class BufferDataOutputStream extends OutputStream implements VersionedDat
   protected LinkedList<ByteBuffer> chunks = null;
   protected int size = 0;
   protected boolean ignoreWrites = false; // added for bug 39569
-  protected short version;
+  protected SerializationVersion version;
   protected boolean doNotCopy;
   protected ByteBuffer buffer;
   /**
@@ -55,7 +55,7 @@ public class BufferDataOutputStream extends OutputStream implements VersionedDat
   private Error expansionException = null;
   private int memoPosition;
 
-  public BufferDataOutputStream(int allocSize, short version) {
+  public BufferDataOutputStream(int allocSize, SerializationVersion version) {
     this(allocSize, version, false);
   }
 
@@ -80,7 +80,7 @@ public class BufferDataOutputStream extends OutputStream implements VersionedDat
    * @param doNotCopy if true then byte arrays/buffers/sources will not be copied to this hdos but
    *        instead referenced.
    */
-  public BufferDataOutputStream(int allocSize, short version, boolean doNotCopy) {
+  public BufferDataOutputStream(int allocSize, SerializationVersion version, boolean doNotCopy) {
     if (allocSize < SMALLEST_CHUNK_SIZE) {
       this.MIN_CHUNK_SIZE = SMALLEST_CHUNK_SIZE;
     } else {
@@ -91,7 +91,8 @@ public class BufferDataOutputStream extends OutputStream implements VersionedDat
     this.doNotCopy = doNotCopy;
   }
 
-  public BufferDataOutputStream(ByteBuffer initialBuffer, short version, boolean doNotCopy) {
+  public BufferDataOutputStream(ByteBuffer initialBuffer, SerializationVersion version,
+      boolean doNotCopy) {
     if (initialBuffer.position() != 0) {
       initialBuffer = initialBuffer.slice();
     }
@@ -151,7 +152,7 @@ public class BufferDataOutputStream extends OutputStream implements VersionedDat
    * {@inheritDoc}
    */
   @Override
-  public short getVersionOrdinal() {
+  public SerializationVersion getVersion() {
     return version;
   }
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/serialization/ByteArrayDataInput.java b/geode-core/src/main/java/org/apache/geode/internal/serialization/ByteArrayDataInput.java
index 20d5f2f..23fff7a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/serialization/ByteArrayDataInput.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/serialization/ByteArrayDataInput.java
@@ -35,7 +35,7 @@ public class ByteArrayDataInput extends InputStream implements DataInput, Versio
   private int pos;
   /** reusable buffer for readUTF */
   private char[] charBuf;
-  private short version;
+  private SerializationVersion version;
 
   /**
    * Create a {@link DataInput} whose contents are empty.
@@ -43,10 +43,10 @@ public class ByteArrayDataInput extends InputStream implements DataInput, Versio
   public ByteArrayDataInput() {}
 
   public ByteArrayDataInput(byte[] bytes) {
-    initialize(bytes, (short) 0);
+    initialize(bytes, null);
   }
 
-  public ByteArrayDataInput(byte[] bytes, short version) {
+  public ByteArrayDataInput(byte[] bytes, SerializationVersion version) {
     initialize(bytes, version);
   }
 
@@ -57,18 +57,18 @@ public class ByteArrayDataInput extends InputStream implements DataInput, Versio
    *        (a copy is not made) so it should not be changed externally.
    * @param version the product version that serialized the object on given bytes
    */
-  public void initialize(byte[] bytes, int version) {
+  public void initialize(byte[] bytes, SerializationVersion version) {
     this.bytes = bytes;
     this.nBytes = bytes.length;
     this.pos = 0;
-    this.version = (short) version;
+    this.version = version;
   }
 
   /**
    * {@inheritDoc}
    */
   @Override
-  public short getVersionOrdinal() {
+  public SerializationVersion getVersion() {
     return version;
   }
 
@@ -463,7 +463,7 @@ public class ByteArrayDataInput extends InputStream implements DataInput, Versio
     this.bytes = null;
     this.nBytes = 0;
     this.pos = 0;
-    this.version = 0;
+    this.version = null;
   }
 
   /**
@@ -471,7 +471,8 @@ public class ByteArrayDataInput extends InputStream implements DataInput, Versio
    */
   @Override
   public String toString() {
-    return this.version == 0 ? super.toString() : (super.toString() + " (v" + this.version + ')');
+    return this.version == null ? super.toString()
+        : (super.toString() + " (v" + this.version + ')');
   }
 
   private void throwUTFEncodingError(int index, int char1, int char2, Integer char3, int enc)
diff --git a/geode-core/src/main/java/org/apache/geode/internal/serialization/DSFIDSerializer.java b/geode-core/src/main/java/org/apache/geode/internal/serialization/DSFIDSerializer.java
index 37cd5a7..d538a02 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/serialization/DSFIDSerializer.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/serialization/DSFIDSerializer.java
@@ -129,11 +129,11 @@ public class DSFIDSerializer {
       if (Version.CURRENT != v && v != null) {
         // get versions where DataOutput was upgraded
         SerializationVersions sv = (SerializationVersions) ds;
-        Version[] versions = sv.getSerializationVersions();
+        SerializationVersion[] versions = sv.getSerializationVersions();
         // check if the version of the peer or diskstore is different and
         // there has been a change in the message
         if (versions != null) {
-          for (Version version : versions) {
+          for (SerializationVersion version : versions) {
             // if peer version is less than the greatest upgraded version
             if (v.compareTo(version) < 0) {
               ds.getClass().getMethod("toDataPre_" + version.getMethodSuffix(),
@@ -181,13 +181,12 @@ public class DSFIDSerializer {
    * Returns
    * zero if the version is same as this member's.
    */
-  public short getVersionForDataStreamOrZero(DataOutput out) {
+  public SerializationVersion getVersionForDataStreamOrNull(DataOutput out) {
     // check if this is a versioned data output
     if (out instanceof VersionedDataStream) {
-      return ((VersionedDataStream) out).getVersionOrdinal();
+      return ((VersionedDataStream) out).getVersion();
     } else {
-      // assume latest version
-      return 0;
+      return null;
     }
   }
 
@@ -262,13 +261,13 @@ public class DSFIDSerializer {
       Version v = InternalDataSerializer.getVersionForDataStreamOrNull(in);
       if (Version.CURRENT != v && v != null) {
         // get versions where DataOutput was upgraded
-        Version[] versions = null;
+        SerializationVersion[] versions = null;
         SerializationVersions vds = (SerializationVersions) ds;
         versions = vds.getSerializationVersions();
         // check if the version of the peer or diskstore is different and
         // there has been a change in the message
         if (versions != null) {
-          for (Version version : versions) {
+          for (SerializationVersion version : versions) {
             // if peer version is less than the greatest upgraded version
             if (v.compareTo(version) < 0) {
               ds.getClass().getMethod("fromDataPre" + '_' + version.getMethodSuffix(),
diff --git a/geode-core/src/main/java/org/apache/geode/internal/serialization/SerializationVersion.java b/geode-core/src/main/java/org/apache/geode/internal/serialization/SerializationVersion.java
new file mode 100644
index 0000000..4f0cbda
--- /dev/null
+++ b/geode-core/src/main/java/org/apache/geode/internal/serialization/SerializationVersion.java
@@ -0,0 +1,140 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.serialization;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.ByteBuffer;
+
+public class SerializationVersion implements Comparable<SerializationVersion> {
+
+  /**
+   * Reserved token that cannot be used for product version but as a flag in internal contexts.
+   */
+  protected static final byte TOKEN_ORDINAL = -1;
+  protected static final int TOKEN_ORDINAL_INT = (TOKEN_ORDINAL & 0xFF);
+
+  /** value used as ordinal to represent this <code>SerializationVersion</code> */
+  protected final short ordinal;
+
+  public SerializationVersion(int ordinal) {
+    this.ordinal = (short) ordinal;
+  }
+
+  /**
+   * Write the given ordinal (result of ordinal()) to given {@link DataOutput}. This keeps
+   * the serialization of ordinal compatible with previous versions writing a single byte to
+   * DataOutput when possible, and a token with 2 bytes if it is large.
+   *
+   * @param out the {@link DataOutput} to write the ordinal write to
+   * @param ordinal the version to be written
+   * @param compressed if true, then use single byte for ordinal < 128, and three bytes for beyond
+   *        that, else always use three bytes where the first byte is {@link #TOKEN_ORDINAL}; former
+   *        mode is useful for interoperatibility with previous versions while latter to use fixed
+   *        size for writing version; typically former will be used for P2P/client-server
+   *        communications while latter for persisting to disk; we use the token to ensure that
+   *        {@link #readOrdinal(DataInput)} can deal with both compressed/uncompressed cases
+   *        seemlessly
+   */
+  public static void writeOrdinal(DataOutput out, short ordinal, boolean compressed)
+      throws IOException {
+    if (compressed && ordinal <= Byte.MAX_VALUE) {
+      out.writeByte(ordinal);
+    } else {
+      out.writeByte(TOKEN_ORDINAL);
+      out.writeShort(ordinal);
+    }
+  }
+
+  /**
+   * Write the given ordinal (result of ordinal()) to given {@link ByteBuffer}. This keeps
+   * the serialization of ordinal compatible with previous versions writing a single byte to
+   * DataOutput when possible, and a token with 2 bytes if it is large.
+   *
+   * @param buffer the {@link ByteBuffer} to write the ordinal write to
+   * @param ordinal the version to be written
+   * @param compressed if true, then use single byte for ordinal < 128, and three bytes for beyond
+   *        that, else always use three bytes where the first byte is {@link #TOKEN_ORDINAL}
+   */
+  public static void writeOrdinal(ByteBuffer buffer, short ordinal, boolean compressed) {
+    if (compressed && ordinal <= Byte.MAX_VALUE) {
+      buffer.put((byte) ordinal);
+    } else {
+      buffer.put(TOKEN_ORDINAL);
+      buffer.putShort(ordinal);
+    }
+  }
+
+  /**
+   * Reads ordinal as written by {@link #writeOrdinal} from given {@link DataInput}.
+   */
+  public static short readOrdinal(DataInput in) throws IOException {
+    final byte ordinal = in.readByte();
+    if (ordinal != TOKEN_ORDINAL) {
+      return ordinal;
+    } else {
+      return in.readShort();
+    }
+  }
+
+  /**
+   * Reads ordinal as written by writeOrdinal from given InputStream. Returns -1 on
+   * end of stream.
+   */
+  public static short readOrdinalFromInputStream(InputStream is) throws IOException {
+    final int ordinal = is.read();
+    if (ordinal != -1) {
+      if (ordinal != TOKEN_ORDINAL_INT) {
+        return (short) ordinal;
+      } else {
+        // two byte ordinal
+        final int ordinalPart1 = is.read();
+        final int ordinalPart2 = is.read();
+        if ((ordinalPart1 | ordinalPart2) >= 0) {
+          return (short) ((ordinalPart1 << 8) | ordinalPart2);
+        } else {
+          return -1;
+        }
+      }
+    } else {
+      return -1;
+    }
+  }
+
+  public String getMethodSuffix() {
+    return "" + ordinal;
+  }
+
+  @Override
+  public String toString() {
+    return "Version{" +
+        "ordinal=" + ordinal +
+        '}';
+  }
+
+  @Override
+  public int compareTo(SerializationVersion other) {
+    if (other != null) {
+      // byte min/max can't overflow int, so use (a-b)
+      final int thisOrdinal = this.ordinal;
+      final int otherOrdinal = other.ordinal;
+      return (thisOrdinal - otherOrdinal);
+    } else {
+      return 1;
+    }
+  }
+}
diff --git a/geode-core/src/main/java/org/apache/geode/internal/serialization/SerializationVersions.java b/geode-core/src/main/java/org/apache/geode/internal/serialization/SerializationVersions.java
index 1d9d2d3..5eeaf02 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/serialization/SerializationVersions.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/serialization/SerializationVersions.java
@@ -14,8 +14,6 @@
  */
 package org.apache.geode.internal.serialization;
 
-import org.apache.geode.internal.Version;
-
 /**
  * This interface is extended by DataSerializableFixedID and VersionedDataSerializable in order to
  * furnish version information to the serialization infrastructure for backward compatibility
@@ -34,6 +32,6 @@ public interface SerializationVersions {
    * The method name is formed with the version's product name and its major, minor, release and
    * patch numbers.
    */
-  Version[] getSerializationVersions();
+  SerializationVersion[] getSerializationVersions();
 
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/serialization/VersionedDataInputStream.java b/geode-core/src/main/java/org/apache/geode/internal/serialization/VersionedDataInputStream.java
index ff0fc2f..b9f0b65 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/serialization/VersionedDataInputStream.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/serialization/VersionedDataInputStream.java
@@ -28,7 +28,7 @@ import java.io.InputStream;
  */
 public class VersionedDataInputStream extends DataInputStream implements VersionedDataStream {
 
-  private final short version;
+  private final SerializationVersion version;
 
   /**
    * Creates a VersionedDataInputStream that uses the specified underlying InputStream.
@@ -36,7 +36,7 @@ public class VersionedDataInputStream extends DataInputStream implements Version
    * @param in the specified input stream
    * @param version the product version that serialized object on the given input stream
    */
-  public VersionedDataInputStream(InputStream in, short version) {
+  public VersionedDataInputStream(InputStream in, SerializationVersion version) {
     super(in);
     this.version = version;
   }
@@ -45,7 +45,7 @@ public class VersionedDataInputStream extends DataInputStream implements Version
    * {@inheritDoc}
    */
   @Override
-  public short getVersionOrdinal() {
+  public SerializationVersion getVersion() {
     return this.version;
   }
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/serialization/VersionedDataOutputStream.java b/geode-core/src/main/java/org/apache/geode/internal/serialization/VersionedDataOutputStream.java
index ddbba6e..9e582f6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/serialization/VersionedDataOutputStream.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/serialization/VersionedDataOutputStream.java
@@ -26,7 +26,7 @@ import java.io.OutputStream;
  */
 public class VersionedDataOutputStream extends DataOutputStream implements VersionedDataStream {
 
-  private final short version;
+  private SerializationVersion version;
 
   /**
    * Creates a VersionedDataOutputStream that wraps the specified underlying OutputStream.
@@ -34,7 +34,7 @@ public class VersionedDataOutputStream extends DataOutputStream implements Versi
    * @param out the underlying output stream
    * @param version the product version that serialized object on the given {@link OutputStream}
    */
-  public VersionedDataOutputStream(OutputStream out, short version) {
+  public VersionedDataOutputStream(OutputStream out, SerializationVersion version) {
     super(out);
     this.version = version;
   }
@@ -43,7 +43,7 @@ public class VersionedDataOutputStream extends DataOutputStream implements Versi
    * {@inheritDoc}
    */
   @Override
-  public short getVersionOrdinal() {
+  public SerializationVersion getVersion() {
     return this.version;
   }
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/serialization/VersionedDataStream.java b/geode-core/src/main/java/org/apache/geode/internal/serialization/VersionedDataStream.java
index d7f7b7a..93dbca9 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/serialization/VersionedDataStream.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/serialization/VersionedDataStream.java
@@ -37,10 +37,10 @@ public interface VersionedDataStream {
 
   /**
    * If the remote peer to which this input/output is connected has a lower version that this
-   * member, then this returns the {@link Version} ordinal of the peer else 0. If the peer has a
+   * member, then this returns the {@link Version} of the peer else null. If the peer has a
    * higher
    * {@link Version}, then this member cannot do any adjustment to serialization and its the remote
    * peer's responsibility to adjust the serialization/deserialization according to this peer.
    */
-  short getVersionOrdinal();
+  SerializationVersion getVersion();
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/tcp/Connection.java b/geode-core/src/main/java/org/apache/geode/internal/tcp/Connection.java
index 60113e8..ef3c430 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/tcp/Connection.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/tcp/Connection.java
@@ -80,6 +80,7 @@ import org.apache.geode.internal.net.BufferPool;
 import org.apache.geode.internal.net.NioFilter;
 import org.apache.geode.internal.net.NioPlainEngine;
 import org.apache.geode.internal.net.SocketCreator;
+import org.apache.geode.internal.serialization.SerializationVersion;
 import org.apache.geode.internal.tcp.MsgReader.Header;
 import org.apache.geode.internal.util.concurrent.ReentrantSemaphore;
 
@@ -651,7 +652,8 @@ public class Connection implements Runnable {
       bb.putInt(cfg.getAsyncQueueTimeout());
       bb.putInt(cfg.getAsyncMaxQueueSize());
       // write own product version
-      Version.writeOrdinal(bb, Version.CURRENT.ordinal(), true);
+      SerializationVersion
+          .writeOrdinal(bb, Version.CURRENT.ordinal(), true);
       // now set the msg length into position 0
       bb.putInt(0, calcHdrSize(bb.position() - MSG_HEADER_BYTES));
       my_okHandshakeBuf = bb;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgDestreamer.java b/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgDestreamer.java
index 814ce1f..8de1b3f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgDestreamer.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgDestreamer.java
@@ -240,7 +240,7 @@ public class MsgDestreamer {
           final Version v = version;
           DataInputStream dis =
               v == null ? new DataInputStream(this.is)
-                  : new VersionedDataInputStream(this.is, v.ordinal());
+                  : new VersionedDataInputStream(this.is, v);
           long startSer = this.stats.startMsgDeserialization();
           setResult((DistributionMessage) InternalDataSerializer.readDSFID(dis));
           this.stats.endMsgDeserialization(startSer);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/tcp/VersionedByteBufferInputStream.java b/geode-core/src/main/java/org/apache/geode/internal/tcp/VersionedByteBufferInputStream.java
index 0945afe..d77686b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/tcp/VersionedByteBufferInputStream.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/tcp/VersionedByteBufferInputStream.java
@@ -18,6 +18,7 @@ package org.apache.geode.internal.tcp;
 import java.nio.ByteBuffer;
 
 import org.apache.geode.internal.Version;
+import org.apache.geode.internal.serialization.SerializationVersion;
 import org.apache.geode.internal.serialization.VersionedDataStream;
 
 /**
@@ -57,11 +58,8 @@ public class VersionedByteBufferInputStream extends ByteBufferInputStream
    * {@inheritDoc}
    */
   @Override
-  public short getVersionOrdinal() {
-    if (version == null) {
-      return Version.CURRENT_ORDINAL;
-    }
-    return this.version.ordinal();
+  public SerializationVersion getVersion() {
+    return this.version;
   }
 
   /**
diff --git a/geode-core/src/main/java/org/apache/geode/internal/tcp/VersionedMsgStreamer.java b/geode-core/src/main/java/org/apache/geode/internal/tcp/VersionedMsgStreamer.java
index 9eed78c..020c90b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/tcp/VersionedMsgStreamer.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/tcp/VersionedMsgStreamer.java
@@ -21,6 +21,7 @@ import org.apache.geode.distributed.internal.DMStats;
 import org.apache.geode.distributed.internal.DistributionMessage;
 import org.apache.geode.internal.Version;
 import org.apache.geode.internal.net.BufferPool;
+import org.apache.geode.internal.serialization.SerializationVersion;
 import org.apache.geode.internal.serialization.VersionedDataStream;
 
 /**
@@ -42,11 +43,8 @@ class VersionedMsgStreamer extends MsgStreamer implements VersionedDataStream {
    * {@inheritDoc}
    */
   @Override
-  public short getVersionOrdinal() {
-    if (version == null) {
-      return Version.CURRENT_ORDINAL;
-    }
-    return this.version.ordinal();
+  public SerializationVersion getVersion() {
+    return this.version;
   }
 
   /**
diff --git a/geode-core/src/main/java/org/apache/geode/internal/util/BlobHelper.java b/geode-core/src/main/java/org/apache/geode/internal/util/BlobHelper.java
index f045151..82b2ee7 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/util/BlobHelper.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/util/BlobHelper.java
@@ -95,7 +95,7 @@ public class BlobHelper {
       if (in == null) {
         in = new ByteArrayDataInput();
       }
-      in.initialize(blob, version == null ? 0 : version.ordinal());
+      in.initialize(blob, version);
       result = DataSerializer.readObject(in);
     }
     endDeserialization(start, blob.length);
diff --git a/geode-core/src/test/java/org/apache/geode/DataSerializerTest.java b/geode-core/src/test/java/org/apache/geode/DataSerializerTest.java
index 823ee30..5ae74a7 100644
--- a/geode-core/src/test/java/org/apache/geode/DataSerializerTest.java
+++ b/geode-core/src/test/java/org/apache/geode/DataSerializerTest.java
@@ -57,9 +57,9 @@ public class DataSerializerTest {
   public void readStringShouldReturnCanonicalEmptyString() throws IOException {
     byte[] serializedEmptyStringBytes = BlobHelper.serializeToBlob("");
     ByteArrayDataInput dataInput1 = new ByteArrayDataInput();
-    dataInput1.initialize(serializedEmptyStringBytes, 0);
+    dataInput1.initialize(serializedEmptyStringBytes, null);
     ByteArrayDataInput dataInput2 = new ByteArrayDataInput();
-    dataInput2.initialize(serializedEmptyStringBytes, 0);
+    dataInput2.initialize(serializedEmptyStringBytes, null);
 
     String firstRead = DataSerializer.readString(dataInput1);
     String secondRead = DataSerializer.readString(dataInput2);
diff --git a/geode-core/src/test/java/org/apache/geode/cache/execute/FunctionAdapterJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/execute/FunctionAdapterJUnitTest.java
index 734c9e9..cbc2ca5 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/execute/FunctionAdapterJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/execute/FunctionAdapterJUnitTest.java
@@ -77,7 +77,7 @@ public class FunctionAdapterJUnitTest {
                 + "serializedFunctionAdapterWithDifferentSerialVersionUID.ser").getAbsolutePath());
 
     DataInputStream dis =
-        new VersionedDataInputStream(new DataInputStream(fis), Version.GFE_82.ordinal());
+        new VersionedDataInputStream(new DataInputStream(fis), Version.GFE_82);
     Object o = InternalDataSerializer.basicReadObject(dis);
     assertTrue(o instanceof FunctionAdapter);
   }
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/GMSMemberJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/GMSMemberJUnitTest.java
index 29f7dac..7c41ee5 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/GMSMemberJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/GMSMemberJUnitTest.java
@@ -202,7 +202,7 @@ public class GMSMemberJUnitTest {
     dataOutput = new HeapDataOutputStream(Version.GFE_90);
     member.writeEssentialData(dataOutput);
     bais = new ByteArrayInputStream(baos.toByteArray());
-    dataInput = new VersionedDataInputStream(new DataInputStream(bais), Version.GFE_90.ordinal());
+    dataInput = new VersionedDataInputStream(new DataInputStream(bais), Version.GFE_90);
     newMember = new GMSMember();
     newMember.readEssentialData(dataInput);
     assertEquals(0, newMember.getVmKind());
diff --git a/geode-core/src/test/java/org/apache/geode/internal/ByteArrayDataInputTest.java b/geode-core/src/test/java/org/apache/geode/internal/ByteArrayDataInputTest.java
index 015f949..aa71e0c 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/ByteArrayDataInputTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/ByteArrayDataInputTest.java
@@ -239,7 +239,7 @@ public class ByteArrayDataInputTest {
       return new java.io.DataInputStream(new java.io.ByteArrayInputStream(inputBytes));
     } else {
       ByteArrayDataInput input = new ByteArrayDataInput();
-      input.initialize(inputBytes, 0);
+      input.initialize(inputBytes, null);
       return input;
     }
   }
diff --git a/geode-core/src/test/java/org/apache/geode/internal/DataSerializableJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/DataSerializableJUnitTest.java
index bb53fe4..d731d97 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/DataSerializableJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/DataSerializableJUnitTest.java
@@ -1165,13 +1165,13 @@ public class DataSerializableJUnitTest implements Serializable {
     VersionedDataSerializableImpl ds = new VersionedDataSerializableImpl(getRandom());
 
     VersionedDataOutputStream v =
-        new VersionedDataOutputStream(this.baos, Version.GFE_70.ordinal());
+        new VersionedDataOutputStream(this.baos, Version.GFE_70);
     DataSerializer.writeObject(ds, v);
     v.flush();
 
     ByteBuffer bb = ByteBuffer.wrap(this.baos.toByteArray());
     ByteBufferInputStream bbis = new ByteBufferInputStream(bb);
-    VersionedDataInputStream vin = new VersionedDataInputStream(bbis, Version.GFE_70.ordinal());
+    VersionedDataInputStream vin = new VersionedDataInputStream(bbis, Version.GFE_70);
     VersionedDataSerializableImpl ds2 =
         (VersionedDataSerializableImpl) DataSerializer.readObject(vin);
 
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/FilterInfoTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/FilterInfoTest.java
index 014f94d..067fee2 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/FilterInfoTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/FilterInfoTest.java
@@ -52,7 +52,7 @@ public class FilterInfoTest {
     byte[] outputBytes = dataOut.toByteArray();
     FilterInfo deserialized = new FilterInfo();
     ByteArrayDataInput dataInput = new ByteArrayDataInput();
-    dataInput.initialize(outputBytes, Version.CURRENT_ORDINAL);
+    dataInput.initialize(outputBytes, Version.CURRENT);
     deserialized.fromData(dataInput);
     assertThat(deserialized.getCQs()).isEqualTo(cqs);
     assertThat(deserialized.getInterestedClients()).isEqualTo(clients);
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/EventIdOptimizationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/EventIdOptimizationJUnitTest.java
index d185e9d..a5ea15a 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/EventIdOptimizationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/EventIdOptimizationJUnitTest.java
@@ -180,7 +180,7 @@ public class EventIdOptimizationJUnitTest {
 
 
     HeapDataOutputStream hdos90 = new HeapDataOutputStream(256, Version.GFE_90);
-    VersionedDataOutputStream dop = new VersionedDataOutputStream(hdos90, Version.GFE_90.ordinal());
+    VersionedDataOutputStream dop = new VersionedDataOutputStream(hdos90, Version.GFE_90);
 
     eventID.toData(dop);
 
@@ -188,7 +188,7 @@ public class EventIdOptimizationJUnitTest {
 
 
     VersionedDataInputStream dataInputStream =
-        new VersionedDataInputStream(bais, Version.GFE_90.ordinal());
+        new VersionedDataInputStream(bais, Version.GFE_90);
 
     EventID eventID2 = new EventID();
     eventID2.fromData(dataInputStream);
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/results/PageEntryJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/results/PageEntryJUnitTest.java
index 88f9e4e..2b84108 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/results/PageEntryJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/results/PageEntryJUnitTest.java
@@ -84,7 +84,7 @@ public class PageEntryJUnitTest {
     entry.toData(out);
     final byte[] bytes = out.toByteArray();
     ByteArrayDataInput in = new ByteArrayDataInput();
-    in.initialize(bytes, (short) 0);
+    in.initialize(bytes, null);
     PageEntry newEntry = new PageEntry();
     newEntry.fromData(in);
     return newEntry;
diff --git a/geode-old-client-support/src/distributedTest/java/org/apache/geode/OldClientSupportDUnitTest.java b/geode-old-client-support/src/distributedTest/java/org/apache/geode/OldClientSupportDUnitTest.java
index 4d21631..d2e9ff1 100644
--- a/geode-old-client-support/src/distributedTest/java/org/apache/geode/OldClientSupportDUnitTest.java
+++ b/geode-old-client-support/src/distributedTest/java/org/apache/geode/OldClientSupportDUnitTest.java
@@ -109,7 +109,7 @@ public class OldClientSupportDUnitTest extends JUnit4CacheTestCase {
 
     Version oldClientVersion = Version.GFE_82;
     VersionedDataOutputStream dout = new VersionedDataOutputStream(
-        new HeapDataOutputStream(10, oldClientVersion), oldClientVersion.ordinal());
+        new HeapDataOutputStream(10, oldClientVersion), oldClientVersion);
 
     for (String geodeClassName : newArrayClassNames) {
       String newName = oldClientSupport.processOutgoingClassName(geodeClassName, dout);
@@ -122,7 +122,7 @@ public class OldClientSupportDUnitTest extends JUnit4CacheTestCase {
     }
 
     VersionedDataInputStream din = new VersionedDataInputStream(
-        new DataInputStream(new ByteArrayInputStream(new byte[10])), oldClientVersion.ordinal());
+        new DataInputStream(new ByteArrayInputStream(new byte[10])), oldClientVersion);
 
     for (String oldClassName : oldArrayClassNames) {
       String newName = oldClientSupport.processIncomingClassName(oldClassName, din);
@@ -198,7 +198,7 @@ public class OldClientSupportDUnitTest extends JUnit4CacheTestCase {
     byte[] serializedForm = byteStream.toByteArray();
 
     ByteArrayDataInput byteDataInput = new ByteArrayDataInput();
-    byteDataInput.initialize(serializedForm, Version.GFE_82.ordinal());
+    byteDataInput.initialize(serializedForm, Version.GFE_82);
     ClientSerializableObject result = DataSerializer.readObject(byteDataInput);
     Assert.assertEquals("Expected an org.apache.geode exception but found " + result,
         result.getClass().getName().substring(0, "org.apache.geode".length()), "org.apache.geode");
@@ -225,7 +225,7 @@ public class OldClientSupportDUnitTest extends JUnit4CacheTestCase {
     byte[] serializedForm = byteStream.toByteArray();
 
     ByteArrayDataInput byteDataInput = new ByteArrayDataInput();
-    byteDataInput.initialize(serializedForm, Version.GFE_82.ordinal());
+    byteDataInput.initialize(serializedForm, Version.GFE_82);
     Object result = DataSerializer.readObject(byteDataInput);
     Assert.assertEquals("Expected an org.apache.geode object but found " + result,
         result.getClass().getName().substring(0, "org.apache.geode".length()), "org.apache.geode");
@@ -249,7 +249,7 @@ public class OldClientSupportDUnitTest extends JUnit4CacheTestCase {
     byte[] serializedForm = byteStream.toByteArray();
 
     ByteArrayDataInput byteDataInput = new ByteArrayDataInput();
-    byteDataInput.initialize(serializedForm, Version.GFE_82.ordinal());
+    byteDataInput.initialize(serializedForm, Version.GFE_82);
     Object result = DataSerializer.readObject(byteDataInput);
     Assert.assertEquals("Expected an org.apache.geode object but found " + result,
         result.getClass().getName().substring(0, "org.apache.geode".length()), "org.apache.geode");
diff --git a/geode-old-client-support/src/main/java/com/gemstone/gemfire/OldClientSupportProvider.java b/geode-old-client-support/src/main/java/com/gemstone/gemfire/OldClientSupportProvider.java
index d6878e4..a0695ce 100644
--- a/geode-old-client-support/src/main/java/com/gemstone/gemfire/OldClientSupportProvider.java
+++ b/geode-old-client-support/src/main/java/com/gemstone/gemfire/OldClientSupportProvider.java
@@ -26,6 +26,7 @@ import org.apache.geode.internal.Version;
 import org.apache.geode.internal.cache.CacheService;
 import org.apache.geode.internal.cache.InternalCache;
 import org.apache.geode.internal.cache.tier.sockets.OldClientSupportService;
+import org.apache.geode.internal.serialization.SerializationVersion;
 import org.apache.geode.internal.serialization.VersionedDataOutputStream;
 import org.apache.geode.management.internal.beans.CacheServiceMBeanBase;
 
@@ -106,7 +107,7 @@ public class OldClientSupportProvider implements OldClientSupportService {
     // if the client is old then it needs com.gemstone.gemfire package names
     if (out instanceof VersionedDataOutputStream) {
       VersionedDataOutputStream vout = (VersionedDataOutputStream) out;
-      Version version = Version.getVersionForDataStream(vout);
+      SerializationVersion version = vout.getVersion();
       if (version != null && version.compareTo(Version.GFE_90) < 0) {
         return processClassName(name, GEODE, GEMFIRE, newClassNamesToOld);
       }