This is an automated email from the ASF dual-hosted git repository. jbarrett pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git
commit 50717fffcaf4afa1fd577aca0992e3c54ed5ebf0 Author: Jacob Barrett <jbarr...@pivotal.io> AuthorDate: Thu Jan 21 18:24:27 2021 -0800 GEODE-8870: Removes GFE_603. --- .../client/internal/ClientSideHandshakeImpl.java | 25 ++++------------------ .../tier/sockets/ClientRegistrationMetadata.java | 13 ++--------- .../tier/sockets/ServerSideHandshakeImpl.java | 6 +----- .../geode/internal/serialization/KnownVersion.java | 7 ------ 4 files changed, 7 insertions(+), 44 deletions(-) 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 50c1515..8a17041 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 @@ -124,15 +124,7 @@ public class ClientSideHandshakeImpl extends Handshake implements ClientSideHand private void setOverrides() { clientConflation = determineClientConflation(); - - // As of May 2009 ( GFE 6.0 ): - // Note that this.clientVersion is used by server side for accepting - // handshakes. - // Client side handshake code uses this.currentClientVersion which can be - // set via tests. - if (currentClientVersion.isNotOlderThan(KnownVersion.GFE_603)) { - overrides = new byte[] {clientConflation}; - } + overrides = new byte[] {clientConflation}; } // used by the client side @@ -393,18 +385,9 @@ public class ClientSideHandshakeImpl extends Handshake implements ClientSideHand DataOutput idOut = new VersionedDataOutputStream(hdos, KnownVersion.GFE_81); DataSerializer.writeObject(id, idOut); - if (currentClientVersion.isNotOlderThan(KnownVersion.GFE_603)) { - byte[] overrides = getOverrides(); - for (final byte override : overrides) { - hdos.writeByte(override); - } - } else { - // write the client conflation setting byte - if (setClientConflationForTesting) { - hdos.writeByte(clientConflationForTesting); - } else { - hdos.writeByte(clientConflation); - } + byte[] overrides = getOverrides(); + for (final byte override : overrides) { + hdos.writeByte(override); } if (isCallbackConnection || communicationMode.isWAN()) { 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 1b369b1..1693ec6 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 @@ -158,10 +158,6 @@ class ClientRegistrationMetadata { return false; } - private boolean doesClientSupportExtractOverrides() { - return clientVersion.isNotOlderThan(KnownVersion.GFE_603); - } - private boolean oldClientRequiresVersionedStreams(final KnownVersion clientVersion) { return KnownVersion.CURRENT.compareTo(clientVersion) > 0; } @@ -177,13 +173,8 @@ class ClientRegistrationMetadata { private boolean getAndValidateClientConflation() throws IOException { - if (doesClientSupportExtractOverrides()) { - byte[] overrides = - Handshake.extractOverrides(new byte[] {(byte) dataInputStream.read()}); - clientConflation = overrides[0]; - } else { - clientConflation = (byte) dataInputStream.read(); - } + final byte[] overrides = Handshake.extractOverrides(new byte[] {(byte) dataInputStream.read()}); + clientConflation = overrides[0]; switch (clientConflation) { case Handshake.CONFLATION_DEFAULT: 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 44d71af..9203b97 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 @@ -94,13 +94,9 @@ public class ServerSideHandshakeImpl extends Handshake implements ServerSideHand new VersionedDataOutputStream(dataOutputStream, clientVersion); } this.id = ClientProxyMembershipID.readCanonicalized(dataInputStream); + setOverrides(new byte[] {dataInputStream.readByte()}); // Note: credentials should always be the last piece in handshake for // Diffie-Hellman key exchange to work - if (clientVersion.isNotOlderThan(KnownVersion.GFE_603)) { - setOverrides(new byte[] {dataInputStream.readByte()}); - } else { - setClientConflation(dataInputStream.readByte()); - } if (this.clientVersion.isOlderThan(KnownVersion.GFE_65) || communicationMode.isWAN()) { this.credentials = readCredentials(dataInputStream, dataOutputStream, sys, this.securityService); diff --git a/geode-serialization/src/main/java/org/apache/geode/internal/serialization/KnownVersion.java b/geode-serialization/src/main/java/org/apache/geode/internal/serialization/KnownVersion.java index 1ad966f..fe41527 100644 --- a/geode-serialization/src/main/java/org/apache/geode/internal/serialization/KnownVersion.java +++ b/geode-serialization/src/main/java/org/apache/geode/internal/serialization/KnownVersion.java @@ -62,13 +62,6 @@ public class KnownVersion extends AbstractVersion { public static final KnownVersion TOKEN = new KnownVersion("", "TOKEN", (byte) -1, (byte) 0, (byte) 0, (byte) 0, TOKEN_ORDINAL); - private static final short GFE_603_ORDINAL = 4; - - @Immutable - @Deprecated - public static final KnownVersion GFE_603 = - new KnownVersion("GFE", "6.0.3", (byte) 6, (byte) 0, (byte) 3, (byte) 0, GFE_603_ORDINAL); - private static final short GFE_61_ORDINAL = 5; @Immutable