[geode] 11/16: GEODE-8870: Removes GFE_6516.

[jbarrett]

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 aa35166cafaaffb410ff5b0c660c21fe651634e9
Author: Jacob Barrett <jbarr...@pivotal.io>
AuthorDate: Sat Jan 16 10:19:50 2021 -0800

    GEODE-8870: Removes GFE_6516.
---
 .../cache/tier/sockets/ClientDataSerializerMessage.java   | 15 +--------------
 .../internal/cache/tier/sockets/SocketMessageWriter.java  | 14 +++++---------
 .../apache/geode/internal/serialization/KnownVersion.java |  7 -------
 3 files changed, 6 insertions(+), 30 deletions(-)

diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientDataSerializerMessage.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientDataSerializerMessage.java
index 31d18b4..eb70ad9 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientDataSerializerMessage.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientDataSerializerMessage.java
@@ -25,7 +25,6 @@ import org.apache.geode.internal.cache.EventID;
 import org.apache.geode.internal.cache.tier.MessageType;
 import org.apache.geode.internal.serialization.DataSerializableFixedID;
 import org.apache.geode.internal.serialization.DeserializationContext;
-import org.apache.geode.internal.serialization.KnownVersion;
 import org.apache.geode.internal.serialization.SerializationContext;
 
 public class ClientDataSerializerMessage extends ClientUpdateMessageImpl {
@@ -65,16 +64,6 @@ public class ClientDataSerializerMessage extends 
ClientUpdateMessageImpl {
    */
   @Override
   protected Message getMessage(CacheClientProxy proxy, byte[] latestValue) 
throws IOException {
-    if (proxy.getVersion().isNotOlderThan(KnownVersion.GFE_6516)) {
-      return getGFE6516Message(proxy.getVersion());
-    } else {
-      throw new IOException("Unsupported client version for server-to-client 
message creation: "
-          + proxy.getVersion());
-    }
-  }
-
-  private Message getGFE6516Message(KnownVersion clientVersion) {
-
     // The format:
     // part 0: serializer1 classname
     // part 1: serializer1 id
@@ -103,10 +92,8 @@ public class ClientDataSerializerMessage extends 
ClientUpdateMessageImpl {
       }
     }
     numOfParts += 1; // one for eventID
-    // this._logger.fine("Number of parts for ClientDataSerializerMessage: "
-    // + numOfParts + ", with eventID: " + this.getEventId());
 
-    final Message message = new Message(numOfParts, clientVersion);
+    final Message message = new Message(numOfParts, proxy.getVersion());
     // Set message type
     message.setMessageType(MessageType.REGISTER_DATASERIALIZERS);
     for (int i = 0; i < dsLength; i = i + 2) {
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/SocketMessageWriter.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/SocketMessageWriter.java
index 0a4ef53..a966620 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/SocketMessageWriter.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/SocketMessageWriter.java
@@ -69,19 +69,15 @@ public class SocketMessageWriter {
       for (DataSerializer dataSerializer : dataSerializers) {
         dataSerializersMap.put(dataSerializer.getId(),
             dataSerializer.getClass().toString().substring(6));
-        if (clientVersion.isNotOlderThan(KnownVersion.GFE_6516)) {
-          ArrayList<String> supportedClassNames = new ArrayList<>();
-          for (Class<?> clazz : dataSerializer.getSupportedClasses()) {
-            supportedClassNames.add(clazz.getName());
-          }
-          dsToSupportedClasses.put(dataSerializer.getId(), 
supportedClassNames);
+        ArrayList<String> supportedClassNames = new ArrayList<>();
+        for (Class<?> clazz : dataSerializer.getSupportedClasses()) {
+          supportedClassNames.add(clazz.getName());
         }
+        dsToSupportedClasses.put(dataSerializer.getId(), supportedClassNames);
       }
     }
     DataSerializer.writeHashMap(dataSerializersMap, dos);
-    if (clientVersion.isNotOlderThan(KnownVersion.GFE_6516)) {
-      DataSerializer.writeHashMap(dsToSupportedClasses, dos);
-    }
+    DataSerializer.writeHashMap(dsToSupportedClasses, dos);
     if (clientVersion.isNotOlderThan(KnownVersion.GEODE_1_5_0)) {
       dos.writeInt(CLIENT_PING_TASK_PERIOD);
     }
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 42d24d8..8dd16ec 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_6516_ORDINAL = 12;
-
-  @Immutable
-  @Deprecated
-  public static final KnownVersion GFE_6516 =
-      new KnownVersion("GFE", "6.5.1.6", (byte) 6, (byte) 5, (byte) 1, (byte) 
6, GFE_6516_ORDINAL);
-
   private static final short GFE_66_ORDINAL = 16;
 
   @Immutable