This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a commit to branch feature/GEODE-7090 in repository https://gitbox.apache.org/repos/asf/geode.git
commit e8b17090e377fe44ec31fba24c23c3c1c2369f29 Author: Bruce Schuchardt <bschucha...@pivotal.io> AuthorDate: Thu Aug 15 11:27:47 2019 -0700 GEODE-7090: Remove dependency on DataSerializer from membership classes Use InternalDataSerializer instead of DataSerializer in GMS classes. --- .../internal/membership/gms/GMSMember.java | 35 +++++++++++----------- .../internal/membership/gms/GMSMembershipView.java | 9 +++--- .../internal/membership/gms/GMSUtil.java | 9 ++---- .../gms/locator/FindCoordinatorResponse.java | 5 ++-- .../membership/gms/locator/GMSLocator.java | 6 ++-- .../membership/gms/locator/GetViewResponse.java | 6 ++-- .../gms/messages/InstallViewMessage.java | 10 +++---- .../gms/messages/JoinRequestMessage.java | 10 +++---- .../gms/messages/JoinResponseMessage.java | 18 +++++------ .../gms/messages/LeaveRequestMessage.java | 6 ++-- .../gms/messages/RemoveMemberMessage.java | 6 ++-- .../gms/messages/SuspectMembersMessage.java | 6 ++-- .../membership/gms/messages/ViewAckMessage.java | 6 ++-- .../membership/gms/messenger/JGroupsMessenger.java | 5 ++-- .../MembershipDependenciesJUnitTest.java | 2 -- 15 files changed, 65 insertions(+), 74 deletions(-) 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..cb68bd2 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,7 +22,6 @@ import java.net.InetAddress; import org.jgroups.util.UUID; -import org.apache.geode.DataSerializer; import org.apache.geode.annotations.VisibleForTesting; import org.apache.geode.internal.DataSerializableFixedID; import org.apache.geode.internal.InternalDataSerializer; @@ -489,10 +488,10 @@ public class GMSMember implements DataSerializableFixedID { @Override public void toData(DataOutput out) throws IOException { - DataSerializer.writeInetAddress(getInetAddress(), out); + InternalDataSerializer.writeInetAddress(getInetAddress(), out); out.writeInt(getPort()); - DataSerializer.writeString(hostName, out); + InternalDataSerializer.writeString(hostName, out); int flags = 0; if (isNetworkPartitionDetectionEnabled()) @@ -509,17 +508,17 @@ public class GMSMember implements DataSerializableFixedID { out.writeInt(getProcessId()); int vmKind = getVmKind(); out.writeByte(vmKind); - DataSerializer.writeStringArray(getGroups(), out); + InternalDataSerializer.writeStringArray(getGroups(), out); - DataSerializer.writeString(getName(), out); + InternalDataSerializer.writeString(getName(), out); if (vmKind == LONER_VM_TYPE) { - DataSerializer.writeString("", out); + InternalDataSerializer.writeString("", out); } else { // added in 6.5 for unique identifiers in P2P - DataSerializer.writeString(String.valueOf(getVmViewId()), out); + InternalDataSerializer.writeString(String.valueOf(getVmViewId()), out); } - DataSerializer + InternalDataSerializer .writeString(durableId == null ? "" : durableId, out); - DataSerializer.writeInteger(durableId == null ? 300 : durableTimeout, out); + InternalDataSerializer.writeInteger(durableId == null ? 300 : durableTimeout, out); Version.writeOrdinal(out, versionOrdinal, true); @@ -538,7 +537,7 @@ public class GMSMember implements DataSerializableFixedID { flags |= PREFERRED_FOR_COORD_BIT; out.writeShort(flags); - DataSerializer.writeInetAddress(inetAddr, out); + InternalDataSerializer.writeInetAddress(inetAddr, out); out.writeInt(udpPort); out.writeInt(vmViewId); out.writeLong(uuidMSBs); @@ -550,10 +549,10 @@ public class GMSMember implements DataSerializableFixedID { @Override public void fromData(DataInput in) throws IOException, ClassNotFoundException { - inetAddr = DataSerializer.readInetAddress(in); + inetAddr = InternalDataSerializer.readInetAddress(in); udpPort = in.readInt(); - this.hostName = DataSerializer.readString(in); + this.hostName = InternalDataSerializer.readString(in); int flags = in.readUnsignedByte(); preferredForCoordinator = (flags & PREFERRED_FOR_COORD_BIT) != 0; @@ -562,20 +561,20 @@ public class GMSMember implements DataSerializableFixedID { directPort = in.readInt(); processId = in.readInt(); vmKind = (byte) in.readUnsignedByte(); - groups = DataSerializer.readStringArray(in); + groups = InternalDataSerializer.readStringArray(in); vmViewId = -1; - name = DataSerializer.readString(in); + name = InternalDataSerializer.readString(in); if (vmKind == LONER_DM_TYPE) { - DataSerializer.readString(in); + InternalDataSerializer.readString(in); } else { - String str = DataSerializer.readString(in); + String str = InternalDataSerializer.readString(in); if (str != null) { // backward compatibility from earlier than 6.5 vmViewId = Integer.parseInt(str); } } - durableId = DataSerializer.readString(in); + durableId = InternalDataSerializer.readString(in); durableTimeout = in.readInt(); versionOrdinal = readVersion(flags, in); @@ -613,7 +612,7 @@ public class GMSMember implements DataSerializableFixedID { this.networkPartitionDetectionEnabled = (flags & NPD_ENABLED_BIT) != 0; this.preferredForCoordinator = (flags & PREFERRED_FOR_COORD_BIT) != 0; - this.inetAddr = DataSerializer.readInetAddress(in); + this.inetAddr = InternalDataSerializer.readInetAddress(in); if (this.inetAddr != null) { this.hostName = SocketCreator.resolve_dns ? SocketCreator.getHostName(inetAddr) 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..0a1eea5 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,7 +32,6 @@ import java.util.stream.Collectors; import org.apache.logging.log4j.Logger; -import org.apache.geode.DataSerializer; import org.apache.geode.annotations.Immutable; import org.apache.geode.internal.DataSerializableFixedID; import org.apache.geode.internal.InternalDataSerializer; @@ -604,9 +603,9 @@ public class GMSMembershipView implements DataSerializableFixedID { writeAsArrayList(members, out); GMSUtil.writeSetOfMemberIDs(shutdownMembers, out); GMSUtil.writeSetOfMemberIDs(crashedMembers, out); - DataSerializer.writeIntArray(failureDetectionPorts, out); + InternalDataSerializer.writeIntArray(failureDetectionPorts, out); // TODO expensive serialization - DataSerializer.writeHashMap(publicKeys, out); + InternalDataSerializer.writeHashMap(publicKeys, out); } @@ -618,8 +617,8 @@ public class GMSMembershipView implements DataSerializableFixedID { this.hashedMembers = new HashSet<>(members); shutdownMembers = GMSUtil.readHashSetOfMemberIDs(in); crashedMembers = GMSUtil.readHashSetOfMemberIDs(in); - failureDetectionPorts = DataSerializer.readIntArray(in); - Map pubkeys = DataSerializer.readHashMap(in); + failureDetectionPorts = InternalDataSerializer.readIntArray(in); + Map pubkeys = InternalDataSerializer.readHashMap(in); if (pubkeys != null) { publicKeys.putAll(pubkeys); } 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..987f769 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,7 +30,6 @@ 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; @@ -65,7 +64,7 @@ public class GMSUtil { } public static GMSMember readMemberID(DataInput in) throws IOException, ClassNotFoundException { - Object id = DataSerializer.readObject(in); + Object id = InternalDataSerializer.readObject(in); if (id == null || id instanceof GMSMember) { return (GMSMember) id; } @@ -211,20 +210,18 @@ public class GMSUtil { private static void writeAsInternalDistributedMember(GMSMember suspect, DataOutput out) throws IOException { InternalDataSerializer.writeDSFID(suspect, DSFIDFactory.DISTRIBUTED_MEMBER, out); - // DataSerializer.writeObject(new InternalDistributedMember(new GMSMemberAdapter(suspect)), - // out); } public static void writeMemberID(GMSMember id, DataOutput out) throws IOException { if (id == null) { - DataSerializer.writeObject(id, out); + InternalDataSerializer.writeObject(id, out); return; } if (InternalDataSerializer.getVersionForDataStream(out).ordinal() < Version.GEODE_1_10_0 .ordinal()) { writeAsInternalDistributedMember(id, out); } else { - DataSerializer.writeObject(id, out); + InternalDataSerializer.writeObject(id, out); } } 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..5e78480 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,7 +22,6 @@ 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; @@ -161,7 +160,7 @@ public class FindCoordinatorResponse extends AbstractGMSMessage out.writeBoolean(fromView); out.writeBoolean(networkPartitionDetectionEnabled); out.writeBoolean(usePreferredCoordinators); - DataSerializer.writeObject(view, out); + InternalDataSerializer.writeObject(view, out); GMSUtil.writeSetOfMemberIDs(registrants, out); } @@ -176,7 +175,7 @@ public class FindCoordinatorResponse extends AbstractGMSMessage fromView = in.readBoolean(); networkPartitionDetectionEnabled = in.readBoolean(); usePreferredCoordinators = in.readBoolean(); - view = DataSerializer.readObject(in); + view = InternalDataSerializer.readObject(in); registrants = GMSUtil.readHashSetOfMemberIDs(in); } } 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..e68c215 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 @@ -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,6 +46,7 @@ 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; @@ -335,7 +335,7 @@ 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); + InternalDataSerializer.writeObject(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", @@ -429,7 +429,7 @@ public class GMSLocator implements Locator { input = new VersionedObjectInput(input, geodeVersion); } - recoveredView = DataSerializer.readObject(input); + recoveredView = 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()); 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..1ca578f 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,9 +18,9 @@ import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; -import org.apache.geode.DataSerializer; import org.apache.geode.distributed.internal.membership.gms.GMSMembershipView; import org.apache.geode.internal.DataSerializableFixedID; +import org.apache.geode.internal.InternalDataSerializer; import org.apache.geode.internal.Version; public class GetViewResponse implements DataSerializableFixedID { @@ -51,12 +51,12 @@ public class GetViewResponse implements DataSerializableFixedID { @Override public void toData(DataOutput out) throws IOException { - DataSerializer.writeObject(view, out); + InternalDataSerializer.writeObject(view, out); } @Override public void fromData(DataInput in) throws IOException, ClassNotFoundException { - view = DataSerializer.readObject(in); + view = InternalDataSerializer.readObject(in); } } 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..6fcc469 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,8 +19,8 @@ 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.InternalDataSerializer; import org.apache.geode.internal.Version; public class InstallViewMessage extends AbstractGMSMessage { @@ -82,16 +82,16 @@ public class InstallViewMessage extends AbstractGMSMessage { public void toData(DataOutput out) throws IOException { out.writeInt(previousViewId); out.writeInt(kind.ordinal()); - DataSerializer.writeObject(this.view, out); - DataSerializer.writeObject(this.credentials, out); + InternalDataSerializer.writeObject(this.view, out); + InternalDataSerializer.writeObject(this.credentials, out); } @Override public void fromData(DataInput in) 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 = InternalDataSerializer.readObject(in); + this.credentials = InternalDataSerializer.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..b32a782 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,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.GMSMember; import org.apache.geode.distributed.internal.membership.gms.GMSUtil; +import org.apache.geode.internal.InternalDataSerializer; import org.apache.geode.internal.Version; public class JoinRequestMessage extends AbstractGMSMessage { @@ -89,8 +89,8 @@ public class JoinRequestMessage extends AbstractGMSMessage { @Override public void toData(DataOutput out) throws IOException { GMSUtil.writeMemberID(memberID, out); - DataSerializer.writeObject(credentials, out); - DataSerializer.writePrimitiveInt(failureDetectionPort, out); + InternalDataSerializer.writeObject(credentials, out); + InternalDataSerializer.writePrimitiveInt(failureDetectionPort, out); // preserve the multicast setting so the receiver can tell // if this is a mcast join request out.writeBoolean(false); @@ -100,8 +100,8 @@ 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); + credentials = InternalDataSerializer.readObject(in); + failureDetectionPort = InternalDataSerializer.readPrimitiveInt(in); // 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..160ec6a 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,10 +20,10 @@ 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.InternalDataSerializer; import org.apache.geode.internal.Version; // TODO this class has been made unintelligible with different combinations of response values. @@ -112,20 +112,20 @@ public class JoinResponseMessage extends AbstractGMSMessage { @Override public void toData(DataOutput out) throws IOException { - DataSerializer.writeObject(currentView, out); + InternalDataSerializer.writeObject(currentView, out); GMSUtil.writeMemberID(memberID, out); - DataSerializer.writeString(rejectionMessage, out); - DataSerializer.writeByteArray(messengerData, out); - DataSerializer.writeByteArray(secretPk, out); + InternalDataSerializer.writeString(rejectionMessage, out); + InternalDataSerializer.writeByteArray(messengerData, out); + InternalDataSerializer.writeByteArray(secretPk, out); } @Override public void fromData(DataInput in) throws IOException, ClassNotFoundException { - currentView = DataSerializer.readObject(in); + currentView = InternalDataSerializer.readObject(in); memberID = GMSUtil.readMemberID(in); - rejectionMessage = DataSerializer.readString(in); - messengerData = DataSerializer.readByteArray(in); - secretPk = DataSerializer.readByteArray(in); + rejectionMessage = InternalDataSerializer.readString(in); + messengerData = InternalDataSerializer.readByteArray(in); + secretPk = InternalDataSerializer.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..b5ade79 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,9 +19,9 @@ 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.InternalDataSerializer; import org.apache.geode.internal.Version; public class LeaveRequestMessage extends AbstractGMSMessage implements HasMemberID { @@ -70,13 +70,13 @@ public class LeaveRequestMessage extends AbstractGMSMessage implements HasMember @Override public void toData(DataOutput out) throws IOException { GMSUtil.writeMemberID(memberID, out); - DataSerializer.writeString(reason, out); + InternalDataSerializer.writeString(reason, out); } @Override public void fromData(DataInput in) throws IOException, ClassNotFoundException { memberID = GMSUtil.readMemberID(in); - reason = DataSerializer.readString(in); + reason = InternalDataSerializer.readString(in); } @Override 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..2179dc4 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,9 +19,9 @@ 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.InternalDataSerializer; import org.apache.geode.internal.Version; public class RemoveMemberMessage extends AbstractGMSMessage implements HasMemberID { @@ -76,13 +76,13 @@ public class RemoveMemberMessage extends AbstractGMSMessage implements HasMember @Override public void toData(DataOutput out) throws IOException { GMSUtil.writeMemberID(memberID, out); - DataSerializer.writeString(reason, out); + InternalDataSerializer.writeString(reason, out); } @Override public void fromData(DataInput in) throws IOException, ClassNotFoundException { memberID = GMSUtil.readMemberID(in); - reason = DataSerializer.readString(in); + reason = InternalDataSerializer.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..6fc538c 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,9 +20,9 @@ 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.InternalDataSerializer; import org.apache.geode.internal.Version; public class SuspectMembersMessage extends AbstractGMSMessage { @@ -64,7 +64,7 @@ public class SuspectMembersMessage extends AbstractGMSMessage { out.writeInt(suspectRequests.size()); for (SuspectRequest sr : suspectRequests) { GMSUtil.writeMemberID(sr.getSuspectMember(), out); - DataSerializer.writeString(sr.getReason(), out); + InternalDataSerializer.writeString(sr.getReason(), out); } } else { out.writeInt(0); @@ -76,7 +76,7 @@ public class SuspectMembersMessage extends AbstractGMSMessage { int size = in.readInt(); for (int i = 0; i < size; i++) { SuspectRequest sr = new SuspectRequest( - GMSUtil.readMemberID(in), DataSerializer.readString(in)); + GMSUtil.readMemberID(in), InternalDataSerializer.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..40371aa 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,9 +18,9 @@ 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.InternalDataSerializer; import org.apache.geode.internal.Version; public class ViewAckMessage extends AbstractGMSMessage { @@ -69,14 +69,14 @@ public class ViewAckMessage extends AbstractGMSMessage { public void toData(DataOutput out) throws IOException { out.writeInt(this.viewId); out.writeBoolean(this.preparing); - DataSerializer.writeObject(this.alternateView, out); + InternalDataSerializer.writeObject(this.alternateView, out); } @Override public void fromData(DataInput in) throws IOException, ClassNotFoundException { this.viewId = in.readInt(); this.preparing = in.readBoolean(); - this.alternateView = DataSerializer.readObject(in); + this.alternateView = InternalDataSerializer.readObject(in); } @Override 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..08954b5 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; @@ -954,7 +953,7 @@ public class JGroupsMessenger implements Messenger { throws IOException { GMSMember m = this.localAddress; m.writeEssentialData(out_stream); - DataSerializer.writeObject(services.getManager().unwrapMessage(gfmsg), out_stream); + InternalDataSerializer.writeObject(services.getManager().unwrapMessage(gfmsg), out_stream); return out_stream.toByteArray(); } @@ -1125,7 +1124,7 @@ public class JGroupsMessenger implements Messenger { throws ClassNotFoundException, IOException { GMSMember m = new GMSMember(); m.readEssentialData(in); - GMSMessage result = services.getManager().wrapMessage(DataSerializer.readObject(in)); + GMSMessage result = services.getManager().wrapMessage(InternalDataSerializer.readObject(in)); setSender(result, m, ordinal); 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..f2fcaab 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 @@ -28,7 +28,6 @@ import com.tngtech.archunit.lang.ArchRule; import org.junit.runner.RunWith; import org.apache.geode.CancelCriterion; -import org.apache.geode.DataSerializer; import org.apache.geode.GemFireException; import org.apache.geode.InternalGemFireError; import org.apache.geode.SystemFailure; @@ -121,7 +120,6 @@ public class MembershipDependenciesJUnitTest { .or(type(ConnectExceptions.class)) // TODO: Serialization needs to become its own module - .or(type(DataSerializer.class)) .or(type(DataSerializableFixedID.class)) .or(type(InternalDataSerializer.class)) .or(type(Version.class))