This is an automated email from the ASF dual-hosted git repository. burcham pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git
commit 415e4402c01ff08df129d55ccc9d42d5000b320e Author: Bill Burcham <bill.burc...@gmail.com> AuthorDate: Fri Jul 17 12:45:17 2020 -0700 GEODE-8337: git mv VersionOrdinal.java->Version.java (cherry picked from commit 2a3b609ceb2f9374cc847d0f367ab2d53f5392a0) --- .../cache/client/ClientCacheFactoryJUnitTest.java | 10 +++--- .../cache/ha/HARegionQueueIntegrationTest.java | 2 +- .../client/internal/ClientSideHandshakeImpl.java | 8 ++--- .../internal/ClusterDistributionManager.java | 4 +-- .../internal/LonerDistributionManager.java | 4 +-- .../distributed/internal/ReplyProcessor21.java | 4 +-- .../membership/InternalDistributedMember.java | 10 +++--- .../internal/streaming/StreamingOperation.java | 2 +- .../internal/cache/AbstractUpdateOperation.java | 2 +- ...xpireDisconnectedClientTransactionsMessage.java | 4 +-- .../geode/internal/cache/GemFireCacheImpl.java | 2 +- .../internal/cache/InitialImageOperation.java | 14 ++++----- .../org/apache/geode/internal/cache/Oplog.java | 2 +- .../geode/internal/cache/PartitionedRegion.java | 4 +-- .../cache/PartitionedRegionQueryEvaluator.java | 2 +- .../geode/internal/cache/ServerPingMessage.java | 2 +- .../geode/internal/cache/ha/HARegionQueue.java | 2 +- .../cache/partitioned/FetchBulkEntriesMessage.java | 2 +- .../cache/partitioned/FetchEntriesMessage.java | 2 +- .../cache/partitioned/FetchKeysMessage.java | 2 +- .../cache/partitioned/IndexCreationMsg.java | 2 +- .../internal/cache/partitioned/QueryMessage.java | 4 +-- .../partitioned/StreamingPartitionOperation.java | 2 +- .../cache/persistence/DiskInitFileParser.java | 2 +- .../tier/sockets/ClientProxyMembershipID.java | 2 +- .../tier/sockets/ClientRegistrationMetadata.java | 2 +- .../tier/sockets/ServerSideHandshakeFactory.java | 2 +- .../internal/cache/tx/RemoteFetchKeysMessage.java | 2 +- .../org/apache/geode/internal/tcp/Connection.java | 4 +-- .../configuration/domain/Configuration.java | 4 +-- .../operation/RestoreRedundancyPerformer.java | 2 +- .../management/internal/util/ManagementUtils.java | 2 +- ...eDisconnectedClientTransactionsMessageTest.java | 2 +- .../cache/ha/ThreadIdentifierJUnitTest.java | 2 +- .../operation/RestoreRedundancyPerformerTest.java | 8 ++--- .../RollingUpgrade2DUnitTestBase.java | 2 +- .../rollingupgrade/RollingUpgradeDUnitTest.java | 4 +-- .../cli/commands/CreateGatewaySenderCommand.java | 2 +- .../internal/cli/commands/RedundancyCommand.java | 2 +- .../commands/CreateGatewaySenderCommandTest.java | 4 +-- .../apache/geode/test/version/VersionManager.java | 28 ++++++++++++----- .../cache/lucene/internal/LuceneServiceImpl.java | 10 +++--- .../internal/distributed/LuceneQueryFunction.java | 2 +- .../LuceneSearchWithRollingUpgradeTestBase.java | 19 +++++++++--- .../gms/fd/GMSHealthMonitorJUnitTest.java | 2 +- .../gms/membership/GMSJoinLeaveJUnitTest.java | 6 ++-- .../gms/messenger/JGroupsMessengerJUnitTest.java | 2 +- .../internal/membership/api/MemberData.java | 4 +-- .../internal/membership/api/MemberIdentifier.java | 6 ++-- .../internal/membership/gms/GMSMemberData.java | 18 +++++------ .../internal/membership/gms/GMSMembership.java | 10 +++--- .../internal/membership/gms/GMSMembershipView.java | 4 +-- .../membership/gms/MemberIdentifierImpl.java | 12 ++++---- .../membership/gms/locator/GMSLocator.java | 2 +- .../membership/gms/messenger/JGroupsMessenger.java | 8 ++--- .../internal/serialization/AbstractVersion.java | 16 +++++----- .../geode/internal/serialization/KnownVersion.java | 6 ++-- .../internal/serialization/UnknownVersion.java | 1 - .../{VersionOrdinal.java => Version.java} | 20 ++++++------ .../geode/internal/serialization/Versioning.java | 36 +++++++++++----------- .../geode/internal/serialization/VersioningIO.java | 4 +-- ...onJUnitTest.java => KnownVersionJUnitTest.java} | 26 ++++------------ .../serialization/UnknownVersionJUnitTest.java | 12 ++++---- .../serialization/VersioningJUnitTest.java | 22 ++++++------- .../distributed/internal/tcpserver/TcpClient.java | 2 +- .../distributed/internal/tcpserver/TcpServer.java | 6 ++-- .../RemoteParallelGatewaySenderEventProcessor.java | 2 +- 67 files changed, 218 insertions(+), 208 deletions(-) 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 d102474..aae71c2 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 @@ -354,8 +354,8 @@ public class ClientCacheFactoryJUnitTest { InternalDistributedMember memberID = (InternalDistributedMember) clientCache.getDistributedSystem().getDistributedMember(); MemberIdentifier gmsID = memberID; - memberID.setVersionObjectForTest(KnownVersion.GFE_82); - assertThat(memberID.getVersionOrdinalObject()).isEqualTo(KnownVersion.GFE_82); + memberID.setVersionForTest(KnownVersion.GFE_82); + assertThat(memberID.getVersion()).isEqualTo(KnownVersion.GFE_82); ClientProxyMembershipID clientID = ClientProxyMembershipID.getClientId(memberID); HeapDataOutputStream out = new HeapDataOutputStream(KnownVersion.GFE_82); @@ -367,14 +367,14 @@ public class ClientCacheFactoryJUnitTest { ClientProxyMembershipID newID = DataSerializer.readObject(in); InternalDistributedMember newMemberID = (InternalDistributedMember) newID.getDistributedMember(); - assertThat(newMemberID.getVersionOrdinalObject()).isEqualTo(KnownVersion.GFE_82); + assertThat(newMemberID.getVersion()).isEqualTo(KnownVersion.GFE_82); assertThat(newID.getClientVersion()).isEqualTo(KnownVersion.GFE_82); assertThat(newMemberID.getUuidLeastSignificantBits()).isEqualTo(0); assertThat(newMemberID.getUuidMostSignificantBits()).isEqualTo(0); gmsID.setUUID(new UUID(1234L, 5678L)); - memberID.setVersionObjectForTest(KnownVersion.CURRENT); + memberID.setVersionForTest(KnownVersion.CURRENT); clientID = ClientProxyMembershipID.getClientId(memberID); out = new HeapDataOutputStream(KnownVersion.CURRENT); DataSerializer.writeObject(clientID, out); @@ -383,7 +383,7 @@ public class ClientCacheFactoryJUnitTest { KnownVersion.CURRENT); newID = DataSerializer.readObject(in); newMemberID = (InternalDistributedMember) newID.getDistributedMember(); - assertThat(newMemberID.getVersionOrdinalObject()).isEqualTo(KnownVersion.CURRENT); + assertThat(newMemberID.getVersion()).isEqualTo(KnownVersion.CURRENT); assertThat(newID.getClientVersion()).isEqualTo(KnownVersion.CURRENT); assertThat(newMemberID.getUuidLeastSignificantBits()) diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ha/HARegionQueueIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ha/HARegionQueueIntegrationTest.java index 14fc72b..207fe96 100644 --- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ha/HARegionQueueIntegrationTest.java +++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ha/HARegionQueueIntegrationTest.java @@ -509,7 +509,7 @@ public class HARegionQueueIntegrationTest { private InternalDistributedMember createMember() { // Create an InternalDistributedMember InternalDistributedMember member = mock(InternalDistributedMember.class); - when(member.getVersionOrdinalObject()).thenReturn(KnownVersion.CURRENT); + when(member.getVersion()).thenReturn(KnownVersion.CURRENT); return member; } 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 2380db7..708d4b2 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 @@ -118,7 +118,7 @@ public class ClientSideHandshakeImpl extends Handshake implements ClientSideHand overrideClientVersion = ver; } else { currentClientVersion = - Versioning.getKnownVersionOrDefault(Versioning.getVersionOrdinal(ver), + Versioning.getKnownVersionOrDefault(Versioning.getVersion(ver), KnownVersion.CURRENT); overrideClientVersion = -1; } @@ -221,7 +221,7 @@ public class ClientSideHandshakeImpl extends Handshake implements ClientSideHand // establish a versioned stream for the other site, if necessary if (wanSiteVersion < KnownVersion.CURRENT_ORDINAL) { dis = new VersionedDataInputStream(dis, Versioning - .getKnownVersionOrDefault(Versioning.getVersionOrdinal(wanSiteVersion), + .getKnownVersionOrDefault(Versioning.getVersion(wanSiteVersion), KnownVersion.CURRENT)); } } @@ -248,7 +248,7 @@ public class ClientSideHandshakeImpl extends Handshake implements ClientSideHand // validate that the remote side has a different distributed system id. if (communicationMode.isWAN() && KnownVersion.GFE_66 - .compareTo(Versioning.getVersionOrdinal(conn.getWanSiteVersion())) <= 0 + .compareTo(Versioning.getVersion(conn.getWanSiteVersion())) <= 0 && currentClientVersion.isNotOlderThan(KnownVersion.GFE_66)) { int remoteDistributedSystemId = in.read(); int localDistributedSystemId = @@ -263,7 +263,7 @@ public class ClientSideHandshakeImpl extends Handshake implements ClientSideHand // Read the PDX registry size from the remote size if (communicationMode.isWAN() && KnownVersion.GFE_80 - .compareTo(Versioning.getVersionOrdinal(conn.getWanSiteVersion())) <= 0 + .compareTo(Versioning.getVersion(conn.getWanSiteVersion())) <= 0 && currentClientVersion.isNotOlderThan(KnownVersion.GFE_80)) { int remotePdxSize = dis.readInt(); serverQStatus.setPdxSize(remotePdxSize); diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/ClusterDistributionManager.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/ClusterDistributionManager.java index 1cf97ca..1219420 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/ClusterDistributionManager.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/ClusterDistributionManager.java @@ -1543,13 +1543,13 @@ public class ClusterDistributionManager implements DistributionManager { @Override public void retainMembersWithSameOrNewerVersion(Collection<InternalDistributedMember> members, KnownVersion version) { - members.removeIf(id -> id.getVersionOrdinalObject().compareTo(version) < 0); + members.removeIf(id -> id.getVersion().compareTo(version) < 0); } @Override public void removeMembersWithSameOrNewerVersion(Collection<InternalDistributedMember> members, KnownVersion version) { - members.removeIf(id -> id.getVersionOrdinalObject().compareTo(version) >= 0); + members.removeIf(id -> id.getVersion().compareTo(version) >= 0); } @Override diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/LonerDistributionManager.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/LonerDistributionManager.java index 5e8e3ed..ffbf2c8 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/LonerDistributionManager.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/LonerDistributionManager.java @@ -189,7 +189,7 @@ public class LonerDistributionManager implements DistributionManager { KnownVersion version) { for (Iterator<InternalDistributedMember> it = members.iterator(); it.hasNext();) { InternalDistributedMember id = it.next(); - if (id.getVersionOrdinalObject().compareTo(version) < 0) { + if (id.getVersion().compareTo(version) < 0) { it.remove(); } } @@ -200,7 +200,7 @@ public class LonerDistributionManager implements DistributionManager { KnownVersion version) { for (Iterator<InternalDistributedMember> it = members.iterator(); it.hasNext();) { InternalDistributedMember id = it.next(); - if (id.getVersionOrdinalObject().compareTo(version) >= 0) { + if (id.getVersion().compareTo(version) >= 0) { it.remove(); } } 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 3194003..83d7884 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,7 +34,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.serialization.DSFIDNotFoundException; -import org.apache.geode.internal.serialization.VersionOrdinal; +import org.apache.geode.internal.serialization.Version; import org.apache.geode.internal.serialization.Versioning; import org.apache.geode.internal.util.Breadcrumbs; import org.apache.geode.internal.util.concurrent.StoppableCountDownLatch; @@ -472,7 +472,7 @@ public class ReplyProcessor21 implements MembershipListener { */ protected synchronized void processException(DistributionMessage msg, DSFIDNotFoundException ex) { final short versionOrdinal = ex.getProductVersionOrdinal(); - final VersionOrdinal anyVersion = Versioning.getVersionOrdinal(versionOrdinal); + final Version anyVersion = Versioning.getVersion(versionOrdinal); logger.fatal(String.format( "Exception received due to missing DSFID %s on remote node %s running version %s.", new Object[] {ex.getUnknownDSFID(), msg.getSender(), anyVersion}), ex); 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 30fb45e..70d6979 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 @@ -49,7 +49,7 @@ 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; -import org.apache.geode.internal.serialization.VersionOrdinal; +import org.apache.geode.internal.serialization.Version; import org.apache.geode.logging.internal.OSProcess; /** @@ -545,13 +545,13 @@ public class InternalDistributedMember return memberIdentifier.getUniqueId(); } - public void setVersionObjectForTest(KnownVersion v) { - memberIdentifier.setVersionObjectForTest(v); + public void setVersionForTest(KnownVersion v) { + memberIdentifier.setVersionForTest(v); } @Override - public VersionOrdinal getVersionOrdinalObject() { - return memberIdentifier.getVersionOrdinalObject(); + public Version getVersion() { + return memberIdentifier.getVersion(); } @Override 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 0ee9323..64c2a38 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 @@ -297,7 +297,7 @@ public abstract class StreamingOperation { int chunkSize = socketBufferSize - MSG_OVERHEAD; HeapDataOutputStream outStream = new HeapDataOutputStream(chunkSize, Versioning - .getKnownVersionOrDefault(getSender().getVersionOrdinalObject(), + .getKnownVersionOrDefault(getSender().getVersion(), KnownVersion.CURRENT)); boolean sentFinalMessage = false; boolean receiverCacheClosed = false; 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 03a0856..66eb2a2 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 @@ -344,7 +344,7 @@ public abstract class AbstractUpdateOperation extends DistributedCacheOperation String msg = String.format("memberID cannot be null for persistent regions: %s", tag); - RuntimeException ex = (sender.getVersionOrdinalObject().isOlderThan(KnownVersion.GFE_80)) + RuntimeException ex = (sender.getVersion().isOlderThan(KnownVersion.GFE_80)) ? new InternalGemFireException(msg) : new InvalidVersionException(msg); throw ex; } 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 955a4b2..1876217 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 @@ -47,7 +47,7 @@ public class ExpireDisconnectedClientTransactionsMessage Set newVersionRecipients = new HashSet(); for (InternalDistributedMember recipient : recipients) { // to geode 1.7.0 and later version servers - if (recipient.getVersionOrdinalObject().isNotOlderThan(KnownVersion.GEODE_1_7_0)) { + if (recipient.getVersion().isNotOlderThan(KnownVersion.GEODE_1_7_0)) { newVersionRecipients.add(recipient); } } @@ -78,7 +78,7 @@ public class ExpireDisconnectedClientTransactionsMessage InternalDistributedMember sender = getSender(); if (cache != null) { TXManagerImpl mgr = cache.getTXMgr(); - if (sender.getVersionOrdinalObject().isNotOlderThan(KnownVersion.GEODE_1_7_0)) { + if (sender.getVersion().isNotOlderThan(KnownVersion.GEODE_1_7_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 3db5973..c5b87bb 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 @@ -4400,7 +4400,7 @@ public class GemFireCacheImpl implements InternalCache, InternalClientCache, Has // the RemoveCacheServerProfileMessage otherMembers .removeIf( - member -> KnownVersion.GEODE_1_5_0.compareTo(member.getVersionOrdinalObject()) > 0); + member -> KnownVersion.GEODE_1_5_0.compareTo(member.getVersion()) > 0); if (!otherMembers.isEmpty()) { if (logger.isDebugEnabled()) { 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 9eca817..3698dbb 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 @@ -339,14 +339,14 @@ public class InitialImageOperation { final ClusterDistributionManager dm = (ClusterDistributionManager) this.region.getDistributionManager(); boolean allowDeltaGII = true; - if (FORCE_FULL_GII || recipient.getVersionOrdinalObject().isOlderThan(KnownVersion.GFE_80)) { + if (FORCE_FULL_GII || recipient.getVersion().isOlderThan(KnownVersion.GFE_80)) { allowDeltaGII = false; } Set keysOfUnfinishedOps = null; RegionVersionVector received_rvv = null; RegionVersionVector remote_rvv = null; if (this.region.getConcurrencyChecksEnabled() - && recipient.getVersionOrdinalObject().isNotOlderThan(KnownVersion.GFE_80)) { + && recipient.getVersion().isNotOlderThan(KnownVersion.GFE_80)) { if (internalBeforeRequestRVV != null && internalBeforeRequestRVV.getRegionName().equals(this.region.getName())) { internalBeforeRequestRVV.run(); @@ -747,7 +747,7 @@ public class InitialImageOperation { Set recipients = this.region.getCacheDistributionAdvisor().adviseReplicates(); for (Iterator it = recipients.iterator(); it.hasNext();) { InternalDistributedMember mbr = (InternalDistributedMember) it.next(); - if (mbr.getVersionOrdinalObject().isOlderThan(KnownVersion.GFE_80)) { + if (mbr.getVersion().isOlderThan(KnownVersion.GFE_80)) { it.remove(); } } @@ -1191,7 +1191,7 @@ public class InitialImageOperation { region.recordEventState(msg.getSender(), msg.eventState); } if (msg.versionVector != null - && msg.getSender().getVersionOrdinalObject().isOlderThan(KnownVersion.GFE_80) + && msg.getSender().getVersion().isOlderThan(KnownVersion.GFE_80) && region.getConcurrencyChecksEnabled()) { // for older version, save received rvv from RegionStateMessage logger.debug("Applying version vector to {}: {}", region.getName(), msg.versionVector); @@ -1600,7 +1600,7 @@ public class InitialImageOperation { } public boolean goWithFullGII(DistributedRegion rgn, RegionVersionVector requesterRVV) { - if (getSender().getVersionOrdinalObject().isOlderThan(KnownVersion.GFE_80)) { + if (getSender().getVersion().isOlderThan(KnownVersion.GFE_80)) { // pre-8.0 could not handle a delta-GII return true; } @@ -1745,7 +1745,7 @@ public class InitialImageOperation { if (eventState != null && eventState.size() > 0) { RegionStateMessage.send(dm, getSender(), this.processorId, eventState, true); } - } else if (getSender().getVersionOrdinalObject().isOlderThan(KnownVersion.GFE_80)) { + } else if (getSender().getVersion().isOlderThan(KnownVersion.GFE_80)) { // older versions of the product expect a RegionStateMessage at this point if (rgn.getConcurrencyChecksEnabled() && this.versionVector == null && !recoveringForLostMember) { @@ -1995,7 +1995,7 @@ public class InitialImageOperation { } final KnownVersion knownVersion = Versioning - .getKnownVersionOrDefault(sender.getVersionOrdinalObject(), KnownVersion.CURRENT); + .getKnownVersionOrDefault(sender.getVersion(), KnownVersion.CURRENT); do { flowControl.acquirePermit(); 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 559f965..216644f 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 @@ -2074,7 +2074,7 @@ public class Oplog implements CompactableOplog, Flushable { short ver = VersioningIO.readOrdinal(dis); final KnownVersion recoveredGFVersion = Versioning.getKnownVersionOrDefault( - Versioning.getVersionOrdinal(ver), null); + Versioning.getVersion(ver), null); if (recoveredGFVersion == null) { throw new DiskAccessException( String.format("Unknown version ordinal %s found when recovering Oplogs", ver), diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java index ad6d22b..0767ced 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java @@ -4830,7 +4830,7 @@ public class PartitionedRegion extends LocalRegion oneBucketKeys.clear(); oneBucketKeys.put(e.getKey(), e.getValue()); try { - if (entry.getKey().getVersionOrdinalObject().isOlderThan(KnownVersion.GFE_80)) { + if (entry.getKey().getVersion().isOlderThan(KnownVersion.GFE_80)) { failures.putAll(nodeToBuckets.get(entry.getKey())); continue; } @@ -4882,7 +4882,7 @@ public class PartitionedRegion extends LocalRegion bucketId.clear(); bucketId.add(bucket); try { - if (entry.getKey().getVersionOrdinalObject().isOlderThan(KnownVersion.GFE_80)) { + if (entry.getKey().getVersion().isOlderThan(KnownVersion.GFE_80)) { failures.addAll(nodeToBuckets.get(entry.getKey())); continue; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionQueryEvaluator.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionQueryEvaluator.java index 4ced34c..c0df11d 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionQueryEvaluator.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionQueryEvaluator.java @@ -186,7 +186,7 @@ public class PartitionedRegionQueryEvaluator extends StreamingPartitionOperation // we will have to sort it boolean sortNeeded = false; List<CompiledSortCriterion> orderByAttribs = null; - if (sender.getVersionOrdinalObject().isOlderThan(KnownVersion.GFE_90)) { + if (sender.getVersion().isOlderThan(KnownVersion.GFE_90)) { CompiledSelect cs = this.query.getSimpleSelect(); if (cs != null && cs.isOrderBy()) { sortNeeded = true; diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ServerPingMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ServerPingMessage.java index 5882fdd..d0cf677 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/ServerPingMessage.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ServerPingMessage.java @@ -65,7 +65,7 @@ public class ServerPingMessage extends PooledDistributionMessage { // filtered recipients for (InternalDistributedMember recipient : recipients) { - if (KnownVersion.GFE_81.compareTo(recipient.getVersionOrdinalObject()) <= 0) { + if (KnownVersion.GFE_81.compareTo(recipient.getVersion()) <= 0) { filteredRecipients.add(recipient); } } 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 21558b8..eeb2b4a 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 @@ -2118,7 +2118,7 @@ public class HARegionQueue implements RegionQueue { try { inputValue = BlobHelper.deserializeBlob(newValueCd.getSerializedValue(), Versioning - .getKnownVersionOrDefault(sender.getVersionOrdinalObject(), KnownVersion.CURRENT), + .getKnownVersionOrDefault(sender.getVersion(), KnownVersion.CURRENT), null); newValueCd = new VMCachedDeserializable(inputValue, newValueCd.getSizeInBytes()); } catch (IOException | ClassNotFoundException e) { diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchBulkEntriesMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchBulkEntriesMessage.java index 9fc2756..766733e 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchBulkEntriesMessage.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchBulkEntriesMessage.java @@ -240,7 +240,7 @@ public class FetchBulkEntriesMessage extends PartitionMessage { HeapDataOutputStream mos = new HeapDataOutputStream( InitialImageOperation.CHUNK_SIZE_IN_BYTES + 2048, Versioning - .getKnownVersionOrDefault(recipient.getVersionOrdinalObject(), KnownVersion.CURRENT)); + .getKnownVersionOrDefault(recipient.getVersion(), KnownVersion.CURRENT)); Iterator<BucketRegion> mapsIterator = maps.iterator(); BucketRegion map = null; Iterator it = null; diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchEntriesMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchEntriesMessage.java index 69f1bea..119885f 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchEntriesMessage.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchEntriesMessage.java @@ -293,7 +293,7 @@ public class FetchEntriesMessage extends PartitionMessage { // always write at least one chunk final HeapDataOutputStream mos = new HeapDataOutputStream( InitialImageOperation.CHUNK_SIZE_IN_BYTES + 2048, Versioning - .getKnownVersionOrDefault(receiver.getVersionOrdinalObject(), KnownVersion.CURRENT)); + .getKnownVersionOrDefault(receiver.getVersion(), KnownVersion.CURRENT)); do { mos.reset(); diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchKeysMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchKeysMessage.java index 9655c44..aa1b829 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchKeysMessage.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchKeysMessage.java @@ -372,7 +372,7 @@ public class FetchKeysMessage extends PartitionMessage { // always write at least one chunk final HeapDataOutputStream mos = new HeapDataOutputStream( InitialImageOperation.CHUNK_SIZE_IN_BYTES + 2048, Versioning - .getKnownVersionOrDefault(recipient.getVersionOrdinalObject(), KnownVersion.CURRENT)); + .getKnownVersionOrDefault(recipient.getVersion(), KnownVersion.CURRENT)); do { mos.reset(); diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/IndexCreationMsg.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/IndexCreationMsg.java index 826ff43..a383aac 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/IndexCreationMsg.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/IndexCreationMsg.java @@ -357,7 +357,7 @@ public class IndexCreationMsg extends PartitionMessage { } for (InternalDistributedMember rec : recipients) { - if (rec.getVersionOrdinalObject().isOlderThan(KnownVersion.GFE_81)) { + if (rec.getVersion().isOlderThan(KnownVersion.GFE_81)) { throw new UnsupportedOperationException( "Indexes should not be created during rolling upgrade"); } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/QueryMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/QueryMessage.java index ffdd027..108a65d 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/QueryMessage.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/QueryMessage.java @@ -124,7 +124,7 @@ public class QueryMessage extends StreamingPartitionOperation.StreamingPartition } Object data = this.currentResultIterator.next(); boolean isPostGFE_8_1 = - this.getSender().getVersionOrdinalObject().isNewerThan(KnownVersion.GFE_81); + this.getSender().getVersion().isNewerThan(KnownVersion.GFE_81); // There is a bug in older versions of GFE such that the query node expects the structs to have // type as ObjectTypes only & not specific types. So the new version needs to send the @@ -192,7 +192,7 @@ public class QueryMessage extends StreamingPartitionOperation.StreamingPartition } isQueryTraced = query.isTraced() - && this.sender.getVersionOrdinalObject().isNotOlderThan(KnownVersion.GFE_81); + && this.sender.getVersion().isNotOlderThan(KnownVersion.GFE_81); // Adds a query trace info object to the results list for remote queries PRQueryTraceInfo queryTraceInfo = null; diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/StreamingPartitionOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/StreamingPartitionOperation.java index 16dd1e1..55af36f 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/StreamingPartitionOperation.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/StreamingPartitionOperation.java @@ -385,7 +385,7 @@ public abstract class StreamingPartitionOperation extends StreamingOperation { boolean receiverCacheClosed = false; this.outStream = new HeapDataOutputStream(chunkSize, Versioning - .getKnownVersionOrDefault(getSender().getVersionOrdinalObject(), KnownVersion.CURRENT)); + .getKnownVersionOrDefault(getSender().getVersion(), KnownVersion.CURRENT)); try { do { 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 9bf801e..a5744ff 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 @@ -434,7 +434,7 @@ public class DiskInitFileParser { ver); } gfversion = Versioning.getKnownVersionOrDefault( - Versioning.getVersionOrdinal(ver), null); + Versioning.getVersion(ver), null); if (gfversion == null) { throw new DiskAccessException( String.format("Unknown version ordinal %s found when recovering Oplogs", ver), 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 0fa67e4..404f778 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 @@ -352,7 +352,7 @@ public class ClientProxyMembershipID public KnownVersion getClientVersion() { return Versioning .getKnownVersionOrDefault( - ((InternalDistributedMember) getDistributedMember()).getVersionOrdinalObject(), + ((InternalDistributedMember) getDistributedMember()).getVersion(), KnownVersion.CURRENT); } 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 b50be26..2790f6f 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 @@ -120,7 +120,7 @@ class ClientRegistrationMetadata { short clientVersionOrdinal = VersioningIO.readOrdinal(dataInputStream); clientVersion = Versioning.getKnownVersionOrDefault( - Versioning.getVersionOrdinal(clientVersionOrdinal), null); + Versioning.getVersion(clientVersionOrdinal), null); final String message; if (clientVersion == null) { 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 c2ff9b3..e86b1de 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 @@ -73,7 +73,7 @@ class ServerSideHandshakeFactory { "HandShakeReader: EOF reached before client version could be read"); } final KnownVersion clientVersion = Versioning.getKnownVersionOrDefault( - Versioning.getVersionOrdinal(clientVersionOrdinal), null); + Versioning.getVersion(clientVersionOrdinal), null); final String message; if (clientVersion == null) { message = KnownVersion.unsupportedVersionMessage(clientVersionOrdinal); diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tx/RemoteFetchKeysMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tx/RemoteFetchKeysMessage.java index 3466119..7653d3d 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tx/RemoteFetchKeysMessage.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tx/RemoteFetchKeysMessage.java @@ -224,7 +224,7 @@ public class RemoteFetchKeysMessage extends RemoteOperationMessage { // always write at least one chunk final HeapDataOutputStream mos = new HeapDataOutputStream( InitialImageOperation.CHUNK_SIZE_IN_BYTES + 2048, Versioning - .getKnownVersionOrDefault(recipient.getVersionOrdinalObject(), KnownVersion.CURRENT)); + .getKnownVersionOrDefault(recipient.getVersion(), KnownVersion.CURRENT)); do { mos.reset(); 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 fb4b331..af63f69 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 @@ -2813,7 +2813,7 @@ public class Connection implements Runnable { // read the product version ordinal for on-the-fly serialization // transformations (for rolling upgrades) remoteVersion = Versioning.getKnownVersionOrDefault( - Versioning.getVersionOrdinal(VersioningIO.readOrdinal(dis)), + Versioning.getVersion(VersioningIO.readOrdinal(dis)), null); int dominoNumber = 0; if (remoteVersion == null @@ -3131,7 +3131,7 @@ public class Connection implements Runnable { // read the product version ordinal for on-the-fly serialization // transformations (for rolling upgrades) remoteVersion = Versioning.getKnownVersionOrDefault( - Versioning.getVersionOrdinal(VersioningIO.readOrdinal(dis)), + Versioning.getVersion(VersioningIO.readOrdinal(dis)), null); ioFilter.doneReading(peerDataBuffer); notifyHandshakeWaiter(true); diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/Configuration.java b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/Configuration.java index b3ade4e..44c6460 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/Configuration.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/Configuration.java @@ -39,7 +39,7 @@ import org.xml.sax.SAXException; import org.apache.geode.DataSerializable; import org.apache.geode.DataSerializer; import org.apache.geode.internal.serialization.KnownVersion; -import org.apache.geode.internal.serialization.VersionOrdinal; +import org.apache.geode.internal.serialization.Version; import org.apache.geode.internal.serialization.Versioning; import org.apache.geode.internal.serialization.VersioningIO; import org.apache.geode.management.configuration.Deployment; @@ -188,7 +188,7 @@ public class Configuration implements DataSerializable { .forEach(deployment -> deployments.put(deployment.getFileName(), deployment)); } else { // version of the data we are reading (1.12 or later) - final VersionOrdinal version = Versioning.getVersionOrdinal(VersioningIO.readOrdinal(in)); + final Version version = Versioning.getVersion(VersioningIO.readOrdinal(in)); if (version.isNotOlderThan(KnownVersion.GEODE_1_12_0)) { deployments.putAll(DataSerializer.readHashMap(in)); } diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/operation/RestoreRedundancyPerformer.java b/geode-core/src/main/java/org/apache/geode/management/internal/operation/RestoreRedundancyPerformer.java index 14e9e08..d65bc58 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/operation/RestoreRedundancyPerformer.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/operation/RestoreRedundancyPerformer.java @@ -129,7 +129,7 @@ public class RestoreRedundancyPerformer RebalanceOperationPerformer.MemberPRInfo prInfo) { return prInfo.dsMemberList.stream() .map(InternalDistributedMember.class::cast) - .filter(member -> member.getVersionOrdinalObject().compareTo(ADDED_VERSION) >= 0) + .filter(member -> member.getVersion().compareTo(ADDED_VERSION) >= 0) .collect(Collectors.toList()); } diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/util/ManagementUtils.java b/geode-core/src/main/java/org/apache/geode/management/internal/util/ManagementUtils.java index 823b7a0..fa406ba 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/util/ManagementUtils.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/util/ManagementUtils.java @@ -77,7 +77,7 @@ public class ManagementUtils { public static Set<DistributedMember> getNormalMembersWithSameOrNewerVersion(InternalCache cache, KnownVersion version) { return getAllNormalMembers(cache).stream().filter( - member -> ((InternalDistributedMember) member).getVersionOrdinalObject() + member -> ((InternalDistributedMember) member).getVersion() .compareTo(version) >= 0) .collect(Collectors.toSet()); } 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 a4257d3..a96a8f5 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 @@ -44,7 +44,7 @@ public class ExpireDisconnectedClientTransactionsMessageTest { when(dm.getCache()).thenReturn(cache); when(cache.getTXMgr()).thenReturn(txManager); doReturn(sender).when(message).getSender(); - when(sender.getVersionOrdinalObject()).thenReturn(version); + when(sender.getVersion()).thenReturn(version); } @Test diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/ThreadIdentifierJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/ThreadIdentifierJUnitTest.java index 38a9b49..c072fc7 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/ThreadIdentifierJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/ThreadIdentifierJUnitTest.java @@ -36,7 +36,7 @@ public class ThreadIdentifierJUnitTest { @Test public void testEqualsIgnoresUUIDBytes() throws Exception { InternalDistributedMember id = new InternalDistributedMember(InetAddress.getLocalHost(), 1234); - id.setVersionObjectForTest(KnownVersion.GFE_90); + id.setVersionForTest(KnownVersion.GFE_90); byte[] memberIdBytes = EventID.getMembershipId(new ClientProxyMembershipID(id)); byte[] memberIdBytesWithoutUUID = new byte[memberIdBytes.length - (2 * 8 + 1)];// UUID bytes + // weight byte diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/operation/RestoreRedundancyPerformerTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/operation/RestoreRedundancyPerformerTest.java index e02a453..e8ca7b9 100644 --- a/geode-core/src/test/java/org/apache/geode/management/internal/operation/RestoreRedundancyPerformerTest.java +++ b/geode-core/src/test/java/org/apache/geode/management/internal/operation/RestoreRedundancyPerformerTest.java @@ -93,9 +93,9 @@ public class RestoreRedundancyPerformerTest { when(internalCacheForClientAccess.getInternalDistributedSystem()) .thenReturn(internalDistributedSystem); - when(server1.getVersionOrdinalObject()) + when(server1.getVersion()) .thenReturn(RestoreRedundancyPerformer.ADDED_VERSION); - when(server2.getVersionOrdinalObject()) + when(server2.getVersion()) .thenReturn(RestoreRedundancyPerformer.ADDED_VERSION); restoreRedundancyPerformer = new RestoreRedundancyPerformer(); @@ -239,9 +239,9 @@ public class RestoreRedundancyPerformerTest { underRedundancyRegionResults.put(REGION_1, regionRedundancyStatusImpl); - when(server1.getVersionOrdinalObject()) + when(server1.getVersion()) .thenReturn(KnownVersion.GEODE_1_2_0); - when(server2.getVersionOrdinalObject()) + when(server2.getVersion()) .thenReturn(KnownVersion.GEODE_1_9_0); diff --git a/geode-core/src/upgradeTest/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTestBase.java b/geode-core/src/upgradeTest/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTestBase.java index 3bc25b2..293bc69 100755 --- a/geode-core/src/upgradeTest/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTestBase.java +++ b/geode-core/src/upgradeTest/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTestBase.java @@ -1073,7 +1073,7 @@ public abstract class RollingUpgrade2DUnitTestBase extends JUnit4DistributedTest private static void assertVersion(GemFireCache cache, short ordinal) { DistributedSystem system = cache.getDistributedSystem(); int thisOrdinal = - ((InternalDistributedMember) system.getDistributedMember()).getVersionOrdinalObject() + ((InternalDistributedMember) system.getDistributedMember()).getVersion() .ordinal(); if (ordinal != thisOrdinal) { throw new Error( diff --git a/geode-core/src/upgradeTest/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgradeDUnitTest.java b/geode-core/src/upgradeTest/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgradeDUnitTest.java index 7f8f3a7..8b7c2be 100644 --- a/geode-core/src/upgradeTest/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgradeDUnitTest.java +++ b/geode-core/src/upgradeTest/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgradeDUnitTest.java @@ -56,7 +56,7 @@ import org.apache.geode.distributed.internal.membership.api.MembershipView; import org.apache.geode.distributed.internal.membership.gms.membership.GMSJoinLeave; import org.apache.geode.internal.AvailablePortHelper; import org.apache.geode.internal.serialization.KnownVersion; -import org.apache.geode.internal.serialization.VersionOrdinal; +import org.apache.geode.internal.serialization.Version; import org.apache.geode.test.dunit.DistributedTestUtils; import org.apache.geode.test.dunit.Host; import org.apache.geode.test.dunit.IgnoredException; @@ -680,7 +680,7 @@ public abstract class RollingUpgradeDUnitTest extends JUnit4DistributedTestCase private static void assertVersion(Cache cache, short ordinal) { DistributedSystem ds = cache.getDistributedSystem(); InternalDistributedMember member = (InternalDistributedMember) ds.getDistributedMember(); - final VersionOrdinal thisVersion = member.getVersionOrdinalObject(); + final Version thisVersion = member.getVersion(); short thisOrdinal = thisVersion.ordinal(); if (ordinal != thisOrdinal) { throw new Error( diff --git a/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/commands/CreateGatewaySenderCommand.java b/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/commands/CreateGatewaySenderCommand.java index 6e8cace..a6b40b9 100644 --- a/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/commands/CreateGatewaySenderCommand.java +++ b/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/commands/CreateGatewaySenderCommand.java @@ -207,7 +207,7 @@ public class CreateGatewaySenderCommand extends SingleGfshCommand { private boolean verifyAllCurrentVersion(Set<DistributedMember> members) { return members.stream().allMatch( - member -> ((InternalDistributedMember) member).getVersionOrdinalObject() + member -> ((InternalDistributedMember) member).getVersion() .equals(KnownVersion.CURRENT)); } diff --git a/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/commands/RedundancyCommand.java b/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/commands/RedundancyCommand.java index 652a9d4..f90c27c 100644 --- a/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/commands/RedundancyCommand.java +++ b/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/commands/RedundancyCommand.java @@ -91,7 +91,7 @@ public class RedundancyCommand extends GfshCommand { RebalanceOperationPerformer.MemberPRInfo prInfo) { return prInfo.dsMemberList.stream() .map(InternalDistributedMember.class::cast) - .filter(member -> member.getVersionOrdinalObject().compareTo(ADDED_VERSION) >= 0) + .filter(member -> member.getVersion().compareTo(ADDED_VERSION) >= 0) .collect(Collectors.toList()); } diff --git a/geode-gfsh/src/test/java/org/apache/geode/management/internal/cli/commands/CreateGatewaySenderCommandTest.java b/geode-gfsh/src/test/java/org/apache/geode/management/internal/cli/commands/CreateGatewaySenderCommandTest.java index 7c8ef21..2784ba5 100644 --- a/geode-gfsh/src/test/java/org/apache/geode/management/internal/cli/commands/CreateGatewaySenderCommandTest.java +++ b/geode-gfsh/src/test/java/org/apache/geode/management/internal/cli/commands/CreateGatewaySenderCommandTest.java @@ -230,9 +230,9 @@ public class CreateGatewaySenderCommandTest { // Create a set of mixed version members Set<DistributedMember> members = new HashSet<>(); InternalDistributedMember currentVersionMember = mock(InternalDistributedMember.class); - when(currentVersionMember.getVersionOrdinalObject()).thenReturn(KnownVersion.CURRENT); + when(currentVersionMember.getVersion()).thenReturn(KnownVersion.CURRENT); InternalDistributedMember oldVersionMember = mock(InternalDistributedMember.class); - when(oldVersionMember.getVersionOrdinalObject()).thenReturn(KnownVersion.GEODE_1_4_0); + when(oldVersionMember.getVersion()).thenReturn(KnownVersion.GEODE_1_4_0); members.add(currentVersionMember); members.add(oldVersionMember); doReturn(members).when(command).getMembers(any(), any()); diff --git a/geode-junit/src/main/java/org/apache/geode/test/version/VersionManager.java b/geode-junit/src/main/java/org/apache/geode/test/version/VersionManager.java index ecb7f50..da0e6d7 100755 --- a/geode-junit/src/main/java/org/apache/geode/test/version/VersionManager.java +++ b/geode-junit/src/main/java/org/apache/geode/test/version/VersionManager.java @@ -235,17 +235,31 @@ public class VersionManager { } private Class<?> findVersionClass() { - // GEODE's Version class was repackaged when serialization was modularized + /* + * The known versions "enum" class has moved packages and been renamed over time: + * + * 1. org.apache.geode.internal.Version + * 2. org.apache.geode.internal.serialization.Version + * 3. org.apache.geode.internal.serialization.KnownVersion + * + * We search in order 3,1,2 because when we renamed the class "KnownVersion" + * we also had an interface in the same package, called "Version" so we want to + * avoid finding that interface when we really want the "enum" class. + */ try { - return Class.forName("org.apache.geode.internal.Version"); + return Class.forName("org.apache.geode.internal.serialization.KnownVersion"); } catch (ClassNotFoundException e) { try { - return Class.forName("org.apache.geode.internal.serialization.KnownVersion"); + return Class.forName("org.apache.geode.internal.Version"); } catch (ClassNotFoundException e2) { - System.out.println("classpath is " + System.getProperty("java.class.path")); - throw new IllegalStateException( - "Unable to locate Version.java in order to establish the product's serialization version", - e2); + try { + return Class.forName("org.apache.geode.internal.serialization.Version"); + } catch (ClassNotFoundException e3) { + System.out.println("classpath is " + System.getProperty("java.class.path")); + throw new IllegalStateException( + "Unable to locate Version or KnownVersion in order to establish the product's serialization version", + e3); + } } } } 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 1ec6343..53abf88 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 @@ -82,7 +82,7 @@ import org.apache.geode.internal.cache.extension.Extensible; import org.apache.geode.internal.cache.xmlcache.XmlGenerator; import org.apache.geode.internal.serialization.DataSerializableFixedID; import org.apache.geode.internal.serialization.KnownVersion; -import org.apache.geode.internal.serialization.VersionOrdinal; +import org.apache.geode.internal.serialization.Version; import org.apache.geode.logging.internal.log4j.api.LogService; import org.apache.geode.management.internal.beans.CacheServiceMBeanBase; import org.apache.geode.util.internal.GeodeGlossary; @@ -240,11 +240,11 @@ public class LuceneServiceImpl implements InternalLuceneService { protected void validateAllMembersAreTheSameVersion(PartitionedRegion region) { Set<InternalDistributedMember> remoteMembers = region.getRegionAdvisor().adviseAllPRNodes(); - final VersionOrdinal localVersion = - cache.getDistributionManager().getDistributionManagerId().getVersionOrdinalObject(); + final Version localVersion = + cache.getDistributionManager().getDistributionManagerId().getVersion(); if (!remoteMembers.isEmpty()) { for (InternalDistributedMember remoteMember : remoteMembers) { - if (!remoteMember.getVersionOrdinalObject().equals(localVersion)) { + if (!remoteMember.getVersion().equals(localVersion)) { throw new IllegalStateException( "The lucene index cannot be created on a existing region if all members hosting the region : " + region.getFullPath() + ", are not the same Apache Geode version "); @@ -726,7 +726,7 @@ public class LuceneServiceImpl implements InternalLuceneService { private boolean isAnyRemoteMemberVersionLessThanGeode1_7_0( Set<InternalDistributedMember> remoteMembers) { for (InternalDistributedMember remoteMember : remoteMembers) { - if (remoteMember.getVersionOrdinalObject().ordinal() < KnownVersion.GEODE_1_7_0.ordinal()) { + if (remoteMember.getVersion().ordinal() < KnownVersion.GEODE_1_7_0.ordinal()) { return true; } } 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 262bfee..590034b 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 @@ -96,7 +96,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.getVersionOrdinalObject().ordinal() < KnownVersion.GEODE_1_6_0.ordinal()) { + if (remoteMember.getVersion().ordinal() < KnownVersion.GEODE_1_6_0.ordinal()) { // re-execute but wait till indexing is complete execute(ctx, true); return; diff --git a/geode-lucene/src/upgradeTest/java/org/apache/geode/cache/lucene/LuceneSearchWithRollingUpgradeTestBase.java b/geode-lucene/src/upgradeTest/java/org/apache/geode/cache/lucene/LuceneSearchWithRollingUpgradeTestBase.java index 533144c..d5e7b09 100644 --- a/geode-lucene/src/upgradeTest/java/org/apache/geode/cache/lucene/LuceneSearchWithRollingUpgradeTestBase.java +++ b/geode-lucene/src/upgradeTest/java/org/apache/geode/cache/lucene/LuceneSearchWithRollingUpgradeTestBase.java @@ -715,14 +715,25 @@ public abstract class LuceneSearchWithRollingUpgradeTestBase extends JUnit4Distr Method getDistributedMemberMethod = ds.getClass().getMethod("getDistributedMember"); getDistributedMemberMethod.setAccessible(true); Object member = getDistributedMemberMethod.invoke(ds); + Method getVersionMethod; + /* + * The method to get the version from an InternalDistributedMember has changed over time: + * + * 1. getVersionObject() + * 2. getVersionOrdinalObject() + * 3. getVersion() + */ try { - // newer versions have this method - getVersionMethod = member.getClass().getMethod("getVersionOrdinalObject"); + getVersionMethod = member.getClass().getMethod("getVersion"); } catch (final NoSuchMethodException e) { - // older versions have this other method - getVersionMethod = member.getClass().getMethod("getVersionObject"); + try { + getVersionMethod = member.getClass().getMethod("getVersionOrdinalObject"); + } catch (final NoSuchMethodException e2) { + getVersionMethod = member.getClass().getMethod("getVersionObject"); + } } + getVersionMethod.setAccessible(true); Object thisVersion = getVersionMethod.invoke(member); Method getOrdinalMethod = thisVersion.getClass().getMethod("ordinal"); diff --git a/geode-membership/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java b/geode-membership/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java index 8f901f1..b77eb39 100644 --- a/geode-membership/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java +++ b/geode-membership/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java @@ -574,7 +574,7 @@ public class GMSHealthMonitorJUnitTest { gmsHealthMonitor.setNextNeighbor(v, memberToCheck); assertNotEquals(memberToCheck, gmsHealthMonitor.getNextNeighbor()); - ((MemberIdentifierImpl) mockMembers.get(0)).setVersionObjectForTest(KnownVersion.GEODE_1_3_0); + ((MemberIdentifierImpl) mockMembers.get(0)).setVersionForTest(KnownVersion.GEODE_1_3_0); boolean retVal = gmsHealthMonitor.inlineCheckIfAvailable(mockMembers.get(0), v, true, memberToCheck, "Not responding"); diff --git a/geode-membership/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java b/geode-membership/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java index 0c0bebd..aa53bdf 100644 --- a/geode-membership/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java +++ b/geode-membership/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java @@ -166,7 +166,7 @@ public class GMSJoinLeaveJUnitTest { mockOldMember = services.getMemberFactory().create( MemberDataBuilder.newBuilderForLocalHost("localhost") .setMembershipPort(8700).build()); - ((MemberIdentifierImpl) mockOldMember).setVersionObjectForTest(KnownVersion.GFE_56); + ((MemberIdentifierImpl) mockOldMember).setVersionForTest(KnownVersion.GFE_56); locatorClient = mock(TcpClient.class); if (useTestGMSJoinLeave) { @@ -1588,7 +1588,7 @@ public class GMSJoinLeaveJUnitTest { // this test must live in the 1.12 and later lines so pick a pre-1.12 version final KnownVersion oldVersion = KnownVersion.GEODE_1_11_0; - myMemberIDWithWrongVersion.setVersionObjectForTest(oldVersion); + myMemberIDWithWrongVersion.setVersionForTest(oldVersion); viewWithWrongVersion.remove(gmsJoinLeaveMemberId); viewWithWrongVersion.add(myMemberIDWithWrongVersion); @@ -1596,7 +1596,7 @@ public class GMSJoinLeaveJUnitTest { gmsJoinLeave.installView(viewWithWrongVersion); assertThat( - gmsJoinLeave.getView().getCanonicalID(gmsJoinLeaveMemberId).getVersionOrdinalObject()) + gmsJoinLeave.getView().getCanonicalID(gmsJoinLeaveMemberId).getVersion()) .isEqualTo(KnownVersion.getCurrentVersion()); } diff --git a/geode-membership/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGroupsMessengerJUnitTest.java b/geode-membership/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGroupsMessengerJUnitTest.java index 65142fe..ff7895d 100755 --- a/geode-membership/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGroupsMessengerJUnitTest.java +++ b/geode-membership/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGroupsMessengerJUnitTest.java @@ -1159,7 +1159,7 @@ public class JGroupsMessengerJUnitTest { MemberIdentifier gms = MemberIdentifierUtil.createMemberID(port); gms.getMemberData().setUUID(UUID.randomUUID()); gms.setVmKind(MemberIdentifier.NORMAL_DM_TYPE); - gms.setVersionObjectForTest(KnownVersion.getCurrentVersion()); + gms.setVersionForTest(KnownVersion.getCurrentVersion()); return gms; } diff --git a/geode-membership/src/main/java/org/apache/geode/distributed/internal/membership/api/MemberData.java b/geode-membership/src/main/java/org/apache/geode/distributed/internal/membership/api/MemberData.java index c5f09fb..3c44b39 100644 --- a/geode-membership/src/main/java/org/apache/geode/distributed/internal/membership/api/MemberData.java +++ b/geode-membership/src/main/java/org/apache/geode/distributed/internal/membership/api/MemberData.java @@ -23,7 +23,7 @@ import org.jgroups.util.UUID; import org.apache.geode.internal.serialization.DeserializationContext; import org.apache.geode.internal.serialization.KnownVersion; import org.apache.geode.internal.serialization.SerializationContext; -import org.apache.geode.internal.serialization.VersionOrdinal; +import org.apache.geode.internal.serialization.Version; /** * MemberIdentifiers are created with a MemberData component. Use MemberDataBuilder to create @@ -46,7 +46,7 @@ public interface MemberData { short getVersionOrdinal(); - VersionOrdinal getVersionOrdinalObject(); + Version getVersion(); String getUniqueTag(); diff --git a/geode-membership/src/main/java/org/apache/geode/distributed/internal/membership/api/MemberIdentifier.java b/geode-membership/src/main/java/org/apache/geode/distributed/internal/membership/api/MemberIdentifier.java index 3084cb7..30cc8dd 100644 --- a/geode-membership/src/main/java/org/apache/geode/distributed/internal/membership/api/MemberIdentifier.java +++ b/geode-membership/src/main/java/org/apache/geode/distributed/internal/membership/api/MemberIdentifier.java @@ -29,7 +29,7 @@ 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; -import org.apache.geode.internal.serialization.VersionOrdinal; +import org.apache.geode.internal.serialization.Version; /** * MemberIdentifier should be implemented by a user of GMS if the default member identifier @@ -132,7 +132,7 @@ public interface MemberIdentifier extends DataSerializableFixedID { /** * Get the Geode version of this member */ - VersionOrdinal getVersionOrdinalObject(); + Version getVersion(); /** * Replace the current member data with the given member data. This can be used to fill out a @@ -191,7 +191,7 @@ public interface MemberIdentifier extends DataSerializableFixedID { String getUniqueId(); - void setVersionObjectForTest(KnownVersion v); + void setVersionForTest(KnownVersion v); void setUniqueTag(String tag); diff --git a/geode-membership/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSMemberData.java b/geode-membership/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSMemberData.java index ebba2e5..76195d4 100644 --- a/geode-membership/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSMemberData.java +++ b/geode-membership/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSMemberData.java @@ -28,7 +28,7 @@ import org.apache.geode.internal.serialization.DeserializationContext; import org.apache.geode.internal.serialization.KnownVersion; import org.apache.geode.internal.serialization.SerializationContext; import org.apache.geode.internal.serialization.StaticSerialization; -import org.apache.geode.internal.serialization.VersionOrdinal; +import org.apache.geode.internal.serialization.Version; import org.apache.geode.internal.serialization.Versioning; import org.apache.geode.internal.serialization.VersioningIO; @@ -88,7 +88,7 @@ public class GMSMemberData implements MemberData, Comparable<GMSMemberData> { * e.g. during rolling upgrade members with old versions receive member identifiers * from members with new (unknown) versions. */ - private transient VersionOrdinal versionOrdinal = KnownVersion.CURRENT; + private transient Version version = KnownVersion.CURRENT; /** * whether this is a partial member ID (without roles, durable attributes). We use partial IDs in @@ -136,7 +136,7 @@ public class GMSMemberData implements MemberData, Comparable<GMSMemberData> { this.durableTimeout = durableTimeout; this.networkPartitionDetectionEnabled = networkPartitionDetectionEnabled; this.preferredForCoordinator = preferredForCoordinator; - this.versionOrdinal = Versioning.getVersionOrdinal(versionOrdinal); + this.version = Versioning.getVersion(versionOrdinal); this.uuidMSBs = msbs; this.uuidLSBs = lsbs; this.memberWeight = memberWeight; @@ -149,7 +149,7 @@ public class GMSMemberData implements MemberData, Comparable<GMSMemberData> { this.inetAddr = i; this.hostName = i.getHostName(); this.udpPort = p; - this.versionOrdinal = Versioning.getVersionOrdinal(versionOrdinal); + this.version = Versioning.getVersion(versionOrdinal); this.uuidMSBs = msbs; this.uuidLSBs = lsbs; this.vmViewId = viewId; @@ -178,7 +178,7 @@ public class GMSMemberData implements MemberData, Comparable<GMSMemberData> { this.durableId = other.durableId; this.durableTimeout = other.durableTimeout; this.groups = other.groups; - this.versionOrdinal = other.versionOrdinal; + this.version = other.version; this.uuidLSBs = other.uuidLSBs; this.uuidMSBs = other.uuidMSBs; this.isPartial = other.isPartial; @@ -222,12 +222,12 @@ public class GMSMemberData implements MemberData, Comparable<GMSMemberData> { @Override public short getVersionOrdinal() { - return versionOrdinal.ordinal(); + return version.ordinal(); } @Override - public VersionOrdinal getVersionOrdinalObject() { - return versionOrdinal; + public Version getVersion() { + return version; } @Override @@ -237,7 +237,7 @@ public class GMSMemberData implements MemberData, Comparable<GMSMemberData> { @Override public void setVersionOrdinal(short versionOrdinal) { - this.versionOrdinal = Versioning.getVersionOrdinal(versionOrdinal); + this.version = Versioning.getVersion(versionOrdinal); } @Override diff --git a/geode-membership/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSMembership.java b/geode-membership/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSMembership.java index cb90f09..33c3104 100644 --- a/geode-membership/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSMembership.java +++ b/geode-membership/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSMembership.java @@ -61,7 +61,7 @@ import org.apache.geode.distributed.internal.membership.api.QuorumChecker; import org.apache.geode.distributed.internal.membership.api.StopShunningMarker; import org.apache.geode.distributed.internal.membership.gms.interfaces.Manager; import org.apache.geode.internal.serialization.KnownVersion; -import org.apache.geode.internal.serialization.VersionOrdinal; +import org.apache.geode.internal.serialization.Version; import org.apache.geode.logging.internal.executors.LoggingExecutors; import org.apache.geode.logging.internal.executors.LoggingThread; import org.apache.geode.util.internal.GeodeGlossary; @@ -378,19 +378,19 @@ public class GMSMembership<ID extends MemberIdentifier> implements Membership<ID latestViewWriteLock.lock(); try { // first determine the version for multicast message serialization - VersionOrdinal version = KnownVersion.CURRENT; + Version version = KnownVersion.CURRENT; for (final Entry<ID, Long> internalIDLongEntry : surpriseMembers .entrySet()) { ID mbr = internalIDLongEntry.getKey(); - final VersionOrdinal itsVersion = mbr.getVersionOrdinalObject(); + final Version itsVersion = mbr.getVersion(); if (itsVersion != null && version.compareTo(itsVersion) < 0) { version = itsVersion; } } for (ID mbr : newView.getMembers()) { - final VersionOrdinal itsVersion = mbr.getVersionOrdinalObject(); + final Version itsVersion = mbr.getVersion(); if (itsVersion != null && itsVersion.compareTo(version) < 0) { - version = mbr.getVersionOrdinalObject(); + version = mbr.getVersion(); } } disableMulticastForRollingUpgrade = !version.equals(KnownVersion.CURRENT); diff --git a/geode-membership/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSMembershipView.java b/geode-membership/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSMembershipView.java index fe27875..d4016ff 100644 --- a/geode-membership/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSMembershipView.java +++ b/geode-membership/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSMembershipView.java @@ -667,9 +667,9 @@ public class GMSMembershipView<ID extends MemberIdentifier> implements DataSeria */ public void correctWrongVersionIn(final ID memberID) { final ID oldID = getCanonicalID(memberID); - if (!oldID.getVersionOrdinalObject().equals(KnownVersion.getCurrentVersion())) { + if (!oldID.getVersion().equals(KnownVersion.getCurrentVersion())) { // don't remove/add the ID lest we change it's relative position in the list - oldID.setVersionObjectForTest(KnownVersion.getCurrentVersion()); + oldID.setVersionForTest(KnownVersion.getCurrentVersion()); } } diff --git a/geode-membership/src/main/java/org/apache/geode/distributed/internal/membership/gms/MemberIdentifierImpl.java b/geode-membership/src/main/java/org/apache/geode/distributed/internal/membership/gms/MemberIdentifierImpl.java index e91ad09..daa1a20 100644 --- a/geode-membership/src/main/java/org/apache/geode/distributed/internal/membership/gms/MemberIdentifierImpl.java +++ b/geode-membership/src/main/java/org/apache/geode/distributed/internal/membership/gms/MemberIdentifierImpl.java @@ -46,7 +46,7 @@ import org.apache.geode.internal.serialization.DeserializationContext; import org.apache.geode.internal.serialization.KnownVersion; import org.apache.geode.internal.serialization.SerializationContext; import org.apache.geode.internal.serialization.StaticSerialization; -import org.apache.geode.internal.serialization.VersionOrdinal; +import org.apache.geode.internal.serialization.Version; import org.apache.geode.internal.serialization.Versioning; import org.apache.geode.internal.serialization.VersioningIO; @@ -422,7 +422,7 @@ public class MemberIdentifierImpl implements MemberIdentifier, DataSerializableF // add version if not current short version = memberData.getVersionOrdinal(); if (version != KnownVersion.CURRENT.ordinal()) { - sb.append("(version:").append(Versioning.getVersionOrdinal(version)).append(')'); + sb.append("(version:").append(Versioning.getVersion(version)).append(')'); } // leave out Roles on purpose @@ -976,20 +976,20 @@ public class MemberIdentifierImpl implements MemberIdentifier, DataSerializableF // add version if not current short version = memberData.getVersionOrdinal(); if (version != KnownVersion.CURRENT.ordinal()) { - sb.append("(version:").append(Versioning.getVersionOrdinal(version)).append(')'); + sb.append("(version:").append(Versioning.getVersion(version)).append(')'); } return sb.toString(); } - public void setVersionObjectForTest(KnownVersion v) { + public void setVersionForTest(KnownVersion v) { memberData.setVersion(v); cachedToString = null; } @Override - public VersionOrdinal getVersionOrdinalObject() { - return memberData.getVersionOrdinalObject(); + public Version getVersion() { + return memberData.getVersion(); } @Override diff --git a/geode-membership/src/main/java/org/apache/geode/distributed/internal/membership/gms/locator/GMSLocator.java b/geode-membership/src/main/java/org/apache/geode/distributed/internal/membership/gms/locator/GMSLocator.java index 1475837..c7c38b0 100644 --- a/geode-membership/src/main/java/org/apache/geode/distributed/internal/membership/gms/locator/GMSLocator.java +++ b/geode-membership/src/main/java/org/apache/geode/distributed/internal/membership/gms/locator/GMSLocator.java @@ -455,7 +455,7 @@ public class GMSLocator<ID extends MemberIdentifier> implements Locator<ID>, Tcp } else { KnownVersion geodeVersion = Versioning.getKnownVersionOrDefault( - Versioning.getVersionOrdinal((short) version), + Versioning.getVersion((short) version), KnownVersion.CURRENT); logger.info("Peer locator found that persistent view was written with version {}", geodeVersion); diff --git a/geode-membership/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGroupsMessenger.java b/geode-membership/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGroupsMessenger.java index fabe5b6..ae20b1a 100644 --- a/geode-membership/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGroupsMessenger.java +++ b/geode-membership/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGroupsMessenger.java @@ -881,7 +881,7 @@ public class JGroupsMessenger<ID extends MemberIdentifier> implements Messenger< long start = services.getStatistics().startMsgSerialization(); final KnownVersion version = Versioning.getKnownVersionOrDefault( - Versioning.getVersionOrdinal(versionOrdinal), + Versioning.getVersion(versionOrdinal), KnownVersion.CURRENT); BufferDataOutputStream out_stream = new BufferDataOutputStream(version); @@ -944,7 +944,7 @@ public class JGroupsMessenger<ID extends MemberIdentifier> implements Messenger< final KnownVersion version = Versioning.getKnownVersionOrDefault( - Versioning.getVersionOrdinal(versionOrdinal), + Versioning.getVersion(versionOrdinal), KnownVersion.CURRENT); BufferDataOutputStream out_stream = new BufferDataOutputStream(version); @@ -1040,7 +1040,7 @@ public class JGroupsMessenger<ID extends MemberIdentifier> implements Messenger< if (ordinal < KnownVersion.getCurrentVersion().ordinal()) { final KnownVersion version = Versioning.getKnownVersionOrDefault( - Versioning.getVersionOrdinal(ordinal), + Versioning.getVersion(ordinal), KnownVersion.CURRENT); dis = new VersionedDataInputStream(dis, version); @@ -1140,7 +1140,7 @@ public class JGroupsMessenger<ID extends MemberIdentifier> implements Messenger< if (ordinal < KnownVersion.getCurrentVersion().ordinal()) { final KnownVersion version = Versioning.getKnownVersionOrDefault( - Versioning.getVersionOrdinal(ordinal), + Versioning.getVersion(ordinal), KnownVersion.CURRENT); in = new VersionedDataInputStream(in, version); diff --git a/geode-serialization/src/main/java/org/apache/geode/internal/serialization/AbstractVersion.java b/geode-serialization/src/main/java/org/apache/geode/internal/serialization/AbstractVersion.java index dc6c1d4..a85745f 100644 --- a/geode-serialization/src/main/java/org/apache/geode/internal/serialization/AbstractVersion.java +++ b/geode-serialization/src/main/java/org/apache/geode/internal/serialization/AbstractVersion.java @@ -21,7 +21,7 @@ package org.apache.geode.internal.serialization; * * Package private since this class is an implementation detail. */ -abstract class AbstractVersion implements VersionOrdinal { +abstract class AbstractVersion implements Version { private final short ordinal; @@ -38,7 +38,7 @@ abstract class AbstractVersion implements VersionOrdinal { } @Override - public int compareTo(final VersionOrdinal other) { + public int compareTo(final Version other) { if (other == null) { return 1; } else { @@ -50,8 +50,8 @@ abstract class AbstractVersion implements VersionOrdinal { public boolean equals(final Object other) { if (other == this) return true; - if (other instanceof VersionOrdinal) { - return ordinal() == ((VersionOrdinal) other).ordinal(); + if (other instanceof Version) { + return ordinal() == ((Version) other).ordinal(); } else { return false; } @@ -77,7 +77,7 @@ abstract class AbstractVersion implements VersionOrdinal { * @return true if this is older than version, otherwise false. */ @Override - public final boolean isOlderThan(final VersionOrdinal version) { + public final boolean isOlderThan(final Version version) { return compareTo(version) < 0; } @@ -88,7 +88,7 @@ abstract class AbstractVersion implements VersionOrdinal { * @return true if this is the same version or newer, otherwise false. */ @Override - public final boolean isNotOlderThan(final VersionOrdinal version) { + public final boolean isNotOlderThan(final Version version) { return compareTo(version) >= 0; } @@ -99,7 +99,7 @@ abstract class AbstractVersion implements VersionOrdinal { * @return true if this is newer than version, otherwise false. */ @Override - public final boolean isNewerThan(final VersionOrdinal version) { + public final boolean isNewerThan(final Version version) { return compareTo(version) > 0; } @@ -110,7 +110,7 @@ abstract class AbstractVersion implements VersionOrdinal { * @return true if this is the same version or older, otherwise false. */ @Override - public final boolean isNotNewerThan(final VersionOrdinal version) { + public final boolean isNotNewerThan(final Version version) { return compareTo(version) <= 0; } 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 52828fc..b4675b7 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 @@ -401,13 +401,13 @@ public class KnownVersion extends AbstractVersion { /** * package-protected for use by Versioning factory */ - static KnownVersion getKnownVersion(final short ordinal, - final KnownVersion returnWhenUnknown) { + static KnownVersion getKnownVersionOrDefault(final short ordinal, + final KnownVersion defaultKnownVersion) { if (ordinal == TOKEN_ORDINAL) { return TOKEN; } if (ordinal < TOKEN_ORDINAL || ordinal >= VALUES.length || VALUES[ordinal] == null) { - return returnWhenUnknown; + return defaultKnownVersion; } return VALUES[ordinal]; } diff --git a/geode-serialization/src/main/java/org/apache/geode/internal/serialization/UnknownVersion.java b/geode-serialization/src/main/java/org/apache/geode/internal/serialization/UnknownVersion.java index 81f7551..f8a651f 100644 --- a/geode-serialization/src/main/java/org/apache/geode/internal/serialization/UnknownVersion.java +++ b/geode-serialization/src/main/java/org/apache/geode/internal/serialization/UnknownVersion.java @@ -19,7 +19,6 @@ public class UnknownVersion extends AbstractVersion { /** * Package-private so only the Versioning factory can access this constructor. - * */ UnknownVersion(final short ordinal) { super(ordinal); diff --git a/geode-serialization/src/main/java/org/apache/geode/internal/serialization/VersionOrdinal.java b/geode-serialization/src/main/java/org/apache/geode/internal/serialization/Version.java similarity index 80% rename from geode-serialization/src/main/java/org/apache/geode/internal/serialization/VersionOrdinal.java rename to geode-serialization/src/main/java/org/apache/geode/internal/serialization/Version.java index 9a65974..cb7d8d1 100644 --- a/geode-serialization/src/main/java/org/apache/geode/internal/serialization/VersionOrdinal.java +++ b/geode-serialization/src/main/java/org/apache/geode/internal/serialization/Version.java @@ -16,7 +16,7 @@ package org.apache.geode.internal.serialization; /** - * VersionOrdinal is able to represent not only currently-known + * {@link Version} is able to represent not only currently-known * Geode versions but future versions as well. This is necessary * because during rolling upgrades Geode manipulates member * identifiers for members running newer versions of the software. @@ -28,15 +28,15 @@ package org.apache.geode.internal.serialization; * ordinal() result. And since this interface extends Comparable, * implementations must define compareTo() as well. * - * Unlike Version (a subtype of VersionOrdinal which acts like an - * enumerated type), VersionOrdinal does not, in general, guarantee + * Unlike {@link KnownVersion} (a subtype of which acts like an + * enumerated type), {@link Version} does not, in general, guarantee * that if vo1.equals(vo2) then vo1 == vo2. * - * Use the Versioning factory class to construct objects implementing + * Use the {@link Versioning} factory class to construct objects implementing * this interface. All instances of known versions are defined as - * constants in the Version class, e.g. Version.GEODE_1_11_0 + * constants in the {@link KnownVersion} class, e.g. Version.GEODE_1_11_0 */ -public interface VersionOrdinal extends Comparable<VersionOrdinal> { +public interface Version extends Comparable<Version> { /** * @return the short ordinal value for comparison implementations @@ -54,7 +54,7 @@ public interface VersionOrdinal extends Comparable<VersionOrdinal> { * @param version to compare to this version * @return true if this is older than version, otherwise false. */ - boolean isOlderThan(VersionOrdinal version); + boolean isOlderThan(Version version); /** * Test if this version is not older than given version. @@ -62,7 +62,7 @@ public interface VersionOrdinal extends Comparable<VersionOrdinal> { * @param version to compare to this version * @return true if this is the same version or newer, otherwise false. */ - boolean isNotOlderThan(VersionOrdinal version); + boolean isNotOlderThan(Version version); /** * Test if this version is newer than given version. @@ -70,7 +70,7 @@ public interface VersionOrdinal extends Comparable<VersionOrdinal> { * @param version to compare to this version * @return true if this is newer than version, otherwise false. */ - boolean isNewerThan(VersionOrdinal version); + boolean isNewerThan(Version version); /** * Test if this version is not newer than given version. @@ -78,6 +78,6 @@ public interface VersionOrdinal extends Comparable<VersionOrdinal> { * @param version to compare to this version * @return true if this is the same version or older, otherwise false. */ - boolean isNotNewerThan(VersionOrdinal version); + boolean isNotNewerThan(Version version); } diff --git a/geode-serialization/src/main/java/org/apache/geode/internal/serialization/Versioning.java b/geode-serialization/src/main/java/org/apache/geode/internal/serialization/Versioning.java index ace80a7..985b272 100644 --- a/geode-serialization/src/main/java/org/apache/geode/internal/serialization/Versioning.java +++ b/geode-serialization/src/main/java/org/apache/geode/internal/serialization/Versioning.java @@ -16,26 +16,27 @@ package org.apache.geode.internal.serialization; /** - * This is a factory for getting VersionOrdinal instances. It's aware of the whole - * VersionOrdinal/Version hierarchy, so when asked for a VersionOrdinal that represents - * a known version (a Version) it returns a reference to one of those. + * This is a factory for getting {@link Version} instances. It's aware of the whole + * {link @Version} hierarchy, so when asked for a {@link Version} that represents + * a known version ({@link KnownVersion}) it returns a reference to one of those. * - * This ensures that toString() on any VersionOrdinal, if that object represents a - * known version, will render itself as a Version. + * This ensures that {@link #toString()} on any {@Version}, if that object represents a + * known version, will render itself as a such. */ public class Versioning { private Versioning() {} /** - * Make a VersionOrdinal for the short ordinal value. + * Find the {@link Version} for the short ordinal value. * - * If the short ordinal represents a known version (Version) then return - * that instead of constructing a new VersionOrdinal. + * If the short ordinal represents a known version ({@link KnownVersion}) then return + * that instead of constructing a new {@link UnknownVersion}. * - * @return a known version (Version) if possible, otherwise a VersionOrdinal. + * @return a known version ({@link KnownVersion}) if possible, otherwise an + * {@link UnknownVersion}. */ - public static VersionOrdinal getVersionOrdinal(final short ordinal) { - final KnownVersion knownVersion = KnownVersion.getKnownVersion(ordinal, null); + public static Version getVersion(final short ordinal) { + final KnownVersion knownVersion = KnownVersion.getKnownVersionOrDefault(ordinal, null); if (knownVersion == null) { return new UnknownVersion(ordinal); } else { @@ -44,17 +45,16 @@ public class Versioning { } /** - * Return the known version (Version) for the VersionOrdinal, if possible. - * Otherwise return the defaultKnownVersion Version. This method essentially - * downcasts a {@link VersionOrdinal} to a known version {@link KnownVersion} + * Return the known version ({@link KnownVersion}) for {@code anyVersion}, if possible. + * Otherwise return {@code defaultKnownVersion}. This method essentially + * downcasts a {@link Version} to a known version {@link KnownVersion}. * - * @param anyVersion came from a call to {@link #getVersionOrdinal(short)} or this - * method - * @param defaultKnownVersion will be returned if anyVersion does not represent + * @param anyVersion came from a call to {@link #getVersion(short)} + * @param defaultKnownVersion will be returned if {@code anyVersion} does not represent * a known version * @return a known version */ - public static KnownVersion getKnownVersionOrDefault(final VersionOrdinal anyVersion, + public static KnownVersion getKnownVersionOrDefault(final Version anyVersion, KnownVersion defaultKnownVersion) { if (anyVersion instanceof KnownVersion) { return (KnownVersion) anyVersion; diff --git a/geode-serialization/src/main/java/org/apache/geode/internal/serialization/VersioningIO.java b/geode-serialization/src/main/java/org/apache/geode/internal/serialization/VersioningIO.java index 9a2d8b7..db5b5c6 100644 --- a/geode-serialization/src/main/java/org/apache/geode/internal/serialization/VersioningIO.java +++ b/geode-serialization/src/main/java/org/apache/geode/internal/serialization/VersioningIO.java @@ -39,7 +39,7 @@ public class VersioningIO { } /** - * Write the given ordinal (result of {@link VersionOrdinal#ordinal()}) to given + * Write the given ordinal (result of {@link Version#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. @@ -92,7 +92,7 @@ public class VersioningIO { } /** - * Write the given ordinal (result of {@link VersionOrdinal#ordinal()}) to given + * Write the given ordinal (result of {@link Version#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. diff --git a/geode-serialization/src/test/java/org/apache/geode/internal/serialization/VersionJUnitTest.java b/geode-serialization/src/test/java/org/apache/geode/internal/serialization/KnownVersionJUnitTest.java similarity index 79% rename from geode-serialization/src/test/java/org/apache/geode/internal/serialization/VersionJUnitTest.java rename to geode-serialization/src/test/java/org/apache/geode/internal/serialization/KnownVersionJUnitTest.java index 5b206f7..178ec28 100644 --- a/geode-serialization/src/test/java/org/apache/geode/internal/serialization/VersionJUnitTest.java +++ b/geode-serialization/src/test/java/org/apache/geode/internal/serialization/KnownVersionJUnitTest.java @@ -20,9 +20,9 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; -public class VersionJUnitTest { +public class KnownVersionJUnitTest { @Test - public void testVersionClass() throws Exception { + public void testKnownVersionClass() throws Exception { compare(KnownVersion.GFE_662, KnownVersion.GFE_66); compare(KnownVersion.GFE_6622, KnownVersion.GFE_662); compare(KnownVersion.GFE_71, KnownVersion.GFE_70); @@ -54,9 +54,9 @@ public class VersionJUnitTest { assertTrue(later.compareTo(later) == 0); assertTrue(earlier.compareTo(later) < 0); - assertTrue(later.compareTo(Versioning.getVersionOrdinal(earlier.ordinal())) > 0); - assertTrue(later.compareTo(Versioning.getVersionOrdinal(later.ordinal())) == 0); - assertTrue(earlier.compareTo(Versioning.getVersionOrdinal(later.ordinal())) < 0); + assertTrue(later.compareTo(Versioning.getVersion(earlier.ordinal())) > 0); + assertTrue(later.compareTo(Versioning.getVersion(later.ordinal())) == 0); + assertTrue(earlier.compareTo(Versioning.getVersion(later.ordinal())) < 0); compareNewerVsOlder(later, earlier); } @@ -94,23 +94,9 @@ public class VersionJUnitTest { @Test public void testFromOrdinalForCurrentVersionSucceeds() { final KnownVersion version = Versioning.getKnownVersionOrDefault( - Versioning.getVersionOrdinal(KnownVersion.CURRENT_ORDINAL), null); + Versioning.getVersion(KnownVersion.CURRENT_ORDINAL), null); assertThat(version).isNotNull(); assertThat(version).isEqualTo(KnownVersion.CURRENT); } - @Test - public void ordinalImplMatchesVersion() { - /* - * We are not using the Version.getVersionOrdinal(short) factory method here - * because we intend to test that Version and VersionOrdinal are cross-comparable. - * The factory would return Version.GFE_82 which would foil our testing. - */ - final UnknownVersion versionOrdinal = new UnknownVersion(KnownVersion.GFE_82.ordinal()); - assertThat(KnownVersion.GFE_82.equals(versionOrdinal)) - .as("GFE_82 Version equals VersionOrdinal").isTrue(); - assertThat(versionOrdinal.equals(KnownVersion.GFE_82)) - .as("GFE_82 VersionOrdinal equals Version").isTrue(); - } - } diff --git a/geode-serialization/src/test/java/org/apache/geode/internal/serialization/UnknownVersionJUnitTest.java b/geode-serialization/src/test/java/org/apache/geode/internal/serialization/UnknownVersionJUnitTest.java index 36ef8a2..27bef49 100644 --- a/geode-serialization/src/test/java/org/apache/geode/internal/serialization/UnknownVersionJUnitTest.java +++ b/geode-serialization/src/test/java/org/apache/geode/internal/serialization/UnknownVersionJUnitTest.java @@ -24,7 +24,7 @@ public class UnknownVersionJUnitTest extends TestCase { @Test public void testEqualMinSameIdentity() { - final VersionOrdinal versionOrdinal = construct(Short.MIN_VALUE); + final Version versionOrdinal = construct(Short.MIN_VALUE); validateEqual(versionOrdinal, versionOrdinal); } @@ -86,7 +86,7 @@ public class UnknownVersionJUnitTest extends TestCase { assertThat(construct((short) 6).equals("howdy!")).isFalse(); } - private void validateEqual(final VersionOrdinal a, final VersionOrdinal b) { + private void validateEqual(final Version a, final Version b) { assertThat(a.compareTo(b)).isEqualTo(0); assertThat(a.equals(b)).isTrue(); assertThat(a.isNewerThan(b)).isFalse(); @@ -96,8 +96,8 @@ public class UnknownVersionJUnitTest extends TestCase { } private void validateUnequal(final short smallerShort, final short largerShort) { - final VersionOrdinal smaller = construct(smallerShort); - final VersionOrdinal larger = construct(largerShort); + final Version smaller = construct(smallerShort); + final Version larger = construct(largerShort); assertThat(smaller.compareTo(larger)).isLessThan(0); assertThat(smaller.equals(larger)).isFalse(); @@ -118,8 +118,8 @@ public class UnknownVersionJUnitTest extends TestCase { } private void validateHash(final short ordinal) { - final VersionOrdinal a = construct(ordinal); - final VersionOrdinal b = construct(ordinal); + final Version a = construct(ordinal); + final Version b = construct(ordinal); assertThat(a.equals(b)).isTrue(); assertThat(a.hashCode()).isEqualTo(b.hashCode()); } diff --git a/geode-serialization/src/test/java/org/apache/geode/internal/serialization/VersioningJUnitTest.java b/geode-serialization/src/test/java/org/apache/geode/internal/serialization/VersioningJUnitTest.java index 7e5d202..0b483f6 100644 --- a/geode-serialization/src/test/java/org/apache/geode/internal/serialization/VersioningJUnitTest.java +++ b/geode-serialization/src/test/java/org/apache/geode/internal/serialization/VersioningJUnitTest.java @@ -22,46 +22,46 @@ import org.junit.Test; public class VersioningJUnitTest { @Test - public void getVersionOrdinalForKnownVersion() { + public void getVersionForKnownVersion() { final KnownVersion current = KnownVersion.getCurrentVersion(); - final VersionOrdinal knownVersion = Versioning.getVersionOrdinal(current.ordinal()); + final Version knownVersion = Versioning.getVersion(current.ordinal()); assertThat(knownVersion).isInstanceOf(KnownVersion.class); assertThat(knownVersion).isEqualTo(current); } @Test - public void getVersionOrdinalForUnknownVersion() { + public void getVersionForUnknownVersion() { // Version.getCurrentVersion() returns the newest/latest version final short unknownOrdinal = (short) (KnownVersion.getCurrentVersion().ordinal() + 1); - final VersionOrdinal unknownVersion = Versioning.getVersionOrdinal(unknownOrdinal); + final Version unknownVersion = Versioning.getVersion(unknownOrdinal); assertThat(unknownVersion).isInstanceOf(UnknownVersion.class); } @Test - public void getVersionOrdinalForToken() { - final VersionOrdinal versionOrdinal = Versioning.getVersionOrdinal(KnownVersion.TOKEN_ORDINAL); + public void getVersionForToken() { + final Version versionOrdinal = Versioning.getVersion(KnownVersion.TOKEN_ORDINAL); assertThat(versionOrdinal).isEqualTo(KnownVersion.TOKEN); assertThat(versionOrdinal).isInstanceOf(KnownVersion.class); } @Test - public void getVersionOrdinalForUnknownNegativeShort() { + public void getVersionForUnknownNegativeShort() { // a little coziness with TOKEN_ORDINAL: we happen to know ordinals lower than that are not // known versions - final VersionOrdinal versionOrdinal = - Versioning.getVersionOrdinal((short) (KnownVersion.TOKEN_ORDINAL - 1)); + final Version versionOrdinal = + Versioning.getVersion((short) (KnownVersion.TOKEN_ORDINAL - 1)); assertThat(versionOrdinal).isInstanceOf(UnknownVersion.class); } @Test - public void getKnownVersionForKnownVersionOrdinal() { + public void getKnownVersionForKnownVersion() { final KnownVersion current = KnownVersion.getCurrentVersion(); final KnownVersion knownVersion = Versioning.getKnownVersionOrDefault(current, null); assertThat(knownVersion).isEqualTo(current); } @Test - public void getKnownVersionForUnknownVersionOrdinal() { + public void getKnownVersionForUnknownVersion() { // Version.getCurrentVersion() returns the newest/latest version final KnownVersion current = KnownVersion.getCurrentVersion(); final short unknownOrdinal = (short) (current.ordinal() + 1); diff --git a/geode-tcp-server/src/main/java/org/apache/geode/distributed/internal/tcpserver/TcpClient.java b/geode-tcp-server/src/main/java/org/apache/geode/distributed/internal/tcpserver/TcpClient.java index 2369886..930481a 100644 --- a/geode-tcp-server/src/main/java/org/apache/geode/distributed/internal/tcpserver/TcpClient.java +++ b/geode-tcp-server/src/main/java/org/apache/geode/distributed/internal/tcpserver/TcpClient.java @@ -153,7 +153,7 @@ public class TcpClient { final short serverVersionShort = getServerVersion(addr, timeout); KnownVersion serverVersion = Versioning.getKnownVersionOrDefault( - Versioning.getVersionOrdinal(serverVersionShort), + Versioning.getVersion(serverVersionShort), null); final String debugVersionMessage; if (serverVersion == null) { diff --git a/geode-tcp-server/src/main/java/org/apache/geode/distributed/internal/tcpserver/TcpServer.java b/geode-tcp-server/src/main/java/org/apache/geode/distributed/internal/tcpserver/TcpServer.java index c133c39..ea84ca9 100755 --- a/geode-tcp-server/src/main/java/org/apache/geode/distributed/internal/tcpserver/TcpServer.java +++ b/geode-tcp-server/src/main/java/org/apache/geode/distributed/internal/tcpserver/TcpServer.java @@ -426,17 +426,17 @@ public class TcpServer { // Create a versioned stream to remember sender's GemFire version versionOrdinal = (short) GOSSIP_TO_GEMFIRE_VERSION_MAP.get(gossipVersion); - if (KnownVersion.GFE_71.compareTo(Versioning.getVersionOrdinal(versionOrdinal)) <= 0) { + if (KnownVersion.GFE_71.compareTo(Versioning.getVersion(versionOrdinal)) <= 0) { // Recent versions of TcpClient will send the version ordinal versionOrdinal = input.readShort(); } if (logger.isDebugEnabled() && versionOrdinal != KnownVersion.CURRENT_ORDINAL) { logger.debug("Locator reading request from " + socket.getInetAddress() + " with version " - + Versioning.getVersionOrdinal(versionOrdinal)); + + Versioning.getVersion(versionOrdinal)); } final KnownVersion version = Versioning.getKnownVersionOrDefault( - Versioning.getVersionOrdinal(versionOrdinal), null); + Versioning.getVersion(versionOrdinal), null); if (version == null) { throw new UnsupportedSerializationVersionException( KnownVersion.unsupportedVersionMessage(versionOrdinal)); diff --git a/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/parallel/RemoteParallelGatewaySenderEventProcessor.java b/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/parallel/RemoteParallelGatewaySenderEventProcessor.java index ff80b70..9f8c99b 100644 --- a/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/parallel/RemoteParallelGatewaySenderEventProcessor.java +++ b/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/parallel/RemoteParallelGatewaySenderEventProcessor.java @@ -94,7 +94,7 @@ public class RemoteParallelGatewaySenderEventProcessor extends ParallelGatewaySe Connection conn = remoteDispatcher.getConnection(false); if (conn != null) { short remoteSiteVersion = conn.getWanSiteVersion(); - if (KnownVersion.GFE_701.compareTo(Versioning.getVersionOrdinal(remoteSiteVersion)) <= 0) { + if (KnownVersion.GFE_701.compareTo(Versioning.getVersion(remoteSiteVersion)) <= 0) { return true; } }