GridUtils -> IgniteUtils
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/fc768b83 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fc768b83 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fc768b83 Branch: refs/heads/ignite-71 Commit: fc768b8318213841dec6d92d1fcd013a8052aaca Parents: d6a720f Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Thu Jan 29 17:10:36 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Thu Jan 29 17:10:36 2015 +0300 ---------------------------------------------------------------------- .../spi/checkpoint/s3/S3CheckpointSpi.java | 4 +- .../ClientPropertiesConfigurationSelfTest.java | 4 +- .../apache/ignite/IgniteCheckedException.java | 2 +- .../java/org/apache/ignite/IgniteException.java | 2 +- .../cache/GridCacheDeploymentManager.java | 2 +- .../cache/GridCacheMvccCandidate.java | 4 +- .../apache/ignite/internal/util/GridUtils.java | 9141 ------------------ .../ignite/internal/util/IgniteUtils.java | 9141 ++++++++++++++++++ .../internal/util/typedef/internal/U.java | 4 +- .../visor/misc/VisorResolveHostNameTask.java | 2 +- .../internal/visor/query/VisorQueryUtils.java | 4 +- .../optimized/IgniteOptimizedMarshaller.java | 2 +- .../IgniteExceptionHelpLinksSelfTest.java | 3 +- .../GridEventStorageCheckAllEventsSelfTest.java | 2 +- .../cache/GridCacheAbstractMetricsSelfTest.java | 10 +- ...artupWithSpecifiedWorkDirectorySelfTest.java | 2 +- ...tartupWithUndefinedGridGainHomeSelfTest.java | 4 +- .../internal/util/GridTestClockTimer.java | 6 +- .../ignite/internal/util/GridUtilsSelfTest.java | 728 -- .../internal/util/IgniteUtilsSelfTest.java | 728 ++ .../ignite/lang/GridSetWrapperSelfTest.java | 2 +- .../testsuites/IgniteUtilSelfTestSuite.java | 2 +- .../ignite/visor/commands/VisorConsole.scala | 6 +- .../commands/alert/VisorAlertCommand.scala | 4 +- .../config/VisorConfigurationCommand.scala | 6 +- .../commands/deploy/VisorDeployCommand.scala | 4 +- .../commands/disco/VisorDiscoveryCommand.scala | 4 +- .../commands/events/VisorEventsCommand.scala | 4 +- .../visor/commands/node/VisorNodeCommand.scala | 4 +- .../commands/start/VisorStartCommand.scala | 4 +- .../commands/tasks/VisorTasksCommand.scala | 4 +- .../commands/top/VisorTopologyCommand.scala | 6 +- .../visor/commands/vvm/VisorVvmCommand.scala | 8 +- .../scala/org/apache/ignite/visor/visor.scala | 20 +- 34 files changed, 9935 insertions(+), 9938 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc768b83/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpi.java ---------------------------------------------------------------------- diff --git a/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpi.java b/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpi.java index 8bc0fb7..5a977a1 100644 --- a/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpi.java +++ b/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpi.java @@ -338,8 +338,8 @@ public class S3CheckpointSpi extends IgniteSpiAdapter implements CheckpointSpi, /** {@inheritDoc} */ @Override public void spiStop() throws IgniteSpiException { if (timeoutWrk != null) { - GridUtils.interrupt(timeoutWrk); - GridUtils.join(timeoutWrk, log); + IgniteUtils.interrupt(timeoutWrk); + IgniteUtils.join(timeoutWrk, log); } unregisterMBean(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc768b83/modules/clients/src/test/java/org/apache/ignite/client/impl/ClientPropertiesConfigurationSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/client/impl/ClientPropertiesConfigurationSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/impl/ClientPropertiesConfigurationSelfTest.java index 31e8638..7b903fa 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/impl/ClientPropertiesConfigurationSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/impl/ClientPropertiesConfigurationSelfTest.java @@ -158,7 +158,7 @@ public class ClientPropertiesConfigurationSelfTest extends GridCommonAbstractTes while (it.hasNext()) lines.add(it.nextLine().replace("#gg.client.", "gg.client.")); - GridUtils.closeQuiet(in); + IgniteUtils.closeQuiet(in); File tmp = File.createTempFile(UUID.randomUUID().toString(), "properties"); @@ -188,7 +188,7 @@ public class ClientPropertiesConfigurationSelfTest extends GridCommonAbstractTes assertEquals(expLoaded, props.size()); - GridUtils.closeQuiet(in); + IgniteUtils.closeQuiet(in); return props; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc768b83/modules/core/src/main/java/org/apache/ignite/IgniteCheckedException.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteCheckedException.java b/modules/core/src/main/java/org/apache/ignite/IgniteCheckedException.java index 8313c40..399b067 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteCheckedException.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteCheckedException.java @@ -20,7 +20,7 @@ package org.apache.ignite; import org.apache.ignite.internal.util.typedef.*; import org.jetbrains.annotations.*; -import static org.apache.ignite.internal.util.GridUtils.*; +import static org.apache.ignite.internal.util.IgniteUtils.*; /** * General grid exception. This exception is used to indicate any error condition http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc768b83/modules/core/src/main/java/org/apache/ignite/IgniteException.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteException.java b/modules/core/src/main/java/org/apache/ignite/IgniteException.java index b517dea..0f89743 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteException.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteException.java @@ -20,7 +20,7 @@ package org.apache.ignite; import org.apache.ignite.internal.util.typedef.*; import org.jetbrains.annotations.*; -import static org.apache.ignite.internal.util.GridUtils.*; +import static org.apache.ignite.internal.util.IgniteUtils.*; /** * General grid exception. This exception is used to indicate any error condition http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc768b83/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java index d5ffb0d..c74d0b3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java @@ -485,7 +485,7 @@ public class GridCacheDeploymentManager<K, V> extends GridCacheSharedManagerAdap allParticipants.put(nodeId, ldrVer); if (added == null) - added = GridUtils.newHashMap(participants.size()); + added = IgniteUtils.newHashMap(participants.size()); added.put(nodeId, ldrVer); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc768b83/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccCandidate.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccCandidate.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccCandidate.java index d814430..43aa691 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccCandidate.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccCandidate.java @@ -539,7 +539,7 @@ public class GridCacheMvccCandidate<K> implements Externalizable, /** {@inheritDoc} */ @Override public void writeExternal(ObjectOutput out) throws IOException { - GridUtils.writeUuid(out, nodeId); + IgniteUtils.writeUuid(out, nodeId); CU.writeVersion(out, ver); @@ -551,7 +551,7 @@ public class GridCacheMvccCandidate<K> implements Externalizable, /** {@inheritDoc} */ @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { - nodeId = GridUtils.readUuid(in); + nodeId = IgniteUtils.readUuid(in); ver = CU.readVersion(in);
