This is an automated email from the ASF dual-hosted git repository.
mmuzaf pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 55a4cf5 IGNITE-12919: Renamed lost occurrences of GridUuid to
IgniteUuid (#7699)
55a4cf5 is described below
commit 55a4cf58dc1deb49f5abfe67e48517f305c29554
Author: Nikita Amelchev <nsamelc...@gmail.com>
AuthorDate: Tue Apr 21 16:29:33 2020 +0300
IGNITE-12919: Renamed lost occurrences of GridUuid to IgniteUuid (#7699)
---
.../apache/ignite/internal/GridJobContextImpl.java | 4 +--
.../apache/ignite/internal/GridJobSiblingImpl.java | 8 ++---
.../java/org/apache/ignite/internal/GridTopic.java | 12 +++----
.../deployment/GridDeploymentInfoBean.java | 4 +--
.../processors/affinity/GridAffinityMessage.java | 4 +--
.../datastructures/CacheDataStructuresManager.java | 8 ++---
.../cache/distributed/dht/GridDhtLockFuture.java | 4 +--
.../cache/transactions/IgniteTxAdapter.java | 4 +--
.../processors/cache/version/GridCacheVersion.java | 4 +--
.../datastructures/GridCacheQueueAdapter.java | 16 ++++-----
.../datastructures/GridCacheQueueHeader.java | 4 +--
.../datastructures/GridCacheQueueItemKey.java | 4 +--
.../datastructures/GridCacheSetHeader.java | 4 +--
.../datastructures/GridCacheSetItemKey.java | 4 +--
.../datastructures/GridSetQueryPredicate.java | 4 +--
.../internal/processors/igfs/IgfsBlockKey.java | 8 ++---
.../internal/processors/igfs/IgfsEntryInfo.java | 4 +--
.../processors/igfs/IgfsFileAffinityRange.java | 4 +--
.../internal/processors/igfs/IgfsFileInfo.java | 8 ++---
.../internal/processors/igfs/IgfsListingEntry.java | 4 +--
.../ignite/internal/processors/igfs/IgfsUtils.java | 4 +--
.../IgfsMetaDirectoryListingRemoveProcessor.java | 4 +--
.../IgfsMetaDirectoryListingReplaceProcessor.java | 4 +--
.../igfs/meta/IgfsMetaFileCreateProcessor.java | 8 ++---
.../igfs/meta/IgfsMetaFileLockProcessor.java | 4 +--
.../apache/ignite/internal/util/IgniteUtils.java | 38 +++++++++++-----------
.../ignite/internal/visor/cache/VisorCache.java | 4 +--
.../visor/cache/VisorCacheConfiguration.java | 4 +--
.../compute/VisorComputeCancelSessionTaskArg.java | 4 +--
.../internal/visor/event/VisorGridEvent.java | 4 +--
.../internal/visor/event/VisorGridJobEvent.java | 8 ++---
.../internal/visor/event/VisorGridTaskEvent.java | 4 +--
.../node/VisorNodeEventsCollectorTaskArg.java | 4 +--
.../internal/visor/tx/FetchNearXidVersionTask.java | 2 +-
.../ignite/internal/visor/tx/TxVerboseId.java | 4 +--
.../ignite/internal/visor/tx/VisorTxInfo.java | 8 ++---
.../ignite/internal/visor/tx/VisorTxTask.java | 6 ++--
.../java/org/apache/ignite/lang/IgniteUuid.java | 20 ++++++------
.../internal/GridTopicExternalizableSelfTest.java | 14 ++++----
.../TxPartitionCounterStateAbstractTest.java | 20 ++++++------
...rtitionCounterStateOnePrimaryOneBackupTest.java | 2 +-
.../org/apache/ignite/lang/IgniteUuidSelfTest.java | 32 +++++++++---------
.../GridTcpCommunicationBenchmark.java | 12 +++----
.../loadtests/communication/GridTestMessage.java | 4 +--
44 files changed, 167 insertions(+), 167 deletions(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/GridJobContextImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/GridJobContextImpl.java
index b4b2be7..9e62e6a 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/GridJobContextImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/GridJobContextImpl.java
@@ -272,14 +272,14 @@ public class GridJobContextImpl implements
ComputeJobContext, Externalizable {
/** {@inheritDoc} */
@Override public void writeExternal(ObjectOutput out) throws IOException {
out.writeObject(ctx);
- U.writeGridUuid(out, jobId);
+ U.writeIgniteUuid(out, jobId);
U.writeMap(out, getAttributes());
}
/** {@inheritDoc} */
@Override public void readExternal(ObjectInput in) throws IOException,
ClassNotFoundException {
ctx = (GridKernalContext)in.readObject();
- jobId = U.readGridUuid(in);
+ jobId = U.readIgniteUuid(in);
attrs = U.readMap(in);
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingImpl.java
index 6d2da87..5004aa9 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingImpl.java
@@ -176,15 +176,15 @@ public class GridJobSiblingImpl implements
ComputeJobSibling, Externalizable {
/** {@inheritDoc} */
@Override public void writeExternal(ObjectOutput out) throws IOException {
// Don't serialize node ID.
- U.writeGridUuid(out, sesId);
- U.writeGridUuid(out, jobId);
+ U.writeIgniteUuid(out, sesId);
+ U.writeIgniteUuid(out, jobId);
}
/** {@inheritDoc} */
@Override public void readExternal(ObjectInput in) throws IOException,
ClassNotFoundException {
// Don't serialize node ID.
- sesId = U.readGridUuid(in);
- jobId = U.readGridUuid(in);
+ sesId = U.readIgniteUuid(in);
+ jobId = U.readIgniteUuid(in);
}
/** {@inheritDoc} */
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/GridTopic.java
b/modules/core/src/main/java/org/apache/ignite/internal/GridTopic.java
index 5e357c7..a76ce4a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridTopic.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridTopic.java
@@ -289,13 +289,13 @@ public enum GridTopic {
/** {@inheritDoc} */
@Override public void writeExternal(ObjectOutput out) throws
IOException {
out.writeByte(topic.ordinal());
- U.writeGridUuid(out, id);
+ U.writeIgniteUuid(out, id);
}
/** {@inheritDoc} */
@Override public void readExternal(ObjectInput in) throws IOException,
ClassNotFoundException {
topic = fromOrdinal(in.readByte());
- id = U.readGridUuid(in);
+ id = U.readIgniteUuid(in);
}
/** {@inheritDoc} */
@@ -357,14 +357,14 @@ public enum GridTopic {
/** {@inheritDoc} */
@Override public void writeExternal(ObjectOutput out) throws
IOException {
out.writeByte(topic.ordinal());
- U.writeGridUuid(out, id1);
+ U.writeIgniteUuid(out, id1);
U.writeUuid(out, id2);
}
/** {@inheritDoc} */
@Override public void readExternal(ObjectInput in) throws IOException,
ClassNotFoundException {
topic = fromOrdinal(in.readByte());
- id1 = U.readGridUuid(in);
+ id1 = U.readIgniteUuid(in);
id2 = U.readUuid(in);
}
@@ -799,14 +799,14 @@ public enum GridTopic {
/** {@inheritDoc} */
@Override public void writeExternal(ObjectOutput out) throws
IOException {
out.writeByte(topic.ordinal());
- U.writeGridUuid(out, id1);
+ U.writeIgniteUuid(out, id1);
out.writeLong(id2);
}
/** {@inheritDoc} */
@Override public void readExternal(ObjectInput in) throws IOException,
ClassNotFoundException {
topic = fromOrdinal(in.readByte());
- id1 = U.readGridUuid(in);
+ id1 = U.readIgniteUuid(in);
id2 = in.readLong();
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentInfoBean.java
b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentInfoBean.java
index 72f5ec6..d663833 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentInfoBean.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentInfoBean.java
@@ -257,7 +257,7 @@ public class GridDeploymentInfoBean implements Message,
GridDeploymentInfo, Exte
/** {@inheritDoc} */
@Override public void writeExternal(ObjectOutput out) throws IOException {
- U.writeGridUuid(out, clsLdrId);
+ U.writeIgniteUuid(out, clsLdrId);
U.writeEnum(out, depMode);
U.writeString(out, userVer);
out.writeBoolean(locDepOwner);
@@ -266,7 +266,7 @@ public class GridDeploymentInfoBean implements Message,
GridDeploymentInfo, Exte
/** {@inheritDoc} */
@Override public void readExternal(ObjectInput in) throws IOException,
ClassNotFoundException {
- clsLdrId = U.readGridUuid(in);
+ clsLdrId = U.readIgniteUuid(in);
depMode = DeploymentMode.fromOrdinal(in.readByte());
userVer = U.readString(in);
locDepOwner = in.readBoolean();
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityMessage.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityMessage.java
index 7bca4db..8edac74 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityMessage.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityMessage.java
@@ -134,7 +134,7 @@ class GridAffinityMessage implements Externalizable {
out.writeInt(depMode.ordinal());
- U.writeGridUuid(out, clsLdrId);
+ U.writeIgniteUuid(out, clsLdrId);
U.writeString(out, srcClsName);
U.writeString(out, userVer);
U.writeMap(out, ldrParties);
@@ -146,7 +146,7 @@ class GridAffinityMessage implements Externalizable {
depMode = DeploymentMode.fromOrdinal(in.readInt());
- clsLdrId = U.readGridUuid(in);
+ clsLdrId = U.readIgniteUuid(in);
srcClsName = U.readString(in);
userVer = U.readString(in);
ldrParties = U.readMap(in);
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java
index 8c44852..48b9292 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java
@@ -658,13 +658,13 @@ public class CacheDataStructuresManager extends
GridCacheManagerAdapter {
/** {@inheritDoc} */
@Override public void writeExternal(ObjectOutput out) throws
IOException {
- U.writeGridUuid(out, setId);
+ U.writeIgniteUuid(out, setId);
U.writeString(out, cacheName);
}
/** {@inheritDoc} */
@Override public void readExternal(ObjectInput in) throws IOException,
ClassNotFoundException {
- setId = U.readGridUuid(in);
+ setId = U.readIgniteUuid(in);
cacheName = U.readString(in);
}
@@ -738,14 +738,14 @@ public class CacheDataStructuresManager extends
GridCacheManagerAdapter {
/** {@inheritDoc} */
@Override public void writeExternal(ObjectOutput out) throws
IOException {
U.writeString(out, cacheName);
- U.writeGridUuid(out, setId);
+ U.writeIgniteUuid(out, setId);
out.writeObject(topVer);
}
/** {@inheritDoc} */
@Override public void readExternal(ObjectInput in) throws IOException,
ClassNotFoundException {
cacheName = U.readString(in);
- setId = U.readGridUuid(in);
+ setId = U.readIgniteUuid(in);
topVer = (AffinityTopologyVersion)in.readObject();
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
index 3c9955a..01cd2a9 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
@@ -1205,7 +1205,7 @@ public final class GridDhtLockFuture extends
GridCacheCompoundIdentityFuture<Boo
sb.append("Transaction tx=").append(tx.getClass().getSimpleName());
sb.append(" [xid=").append(tx.xid());
sb.append(", xidVer=").append(tx.xidVersion());
- sb.append(", nearXid=").append(tx.nearXidVersion().asGridUuid());
+ sb.append(", nearXid=").append(tx.nearXidVersion().asIgniteUuid());
sb.append(", nearXidVer=").append(tx.nearXidVersion());
sb.append(", nearNodeId=").append(tx.nearNodeId());
sb.append(", label=").append(tx.label());
@@ -1231,7 +1231,7 @@ public final class GridDhtLockFuture extends
GridCacheCompoundIdentityFuture<Boo
sb.append("key=").append(key).append(",
owner=");
sb.append("[xid=").append(itx.xid()).append(",
");
sb.append("xidVer=").append(itx.xidVersion()).append(", ");
-
sb.append("nearXid=").append(itx.nearXidVersion().asGridUuid()).append(", ");
+
sb.append("nearXid=").append(itx.nearXidVersion().asIgniteUuid()).append(", ");
sb.append("nearXidVer=").append(itx.nearXidVersion()).append(", ");
sb.append("label=").append(itx.label()).append(", ");
sb.append("nearNodeId=").append(candidate.otherNodeId()).append("]");
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
index fff1214..0130dcc 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
@@ -696,7 +696,7 @@ public abstract class IgniteTxAdapter extends
GridMetadataAwareAdapter implement
/** {@inheritDoc} */
@Override public IgniteUuid xid() {
- return xidVer.asGridUuid();
+ return xidVer.asIgniteUuid();
}
/** {@inheritDoc} */
@@ -1969,7 +1969,7 @@ public abstract class IgniteTxAdapter extends
GridMetadataAwareAdapter implement
*/
protected Object readResolve() throws ObjectStreamException {
return new TxShadow(
- xidVer.asGridUuid(),
+ xidVer.asIgniteUuid(),
nodeId,
threadId,
startTime,
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersion.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersion.java
index c9987cd..4f4f9d0 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersion.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersion.java
@@ -169,9 +169,9 @@ public class GridCacheVersion implements Message,
Comparable<GridCacheVersion>,
}
/**
- * @return Version represented as {@code GridUuid}
+ * @return Version represented as {@code IgniteUuid}
*/
- public IgniteUuid asGridUuid() {
+ public IgniteUuid asIgniteUuid() {
return new IgniteUuid(new UUID(topVer, nodeOrderDrId), order);
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheQueueAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheQueueAdapter.java
index e7bde03..16cf76c 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheQueueAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheQueueAdapter.java
@@ -766,12 +766,12 @@ public abstract class GridCacheQueueAdapter<T> extends
AbstractCollection<T> imp
/** {@inheritDoc} */
@Override public void writeExternal(ObjectOutput out) throws
IOException {
- U.writeGridUuid(out, id);
+ U.writeIgniteUuid(out, id);
}
/** {@inheritDoc} */
@Override public void readExternal(ObjectInput in) throws IOException,
ClassNotFoundException {
- id = U.readGridUuid(in);
+ id = U.readIgniteUuid(in);
}
}
@@ -859,12 +859,12 @@ public abstract class GridCacheQueueAdapter<T> extends
AbstractCollection<T> imp
/** {@inheritDoc} */
@Override public void writeExternal(ObjectOutput out) throws
IOException {
- U.writeGridUuid(out, id);
+ U.writeIgniteUuid(out, id);
}
/** {@inheritDoc} */
@Override public void readExternal(ObjectInput in) throws IOException,
ClassNotFoundException {
- id = U.readGridUuid(in);
+ id = U.readIgniteUuid(in);
}
}
@@ -929,13 +929,13 @@ public abstract class GridCacheQueueAdapter<T> extends
AbstractCollection<T> imp
/** {@inheritDoc} */
@Override public void writeExternal(ObjectOutput out) throws
IOException {
- U.writeGridUuid(out, id);
+ U.writeIgniteUuid(out, id);
out.writeInt(size);
}
/** {@inheritDoc} */
@Override public void readExternal(ObjectInput in) throws IOException,
ClassNotFoundException {
- id = U.readGridUuid(in);
+ id = U.readIgniteUuid(in);
size = in.readInt();
}
}
@@ -1044,13 +1044,13 @@ public abstract class GridCacheQueueAdapter<T> extends
AbstractCollection<T> imp
/** {@inheritDoc} */
@Override public void writeExternal(ObjectOutput out) throws
IOException {
- U.writeGridUuid(out, id);
+ U.writeIgniteUuid(out, id);
out.writeObject(idx);
}
/** {@inheritDoc} */
@Override public void readExternal(ObjectInput in) throws IOException,
ClassNotFoundException {
- id = U.readGridUuid(in);
+ id = U.readIgniteUuid(in);
idx = (Long)in.readObject();
}
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheQueueHeader.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheQueueHeader.java
index c55bf3d..d0bf06b 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheQueueHeader.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheQueueHeader.java
@@ -163,7 +163,7 @@ public class GridCacheQueueHeader implements
GridCacheInternal, Externalizable {
/** {@inheritDoc} */
@Override public void writeExternal(ObjectOutput out) throws IOException {
- U.writeGridUuid(out, id);
+ U.writeIgniteUuid(out, id);
out.writeInt(cap);
out.writeBoolean(collocated);
out.writeLong(head);
@@ -180,7 +180,7 @@ public class GridCacheQueueHeader implements
GridCacheInternal, Externalizable {
/** {@inheritDoc} */
@Override public void readExternal(ObjectInput in) throws IOException,
ClassNotFoundException {
- id = U.readGridUuid(in);
+ id = U.readIgniteUuid(in);
cap = in.readInt();
collocated = in.readBoolean();
head = in.readLong();
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheQueueItemKey.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheQueueItemKey.java
index ae6ebfc..9934e9b 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheQueueItemKey.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheQueueItemKey.java
@@ -82,14 +82,14 @@ class GridCacheQueueItemKey implements Externalizable,
QueueItemKey {
/** {@inheritDoc} */
@Override public void writeExternal(ObjectOutput out) throws IOException {
- U.writeGridUuid(out, queueId);
+ U.writeIgniteUuid(out, queueId);
U.writeString(out, queueName);
out.writeLong(idx);
}
/** {@inheritDoc} */
@Override public void readExternal(ObjectInput in) throws IOException,
ClassNotFoundException {
- queueId = U.readGridUuid(in);
+ queueId = U.readIgniteUuid(in);
queueName = U.readString(in);
idx = in.readLong();
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetHeader.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetHeader.java
index 3aa1a98..144a7eb 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetHeader.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetHeader.java
@@ -86,14 +86,14 @@ public class GridCacheSetHeader implements
GridCacheInternal, Externalizable {
/** {@inheritDoc} */
@Override public void writeExternal(ObjectOutput out) throws IOException {
- U.writeGridUuid(out, id);
+ U.writeIgniteUuid(out, id);
out.writeBoolean(collocated);
out.writeBoolean(separated);
}
/** {@inheritDoc} */
@Override public void readExternal(ObjectInput in) throws IOException {
- id = U.readGridUuid(in);
+ id = U.readIgniteUuid(in);
collocated = in.readBoolean();
try {
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetItemKey.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetItemKey.java
index a11ef31..33356c6 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetItemKey.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetItemKey.java
@@ -91,13 +91,13 @@ public class GridCacheSetItemKey implements SetItemKey,
Externalizable {
/** {@inheritDoc} */
@Override public void writeExternal(ObjectOutput out) throws IOException {
- U.writeGridUuid(out, setId);
+ U.writeIgniteUuid(out, setId);
out.writeObject(item);
}
/** {@inheritDoc} */
@Override public void readExternal(ObjectInput in) throws IOException,
ClassNotFoundException {
- setId = U.readGridUuid(in);
+ setId = U.readIgniteUuid(in);
item = in.readObject();
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridSetQueryPredicate.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridSetQueryPredicate.java
index a9b37c3..3450cec 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridSetQueryPredicate.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridSetQueryPredicate.java
@@ -103,13 +103,13 @@ public class GridSetQueryPredicate<K, V> implements
IgniteBiPredicate<K, V>, Ext
/** {@inheritDoc} */
@Override public void writeExternal(ObjectOutput out) throws IOException {
- U.writeGridUuid(out, setId);
+ U.writeIgniteUuid(out, setId);
out.writeBoolean(collocated);
}
/** {@inheritDoc} */
@Override public void readExternal(ObjectInput in) throws IOException,
ClassNotFoundException {
- setId = U.readGridUuid(in);
+ setId = U.readIgniteUuid(in);
collocated = in.readBoolean();
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsBlockKey.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsBlockKey.java
index 98bf306..4fa6a67 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsBlockKey.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsBlockKey.java
@@ -144,16 +144,16 @@ public final class IgfsBlockKey implements
IgfsBaseBlockKey, Message, Externaliz
/** {@inheritDoc} */
@Override public void writeExternal(ObjectOutput out) throws IOException {
- U.writeGridUuid(out, fileId);
- U.writeGridUuid(out, affKey);
+ U.writeIgniteUuid(out, fileId);
+ U.writeIgniteUuid(out, affKey);
out.writeBoolean(evictExclude);
out.writeLong(blockId);
}
/** {@inheritDoc} */
@Override public void readExternal(ObjectInput in) throws IOException {
- fileId = U.readGridUuid(in);
- affKey = U.readGridUuid(in);
+ fileId = U.readIgniteUuid(in);
+ affKey = U.readIgniteUuid(in);
evictExclude = in.readBoolean();
blockId = in.readLong();
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsEntryInfo.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsEntryInfo.java
index 4df8b34..fa05345 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsEntryInfo.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsEntryInfo.java
@@ -266,7 +266,7 @@ public abstract class IgfsEntryInfo implements
Externalizable {
/** {@inheritDoc} */
@Override public void writeExternal(ObjectOutput out) throws IOException {
- U.writeGridUuid(out, id);
+ U.writeIgniteUuid(out, id);
IgfsUtils.writeProperties(out, props);
@@ -276,7 +276,7 @@ public abstract class IgfsEntryInfo implements
Externalizable {
/** {@inheritDoc} */
@Override public void readExternal(ObjectInput in) throws IOException,
ClassNotFoundException {
- id = U.readGridUuid(in);
+ id = U.readIgniteUuid(in);
props = IgfsUtils.readProperties(in);
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileAffinityRange.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileAffinityRange.java
index d2b6819..066371d 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileAffinityRange.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileAffinityRange.java
@@ -249,7 +249,7 @@ public class IgfsFileAffinityRange implements Message,
Externalizable, Binaryliz
/** {@inheritDoc} */
@Override public void writeExternal(ObjectOutput out) throws IOException {
- U.writeGridUuid(out, affKey);
+ U.writeIgniteUuid(out, affKey);
out.writeInt(status);
out.writeLong(startOff);
out.writeLong(endOff);
@@ -257,7 +257,7 @@ public class IgfsFileAffinityRange implements Message,
Externalizable, Binaryliz
/** {@inheritDoc} */
@Override public void readExternal(ObjectInput in) throws IOException,
ClassNotFoundException {
- affKey = U.readGridUuid(in);
+ affKey = U.readIgniteUuid(in);
status = in.readInt();
startOff = in.readLong();
endOff = in.readLong();
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfo.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfo.java
index 50dde2d..53b8d16 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfo.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfo.java
@@ -217,8 +217,8 @@ public final class IgfsFileInfo extends IgfsEntryInfo
implements Binarylizable {
out.writeInt(blockSize);
out.writeLong(len);
- U.writeGridUuid(out, lockId);
- U.writeGridUuid(out, affKey);
+ U.writeIgniteUuid(out, lockId);
+ U.writeIgniteUuid(out, affKey);
out.writeObject(fileMap);
out.writeBoolean(evictExclude);
}
@@ -229,8 +229,8 @@ public final class IgfsFileInfo extends IgfsEntryInfo
implements Binarylizable {
blockSize = in.readInt();
len = in.readLong();
- lockId = U.readGridUuid(in);
- affKey = U.readGridUuid(in);
+ lockId = U.readIgniteUuid(in);
+ affKey = U.readIgniteUuid(in);
fileMap = (IgfsFileMap)in.readObject();
evictExclude = in.readBoolean();
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsListingEntry.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsListingEntry.java
index 3f5c17a..93485bf 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsListingEntry.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsListingEntry.java
@@ -98,13 +98,13 @@ public class IgfsListingEntry implements Externalizable,
Binarylizable {
/** {@inheritDoc} */
@Override public void writeExternal(ObjectOutput out) throws IOException {
- U.writeGridUuid(out, id);
+ U.writeIgniteUuid(out, id);
out.writeBoolean(dir);
}
/** {@inheritDoc} */
@Override public void readExternal(ObjectInput in) throws IOException,
ClassNotFoundException {
- id = U.readGridUuid(in);
+ id = U.readIgniteUuid(in);
dir = in.readBoolean();
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsUtils.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsUtils.java
index 9a9fc31..342c7d6 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsUtils.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsUtils.java
@@ -664,7 +664,7 @@ public class IgfsUtils {
if (entry != null) {
out.writeBoolean(true);
- IgniteUtils.writeGridUuid(out, entry.fileId());
+ IgniteUtils.writeIgniteUuid(out, entry.fileId());
out.writeBoolean(entry.isDirectory());
}
@@ -681,7 +681,7 @@ public class IgfsUtils {
*/
@Nullable public static IgfsListingEntry readListingEntry(DataInput in)
throws IOException {
if (in.readBoolean()) {
- IgniteUuid id = IgniteUtils.readGridUuid(in);
+ IgniteUuid id = IgniteUtils.readIgniteUuid(in);
boolean dir = in.readBoolean();
return new IgfsListingEntry(id, dir);
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaDirectoryListingRemoveProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaDirectoryListingRemoveProcessor.java
index 4c34fea..c93d3bb 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaDirectoryListingRemoveProcessor.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaDirectoryListingRemoveProcessor.java
@@ -100,13 +100,13 @@ public class IgfsMetaDirectoryListingRemoveProcessor
implements EntryProcessor<I
/** {@inheritDoc} */
@Override public void writeExternal(ObjectOutput out) throws IOException {
U.writeString(out, fileName);
- U.writeGridUuid(out, fileId);
+ U.writeIgniteUuid(out, fileId);
}
/** {@inheritDoc} */
@Override public void readExternal(ObjectInput in) throws IOException,
ClassNotFoundException {
fileName = U.readString(in);
- fileId = U.readGridUuid(in);
+ fileId = U.readIgniteUuid(in);
}
/** {@inheritDoc} */
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaDirectoryListingReplaceProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaDirectoryListingReplaceProcessor.java
index e230f05..0c8db05 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaDirectoryListingReplaceProcessor.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaDirectoryListingReplaceProcessor.java
@@ -98,13 +98,13 @@ public final class IgfsMetaDirectoryListingReplaceProcessor
implements EntryProc
/** {@inheritDoc} */
@Override public void writeExternal(ObjectOutput out) throws IOException {
U.writeString(out, name);
- U.writeGridUuid(out, id);
+ U.writeIgniteUuid(out, id);
}
/** {@inheritDoc} */
@Override public void readExternal(ObjectInput in) throws IOException,
ClassNotFoundException {
name = U.readString(in);
- id = U.readGridUuid(in);
+ id = U.readIgniteUuid(in);
}
/** {@inheritDoc} */
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaFileCreateProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaFileCreateProcessor.java
index a3e9d48..a4631db 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaFileCreateProcessor.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaFileCreateProcessor.java
@@ -131,8 +131,8 @@ public class IgfsMetaFileCreateProcessor implements
EntryProcessor<IgniteUuid, I
IgfsUtils.writeProperties(out, props);
out.writeInt(blockSize);
- U.writeGridUuid(out, affKey);
- U.writeGridUuid(out, lockId);
+ U.writeIgniteUuid(out, affKey);
+ U.writeIgniteUuid(out, lockId);
out.writeBoolean(evictExclude);
out.writeLong(len);
@@ -146,8 +146,8 @@ public class IgfsMetaFileCreateProcessor implements
EntryProcessor<IgniteUuid, I
props = IgfsUtils.readProperties(in);
blockSize = in.readInt();
- affKey = U.readGridUuid(in);
- lockId = U.readGridUuid(in);
+ affKey = U.readIgniteUuid(in);
+ lockId = U.readIgniteUuid(in);
evictExclude = in.readBoolean();
len = in.readLong();
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaFileLockProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaFileLockProcessor.java
index 3258f10..15a9e0f 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaFileLockProcessor.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaFileLockProcessor.java
@@ -78,12 +78,12 @@ public class IgfsMetaFileLockProcessor implements
EntryProcessor<IgniteUuid, Igf
/** {@inheritDoc} */
@Override public void writeExternal(ObjectOutput out) throws IOException {
- U.writeGridUuid(out, lockId);
+ U.writeIgniteUuid(out, lockId);
}
/** {@inheritDoc} */
@Override public void readExternal(ObjectInput in) throws IOException,
ClassNotFoundException {
- lockId = U.readGridUuid(in);
+ lockId = U.readIgniteUuid(in);
}
/** {@inheritDoc} */
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
index 93c80f2..8ffe8a5 100755
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
@@ -1829,12 +1829,12 @@ public abstract class IgniteUtils {
* Gets 8-character substring of {@link org.apache.ignite.lang.IgniteUuid}
(for terse logging).
* The ID8 will be constructed as follows:
* <ul>
- * <li>Take first 4 digits for global ID, i.e. {@code
GridUuid.globalId()}.</li>
- * <li>Take last 4 digits for local ID, i.e. {@code
GridUuid.localId()}.</li>
+ * <li>Take first 4 digits for global ID, i.e. {@link
IgniteUuid#globalId()}.</li>
+ * <li>Take last 4 digits for local ID, i.e. {@link
IgniteUuid#localId()}.</li>
* </ul>
*
* @param id Input ID.
- * @return 8-character representation of {@code GridUuid}.
+ * @return 8-character representation of {@link IgniteUuid}.
*/
public static String id8(IgniteUuid id) {
String s = id.toString();
@@ -5097,35 +5097,35 @@ public abstract class IgniteUtils {
}
/**
- * Writes Grid UUIDs to output stream. This method is meant to be used by
+ * Writes Ignite UUIDs to output stream. This method is meant to be used by
* implementations of {@link Externalizable} interface.
*
* @param out Output stream.
- * @param col Grid UUIDs to write.
+ * @param col Ignite UUIDs to write.
* @throws IOException If write failed.
*/
- public static void writeGridUuids(DataOutput out, @Nullable
Collection<IgniteUuid> col) throws IOException {
+ public static void writeIgniteUuids(DataOutput out, @Nullable
Collection<IgniteUuid> col) throws IOException {
if (col != null) {
out.writeBoolean(true);
out.writeInt(col.size());
for (IgniteUuid id : col)
- writeGridUuid(out, id);
+ writeIgniteUuid(out, id);
}
else
out.writeBoolean(false);
}
/**
- * Reads Grid UUIDs from input stream. This method is meant to be used by
+ * Reads Ignite UUIDs from input stream. This method is meant to be used by
* implementations of {@link Externalizable} interface.
*
* @param in Input stream.
- * @return Read Grid UUIDs.
+ * @return Read Ignite UUIDs.
* @throws IOException If read failed.
*/
- @Nullable public static List<IgniteUuid> readGridUuids(DataInput in)
throws IOException {
+ @Nullable public static List<IgniteUuid> readIgniteUuids(DataInput in)
throws IOException {
List<IgniteUuid> col = null;
// Check null flag.
@@ -5135,7 +5135,7 @@ public abstract class IgniteUtils {
col = new ArrayList<>(size);
for (int i = 0; i < size; i++)
- col.add(readGridUuid(in));
+ col.add(readIgniteUuid(in));
}
return col;
@@ -5225,7 +5225,7 @@ public abstract class IgniteUtils {
* @param uid UUID to write.
* @throws IOException If write failed.
*/
- public static void writeGridUuid(DataOutput out, IgniteUuid uid) throws
IOException {
+ public static void writeIgniteUuid(DataOutput out, IgniteUuid uid) throws
IOException {
// Write null flag.
out.writeBoolean(uid == null);
@@ -5245,7 +5245,7 @@ public abstract class IgniteUtils {
* @return Read UUID.
* @throws IOException If read failed.
*/
- @Nullable public static IgniteUuid readGridUuid(DataInput in) throws
IOException {
+ @Nullable public static IgniteUuid readIgniteUuid(DataInput in) throws
IOException {
// If UUID is not null.
if (!in.readBoolean()) {
long most = in.readLong();
@@ -5262,9 +5262,9 @@ public abstract class IgniteUtils {
}
/**
- * Converts GridUuid to bytes.
+ * Converts {@link IgniteUuid} to bytes.
*
- * @param uuid GridUuid to convert.
+ * @param uuid {@link IgniteUuid} to convert.
* @return Bytes.
*/
public static byte[] igniteUuidToBytes(IgniteUuid uuid) {
@@ -5278,9 +5278,9 @@ public abstract class IgniteUtils {
}
/**
- * Converts GridUuid to bytes.
+ * Converts {@link IgniteUuid} to bytes.
*
- * @param uuid GridUuid to convert.
+ * @param uuid {@link IgniteUuid} to convert.
* @param out Output array to write to.
* @param off Offset from which to write.
*/
@@ -5293,11 +5293,11 @@ public abstract class IgniteUtils {
}
/**
- * Converts bytes to GridUuid.
+ * Converts bytes to {@link IgniteUuid}.
*
* @param in Input byte array.
* @param off Offset from which start reading.
- * @return GridUuid instance.
+ * @return {@link IgniteUuid} instance.
*/
public static IgniteUuid bytesToIgniteUuid(byte[] in, int off) {
long most = bytesToLong(in, off);
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCache.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCache.java
index 495a9cb..a4cee4e 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCache.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCache.java
@@ -298,7 +298,7 @@ public class VisorCache extends VisorDataTransferObject {
/** {@inheritDoc} */
@Override protected void writeExternalData(ObjectOutput out) throws
IOException {
U.writeString(out, name);
- U.writeGridUuid(out, dynamicDeploymentId);
+ U.writeIgniteUuid(out, dynamicDeploymentId);
U.writeEnum(out, mode);
out.writeLong(memorySize);
out.writeLong(indexesSize);
@@ -316,7 +316,7 @@ public class VisorCache extends VisorDataTransferObject {
/** {@inheritDoc} */
@Override protected void readExternalData(byte protoVer, ObjectInput in)
throws IOException, ClassNotFoundException {
name = U.readString(in);
- dynamicDeploymentId = U.readGridUuid(in);
+ dynamicDeploymentId = U.readIgniteUuid(in);
mode = CacheMode.fromOrdinal(in.readByte());
memorySize = in.readLong();
indexesSize = in.readLong();
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
index de86686..a82518f 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
@@ -588,7 +588,7 @@ public class VisorCacheConfiguration extends
VisorDataTransferObject {
out.writeBoolean(readFromBackup);
U.writeString(out, tmLookupClsName);
U.writeString(out, topValidator);
- U.writeGridUuid(out, dynamicDeploymentId);
+ U.writeIgniteUuid(out, dynamicDeploymentId);
// V2
U.writeEnum(out, diskPageCompression);
@@ -636,7 +636,7 @@ public class VisorCacheConfiguration extends
VisorDataTransferObject {
readFromBackup = in.readBoolean();
tmLookupClsName = U.readString(in);
topValidator = U.readString(in);
- dynamicDeploymentId = U.readGridUuid(in);
+ dynamicDeploymentId = U.readIgniteUuid(in);
if (protoVer > V1) {
diskPageCompression =
DiskPageCompression.fromOrdinal(in.readByte());
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/compute/VisorComputeCancelSessionTaskArg.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/compute/VisorComputeCancelSessionTaskArg.java
index c480232..2aff54c 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/compute/VisorComputeCancelSessionTaskArg.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/visor/compute/VisorComputeCancelSessionTaskArg.java
@@ -58,12 +58,12 @@ public class VisorComputeCancelSessionTaskArg extends
VisorDataTransferObject {
/** {@inheritDoc} */
@Override protected void writeExternalData(ObjectOutput out) throws
IOException {
- U.writeGridUuid(out, sesId);
+ U.writeIgniteUuid(out, sesId);
}
/** {@inheritDoc} */
@Override protected void readExternalData(byte protoVer, ObjectInput in)
throws IOException, ClassNotFoundException {
- sesId = U.readGridUuid(in);
+ sesId = U.readIgniteUuid(in);
}
/** {@inheritDoc} */
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridEvent.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridEvent.java
index 4814aba..c1e3998 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridEvent.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridEvent.java
@@ -136,7 +136,7 @@ public class VisorGridEvent extends VisorDataTransferObject
{
/** {@inheritDoc} */
@Override protected void writeExternalData(ObjectOutput out) throws
IOException {
out.writeInt(typeId);
- U.writeGridUuid(out, id);
+ U.writeIgniteUuid(out, id);
U.writeString(out, name);
U.writeUuid(out, nid);
out.writeLong(ts);
@@ -147,7 +147,7 @@ public class VisorGridEvent extends VisorDataTransferObject
{
/** {@inheritDoc} */
@Override protected void readExternalData(byte protoVer, ObjectInput in)
throws IOException, ClassNotFoundException {
typeId = in.readInt();
- id = U.readGridUuid(in);
+ id = U.readIgniteUuid(in);
name = U.readString(in);
nid = U.readUuid(in);
ts = in.readLong();
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridJobEvent.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridJobEvent.java
index 2a7ea18..4d2fa79 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridJobEvent.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridJobEvent.java
@@ -128,8 +128,8 @@ public class VisorGridJobEvent extends VisorGridEvent {
U.writeString(out, taskName);
U.writeString(out, taskClsName);
- U.writeGridUuid(out, taskSesId);
- U.writeGridUuid(out, jobId);
+ U.writeIgniteUuid(out, taskSesId);
+ U.writeIgniteUuid(out, jobId);
}
/** {@inheritDoc} */
@@ -140,8 +140,8 @@ public class VisorGridJobEvent extends VisorGridEvent {
taskName = U.readString(in);
taskClsName = U.readString(in);
- taskSesId = U.readGridUuid(in);
- jobId = U.readGridUuid(in);
+ taskSesId = U.readIgniteUuid(in);
+ jobId = U.readIgniteUuid(in);
}
/** {@inheritDoc} */
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridTaskEvent.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridTaskEvent.java
index a0836c4..0f23c97 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridTaskEvent.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridTaskEvent.java
@@ -128,7 +128,7 @@ public class VisorGridTaskEvent extends VisorGridEvent {
U.writeString(out, taskName);
U.writeString(out, taskClsName);
- U.writeGridUuid(out, taskSesId);
+ U.writeIgniteUuid(out, taskSesId);
out.writeBoolean(internal);
}
@@ -140,7 +140,7 @@ public class VisorGridTaskEvent extends VisorGridEvent {
taskName = U.readString(in);
taskClsName = U.readString(in);
- taskSesId = U.readGridUuid(in);
+ taskSesId = U.readIgniteUuid(in);
internal = in.readBoolean();
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeEventsCollectorTaskArg.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeEventsCollectorTaskArg.java
index c2e6b4a..06cb340 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeEventsCollectorTaskArg.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeEventsCollectorTaskArg.java
@@ -144,7 +144,7 @@ public class VisorNodeEventsCollectorTaskArg extends
VisorDataTransferObject {
out.writeObject(typeArg);
out.writeObject(timeArg);
U.writeString(out, taskName);
- U.writeGridUuid(out, taskSesId);
+ U.writeIgniteUuid(out, taskSesId);
}
/** {@inheritDoc} */
@@ -153,7 +153,7 @@ public class VisorNodeEventsCollectorTaskArg extends
VisorDataTransferObject {
typeArg = (int[])in.readObject();
timeArg = (Long)in.readObject();
taskName = U.readString(in);
- taskSesId = U.readGridUuid(in);
+ taskSesId = U.readIgniteUuid(in);
}
/** {@inheritDoc} */
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/tx/FetchNearXidVersionTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/tx/FetchNearXidVersionTask.java
index 0bfa5f7..74d13ec 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/tx/FetchNearXidVersionTask.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/visor/tx/FetchNearXidVersionTask.java
@@ -78,7 +78,7 @@ public class FetchNearXidVersionTask extends
VisorMultiNodeTask<TxVerboseId, Gri
for (IgniteInternalTx tx : transactions) {
if (tx.xid().equals(arg.uuid()) ||
- tx.nearXidVersion().asGridUuid().equals(arg.uuid()) ||
+ tx.nearXidVersion().asIgniteUuid().equals(arg.uuid()) ||
tx.xidVersion().equals(arg.gridCacheVersion()) ||
tx.nearXidVersion().equals(arg.gridCacheVersion()))
return tx.nearXidVersion();
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/tx/TxVerboseId.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/tx/TxVerboseId.java
index c55a1e1..0bb25ac 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/tx/TxVerboseId.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/visor/tx/TxVerboseId.java
@@ -105,7 +105,7 @@ public class TxVerboseId extends IgniteDataTransferObject {
/** {@inheritDoc} */
@Override protected void writeExternalData(ObjectOutput out) throws
IOException {
- U.writeGridUuid(out, uuid);
+ U.writeIgniteUuid(out, uuid);
out.writeObject(gridCacheVer);
}
@@ -114,7 +114,7 @@ public class TxVerboseId extends IgniteDataTransferObject {
byte protoVer,
ObjectInput in
) throws IOException, ClassNotFoundException {
- uuid = U.readGridUuid(in);
+ uuid = U.readIgniteUuid(in);
gridCacheVer = (GridCacheVersion)in.readObject();
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/tx/VisorTxInfo.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/tx/VisorTxInfo.java
index b672ec3..399e5c2 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/tx/VisorTxInfo.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/visor/tx/VisorTxInfo.java
@@ -226,7 +226,7 @@ public class VisorTxInfo extends VisorDataTransferObject {
/** {@inheritDoc} */
@Override protected void writeExternalData(ObjectOutput out) throws
IOException {
- U.writeGridUuid(out, xid);
+ U.writeIgniteUuid(out, xid);
out.writeLong(duration);
U.writeEnum(out, isolation);
U.writeEnum(out, concurrency);
@@ -235,7 +235,7 @@ public class VisorTxInfo extends VisorDataTransferObject {
U.writeCollection(out, primaryNodes);
U.writeEnum(out, state);
out.writeInt(size);
- U.writeGridUuid(out, nearXid);
+ U.writeIgniteUuid(out, nearXid);
U.writeCollection(out, masterNodeIds);
out.writeLong(startTime);
out.writeLong(topVer == null ? -1 : topVer.topologyVersion());
@@ -248,7 +248,7 @@ public class VisorTxInfo extends VisorDataTransferObject {
byte protoVer,
ObjectInput in
) throws IOException, ClassNotFoundException {
- xid = U.readGridUuid(in);
+ xid = U.readIgniteUuid(in);
duration = in.readLong();
isolation = TransactionIsolation.fromOrdinal(in.readByte());
concurrency = TransactionConcurrency.fromOrdinal(in.readByte());
@@ -258,7 +258,7 @@ public class VisorTxInfo extends VisorDataTransferObject {
state = TransactionState.fromOrdinal(in.readByte());
size = in.readInt();
if (protoVer >= V2) {
- nearXid = U.readGridUuid(in);
+ nearXid = U.readIgniteUuid(in);
masterNodeIds = U.readCollection(in);
startTime = in.readLong();
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/tx/VisorTxTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/tx/VisorTxTask.java
index 3994193..0c295a4 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/tx/VisorTxTask.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/visor/tx/VisorTxTask.java
@@ -327,7 +327,7 @@ public class VisorTxTask extends
VisorMultiNodeTask<VisorTxTaskArg, Map<ClusterN
infos.add(new VisorTxInfo(locTx.xid(), locTx.startTime(),
duration, locTx.isolation(),
locTx.concurrency(), locTx.timeout(), lb, mappings,
locTx.state(), size,
- locTx.nearXidVersion().asGridUuid(),
locTx.masterNodeIds(), locTx.topologyVersionSnapshot(),
+ locTx.nearXidVersion().asIgniteUuid(),
locTx.masterNodeIds(), locTx.topologyVersionSnapshot(),
verboseInfo));
if (arg.getOperation() == VisorTxOperation.KILL)
@@ -343,9 +343,9 @@ public class VisorTxTask extends
VisorMultiNodeTask<VisorTxTaskArg, Map<ClusterN
if (completed != null) {
if (Boolean.TRUE.equals(completed))
- infos.add(new
VisorTxInfo(arg.txInfoArgument().gridCacheVersion().asGridUuid(), COMMITTED));
+ infos.add(new
VisorTxInfo(arg.txInfoArgument().gridCacheVersion().asIgniteUuid(), COMMITTED));
else if (Boolean.FALSE.equals(completed))
- infos.add(new
VisorTxInfo(arg.txInfoArgument().gridCacheVersion().asGridUuid(), ROLLED_BACK));
+ infos.add(new
VisorTxInfo(arg.txInfoArgument().gridCacheVersion().asIgniteUuid(),
ROLLED_BACK));
}
}
diff --git a/modules/core/src/main/java/org/apache/ignite/lang/IgniteUuid.java
b/modules/core/src/main/java/org/apache/ignite/lang/IgniteUuid.java
index ce1fcc1..73ab127 100644
--- a/modules/core/src/main/java/org/apache/ignite/lang/IgniteUuid.java
+++ b/modules/core/src/main/java/org/apache/ignite/lang/IgniteUuid.java
@@ -64,7 +64,7 @@ public final class IgniteUuid implements
Comparable<IgniteUuid>, Iterable<Ignite
}
/**
- * Constructs {@code GridUuid} from a global and local identifiers.
+ * Constructs {@code IgniteUuid} from a global and local identifiers.
*
* @param gid UUID.
* @param locId Counter.
@@ -104,7 +104,7 @@ public final class IgniteUuid implements
Comparable<IgniteUuid>, Iterable<Ignite
}
/**
- * Constructs new {@code GridUuid} based on global and local ID portions.
+ * Constructs new {@code IgniteUuid} based on global and local ID portions.
*
* @param id UUID instance.
* @return Newly created pseudo-random ID.
@@ -116,11 +116,11 @@ public final class IgniteUuid implements
Comparable<IgniteUuid>, Iterable<Ignite
}
/**
- * Converts string into {@code GridUuid}. The String must be in the format
generated
- * by {@link #toString() GridUuid.toString()} method.
+ * Converts string into {@code IgniteUuid}. The String must be in the
format generated
+ * by {@link IgniteUuid#toString()} method.
*
- * @param s String to convert to {@code GridUuid}.
- * @return {@code GridUuid} instance representing given string.
+ * @param s String to convert to {@code IgniteUuid}.
+ * @return {@code IgniteUuid} instance representing given string.
*/
public static IgniteUuid fromString(String s) {
int firstDash = s.indexOf('-');
@@ -142,18 +142,18 @@ public final class IgniteUuid implements
Comparable<IgniteUuid>, Iterable<Ignite
}
/**
- * Gets global ID portion of this {@code GridUuid}.
+ * Gets global ID portion of this {@code IgniteUuid}.
*
- * @return Global ID portion of this {@code GridUuid}.
+ * @return Global ID portion of this {@code IgniteUuid}.
*/
public UUID globalId() {
return gid;
}
/**
- * Gets local ID portion of this {@code GridUuid}.
+ * Gets local ID portion of this {@code IgniteUuid}.
*
- * @return Local ID portion of this {@code GridUuid}.
+ * @return Local ID portion of this {@code IgniteUuid}.
*/
public long localId() {
return locId;
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/GridTopicExternalizableSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/GridTopicExternalizableSelfTest.java
index 31ca8e6..d34f146 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/GridTopicExternalizableSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/GridTopicExternalizableSelfTest.java
@@ -30,7 +30,7 @@ import org.junit.Test;
*/
public class GridTopicExternalizableSelfTest extends
IgniteExternalizableAbstractTest {
/** */
- private static final IgniteUuid A_GRID_UUID = IgniteUuid.randomUuid();
+ private static final IgniteUuid A_IGNITE_UUID = IgniteUuid.randomUuid();
/** */
private static final UUID AN_UUID = UUID.randomUUID();
@@ -48,12 +48,12 @@ public class GridTopicExternalizableSelfTest extends
IgniteExternalizableAbstrac
* @throws Exception If failed.
*/
@Test
- public void testSerializationTopicCreatedByGridUuid() throws Exception {
+ public void testSerializationTopicCreatedByIgniteUuid() throws Exception {
for (Marshaller marsh : getMarshallers()) {
info("Test GridTopic externalization [marshaller=" + marsh + ']');
for (GridTopic topic : GridTopic.values()) {
- Externalizable msgOut =
(Externalizable)topic.topic(A_GRID_UUID);
+ Externalizable msgOut =
(Externalizable)topic.topic(A_IGNITE_UUID);
assertEquals(msgOut, GridTestIoUtils.externalize(msgOut,
marsh));
}
@@ -64,12 +64,12 @@ public class GridTopicExternalizableSelfTest extends
IgniteExternalizableAbstrac
* @throws Exception If failed.
*/
@Test
- public void testSerializationTopicCreatedByGridUuidAndUUID() throws
Exception {
+ public void testSerializationTopicCreatedByIgniteUuidAndUUID() throws
Exception {
for (Marshaller marsh : getMarshallers()) {
info("Test GridTopic externalization [marshaller=" + marsh + ']');
for (GridTopic topic : GridTopic.values()) {
- Externalizable msgOut =
(Externalizable)topic.topic(A_GRID_UUID, AN_UUID);
+ Externalizable msgOut =
(Externalizable)topic.topic(A_IGNITE_UUID, AN_UUID);
assertEquals(msgOut, GridTestIoUtils.externalize(msgOut,
marsh));
}
@@ -80,12 +80,12 @@ public class GridTopicExternalizableSelfTest extends
IgniteExternalizableAbstrac
* @throws Exception If failed.
*/
@Test
- public void testSerializationTopicCreatedByGridUuidAndLong() throws
Exception {
+ public void testSerializationTopicCreatedByIgniteUuidAndLong() throws
Exception {
for (Marshaller marsh : getMarshallers()) {
info("Test GridTopic externalization [marshaller=" + marsh + ']');
for (GridTopic topic : GridTopic.values()) {
- Externalizable msgOut =
(Externalizable)topic.topic(A_GRID_UUID, A_LONG);
+ Externalizable msgOut =
(Externalizable)topic.topic(A_IGNITE_UUID, A_LONG);
assertEquals(msgOut, GridTestIoUtils.externalize(msgOut,
marsh));
}
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxPartitionCounterStateAbstractTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxPartitionCounterStateAbstractTest.java
index 640b578..0b04b6b 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxPartitionCounterStateAbstractTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxPartitionCounterStateAbstractTest.java
@@ -293,7 +293,7 @@ public abstract class TxPartitionCounterStateAbstractTest
extends GridCommonAbst
futMap.put(req.futureId(), req.version());
- return cb.beforePrimaryPrepare(to, req.version().asGridUuid(),
createSendFuture(clientWrappedSpi, msg));
+ return cb.beforePrimaryPrepare(to,
req.version().asIgniteUuid(), createSendFuture(clientWrappedSpi, msg));
}
else if (msg instanceof GridNearTxFinishRequest) {
IgniteEx to = IgnitionEx.gridxx(node.id());
@@ -420,7 +420,7 @@ public abstract class TxPartitionCounterStateAbstractTest
extends GridCommonAbst
IgniteInternalTx primTx = findTx(from, nearVer, true);
IgniteInternalTx backupTx = findTx(to, nearVer, false);
- return cb.beforeBackupFinish(from, to, primTx, backupTx,
nearVer.asGridUuid(), createSendFuture(wrappedPrimSpi, msg));
+ return cb.beforeBackupFinish(from, to, primTx, backupTx,
nearVer.asIgniteUuid(), createSendFuture(wrappedPrimSpi, msg));
}
else if (msg instanceof GridNearTxPrepareResponse) {
GridNearTxPrepareResponse resp =
(GridNearTxPrepareResponse)msg;
@@ -431,7 +431,7 @@ public abstract class TxPartitionCounterStateAbstractTest
extends GridCommonAbst
IgniteInternalTx primTx = findTx(from, ver, true);
- return cb.afterPrimaryPrepare(from, primTx, ver.asGridUuid(),
createSendFuture(wrappedPrimSpi, msg));
+ return cb.afterPrimaryPrepare(from, primTx,
ver.asIgniteUuid(), createSendFuture(wrappedPrimSpi, msg));
}
else if (msg instanceof GridNearTxFinishResponse) {
IgniteEx to = IgnitionEx.gridxx(node.id());
@@ -440,7 +440,7 @@ public abstract class TxPartitionCounterStateAbstractTest
extends GridCommonAbst
IgniteEx from = fromNode(wrappedPrimSpi);
- IgniteUuid nearVer = futMap.get(req.futureId()).asGridUuid();
+ IgniteUuid nearVer = futMap.get(req.futureId()).asIgniteUuid();
return cb.afterPrimaryFinish(from, nearVer,
createSendFuture(wrappedPrimSpi, msg));
}
@@ -470,7 +470,7 @@ public abstract class TxPartitionCounterStateAbstractTest
extends GridCommonAbst
IgniteInternalTx backupTx = findTx(from, ver, false);
- return cb.afterBackupPrepare(to, from, backupTx,
ver.asGridUuid(), createSendFuture(wrappedBackupSpi, msg));
+ return cb.afterBackupPrepare(to, from, backupTx,
ver.asIgniteUuid(), createSendFuture(wrappedBackupSpi, msg));
}
else if (msg instanceof GridDhtTxFinishResponse) {
IgniteEx from = fromNode(wrappedBackupSpi);
@@ -484,7 +484,7 @@ public abstract class TxPartitionCounterStateAbstractTest
extends GridCommonAbst
return false; // Message from parallel partition.
// Version is null if message is a response to
checkCommittedRequest.
- return cb.afterBackupFinish(to, from, ver.asGridUuid(),
createSendFuture(wrappedBackupSpi, msg));
+ return cb.afterBackupFinish(to, from, ver.asIgniteUuid(),
createSendFuture(wrappedBackupSpi, msg));
}
return false;
@@ -952,7 +952,7 @@ public abstract class TxPartitionCounterStateAbstractTest
extends GridCommonAbst
return false;
runAsync(() -> {
- futures.put(new T3<>(primary, TxState.COMMIT,
tx.nearXidVersion().asGridUuid()), proceedFut);
+ futures.put(new T3<>(primary, TxState.COMMIT,
tx.nearXidVersion().asIgniteUuid()), proceedFut);
if (countForNode(primary, TxState.COMMIT) == txCnt)
futures.remove(new T3<>(primary, TxState.COMMIT,
version(commits.get(primary).poll()))).onDone();
@@ -972,11 +972,11 @@ public abstract class TxPartitionCounterStateAbstractTest
extends GridCommonAbst
runAsync(() -> {
if (assigns.get(primary) != null) {
- int v0 = assignCntr.compute(new T2<>(primary,
primaryTx.nearXidVersion().asGridUuid()),
+ int v0 = assignCntr.compute(new T2<>(primary,
primaryTx.nearXidVersion().asIgniteUuid()),
(key, val) -> (val == null ? 0 : val) + 1);
if (v0 == 2) {
- onCounterAssigned(primary, primaryTx,
order(primaryTx.nearXidVersion().asGridUuid()));
+ onCounterAssigned(primary, primaryTx,
order(primaryTx.nearXidVersion().asIgniteUuid()));
if (!assigns.get(primary).isEmpty())
futures.remove(new T3<>(primary, TxState.ASSIGN,
@@ -985,7 +985,7 @@ public abstract class TxPartitionCounterStateAbstractTest
extends GridCommonAbst
}
if (prepares.get(backup) != null) {
- futures.put(new T3<>(backup, TxState.PREPARE,
primaryTx.nearXidVersion().asGridUuid()), proceedFut);
+ futures.put(new T3<>(backup, TxState.PREPARE,
primaryTx.nearXidVersion().asIgniteUuid()), proceedFut);
// Wait until all prep requests queued and force prepare
order.
if (countForNode(backup, TxState.PREPARE) == txCnt) {
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxPartitionCounterStateOnePrimaryOneBackupTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxPartitionCounterStateOnePrimaryOneBackupTest.java
index 88e6555..8968d99 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxPartitionCounterStateOnePrimaryOneBackupTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxPartitionCounterStateOnePrimaryOneBackupTest.java
@@ -348,7 +348,7 @@ public class TxPartitionCounterStateOnePrimaryOneBackupTest
extends TxPartitionC
@Override public boolean beforeBackupPrepare(IgniteEx primary,
IgniteEx backup, IgniteInternalTx primaryTx,
GridFutureAdapter<?> proceedFut) {
runAsync(() -> {
- IgniteUuid nearXidVer =
primaryTx.nearXidVersion().asGridUuid();
+ IgniteUuid nearXidVer =
primaryTx.nearXidVersion().asIgniteUuid();
onPrimaryPrepared(primary, primaryTx, order(nearXidVer));
diff --git
a/modules/core/src/test/java/org/apache/ignite/lang/IgniteUuidSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/lang/IgniteUuidSelfTest.java
index f81698b..7894b17 100644
--- a/modules/core/src/test/java/org/apache/ignite/lang/IgniteUuidSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/lang/IgniteUuidSelfTest.java
@@ -76,7 +76,7 @@ public class IgniteUuidSelfTest extends
GridCommonAbstractTest {
* JUnit.
*/
@Test
- public void testGridUuid() {
+ public void testIgniteUuid() {
IgniteUuid id1 = IgniteUuid.randomUuid();
IgniteUuid id2 = IgniteUuid.randomUuid();
@@ -99,7 +99,7 @@ public class IgniteUuidSelfTest extends
GridCommonAbstractTest {
* JUnit.
*/
@Test
- public void testGridUuidPerformance() {
+ public void testIgniteUuidPerformance() {
long start = System.currentTimeMillis();
for (int i = 0; i < NUM; i++)
@@ -117,7 +117,7 @@ public class IgniteUuidSelfTest extends
GridCommonAbstractTest {
if (dur2 == 0)
dur2 = 1;
- System.out.println("Creation: UUID=" + dur1 + "ms, GridUuid=" + dur2 +
"ms, " + (dur1 / dur2) + "x faster.");
+ System.out.println("Creation: UUID=" + dur1 + "ms, IgniteUuid=" + dur2
+ "ms, " + (dur1 / dur2) + "x faster.");
}
/**
@@ -133,11 +133,11 @@ public class IgniteUuidSelfTest extends
GridCommonAbstractTest {
for (int i = 0; i < uids.length; i++)
uids[i] = new UuidBean(UUID.randomUUID());
- GridUuidBean[] guids = new GridUuidBean[NUM];
+ IgniteUuidBean[] guids = new IgniteUuidBean[NUM];
// Populate.
for (int i = 0; i < guids.length; i++)
- guids[i] = new GridUuidBean(IgniteUuid.randomUuid());
+ guids[i] = new IgniteUuidBean(IgniteUuid.randomUuid());
// Warm up.
testArray(uids, NUM);
@@ -163,7 +163,7 @@ public class IgniteUuidSelfTest extends
GridCommonAbstractTest {
String metric = res == 1 ? "as fast as UUID" : dur1 < dur2 ? res + "x
**SLOWER**" : res + "x faster";
- System.out.println("Serialization: UUID=" + dur1 + "ms, GridUuid=" +
dur2 + "ms, GridUuid is " +
+ System.out.println("Serialization: UUID=" + dur1 + "ms, IgniteUuid=" +
dur2 + "ms, IgniteUuid is " +
metric + ".");
}
@@ -242,21 +242,21 @@ public class IgniteUuidSelfTest extends
GridCommonAbstractTest {
/**
*
*/
- private static class GridUuidBean implements Externalizable {
+ private static class IgniteUuidBean implements Externalizable {
/** */
private IgniteUuid uid;
/**
* Empty constructor required for {@link Externalizable}.
*/
- public GridUuidBean() {
+ public IgniteUuidBean() {
// No-op.
}
/**
- * @param uid Grid UUID.
+ * @param uid Ignite UUID.
*/
- private GridUuidBean(IgniteUuid uid) {
+ private IgniteUuidBean(IgniteUuid uid) {
this.uid = uid;
}
@@ -265,20 +265,20 @@ public class IgniteUuidSelfTest extends
GridCommonAbstractTest {
// Uncomment if you would like to see raw serialization
performance.
//out.writeObject(uid);
- U.writeGridUuid(out, uid);
+ U.writeIgniteUuid(out, uid);
}
/** {@inheritDoc} */
@Override public void readExternal(ObjectInput in) throws IOException,
ClassNotFoundException {
// Uncomment if you would like to see raw serialization
performance.
- //uid = (GridUuid)in.readObject();
+ //uid = (IgniteUuid)in.readObject();
- uid = U.readGridUuid(in);
+ uid = U.readIgniteUuid(in);
}
/** {@inheritDoc} */
@Override public boolean equals(Object o) {
- return this == o || uid.equals(((GridUuidBean)o).uid);
+ return this == o || uid.equals(((IgniteUuidBean)o).uid);
}
/** {@inheritDoc} */
@@ -287,7 +287,7 @@ public class IgniteUuidSelfTest extends
GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override public String toString() { return
S.toString(GridUuidBean.class, this); }
+ @Override public String toString() { return
S.toString(IgniteUuidBean.class, this); }
}
/**
@@ -305,7 +305,7 @@ public class IgniteUuidSelfTest extends
GridCommonAbstractTest {
}
/**
- * @param uid Grid UUID.
+ * @param uid Ignite UUID.
*/
private UuidBean(UUID uid) {
this.uid = uid;
diff --git
a/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridTcpCommunicationBenchmark.java
b/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridTcpCommunicationBenchmark.java
index b94ccca..a0750d8 100644
---
a/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridTcpCommunicationBenchmark.java
+++
b/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridTcpCommunicationBenchmark.java
@@ -203,7 +203,7 @@ package org.apache.ignite.loadtests.communication;
// @Override public Object call() throws Exception {
// try {
// while (!finish.get()) {
-// GridUuid msgId = GridUuid.randomUuid();
+// IgniteUuid msgId = IgniteUuid.randomUuid();
//
// sem.acquire();
//
@@ -264,7 +264,7 @@ package org.apache.ignite.loadtests.communication;
//
// final LongAdder8 msgCntr = new LongAdder8();
//
-// final Map<GridUuid, CountDownLatch> map = new ConcurrentHashMap8<>();
+// final Map<IgniteUuid, CountDownLatch> map = new
ConcurrentHashMap8<>();
//
// rcvComm.setListener(new GridCommunicationListener() {
// @Override public void onMessage(UUID nodeId, byte[] msg,
GridAbsClosure msgC) {
@@ -325,7 +325,7 @@ package org.apache.ignite.loadtests.communication;
// info("Test thread started.");
//
// try {
-// GridUuid msgId = GridUuid.randomUuid();
+// IgniteUuid msgId = IgniteUuid.randomUuid();
//
// GridTuple2<byte[], Integer> t =
getTestResources().getMarshaller().
// marshalNoCopy(new GridTestMessage(msgId, testStr),
4);
@@ -394,7 +394,7 @@ package org.apache.ignite.loadtests.communication;
// final Semaphore sem = new Semaphore(CONCUR_MSGS);
// final LongAdder8 msgCntr = new LongAdder8();
//
-// final Map<GridUuid, CountDownLatch> latches = new
ConcurrentHashMap8<>();
+// final Map<IgniteUuid, CountDownLatch> latches = new
ConcurrentHashMap8<>();
//
// rcvComm.setListener(new GridCommunicationListener() {
// @Override public void onMessage(UUID nodeId, byte[] msg,
GridAbsClosure msgC) {
@@ -450,7 +450,7 @@ package org.apache.ignite.loadtests.communication;
// if (latch != null)
// U.await(latch);
//
-// GridUuid msgId = GridUuid.randomUuid();
+// IgniteUuid msgId = IgniteUuid.randomUuid();
//
// sem.acquire();
//
@@ -529,7 +529,7 @@ package org.apache.ignite.loadtests.communication;
// while (!finish.get()) {
// U.sleep(1000);
//
-// GridUuid msgId = GridUuid.randomUuid();
+// IgniteUuid msgId = IgniteUuid.randomUuid();
// CountDownLatch latch = new CountDownLatch(1);
//
// latches.put(msgId, latch);
diff --git
a/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridTestMessage.java
b/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridTestMessage.java
index 86c7b0c..3cd6130 100644
---
a/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridTestMessage.java
+++
b/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridTestMessage.java
@@ -100,7 +100,7 @@ class GridTestMessage implements Message, Externalizable {
/** {@inheritDoc} */
@Override public void writeExternal(ObjectOutput out) throws IOException {
- U.writeGridUuid(out, id);
+ U.writeIgniteUuid(out, id);
out.writeLong(field1);
out.writeLong(field2);
U.writeString(out, str);
@@ -109,7 +109,7 @@ class GridTestMessage implements Message, Externalizable {
/** {@inheritDoc} */
@Override public void readExternal(ObjectInput in) throws IOException,
ClassNotFoundException {
- id = U.readGridUuid(in);
+ id = U.readIgniteUuid(in);
field1 = in.readLong();
field2 = in.readLong();
str = U.readString(in);
