geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sai_boorlaga...@apache.org
Subject [geode] branch develop updated: GEODE-6434: Changing ordinal variables to GEODE_X_Y_Z format (#3212)
Date Tue, 26 Feb 2019 20:15:51 GMT
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/develop by this push:
     new b5bb742  GEODE-6434: Changing ordinal variables to GEODE_X_Y_Z format (#3212)
b5bb742 is described below

commit b5bb74203e7c3d5a01b72749c3247badfbd29c8c
Author: Sai Boorlagadda <sai.boorlagadda@gmail.com>
AuthorDate: Tue Feb 26 12:15:41 2019 -0800

    GEODE-6434: Changing ordinal variables to GEODE_X_Y_Z format (#3212)
---
 .../membership/InternalDistributedMember.java      |  2 +-
 .../internal/membership/gms/GMSMember.java         |  4 +-
 .../membership/gms/fd/GMSHealthMonitor.java        |  2 +-
 .../geode/internal/InternalDataSerializer.java     |  2 +-
 .../java/org/apache/geode/internal/Version.java    | 70 +++++++++++-----------
 .../cache/DestroyPartitionedRegionMessage.java     |  2 +-
 .../org/apache/geode/internal/cache/EventID.java   |  4 +-
 ...xpireDisconnectedClientTransactionsMessage.java |  4 +-
 .../geode/internal/cache/GemFireCacheImpl.java     |  2 +-
 .../cache/InvalidatePartitionedRegionMessage.java  |  2 +-
 .../cache/LatestLastAccessTimeOperation.java       |  2 +-
 .../geode/internal/cache/TXCommitMessage.java      |  2 +-
 .../cache/tier/sockets/CacheClientNotifier.java    |  2 +-
 .../cache/tier/sockets/CommandInitializer.java     | 24 ++++----
 .../internal/cache/wan/GatewaySenderEventImpl.java |  6 +-
 .../internal/configuration/domain/XmlEntity.java   |  2 +-
 .../apache/geode/internal/VersionJUnitTest.java    | 10 ++--
 ...eDisconnectedClientTransactionsMessageTest.java |  4 +-
 .../commands/CreateGatewaySenderCommandTest.java   |  2 +-
 .../tier/sockets/ClientServerMiscBCDUnitTest.java  |  2 +-
 .../internal/LuceneIndexCreationProfile.java       |  2 +-
 .../cache/lucene/internal/LuceneServiceImpl.java   |  2 +-
 .../lucene/internal/cli/LuceneIndexCommands.java   |  4 +-
 .../internal/distributed/LuceneQueryFunction.java  |  4 +-
 .../internal/cli/LuceneIndexCommandsJUnitTest.java |  4 +-
 25 files changed, 83 insertions(+), 83 deletions(-)

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 be1c9aa..6a8c6ab 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
@@ -1158,7 +1158,7 @@ public class InternalDistributedMember implements DistributedMember,
Externaliza
 
     Version outputVersion = InternalDataSerializer.getVersionForDataStream(out);
     if (0 <= outputVersion.compareTo(Version.GFE_90)
-        && outputVersion.compareTo(Version.GEODE_110) < 0) {
+        && outputVersion.compareTo(Version.GEODE_1_1_0) < 0) {
       netMbr.writeAdditionalData(out);
     }
   }
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 8f7e457..32be3c8 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
@@ -518,7 +518,7 @@ public class GMSMember implements NetMember, DataSerializableFixedID {
     out.writeInt(vmViewId);
     out.writeLong(uuidMSBs);
     out.writeLong(uuidLSBs);
-    if (InternalDataSerializer.getVersionForDataStream(out).compareTo(Version.GEODE_120)
>= 0) {
+    if (InternalDataSerializer.getVersionForDataStream(out).compareTo(Version.GEODE_1_2_0)
>= 0) {
       out.writeByte(vmKind);
     }
   }
@@ -547,7 +547,7 @@ public class GMSMember implements NetMember, DataSerializableFixedID {
     this.vmViewId = in.readInt();
     this.uuidMSBs = in.readLong();
     this.uuidLSBs = in.readLong();
-    if (InternalDataSerializer.getVersionForDataStream(in).compareTo(Version.GEODE_120) >=
0) {
+    if (InternalDataSerializer.getVersionForDataStream(in).compareTo(Version.GEODE_1_2_0)
>= 0) {
       this.vmKind = in.readByte();
     }
   }
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 05c0a34..5f2073c 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
@@ -1350,7 +1350,7 @@ public class GMSHealthMonitor implements HealthMonitor, MessageHandler
{
 
       if (!failed) {
         if (!isStopping && !initiator.equals(localAddress)
-            && initiator.getVersionObject().compareTo(Version.GEODE_130) >= 0)
{
+            && initiator.getVersionObject().compareTo(Version.GEODE_1_3_0) >=
0) {
           // 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/internal/InternalDataSerializer.java
b/geode-core/src/main/java/org/apache/geode/internal/InternalDataSerializer.java
index bdc19b8..0e72c0b 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
@@ -342,7 +342,7 @@ public abstract class InternalDataSerializer extends DataSerializer {
       VersionedDataStream vout = (VersionedDataStream) out;
       Version version = vout.getVersion();
       if (null != version) {
-        if (version.compareTo(Version.GEODE_190) < 0) {
+        if (version.compareTo(Version.GEODE_1_9_0) < 0) {
           if (name.equals(POST_GEODE_190_SERVER_CQIMPL)) {
             return PRE_GEODE_190_SERVER_CQIMPL;
           }
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 e7154e2..ddb4be2 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
@@ -200,74 +200,74 @@ public class Version implements Comparable<Version> {
   public static final Version GFE_90 =
       new Version("GFE", "9.0", (byte) 9, (byte) 0, (byte) 0, (byte) 0, GFE_90_ORDINAL);
 
-  // prior to v1.2.0 GEODE_110 was named GFE_91. This was used for both the rel/v1.1.0
+  // prior to v1.2.0 GEODE_1_1_0 was named GFE_91. This was used for both the rel/v1.1.0
   // and rel/v1.1.1 releases
-  private static final byte GEODE_110_ORDINAL = 50;
+  private static final byte GEODE_1_1_0_ORDINAL = 50;
 
   @Immutable
-  public static final Version GEODE_110 =
-      new Version("GEODE", "1.1.0", (byte) 1, (byte) 1, (byte) 0, (byte) 0, GEODE_110_ORDINAL);
+  public static final Version GEODE_1_1_0 =
+      new Version("GEODE", "1.1.0", (byte) 1, (byte) 1, (byte) 0, (byte) 0, GEODE_1_1_0_ORDINAL);
 
   // This ordinal was never used
-  private static final byte GEODE_111_ORDINAL = 55;
+  private static final byte GEODE_1_1_1_ORDINAL = 55;
 
   @Immutable
-  public static final Version GEODE_111 =
-      new Version("GEODE", "1.1.1", (byte) 1, (byte) 1, (byte) 1, (byte) 0, GEODE_111_ORDINAL);
+  public static final Version GEODE_1_1_1 =
+      new Version("GEODE", "1.1.1", (byte) 1, (byte) 1, (byte) 1, (byte) 0, GEODE_1_1_1_ORDINAL);
 
-  private static final byte GEODE_120_ORDINAL = 65;
+  private static final byte GEODE_1_2_0_ORDINAL = 65;
 
   @Immutable
-  public static final Version GEODE_120 =
-      new Version("GEODE", "1.2.0", (byte) 1, (byte) 2, (byte) 0, (byte) 0, GEODE_120_ORDINAL);
+  public static final Version GEODE_1_2_0 =
+      new Version("GEODE", "1.2.0", (byte) 1, (byte) 2, (byte) 0, (byte) 0, GEODE_1_2_0_ORDINAL);
 
-  private static final byte GEODE_130_ORDINAL = 70;
+  private static final byte GEODE_1_3_0_ORDINAL = 70;
 
   @Immutable
-  public static final Version GEODE_130 =
-      new Version("GEODE", "1.3.0", (byte) 1, (byte) 3, (byte) 0, (byte) 0, GEODE_130_ORDINAL);
+  public static final Version GEODE_1_3_0 =
+      new Version("GEODE", "1.3.0", (byte) 1, (byte) 3, (byte) 0, (byte) 0, GEODE_1_3_0_ORDINAL);
 
-  private static final byte GEODE_140_ORDINAL = 75;
+  private static final byte GEODE_1_4_0_ORDINAL = 75;
 
   @Immutable
-  public static final Version GEODE_140 =
-      new Version("GEODE", "1.4.0", (byte) 1, (byte) 4, (byte) 0, (byte) 0, GEODE_140_ORDINAL);
+  public static final Version GEODE_1_4_0 =
+      new Version("GEODE", "1.4.0", (byte) 1, (byte) 4, (byte) 0, (byte) 0, GEODE_1_4_0_ORDINAL);
 
-  private static final byte GEODE_150_ORDINAL = 80;
+  private static final byte GEODE_1_5_0_ORDINAL = 80;
 
   @Immutable
-  public static final Version GEODE_150 =
-      new Version("GEODE", "1.5.0", (byte) 1, (byte) 5, (byte) 0, (byte) 0, GEODE_150_ORDINAL);
+  public static final Version GEODE_1_5_0 =
+      new Version("GEODE", "1.5.0", (byte) 1, (byte) 5, (byte) 0, (byte) 0, GEODE_1_5_0_ORDINAL);
 
-  private static final byte GEODE_160_ORDINAL = 85;
+  private static final byte GEODE_1_6_0_ORDINAL = 85;
 
   @Immutable
-  public static final Version GEODE_160 =
-      new Version("GEODE", "1.6.0", (byte) 1, (byte) 6, (byte) 0, (byte) 0, GEODE_160_ORDINAL);
+  public static final Version GEODE_1_6_0 =
+      new Version("GEODE", "1.6.0", (byte) 1, (byte) 6, (byte) 0, (byte) 0, GEODE_1_6_0_ORDINAL);
 
-  private static final byte GEODE_170_ORDINAL = 90;
+  private static final byte GEODE_1_7_0_ORDINAL = 90;
 
   @Immutable
-  public static final Version GEODE_170 =
-      new Version("GEODE", "1.7.0", (byte) 1, (byte) 7, (byte) 0, (byte) 0, GEODE_170_ORDINAL);
+  public static final Version GEODE_1_7_0 =
+      new Version("GEODE", "1.7.0", (byte) 1, (byte) 7, (byte) 0, (byte) 0, GEODE_1_7_0_ORDINAL);
 
-  private static final byte GEODE_180_ORDINAL = 95;
+  private static final byte GEODE_1_8_0_ORDINAL = 95;
 
   @Immutable
-  public static final Version GEODE_180 =
-      new Version("GEODE", "1.8.0", (byte) 1, (byte) 8, (byte) 0, (byte) 0, GEODE_180_ORDINAL);
+  public static final Version GEODE_1_8_0 =
+      new Version("GEODE", "1.8.0", (byte) 1, (byte) 8, (byte) 0, (byte) 0, GEODE_1_8_0_ORDINAL);
 
-  private static final byte GEODE_190_ORDINAL = 100;
+  private static final byte GEODE_1_9_0_ORDINAL = 100;
 
   @Immutable
-  public static final Version GEODE_190 =
-      new Version("GEODE", "1.9.0", (byte) 1, (byte) 9, (byte) 0, (byte) 0, GEODE_190_ORDINAL);
+  public static final Version GEODE_1_9_0 =
+      new Version("GEODE", "1.9.0", (byte) 1, (byte) 9, (byte) 0, (byte) 0, GEODE_1_9_0_ORDINAL);
 
-  private static final byte GEODE_1100_ORDINAL = 105;
+  private static final byte GEODE_1_10_0_ORDINAL = 105;
 
   @Immutable
-  public static final Version GEODE_1100 =
-      new Version("GEODE", "1.10.0", (byte) 1, (byte) 9, (byte) 0, (byte) 0, GEODE_1100_ORDINAL);
+  public static final Version GEODE_1_10_0 =
+      new Version("GEODE", "1.10.0", (byte) 1, (byte) 9, (byte) 0, (byte) 0, GEODE_1_10_0_ORDINAL);
 
   /* NOTE: when adding a new version bump the ordinal by 5. Ordinals can be short ints */
 
@@ -276,7 +276,7 @@ public class Version implements Comparable<Version> {
    * HIGHEST_VERSION when changing CURRENT !!!
    */
   @Immutable
-  public static final Version CURRENT = GEODE_1100;
+  public static final Version CURRENT = GEODE_1_10_0;
 
   /**
    * A lot of versioning code needs access to the current version's ordinal
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 65c0fa3..070fb6b 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
@@ -216,7 +216,7 @@ public class DestroyPartitionedRegionMessage extends PartitionMessage
{
 
   @Override
   public Version[] getSerializationVersions() {
-    return new Version[] {Version.GEODE_190};
+    return new Version[] {Version.GEODE_1_9_0};
   }
 
 
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 9d56abe..d282073 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
@@ -310,7 +310,7 @@ public class EventID implements DataSerializableFixedID, Serializable,
Externali
   public InternalDistributedMember getDistributedMember(Version targetVersion) {
     ByteArrayInputStream bais = new ByteArrayInputStream(this.membershipID);
     DataInputStream dis = new DataInputStream(bais);
-    if (targetVersion.compareTo(Version.GEODE_110) < 0) {
+    if (targetVersion.compareTo(Version.GEODE_1_1_0) < 0) {
       // GEODE-3153: clients expect to receive UUID bytes, which are only
       // read if the stream's version is 1.0.0-incubating
       dis = new VersionedDataInputStream(dis, Version.GFE_90);
@@ -352,7 +352,7 @@ public class EventID implements DataSerializableFixedID, Serializable,
Externali
     // using the client's version to ensure it gets the proper on-wire form
     // of the identifier
     // See GEODE-3072
-    if (version.compareTo(Version.GEODE_110) < 0) {
+    if (version.compareTo(Version.GEODE_1_1_0) < 0) {
       InternalDistributedMember member = getDistributedMember(Version.GFE_90);
       // reserialize with the client's version so that we write the UUID
       // bytes
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 708544f..5ac5858 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
@@ -45,7 +45,7 @@ public class ExpireDisconnectedClientTransactionsMessage
     Set newVersionRecipients = new HashSet();
     for (InternalDistributedMember recipient : recipients) {
       // to geode 1.7.0 and later version servers
-      if (recipient.getVersionObject().compareTo(Version.GEODE_170) >= 0) {
+      if (recipient.getVersionObject().compareTo(Version.GEODE_1_7_0) >= 0) {
         newVersionRecipients.add(recipient);
       }
     }
@@ -74,7 +74,7 @@ public class ExpireDisconnectedClientTransactionsMessage
     InternalDistributedMember sender = getSender();
     if (cache != null) {
       TXManagerImpl mgr = cache.getTXMgr();
-      if (sender.getVersionObject().compareTo(Version.GEODE_170) >= 0) {
+      if (sender.getVersionObject().compareTo(Version.GEODE_1_7_0) >= 0) {
         // schedule to expire disconnected client transaction.
         mgr.expireDisconnectedClientTransactions(this.txIds, false);
       } else {
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 2fa37ae..3eab4a9 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
@@ -4604,7 +4604,7 @@ public class GemFireCacheImpl implements InternalCache, InternalClientCache,
Has
     Iterator memberIterator = otherMembers.iterator();
     while (memberIterator.hasNext()) {
       InternalDistributedMember member = (InternalDistributedMember) memberIterator.next();
-      if (Version.GEODE_150.compareTo(member.getVersionObject()) > 0) {
+      if (Version.GEODE_1_5_0.compareTo(member.getVersionObject()) > 0) {
         memberIterator.remove();
       }
     }
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 aabacae..3e4d3cf 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
@@ -120,6 +120,6 @@ public class InvalidatePartitionedRegionMessage extends PartitionMessage
{
 
   @Override
   public Version[] getSerializationVersions() {
-    return new Version[] {Version.GEODE_190};
+    return new Version[] {Version.GEODE_1_9_0};
   }
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/LatestLastAccessTimeOperation.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/LatestLastAccessTimeOperation.java
index a9d8e29..e97558e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/LatestLastAccessTimeOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/LatestLastAccessTimeOperation.java
@@ -40,7 +40,7 @@ public class LatestLastAccessTimeOperation<K> {
     final Set<InternalDistributedMember> recipients =
         this.region.getCacheDistributionAdvisor().adviseNetSearch();
     final DistributionManager dm = this.region.getDistributionManager();
-    dm.retainMembersWithSameOrNewerVersion(recipients, Version.GEODE_140);
+    dm.retainMembersWithSameOrNewerVersion(recipients, Version.GEODE_1_4_0);
     final LatestLastAccessTimeReplyProcessor replyProcessor =
         new LatestLastAccessTimeReplyProcessor(dm, recipients);
     dm.putOutgoing(
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TXCommitMessage.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/TXCommitMessage.java
index 04fbe88..2a3f022 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/TXCommitMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TXCommitMessage.java
@@ -931,7 +931,7 @@ public class TXCommitMessage extends PooledDistributionMessage
   }
 
   private boolean hasFlagsField(final Version version) {
-    return version.compareTo(Version.GEODE_170) >= 0;
+    return version.compareTo(Version.GEODE_1_7_0) >= 0;
   }
 
   private boolean useShadowKey() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientNotifier.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientNotifier.java
index 0903d29..f96bad7 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientNotifier.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientNotifier.java
@@ -213,7 +213,7 @@ public class CacheClientNotifier {
       if (clientVersion.compareTo(Version.GFE_6516) >= 0) {
         DataSerializer.writeHashMap(dsToSupportedClasses, dos);
       }
-      if (clientVersion.compareTo(Version.GEODE_150) >= 0) {
+      if (clientVersion.compareTo(Version.GEODE_1_5_0) >= 0) {
         dos.writeInt(CLIENT_PING_TASK_PERIOD);
       }
     }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CommandInitializer.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CommandInitializer.java
index cc69582..2a38db2 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CommandInitializer.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CommandInitializer.java
@@ -324,22 +324,22 @@ public class CommandInitializer {
     commands.put(MessageType.QUERY_WITH_PARAMETERS, QueryWithParametersGeode10.getCommand());
     commands.put(MessageType.QUERY, QueryGeode10.getCommand());
 
-    ALL_COMMANDS.put(Version.GEODE_110, commands);
-    ALL_COMMANDS.put(Version.GEODE_111, commands);
-    ALL_COMMANDS.put(Version.GEODE_120, commands);
-    ALL_COMMANDS.put(Version.GEODE_130, commands);
-    ALL_COMMANDS.put(Version.GEODE_140, commands);
-    ALL_COMMANDS.put(Version.GEODE_150, commands);
-    ALL_COMMANDS.put(Version.GEODE_160, commands);
-    ALL_COMMANDS.put(Version.GEODE_170, commands);
+    ALL_COMMANDS.put(Version.GEODE_1_1_0, commands);
+    ALL_COMMANDS.put(Version.GEODE_1_1_1, commands);
+    ALL_COMMANDS.put(Version.GEODE_1_2_0, commands);
+    ALL_COMMANDS.put(Version.GEODE_1_3_0, commands);
+    ALL_COMMANDS.put(Version.GEODE_1_4_0, commands);
+    ALL_COMMANDS.put(Version.GEODE_1_5_0, commands);
+    ALL_COMMANDS.put(Version.GEODE_1_6_0, commands);
+    ALL_COMMANDS.put(Version.GEODE_1_7_0, commands);
 
     Map<Integer, Command> geode18Commands = new HashMap<Integer, Command>();
-    geode18Commands.putAll(ALL_COMMANDS.get(Version.GEODE_170));
+    geode18Commands.putAll(ALL_COMMANDS.get(Version.GEODE_1_7_0));
     geode18Commands.put(MessageType.EXECUTE_REGION_FUNCTION,
         ExecuteRegionFunctionGeode18.getCommand());
-    ALL_COMMANDS.put(Version.GEODE_180, geode18Commands);
-    ALL_COMMANDS.put(Version.GEODE_190, geode18Commands);
-    ALL_COMMANDS.put(Version.GEODE_1100, geode18Commands);
+    ALL_COMMANDS.put(Version.GEODE_1_8_0, geode18Commands);
+    ALL_COMMANDS.put(Version.GEODE_1_9_0, geode18Commands);
+    ALL_COMMANDS.put(Version.GEODE_1_10_0, geode18Commands);
   }
 
   public static Map<Integer, Command> getCommands(Version version) {
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 46a7fa8..4a1e802 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
@@ -71,7 +71,7 @@ public class GatewaySenderEventImpl
 
   // It should use current version. But it was hard-coded to be 0x11, i.e. GEODE_120_ORDINAL,
   // by mistake since 120 to pre-190
-  protected static final short VERSION = Version.GEODE_190.ordinal();
+  protected static final short VERSION = Version.GEODE_1_9_0.ordinal();
 
   protected EnumListenerEvent operation;
 
@@ -720,7 +720,7 @@ public class GatewaySenderEventImpl
   @Override
   public void fromData(DataInput in) throws IOException, ClassNotFoundException {
     fromDataPre_GEODE_1_9_0_0(in);
-    if (version >= Version.GEODE_190.ordinal()) {
+    if (version >= Version.GEODE_1_9_0.ordinal()) {
       this.isConcurrencyConflict = DataSerializer.readBoolean(in);
     }
   }
@@ -1181,7 +1181,7 @@ public class GatewaySenderEventImpl
 
   @Override
   public Version[] getSerializationVersions() {
-    return new Version[] {Version.GEODE_190};
+    return new Version[] {Version.GEODE_1_9_0};
   }
 
   public int getSerializedValueSize() {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/XmlEntity.java
b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/XmlEntity.java
index dc38aeb..01da678 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/XmlEntity.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/XmlEntity.java
@@ -429,7 +429,7 @@ public class XmlEntity implements VersionedDataSerializable {
 
   @Override
   public Version[] getSerializationVersions() {
-    return new Version[] {Version.GEODE_111};
+    return new Version[] {Version.GEODE_1_1_1};
   }
 
   @Override
diff --git a/geode-core/src/test/java/org/apache/geode/internal/VersionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/VersionJUnitTest.java
index a82c73a..529f1bf 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/VersionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/VersionJUnitTest.java
@@ -34,11 +34,11 @@ public class VersionJUnitTest {
     compare(Version.GFE_81, Version.GFE_71);
     compare(Version.GFE_81, Version.GFE_80);
     compare(Version.GFE_82, Version.GFE_81);
-    compare(Version.GEODE_110, Version.GFE_82);
-    compare(Version.GEODE_120, Version.GEODE_111);
-    compare(Version.GEODE_130, Version.GEODE_120);
-    compare(Version.GEODE_140, Version.GEODE_130);
-    compare(Version.GEODE_150, Version.GEODE_140);
+    compare(Version.GEODE_1_1_0, Version.GFE_82);
+    compare(Version.GEODE_1_2_0, Version.GEODE_1_1_1);
+    compare(Version.GEODE_1_3_0, Version.GEODE_1_2_0);
+    compare(Version.GEODE_1_4_0, Version.GEODE_1_3_0);
+    compare(Version.GEODE_1_5_0, Version.GEODE_1_4_0);
   }
 
   private void compare(Version later, Version earlier) {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ExpireDisconnectedClientTransactionsMessageTest.java
b/geode-core/src/test/java/org/apache/geode/internal/cache/ExpireDisconnectedClientTransactionsMessageTest.java
index 3c32620..3a3bf86 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ExpireDisconnectedClientTransactionsMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ExpireDisconnectedClientTransactionsMessageTest.java
@@ -49,7 +49,7 @@ public class ExpireDisconnectedClientTransactionsMessageTest {
 
   @Test
   public void processMessageFromServerOfGeode170AndLaterVersionWillExpireDisconnectedClientTransactions()
{
-    when(version.compareTo(Version.GEODE_170)).thenReturn(1);
+    when(version.compareTo(Version.GEODE_1_7_0)).thenReturn(1);
 
     message.process(dm);
 
@@ -58,7 +58,7 @@ public class ExpireDisconnectedClientTransactionsMessageTest {
 
   @Test
   public void processMessageFromServerOfPriorGeode170VersionWillRemoveExpiredClientTransactions()
{
-    when(version.compareTo(Version.GEODE_170)).thenReturn(-1);
+    when(version.compareTo(Version.GEODE_1_7_0)).thenReturn(-1);
 
     message.process(dm);
 
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateGatewaySenderCommandTest.java
b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateGatewaySenderCommandTest.java
index 8e0567a..f708efe 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateGatewaySenderCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateGatewaySenderCommandTest.java
@@ -172,7 +172,7 @@ public class CreateGatewaySenderCommandTest {
     InternalDistributedMember currentVersionMember = mock(InternalDistributedMember.class);
     doReturn(Version.CURRENT).when(currentVersionMember).getVersionObject();
     InternalDistributedMember oldVersionMember = mock(InternalDistributedMember.class);
-    doReturn(Version.GEODE_140).when(oldVersionMember).getVersionObject();
+    doReturn(Version.GEODE_1_4_0).when(oldVersionMember).getVersionObject();
     members.add(currentVersionMember);
     members.add(oldVersionMember);
     doReturn(members).when(command).getMembers(any(), any());
diff --git a/geode-cq/src/upgradeTest/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java
b/geode-cq/src/upgradeTest/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java
index ec2bce7..cf7b8fa 100755
--- a/geode-cq/src/upgradeTest/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java
+++ b/geode-cq/src/upgradeTest/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java
@@ -79,7 +79,7 @@ public class ClientServerMiscBCDUnitTest extends ClientServerMiscDUnitTestBase
{
   void createClientCacheAndVerifyPingIntervalIsSet(String host, int port) throws Exception
{
     // this functionality was introduced in 1.5. If we let the test run in older
     // clients it will throw a NoSuchMethodError
-    if (Version.CURRENT_ORDINAL >= 80 /* GEODE_150 */) {
+    if (Version.CURRENT_ORDINAL >= 80 /* GEODE_1_5_0 */) {
       super.createClientCacheAndVerifyPingIntervalIsSet(host, port);
     }
   }
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexCreationProfile.java
b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexCreationProfile.java
index 15370e1..93b5c0a 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexCreationProfile.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexCreationProfile.java
@@ -217,6 +217,6 @@ public class LuceneIndexCreationProfile implements CacheServiceProfile,
Versione
 
   @Override
   public Version[] getSerializationVersions() {
-    return new Version[] {Version.GEODE_140};
+    return new Version[] {Version.GEODE_1_4_0};
   }
 }
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 2d6bce7..6c07361 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
@@ -706,7 +706,7 @@ public class LuceneServiceImpl implements InternalLuceneService {
   private boolean isAnyRemoteMemberVersionLessThanGeode1_7_0(
       Set<InternalDistributedMember> remoteMembers) {
     for (InternalDistributedMember remoteMember : remoteMembers) {
-      if (remoteMember.getVersionObject().ordinal() < Version.GEODE_170.ordinal()) {
+      if (remoteMember.getVersionObject().ordinal() < Version.GEODE_1_7_0.ordinal()) {
         return true;
       }
     }
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommands.java
b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommands.java
index 2023aa2..0e25672 100755
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommands.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommands.java
@@ -290,11 +290,11 @@ public class LuceneIndexCommands extends InternalGfshCommand {
 
     // Get members >= Geode 1.8 (when the new destroy code path went into the product)
     Set<DistributedMember> validVersionMembers =
-        getNormalMembersWithSameOrNewerVersion(Version.GEODE_170);
+        getNormalMembersWithSameOrNewerVersion(Version.GEODE_1_7_0);
     if (validVersionMembers.isEmpty()) {
       return ResultBuilder.createInfoResult(CliStrings.format(
           LuceneCliStrings.LUCENE_DESTROY_INDEX__MSG__COULD_NOT_FIND__MEMBERS_GREATER_THAN_VERSION_0,
-          Version.GEODE_170));
+          Version.GEODE_1_7_0));
     }
 
     // Execute the destroy index function
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/LuceneQueryFunction.java
b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/LuceneQueryFunction.java
index ade8fe9..33ae0c3 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/LuceneQueryFunction.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/LuceneQueryFunction.java
@@ -71,7 +71,7 @@ public class LuceneQueryFunction implements InternalFunction<LuceneFunctionConte
           (PartitionedRegionFunctionResultSender) context.getResultSender();
       Version clientVersion = resultSender.getClientVersion();
       if (clientVersion != null) { // is a client server connection
-        if (clientVersion.ordinal() < Version.GEODE_160.ordinal()) {
+        if (clientVersion.ordinal() < Version.GEODE_1_6_0.ordinal()) {
           execute(context, true);
           return;
         }
@@ -91,7 +91,7 @@ public class LuceneQueryFunction implements InternalFunction<LuceneFunctionConte
     // Hence the query waits for the repositories to be ready instead of throwing the exception
     if (!remoteMembers.isEmpty()) {
       for (InternalDistributedMember remoteMember : remoteMembers) {
-        if (remoteMember.getVersionObject().ordinal() < Version.GEODE_160.ordinal()) {
+        if (remoteMember.getVersionObject().ordinal() < Version.GEODE_1_6_0.ordinal())
{
           // re-execute but wait till indexing is complete
           execute(ctx, true);
           return;
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsJUnitTest.java
b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsJUnitTest.java
index fe2d61e..2202d8c 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsJUnitTest.java
@@ -430,7 +430,7 @@ public class LuceneIndexCommandsJUnitTest {
     final List<CliFunctionResult> cliFunctionResults = new ArrayList<>();
     String expectedStatus = CliStrings.format(
         LuceneCliStrings.LUCENE_DESTROY_INDEX__MSG__COULD_NOT_FIND__MEMBERS_GREATER_THAN_VERSION_0,
-        new Object[] {Version.GEODE_170}) + LINE_SEPARATOR;
+        new Object[] {Version.GEODE_1_7_0}) + LINE_SEPARATOR;
     cliFunctionResults.add(new CliFunctionResult("member0", CliFunctionResult.StatusState.OK));
     doReturn(Collections.emptySet()).when(commands).getNormalMembersWithSameOrNewerVersion(any());
     CommandResult result = (CommandResult) commands.destroyIndex("index", "regionPath");
@@ -481,7 +481,7 @@ public class LuceneIndexCommandsJUnitTest {
     final List<CliFunctionResult> cliFunctionResults = new ArrayList<>();
     String expectedStatus = CliStrings.format(
         LuceneCliStrings.LUCENE_DESTROY_INDEX__MSG__COULD_NOT_FIND__MEMBERS_GREATER_THAN_VERSION_0,
-        new Object[] {Version.GEODE_170}) + LINE_SEPARATOR;
+        new Object[] {Version.GEODE_1_7_0}) + LINE_SEPARATOR;
     cliFunctionResults.add(new CliFunctionResult("member0", CliFunctionResult.StatusState.OK));
     CommandResult result = (CommandResult) commands.destroyIndex(null, "regionPath");
     verifyDestroyIndexCommandResult(result, cliFunctionResults, expectedStatus);


Mime
View raw message