http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/gridgain/grid/kernal/processors/clock/GridClockSyncProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/clock/GridClockSyncProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/clock/GridClockSyncProcessor.java index d1a24d6..12c59e0 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/clock/GridClockSyncProcessor.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/clock/GridClockSyncProcessor.java @@ -21,7 +21,6 @@ import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.events.*; import org.apache.ignite.thread.*; -import org.gridgain.grid.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.managers.communication.*; import org.gridgain.grid.kernal.managers.discovery.*; @@ -340,7 +339,7 @@ public class GridClockSyncProcessor extends GridProcessorAdapter { } /** {@inheritDoc} */ - @Override protected void body() throws InterruptedException, GridInterruptedException { + @Override protected void body() throws InterruptedException, IgniteInterruptedException { while (!isCancelled()) { GridDiscoveryTopologySnapshot top = lastSnapshot;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/gridgain/grid/kernal/processors/closure/GridClosureProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/closure/GridClosureProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/closure/GridClosureProcessor.java index f7bb5e9..381fed1 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/closure/GridClosureProcessor.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/closure/GridClosureProcessor.java @@ -25,8 +25,6 @@ import org.apache.ignite.compute.*; import org.apache.ignite.lang.*; import org.apache.ignite.marshaller.*; import org.apache.ignite.resources.*; -import org.gridgain.grid.cache.*; -import org.gridgain.grid.cache.affinity.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.processors.*; import org.gridgain.grid.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/gridgain/grid/kernal/processors/continuous/GridContinuousProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/continuous/GridContinuousProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/continuous/GridContinuousProcessor.java index 6ec86a5..493fec9 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/continuous/GridContinuousProcessor.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/continuous/GridContinuousProcessor.java @@ -23,7 +23,6 @@ import org.apache.ignite.events.*; import org.apache.ignite.lang.*; import org.apache.ignite.marshaller.*; import org.apache.ignite.thread.*; -import org.gridgain.grid.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.managers.communication.*; import org.gridgain.grid.kernal.managers.deployment.*; @@ -402,7 +401,7 @@ public class GridContinuousProcessor extends GridProcessorAdapter { GridDeployment dep = ctx.deploy().deploy(cls, U.detectClassLoader(cls)); if (dep == null) - throw new GridDeploymentException("Failed to deploy projection predicate: " + prjPred); + throw new IgniteDeploymentException("Failed to deploy projection predicate: " + prjPred); reqData.clsName = clsName; reqData.depInfo = new GridDeploymentInfoBean(dep); @@ -755,7 +754,7 @@ public class GridContinuousProcessor extends GridProcessorAdapter { depInfo.userVersion(), nodeId, depInfo.classLoaderId(), depInfo.participants(), null); if (dep == null) - throw new GridDeploymentException("Failed to obtain deployment for class: " + clsName); + throw new IgniteDeploymentException("Failed to obtain deployment for class: " + clsName); data.p2pUnmarshal(marsh, dep.classLoader()); } @@ -1002,7 +1001,7 @@ public class GridContinuousProcessor extends GridProcessorAdapter { try { U.sleep(interval0); } - catch (GridInterruptedException ignored) { + catch (IgniteInterruptedException ignored) { break; } @@ -1155,7 +1154,7 @@ public class GridContinuousProcessor extends GridProcessorAdapter { break; } - catch (GridInterruptedException e) { + catch (IgniteInterruptedException e) { throw e; } catch (IgniteCheckedException e) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoadCacheUpdaters.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoadCacheUpdaters.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoadCacheUpdaters.java index 5527f7a..c9a7be1 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoadCacheUpdaters.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoadCacheUpdaters.java @@ -23,8 +23,6 @@ import org.apache.ignite.cache.affinity.*; import org.apache.ignite.dataload.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.transactions.*; -import org.gridgain.grid.cache.*; -import org.gridgain.grid.cache.affinity.*; import org.gridgain.grid.util.typedef.*; import org.jetbrains.annotations.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderProcessor.java index fba509a..b93d0ad 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderProcessor.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderProcessor.java @@ -22,7 +22,6 @@ import org.apache.ignite.dataload.*; import org.apache.ignite.lang.*; import org.apache.ignite.marshaller.*; import org.apache.ignite.thread.*; -import org.gridgain.grid.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.managers.communication.*; import org.gridgain.grid.kernal.managers.deployment.*; @@ -81,7 +80,7 @@ public class GridDataLoaderProcessor<K, V> extends GridProcessorAdapter { return; flusher = new IgniteThread(new GridWorker(ctx.gridName(), "grid-data-loader-flusher", log) { - @Override protected void body() throws InterruptedException, GridInterruptedException { + @Override protected void body() throws InterruptedException, IgniteInterruptedException { while (!isCancelled()) { IgniteDataLoaderImpl<K, V> ldr = flushQ.take(); @@ -128,7 +127,7 @@ public class GridDataLoaderProcessor<K, V> extends GridProcessorAdapter { try { ldr.close(cancel); } - catch (GridInterruptedException e) { + catch (IgniteInterruptedException e) { U.warn(log, "Interrupted while waiting for completion of the data loader: " + ldr, e); } catch (IgniteCheckedException e) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dataload/IgniteDataLoaderImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dataload/IgniteDataLoaderImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dataload/IgniteDataLoaderImpl.java index ec7cdc9..d3f80c9 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dataload/IgniteDataLoaderImpl.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dataload/IgniteDataLoaderImpl.java @@ -24,8 +24,6 @@ import org.apache.ignite.dataload.*; import org.apache.ignite.events.*; import org.apache.ignite.lang.*; import org.apache.ignite.product.*; -import org.gridgain.grid.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.managers.communication.*; import org.gridgain.grid.kernal.managers.deployment.*; @@ -520,7 +518,7 @@ public class IgniteDataLoaderImpl<K, V> implements IgniteDataLoader<K, V>, Delay try { f = buf.update(entriesForNode, lsnr); } - catch (GridInterruptedException e1) { + catch (IgniteInterruptedException e1) { resFut.onDone(e1); return; @@ -645,7 +643,7 @@ public class IgniteDataLoaderImpl<K, V> implements IgniteDataLoader<K, V>, Delay * Does not wait for result and does not fail on errors assuming that this method * should be called periodically. */ - @Override public void tryFlush() throws GridInterruptedException { + @Override public void tryFlush() throws IgniteInterruptedException { if (!busyLock.enterBusy()) return; @@ -795,11 +793,11 @@ public class IgniteDataLoaderImpl<K, V> implements IgniteDataLoader<K, V>, Delay /** * @param newEntries Infos. * @param lsnr Listener for the operation future. - * @throws GridInterruptedException If failed. + * @throws org.apache.ignite.IgniteInterruptedException If failed. * @return Future for operation. */ @Nullable GridFutureAdapter<?> update(Iterable<Map.Entry<K, V>> newEntries, - IgniteInClosure<IgniteFuture<?>> lsnr) throws GridInterruptedException { + IgniteInClosure<IgniteFuture<?>> lsnr) throws IgniteInterruptedException { List<Map.Entry<K, V>> entries0 = null; GridFutureAdapter<Object> curFut0; @@ -840,10 +838,10 @@ public class IgniteDataLoaderImpl<K, V> implements IgniteDataLoader<K, V>, Delay /** * @return Future if any submitted. * - * @throws GridInterruptedException If thread has been interrupted. + * @throws org.apache.ignite.IgniteInterruptedException If thread has been interrupted. */ @Nullable - IgniteFuture<?> flush() throws GridInterruptedException { + IgniteFuture<?> flush() throws IgniteInterruptedException { List<Map.Entry<K, V>> entries0 = null; GridFutureAdapter<Object> curFut0 = null; @@ -887,9 +885,9 @@ public class IgniteDataLoaderImpl<K, V> implements IgniteDataLoader<K, V>, Delay /** * Increments active tasks count. * - * @throws GridInterruptedException If thread has been interrupted. + * @throws org.apache.ignite.IgniteInterruptedException If thread has been interrupted. */ - private void incrementActiveTasks() throws GridInterruptedException { + private void incrementActiveTasks() throws IgniteInterruptedException { U.acquire(sem); } @@ -905,10 +903,10 @@ public class IgniteDataLoaderImpl<K, V> implements IgniteDataLoader<K, V>, Delay /** * @param entries Entries to submit. * @param curFut Current future. - * @throws GridInterruptedException If interrupted. + * @throws org.apache.ignite.IgniteInterruptedException If interrupted. */ private void submit(final Collection<Map.Entry<K, V>> entries, final GridFutureAdapter<Object> curFut) - throws GridInterruptedException { + throws IgniteInterruptedException { assert entries != null; assert !entries.isEmpty(); assert curFut != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDataManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDataManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDataManager.java index a4ff696..5da86c9 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDataManager.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDataManager.java @@ -26,9 +26,6 @@ import org.apache.ignite.fs.*; import org.apache.ignite.lang.*; import org.apache.ignite.thread.*; import org.apache.ignite.transactions.*; -import org.gridgain.grid.*; -import org.gridgain.grid.cache.*; -import org.gridgain.grid.cache.affinity.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.managers.communication.*; import org.gridgain.grid.kernal.managers.eventstorage.*; @@ -241,7 +238,7 @@ public class GridGgfsDataManager extends GridGgfsManager { // Always wait thread exit. U.join(delWorker); } - catch (GridInterruptedException e) { + catch (IgniteInterruptedException e) { log.warning("Got interrupter while waiting for delete worker to stop (will continue stopping).", e); } @@ -1693,7 +1690,7 @@ public class GridGgfsDataManager extends GridGgfsManager { } /** {@inheritDoc} */ - @Override protected void body() throws InterruptedException, GridInterruptedException { + @Override protected void body() throws InterruptedException, IgniteInterruptedException { try { while (!isCancelled()) { IgniteBiTuple<GridFutureAdapter<Object>, GridGgfsFileInfo> req = delReqs.take(); @@ -1724,7 +1721,7 @@ public class GridGgfsDataManager extends GridGgfsManager { block)); } } - catch (GridInterruptedException ignored) { + catch (IgniteInterruptedException ignored) { // Ignore interruption during shutdown. } catch (IgniteCheckedException e) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDeleteWorker.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDeleteWorker.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDeleteWorker.java index 541b052..8e30c58 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDeleteWorker.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDeleteWorker.java @@ -21,7 +21,6 @@ import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.events.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.*; import org.gridgain.grid.kernal.managers.communication.*; import org.gridgain.grid.kernal.managers.eventstorage.*; import org.gridgain.grid.util.typedef.*; @@ -179,7 +178,7 @@ public class GridGgfsDeleteWorker extends GridGgfsThread { else break; } - catch (GridInterruptedException ignored) { + catch (IgniteInterruptedException ignored) { // Ignore this exception while stopping. } catch (IgniteCheckedException e) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsFileWorkerBatch.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsFileWorkerBatch.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsFileWorkerBatch.java index 76667dc..080e217 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsFileWorkerBatch.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsFileWorkerBatch.java @@ -19,7 +19,6 @@ package org.gridgain.grid.kernal.processors.ggfs; import org.apache.ignite.*; import org.apache.ignite.fs.*; -import org.gridgain.grid.*; import org.gridgain.grid.util.typedef.internal.*; import java.io.*; @@ -167,7 +166,7 @@ public class GridGgfsFileWorkerBatch { catch (InterruptedException e) { Thread.currentThread().interrupt(); - throw new GridInterruptedException(e); + throw new IgniteInterruptedException(e); } IgniteCheckedException err0 = err; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsFragmentizerManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsFragmentizerManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsFragmentizerManager.java index 3932f71..c986e96 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsFragmentizerManager.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsFragmentizerManager.java @@ -22,7 +22,6 @@ import org.apache.ignite.cluster.*; import org.apache.ignite.events.*; import org.apache.ignite.lang.*; import org.apache.ignite.thread.*; -import org.gridgain.grid.*; import org.gridgain.grid.kernal.managers.communication.*; import org.gridgain.grid.kernal.managers.eventstorage.*; import org.gridgain.grid.util.*; @@ -392,7 +391,7 @@ public class GridGgfsFragmentizerManager extends GridGgfsManager { } /** {@inheritDoc} */ - @Override protected void body() throws InterruptedException, GridInterruptedException { + @Override protected void body() throws InterruptedException, IgniteInterruptedException { // Wait for all previous fragmentizer tasks to complete. syncStart(); @@ -410,7 +409,7 @@ public class GridGgfsFragmentizerManager extends GridGgfsManager { } } catch (IgniteCheckedException | IgniteException e) { - if (!X.hasCause(e, InterruptedException.class) && !X.hasCause(e, GridInterruptedException.class)) + if (!X.hasCause(e, InterruptedException.class) && !X.hasCause(e, IgniteInterruptedException.class)) LT.warn(log, e, "Failed to get fragmentizer file info (will retry)."); else { if (log.isDebugEnabled()) @@ -726,7 +725,7 @@ public class GridGgfsFragmentizerManager extends GridGgfsManager { } /** {@inheritDoc} */ - @Override protected void body() throws InterruptedException, GridInterruptedException { + @Override protected void body() throws InterruptedException, IgniteInterruptedException { while (!isCancelled()) { IgniteBiTuple<UUID, GridGgfsCommunicationMessage> req = msgs.take(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetaManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetaManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetaManager.java index b8702a0..3f990bf 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetaManager.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetaManager.java @@ -24,8 +24,6 @@ import org.apache.ignite.events.*; import org.apache.ignite.fs.*; import org.apache.ignite.lang.*; import org.apache.ignite.transactions.*; -import org.gridgain.grid.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.managers.eventstorage.*; import org.gridgain.grid.kernal.processors.cache.*; import org.gridgain.grid.kernal.processors.task.*; @@ -138,7 +136,7 @@ public class GridGgfsMetaManager extends GridGgfsManager { try { U.join(delWorker0); } - catch (GridInterruptedException ignored) { + catch (IgniteInterruptedException ignored) { // No-op. } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessor.java index 71faa4b..8a251e6 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessor.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessor.java @@ -27,8 +27,6 @@ import org.apache.ignite.configuration.*; import org.apache.ignite.fs.*; import org.apache.ignite.fs.mapreduce.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.cache.*; -import org.gridgain.grid.cache.affinity.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.processors.cache.*; import org.gridgain.grid.kernal.processors.license.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsServer.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsServer.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsServer.java index 33dfa8b..5c39b23 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsServer.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsServer.java @@ -20,7 +20,6 @@ package org.gridgain.grid.kernal.processors.ggfs; import org.apache.ignite.*; import org.apache.ignite.lang.*; import org.apache.ignite.thread.*; -import org.gridgain.grid.*; import org.gridgain.grid.kernal.ggfs.common.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; @@ -228,7 +227,7 @@ public class GridGgfsServer { } /** {@inheritDoc} */ - @Override protected void body() throws InterruptedException, GridInterruptedException { + @Override protected void body() throws InterruptedException, IgniteInterruptedException { try { GridGgfsDataInputStream dis = new GridGgfsDataInputStream(endpoint.inputStream()); @@ -389,7 +388,7 @@ public class GridGgfsServer { } /** {@inheritDoc} */ - @Override protected void body() throws InterruptedException, GridInterruptedException { + @Override protected void body() throws InterruptedException, IgniteInterruptedException { try { while (!Thread.currentThread().isInterrupted()) { GridIpcEndpoint client = srvEndpoint.accept(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobProcessor.java index efcefbe..4d85c09 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobProcessor.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobProcessor.java @@ -24,7 +24,6 @@ import org.apache.ignite.events.*; import org.apache.ignite.lang.*; import org.apache.ignite.marshaller.*; import org.apache.ignite.product.*; -import org.gridgain.grid.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.managers.collision.*; import org.gridgain.grid.kernal.managers.communication.*; @@ -1099,7 +1098,7 @@ public class GridJobProcessor extends GridProcessorAdapter { } else { // Deployment is null. - IgniteCheckedException ex = new GridDeploymentException("Task was not deployed or was redeployed since " + + IgniteCheckedException ex = new IgniteDeploymentException("Task was not deployed or was redeployed since " + "task execution [taskName=" + req.getTaskName() + ", taskClsName=" + req.getTaskClassName() + ", codeVer=" + req.getUserVersion() + ", clsLdrId=" + req.getClassLoaderId() + ", seqNum=" + req.getClassLoaderId().localId() + ", depMode=" + req.getDeploymentMode() + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobWorker.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobWorker.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobWorker.java index cb855c8..4012c93 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobWorker.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobWorker.java @@ -24,7 +24,6 @@ import org.apache.ignite.events.*; import org.apache.ignite.fs.*; import org.apache.ignite.lang.*; import org.apache.ignite.marshaller.*; -import org.gridgain.grid.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.managers.deployment.*; import org.gridgain.grid.kernal.processors.task.*; @@ -490,7 +489,7 @@ public class GridJobWorker extends GridWorker implements GridTimeoutObject { } } catch (IgniteCheckedException e) { - if (sysStopping && e.hasCause(GridInterruptedException.class, InterruptedException.class)) { + if (sysStopping && e.hasCause(IgniteInterruptedException.class, InterruptedException.class)) { ex = handleThrowable(e); assert ex != null; @@ -561,7 +560,7 @@ public class GridJobWorker extends GridWorker implements GridTimeoutObject { ex = new ComputeUserUndeclaredException(msg, e); } - else if (sysStopping && X.hasCause(e, InterruptedException.class, GridInterruptedException.class)) { + else if (sysStopping && X.hasCause(e, InterruptedException.class, IgniteInterruptedException.class)) { msg = "Job got interrupted due to system stop (will attempt failover)."; ex = new ComputeExecutionRejectedException(e); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/gridgain/grid/kernal/processors/query/GridQueryProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/query/GridQueryProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/query/GridQueryProcessor.java index a6417e7..9805120 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/query/GridQueryProcessor.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/query/GridQueryProcessor.java @@ -23,7 +23,6 @@ import org.apache.ignite.cache.query.*; import org.apache.ignite.lang.*; import org.apache.ignite.portables.*; import org.apache.ignite.spi.indexing.*; -import org.gridgain.grid.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.processors.*; import org.gridgain.grid.util.*; @@ -1304,9 +1303,9 @@ public class GridQueryProcessor extends GridProcessorAdapter { /** * @return Waits for initialization. - * @throws GridInterruptedException If thread is interrupted. + * @throws org.apache.ignite.IgniteInterruptedException If thread is interrupted. */ - boolean await() throws GridInterruptedException { + boolean await() throws IgniteInterruptedException { return initializer.await(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/handlers/cache/GridCacheCommandHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/handlers/cache/GridCacheCommandHandler.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/handlers/cache/GridCacheCommandHandler.java index 3cdf136..864ea34 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/handlers/cache/GridCacheCommandHandler.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/handlers/cache/GridCacheCommandHandler.java @@ -24,7 +24,6 @@ import org.apache.ignite.cluster.*; import org.apache.ignite.lang.*; import org.apache.ignite.resources.*; import org.apache.ignite.transactions.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.processors.cache.*; import org.gridgain.grid.kernal.processors.license.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/handlers/cache/GridCacheQueryCommandHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/handlers/cache/GridCacheQueryCommandHandler.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/handlers/cache/GridCacheQueryCommandHandler.java index 4c8040c..47f5a31 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/handlers/cache/GridCacheQueryCommandHandler.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/handlers/cache/GridCacheQueryCommandHandler.java @@ -23,7 +23,6 @@ import org.apache.ignite.cache.query.*; import org.apache.ignite.cluster.*; import org.apache.ignite.lang.*; import org.apache.ignite.resources.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.processors.cache.*; import org.gridgain.grid.kernal.processors.cache.query.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessor.java index 7255379..b872e54 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessor.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessor.java @@ -27,8 +27,6 @@ import org.apache.ignite.managed.*; import org.apache.ignite.marshaller.*; import org.apache.ignite.thread.*; import org.apache.ignite.transactions.*; -import org.gridgain.grid.*; -import org.gridgain.grid.cache.*; import org.apache.ignite.cache.query.GridCacheContinuousQueryEntry; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.managers.eventstorage.*; @@ -817,14 +815,14 @@ public class GridServiceProcessor extends GridProcessorAdapter { try { cp.execute(svcCtx); } - catch (InterruptedException | GridInterruptedException ignore) { + catch (InterruptedException | IgniteInterruptedException ignore) { if (log.isDebugEnabled()) log.debug("Service thread was interrupted [name=" + svcCtx.name() + ", execId=" + svcCtx.executionId() + ']'); } catch (IgniteException e) { if (e.hasCause(InterruptedException.class) || - e.hasCause(GridInterruptedException.class)) { + e.hasCause(IgniteInterruptedException.class)) { if (log.isDebugEnabled()) log.debug("Service thread was interrupted [name=" + svcCtx.name() + ", execId=" + svcCtx.executionId() + ']'); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/IgniteStreamerImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/IgniteStreamerImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/IgniteStreamerImpl.java index eb77b51..915642c 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/IgniteStreamerImpl.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/IgniteStreamerImpl.java @@ -24,7 +24,6 @@ import org.apache.ignite.lang.*; import org.apache.ignite.streamer.*; import org.apache.ignite.streamer.router.*; import org.apache.ignite.thread.*; -import org.gridgain.grid.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.managers.communication.*; import org.gridgain.grid.kernal.managers.deployment.*; @@ -360,7 +359,7 @@ public class IgniteStreamerImpl implements IgniteStreamerEx, Externalizable { execFut.get(); } catch (IgniteCheckedException e) { - if (!e.hasCause(GridInterruptedException.class)) + if (!e.hasCause(IgniteInterruptedException.class)) U.warn(log, "Failed to wait for batch execution future completion (will ignore) " + "[execFut=" + execFut + ", e=" + e + ']'); } @@ -570,7 +569,7 @@ public class IgniteStreamerImpl implements IgniteStreamerEx, Externalizable { * @param stageName Stage name. * @param evts Events. * @return Future. - * @throws GridInterruptedException If failed. + * @throws org.apache.ignite.IgniteInterruptedException If failed. */ private GridStreamerStageExecutionFuture addEvents0( @Nullable IgniteUuid execId, @@ -580,7 +579,7 @@ public class IgniteStreamerImpl implements IgniteStreamerEx, Externalizable { @Nullable Collection<UUID> execNodeIds, String stageName, Collection<?> evts - ) throws GridInterruptedException { + ) throws IgniteInterruptedException { assert !F.isEmpty(evts); assert !F.isEmpty(stageName); @@ -611,7 +610,7 @@ public class IgniteStreamerImpl implements IgniteStreamerEx, Externalizable { catch (InterruptedException e) { Thread.currentThread().interrupt(); - throw new GridInterruptedException(e); + throw new IgniteInterruptedException(e); } } @@ -896,7 +895,7 @@ public class IgniteStreamerImpl implements IgniteStreamerEx, Externalizable { addEvents0(null, fut.failoverAttemptCount() + 1, 0, null, Collections.singleton(ctx.localNodeId()), fut.stageName(), fut.events()); } - catch (GridInterruptedException e) { + catch (IgniteInterruptedException e) { e.printStackTrace(); assert false : "Failover submit should never attempt to acquire semaphore: " + fut + ']'; @@ -1278,7 +1277,7 @@ public class IgniteStreamerImpl implements IgniteStreamerEx, Externalizable { } /** {@inheritDoc} */ - @Override protected void body() throws InterruptedException, GridInterruptedException { + @Override protected void body() throws InterruptedException, IgniteInterruptedException { try { long start = U.currentTimeMillis(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/gridgain/grid/kernal/processors/task/GridTaskProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/task/GridTaskProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/task/GridTaskProcessor.java index 3614a02..cf9ba9d 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/task/GridTaskProcessor.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/task/GridTaskProcessor.java @@ -25,8 +25,6 @@ import org.apache.ignite.events.*; import org.apache.ignite.lang.*; import org.apache.ignite.marshaller.*; import org.apache.ignite.plugin.security.*; -import org.gridgain.grid.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.managers.communication.*; import org.gridgain.grid.kernal.managers.deployment.*; @@ -428,13 +426,13 @@ public class GridTaskProcessor extends GridProcessorAdapter { dep = ctx.deploy().getDeployment(taskName); if (dep == null) - throw new GridDeploymentException("Unknown task name or failed to auto-deploy " + + throw new IgniteDeploymentException("Unknown task name or failed to auto-deploy " + "task (was task (re|un)deployed?): " + taskName); taskCls = dep.deployedClass(taskName); if (taskCls == null) - throw new GridDeploymentException("Unknown task name or failed to auto-deploy " + + throw new IgniteDeploymentException("Unknown task name or failed to auto-deploy " + "task (was task (re|un)deployed?) [taskName=" + taskName + ", dep=" + dep + ']'); if (!ComputeTask.class.isAssignableFrom(taskCls)) @@ -454,7 +452,7 @@ public class GridTaskProcessor extends GridProcessorAdapter { dep = ctx.deploy().deploy(taskCls, U.detectClassLoader(taskCls)); if (dep == null) - throw new GridDeploymentException("Failed to auto-deploy task (was task (re|un)deployed?): " + + throw new IgniteDeploymentException("Failed to auto-deploy task (was task (re|un)deployed?): " + taskCls); taskName = taskName(dep, taskCls, map); @@ -494,7 +492,7 @@ public class GridTaskProcessor extends GridProcessorAdapter { dep = ctx.deploy().deploy(cls, ldr); if (dep == null) - throw new GridDeploymentException("Failed to auto-deploy task (was task (re|un)deployed?): " + cls); + throw new IgniteDeploymentException("Failed to auto-deploy task (was task (re|un)deployed?): " + cls); taskName = taskName(dep, taskCls, map); } @@ -552,7 +550,7 @@ public class GridTaskProcessor extends GridProcessorAdapter { if (deployEx == null && securityEx == null) { if (dep == null || !dep.acquire()) - handleException(new GridDeploymentException("Task not deployed: " + ses.getTaskName()), fut); + handleException(new IgniteDeploymentException("Task not deployed: " + ses.getTaskName()), fut); else { GridTaskWorker<?, ?> taskWorker = new GridTaskWorker<>( ctx, http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCache.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCache.java index 8dcee49..1bc6749 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCache.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCache.java @@ -21,7 +21,6 @@ import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.cache.*; import org.apache.ignite.cluster.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.processors.cache.*; import org.gridgain.grid.kernal.processors.cache.distributed.dht.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheAffinityConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheAffinityConfiguration.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheAffinityConfiguration.java index 8288171..e1e78cb 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheAffinityConfiguration.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheAffinityConfiguration.java @@ -20,7 +20,6 @@ package org.gridgain.grid.kernal.visor.cache; import org.apache.ignite.cache.*; import org.apache.ignite.cache.affinity.*; import org.apache.ignite.cache.affinity.consistenthash.*; -import org.gridgain.grid.cache.affinity.*; import org.gridgain.grid.util.typedef.internal.*; import org.jetbrains.annotations.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheClearTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheClearTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheClearTask.java index b38986c..ae8ba5a 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheClearTask.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheClearTask.java @@ -20,7 +20,6 @@ package org.gridgain.grid.kernal.visor.cache; import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.processors.task.*; import org.gridgain.grid.kernal.visor.*; import org.gridgain.grid.util.typedef.internal.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheCompactTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheCompactTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheCompactTask.java index 11a5a15..a9a9ad1 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheCompactTask.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheCompactTask.java @@ -20,7 +20,6 @@ package org.gridgain.grid.kernal.visor.cache; import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.processors.task.*; import org.gridgain.grid.kernal.visor.*; import org.gridgain.grid.util.typedef.internal.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheConfiguration.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheConfiguration.java index 98d4721..65243a4 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheConfiguration.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheConfiguration.java @@ -19,7 +19,6 @@ package org.gridgain.grid.kernal.visor.cache; import org.apache.ignite.cache.*; import org.apache.ignite.cache.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.util.typedef.internal.*; import org.jetbrains.annotations.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheLoadTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheLoadTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheLoadTask.java index e4b03e0..7b51300 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheLoadTask.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheLoadTask.java @@ -19,7 +19,6 @@ package org.gridgain.grid.kernal.visor.cache; import org.apache.ignite.*; import org.apache.ignite.cache.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.processors.task.*; import org.gridgain.grid.kernal.visor.*; import org.gridgain.grid.util.lang.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheMetadataTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheMetadataTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheMetadataTask.java index 0a7eb8e..e7815a2 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheMetadataTask.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheMetadataTask.java @@ -19,7 +19,6 @@ package org.gridgain.grid.kernal.visor.cache; import org.apache.ignite.*; import org.apache.ignite.cache.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.processors.cache.query.*; import org.gridgain.grid.kernal.processors.task.*; import org.gridgain.grid.kernal.visor.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheMetrics.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheMetrics.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheMetrics.java index 5e0e191..98420a7 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheMetrics.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheMetrics.java @@ -18,7 +18,6 @@ package org.gridgain.grid.kernal.visor.cache; import org.apache.ignite.cache.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.util.typedef.internal.*; import java.io.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheMetricsCollectorTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheMetricsCollectorTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheMetricsCollectorTask.java index 5d87229..3a2fdb8 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheMetricsCollectorTask.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheMetricsCollectorTask.java @@ -21,7 +21,6 @@ import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.compute.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.processors.task.*; import org.gridgain.grid.kernal.visor.*; import org.gridgain.grid.util.typedef.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCachePreloadConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCachePreloadConfiguration.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCachePreloadConfiguration.java index 8a7c0b9..8118ec5 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCachePreloadConfiguration.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCachePreloadConfiguration.java @@ -18,7 +18,6 @@ package org.gridgain.grid.kernal.visor.cache; import org.apache.ignite.cache.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.util.typedef.internal.*; import java.io.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCachePreloadTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCachePreloadTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCachePreloadTask.java index a630c59..00bd5df 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCachePreloadTask.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCachePreloadTask.java @@ -20,7 +20,6 @@ package org.gridgain.grid.kernal.visor.cache; import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.processors.task.*; import org.gridgain.grid.kernal.visor.*; import org.gridgain.grid.util.typedef.internal.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheResetMetricsTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheResetMetricsTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheResetMetricsTask.java index 36906b7..3550940 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheResetMetricsTask.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheResetMetricsTask.java @@ -19,7 +19,6 @@ package org.gridgain.grid.kernal.visor.cache; import org.apache.ignite.*; import org.apache.ignite.cache.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.processors.task.*; import org.gridgain.grid.kernal.visor.*; import org.gridgain.grid.util.typedef.internal.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheSwapBackupsTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheSwapBackupsTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheSwapBackupsTask.java index 67c96e0..d8f3861 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheSwapBackupsTask.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheSwapBackupsTask.java @@ -20,7 +20,6 @@ package org.gridgain.grid.kernal.visor.cache; import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.processors.task.*; import org.gridgain.grid.kernal.visor.*; import org.gridgain.grid.util.typedef.internal.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodeDataCollectorJob.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodeDataCollectorJob.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodeDataCollectorJob.java index 4c46e4d..255f2be 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodeDataCollectorJob.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodeDataCollectorJob.java @@ -22,7 +22,6 @@ import org.apache.ignite.cache.*; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; import org.apache.ignite.streamer.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.processors.ggfs.*; import org.gridgain.grid.kernal.visor.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/gridgain/grid/kernal/visor/query/VisorQueryTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/query/VisorQueryTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/query/VisorQueryTask.java index 8800a3d..9bf8961 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/query/VisorQueryTask.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/query/VisorQueryTask.java @@ -22,7 +22,6 @@ import org.apache.ignite.cache.*; import org.apache.ignite.cache.query.*; import org.apache.ignite.cluster.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.processors.cache.query.*; import org.gridgain.grid.kernal.processors.query.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/gridgain/grid/package.html ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/package.html b/modules/core/src/main/java/org/gridgain/grid/package.html deleted file mode 100644 index 863a686..0000000 --- a/modules/core/src/main/java/org/gridgain/grid/package.html +++ /dev/null @@ -1,23 +0,0 @@ -<!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> -<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd";> -<html> -<body> - <!-- Package description. --> - Contains entry-point <b>GridGain & HPC APIs.</b> -</body> -</html> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/gridgain/grid/util/GridAtomicInitializer.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/util/GridAtomicInitializer.java b/modules/core/src/main/java/org/gridgain/grid/util/GridAtomicInitializer.java index edad5f0..3860781 100644 --- a/modules/core/src/main/java/org/gridgain/grid/util/GridAtomicInitializer.java +++ b/modules/core/src/main/java/org/gridgain/grid/util/GridAtomicInitializer.java @@ -18,7 +18,6 @@ package org.gridgain.grid.util; import org.apache.ignite.*; -import org.gridgain.grid.*; import org.gridgain.grid.util.typedef.internal.*; import java.util.concurrent.*; @@ -93,9 +92,9 @@ public class GridAtomicInitializer<T> { * Await for completion. * * @return {@code true} If initialization was completed successfully. - * @throws GridInterruptedException If thread was interrupted. + * @throws org.apache.ignite.IgniteInterruptedException If thread was interrupted. */ - public boolean await() throws GridInterruptedException { + public boolean await() throws IgniteInterruptedException { if (!finished) { synchronized (mux) { while (!finished) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/gridgain/grid/util/GridUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/util/GridUtils.java b/modules/core/src/main/java/org/gridgain/grid/util/GridUtils.java index fcd555a..228d8da 100644 --- a/modules/core/src/main/java/org/gridgain/grid/util/GridUtils.java +++ b/modules/core/src/main/java/org/gridgain/grid/util/GridUtils.java @@ -29,8 +29,6 @@ import org.apache.ignite.mbean.*; import org.apache.ignite.portables.*; import org.apache.ignite.product.*; import org.apache.ignite.spi.*; -import org.gridgain.grid.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.managers.deployment.*; import org.gridgain.grid.kernal.processors.cache.*; @@ -1752,7 +1750,7 @@ public abstract class GridUtils { /** * Copies metadata from given object into the passed in metadata aware - * instance - if object is not {@code null} and implements {@link GridMetadataAware}. + * instance - if object is not {@code null} and implements {@link org.apache.ignite.IgniteMetadataAware}. * Otherwise - returns passed metadata aware instance unchanged. * * @param t Passed in metadata aware instance. @@ -1760,11 +1758,11 @@ public abstract class GridUtils { * @param <T> Type of the metadata aware instance. * @return Metadata aware instance with metadata potentially copied. */ - public static <T extends GridMetadataAware> T withMeta(T t, @Nullable Object obj) { + public static <T extends IgniteMetadataAware> T withMeta(T t, @Nullable Object obj) { assert t != null; - if (obj instanceof GridMetadataAware) - t.copyMeta((GridMetadataAware)obj); + if (obj instanceof IgniteMetadataAware) + t.copyMeta((IgniteMetadataAware)obj); return t; } @@ -5674,17 +5672,17 @@ public abstract class GridUtils { * Converts {@link InterruptedException} to {@link IgniteCheckedException}. * * @param mux Mux to wait on. - * @throws GridInterruptedException If interrupted. + * @throws org.apache.ignite.IgniteInterruptedException If interrupted. */ @SuppressWarnings({"WaitNotInLoop", "WaitWhileNotSynced"}) - public static void wait(Object mux) throws GridInterruptedException { + public static void wait(Object mux) throws IgniteInterruptedException { try { mux.wait(); } catch (InterruptedException e) { Thread.currentThread().interrupt(); - throw new GridInterruptedException(e); + throw new IgniteInterruptedException(e); } } @@ -6894,16 +6892,16 @@ public abstract class GridUtils { * Awaits for condition. * * @param cond Condition to await for. - * @throws GridInterruptedException Wrapped {@link InterruptedException} + * @throws org.apache.ignite.IgniteInterruptedException Wrapped {@link InterruptedException} */ - public static void await(Condition cond) throws GridInterruptedException { + public static void await(Condition cond) throws IgniteInterruptedException { try { cond.await(); } catch (InterruptedException e) { Thread.currentThread().interrupt(); - throw new GridInterruptedException(e); + throw new IgniteInterruptedException(e); } } @@ -6914,16 +6912,16 @@ public abstract class GridUtils { * @param time The maximum time to wait, * @param unit The unit of the {@code time} argument. * @return {@code false} if the waiting time detectably elapsed before return from the method, else {@code true} - * @throws GridInterruptedException Wrapped {@link InterruptedException} + * @throws org.apache.ignite.IgniteInterruptedException Wrapped {@link InterruptedException} */ - public static boolean await(Condition cond, long time, TimeUnit unit) throws GridInterruptedException { + public static boolean await(Condition cond, long time, TimeUnit unit) throws IgniteInterruptedException { try { return cond.await(time, unit); } catch (InterruptedException e) { Thread.currentThread().interrupt(); - throw new GridInterruptedException(e); + throw new IgniteInterruptedException(e); } } @@ -6931,9 +6929,9 @@ public abstract class GridUtils { * Awaits for the latch. * * @param latch Latch to wait for. - * @throws GridInterruptedException Wrapped {@link InterruptedException}. + * @throws org.apache.ignite.IgniteInterruptedException Wrapped {@link InterruptedException}. */ - public static void await(CountDownLatch latch) throws GridInterruptedException { + public static void await(CountDownLatch latch) throws IgniteInterruptedException { try { if (latch.getCount() > 0) latch.await(); @@ -6941,7 +6939,7 @@ public abstract class GridUtils { catch (InterruptedException e) { Thread.currentThread().interrupt(); - throw new GridInterruptedException(e); + throw new IgniteInterruptedException(e); } } @@ -6953,17 +6951,17 @@ public abstract class GridUtils { * @param unit Time unit for timeout. * @return {@code True} if the count reached zero and {@code false} * if the waiting time elapsed before the count reached zero. - * @throws GridInterruptedException Wrapped {@link InterruptedException}. + * @throws org.apache.ignite.IgniteInterruptedException Wrapped {@link InterruptedException}. */ public static boolean await(CountDownLatch latch, long timeout, TimeUnit unit) - throws GridInterruptedException { + throws IgniteInterruptedException { try { return latch.await(timeout, unit); } catch (InterruptedException e) { Thread.currentThread().interrupt(); - throw new GridInterruptedException(e); + throw new IgniteInterruptedException(e); } } @@ -7027,16 +7025,16 @@ public abstract class GridUtils { * Sleeps for given number of milliseconds. * * @param ms Time to sleep. - * @throws GridInterruptedException Wrapped {@link InterruptedException}. + * @throws org.apache.ignite.IgniteInterruptedException Wrapped {@link InterruptedException}. */ - public static void sleep(long ms) throws GridInterruptedException { + public static void sleep(long ms) throws IgniteInterruptedException { try { Thread.sleep(ms); } catch (InterruptedException e) { Thread.currentThread().interrupt(); - throw new GridInterruptedException(e); + throw new IgniteInterruptedException(e); } } @@ -7044,9 +7042,9 @@ public abstract class GridUtils { * Joins worker. * * @param w Worker. - * @throws GridInterruptedException Wrapped {@link InterruptedException}. + * @throws org.apache.ignite.IgniteInterruptedException Wrapped {@link InterruptedException}. */ - public static void join(GridWorker w) throws GridInterruptedException { + public static void join(GridWorker w) throws IgniteInterruptedException { try { if (w != null) w.join(); @@ -7054,7 +7052,7 @@ public abstract class GridUtils { catch (InterruptedException e) { Thread.currentThread().interrupt(); - throw new GridInterruptedException(e); + throw new IgniteInterruptedException(e); } } @@ -7075,7 +7073,7 @@ public abstract class GridUtils { catch (InterruptedException e) { Thread.currentThread().interrupt(); - throw new GridInterruptedException(e); + throw new IgniteInterruptedException(e); } catch (CancellationException e) { throw new IgniteCheckedException(e); @@ -7086,16 +7084,16 @@ public abstract class GridUtils { * Joins thread. * * @param t Thread. - * @throws GridInterruptedException Wrapped {@link InterruptedException}. + * @throws org.apache.ignite.IgniteInterruptedException Wrapped {@link InterruptedException}. */ - public static void join(Thread t) throws GridInterruptedException { + public static void join(Thread t) throws IgniteInterruptedException { try { t.join(); } catch (InterruptedException e) { Thread.currentThread().interrupt(); - throw new GridInterruptedException(e); + throw new IgniteInterruptedException(e); } } @@ -7103,16 +7101,16 @@ public abstract class GridUtils { * Acquires a permit from provided semaphore. * * @param sem Semaphore. - * @throws GridInterruptedException Wrapped {@link InterruptedException}. + * @throws org.apache.ignite.IgniteInterruptedException Wrapped {@link InterruptedException}. */ - public static void acquire(Semaphore sem) throws GridInterruptedException { + public static void acquire(Semaphore sem) throws IgniteInterruptedException { try { sem.acquire(); } catch (InterruptedException e) { Thread.currentThread().interrupt(); - throw new GridInterruptedException(e); + throw new IgniteInterruptedException(e); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/gridgain/grid/util/future/GridEmbeddedFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/util/future/GridEmbeddedFuture.java b/modules/core/src/main/java/org/gridgain/grid/util/future/GridEmbeddedFuture.java index a32b139..06bb655 100644 --- a/modules/core/src/main/java/org/gridgain/grid/util/future/GridEmbeddedFuture.java +++ b/modules/core/src/main/java/org/gridgain/grid/util/future/GridEmbeddedFuture.java @@ -19,7 +19,6 @@ package org.gridgain.grid.util.future; import org.apache.ignite.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.util.lang.*; import org.gridgain.grid.util.typedef.internal.*; @@ -268,7 +267,7 @@ public class GridEmbeddedFuture<A, B> extends GridFutureAdapter<A> { try { applyx(f); } - catch (GridIllegalStateException ignore) { + catch (IgniteIllegalStateException ignore) { U.warn(log, "Will not execute future listener (grid is stopping): " + ctx.gridName()); } catch (Exception e) { @@ -300,7 +299,7 @@ public class GridEmbeddedFuture<A, B> extends GridFutureAdapter<A> { try { applyx(f); } - catch (GridIllegalStateException ignore) { + catch (IgniteIllegalStateException ignore) { U.warn(log, "Will not execute future listener (grid is stopping): " + ctx.gridName()); } catch (Exception e) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/gridgain/grid/util/future/GridFutureAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/util/future/GridFutureAdapter.java b/modules/core/src/main/java/org/gridgain/grid/util/future/GridFutureAdapter.java index 40f992b..30eeae5 100644 --- a/modules/core/src/main/java/org/gridgain/grid/util/future/GridFutureAdapter.java +++ b/modules/core/src/main/java/org/gridgain/grid/util/future/GridFutureAdapter.java @@ -19,7 +19,6 @@ package org.gridgain.grid.util.future; import org.apache.ignite.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.util.tostring.*; import org.gridgain.grid.util.typedef.internal.*; @@ -212,7 +211,7 @@ public class GridFutureAdapter<R> extends AbstractQueuedSynchronizer implements catch (InterruptedException e) { Thread.currentThread().interrupt(); - throw new GridInterruptedException(e); + throw new IgniteInterruptedException(e); } } @@ -235,7 +234,7 @@ public class GridFutureAdapter<R> extends AbstractQueuedSynchronizer implements catch (InterruptedException e) { Thread.currentThread().interrupt(); - throw new GridInterruptedException("Got interrupted while waiting for future to complete.", e); + throw new IgniteInterruptedException("Got interrupted while waiting for future to complete.", e); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/gridgain/grid/util/future/GridFutureAdapterEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/util/future/GridFutureAdapterEx.java b/modules/core/src/main/java/org/gridgain/grid/util/future/GridFutureAdapterEx.java index 066af91..90f2fbc 100644 --- a/modules/core/src/main/java/org/gridgain/grid/util/future/GridFutureAdapterEx.java +++ b/modules/core/src/main/java/org/gridgain/grid/util/future/GridFutureAdapterEx.java @@ -19,7 +19,6 @@ package org.gridgain.grid.util.future; import org.apache.ignite.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.*; import org.gridgain.grid.util.lang.*; import org.gridgain.grid.util.tostring.*; import org.gridgain.grid.util.typedef.internal.*; @@ -161,7 +160,7 @@ public class GridFutureAdapterEx<R> extends AbstractQueuedSynchronizer implement catch (InterruptedException e) { Thread.currentThread().interrupt(); - throw new GridInterruptedException(e); + throw new IgniteInterruptedException(e); } } @@ -184,7 +183,7 @@ public class GridFutureAdapterEx<R> extends AbstractQueuedSynchronizer implement catch (InterruptedException e) { Thread.currentThread().interrupt(); - throw new GridInterruptedException("Got interrupted while waiting for future to complete.", e); + throw new IgniteInterruptedException("Got interrupted while waiting for future to complete.", e); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemoryServerEndpoint.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemoryServerEndpoint.java b/modules/core/src/main/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemoryServerEndpoint.java index 735b75c..2b66f43 100644 --- a/modules/core/src/main/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemoryServerEndpoint.java +++ b/modules/core/src/main/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemoryServerEndpoint.java @@ -20,7 +20,6 @@ package org.gridgain.grid.util.ipc.shmem; import org.apache.ignite.*; import org.apache.ignite.resources.*; import org.apache.ignite.thread.*; -import org.gridgain.grid.*; import org.gridgain.grid.kernal.processors.resource.*; import org.gridgain.grid.util.*; import org.gridgain.grid.util.typedef.*; @@ -321,7 +320,7 @@ public class GridIpcSharedMemoryServerEndpoint implements GridIpcServerEndpoint } } // while - throw new GridInterruptedException("Socket accept was interrupted."); + throw new IgniteInterruptedException("Socket accept was interrupted."); } /** @@ -432,7 +431,7 @@ public class GridIpcSharedMemoryServerEndpoint implements GridIpcServerEndpoint try { U.join(gcWorker); } - catch (GridInterruptedException e) { + catch (IgniteInterruptedException e) { U.warn(log, "Interrupted when stopping GC worker.", e); } finally { @@ -503,7 +502,7 @@ public class GridIpcSharedMemoryServerEndpoint implements GridIpcServerEndpoint } /** {@inheritDoc} */ - @Override protected void body() throws InterruptedException, GridInterruptedException { + @Override protected void body() throws InterruptedException, IgniteInterruptedException { if (log.isDebugEnabled()) log.debug("GC worker started."); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/gridgain/grid/util/lang/GridComputeJobWrapper.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/util/lang/GridComputeJobWrapper.java b/modules/core/src/main/java/org/gridgain/grid/util/lang/GridComputeJobWrapper.java index bf7f4a9..57085bf 100644 --- a/modules/core/src/main/java/org/gridgain/grid/util/lang/GridComputeJobWrapper.java +++ b/modules/core/src/main/java/org/gridgain/grid/util/lang/GridComputeJobWrapper.java @@ -19,7 +19,6 @@ package org.gridgain.grid.util.lang; import org.apache.ignite.*; import org.apache.ignite.compute.*; -import org.gridgain.grid.*; import org.gridgain.grid.util.typedef.internal.*; import org.jetbrains.annotations.*; @@ -41,21 +40,21 @@ public class GridComputeJobWrapper extends GridMetadataAwareAdapter implements C private transient volatile GridPeerDeployAware p; /** - * Creates a wrapper with given grid {@code job}. If {@code job} implements {@link GridMetadataAware} + * Creates a wrapper with given grid {@code job}. If {@code job} implements {@link org.apache.ignite.IgniteMetadataAware} * interface and {@code copyMeta} is {@code true} - the metadata information will be * copied from given {@code job} to this wrapper. * * @param job Job to wrap. * @param cpMeta Whether or not to copy metadata in case when {@code job} - * implements {@link GridMetadataAware} interface. + * implements {@link org.apache.ignite.IgniteMetadataAware} interface. */ public GridComputeJobWrapper(ComputeJob job, boolean cpMeta) { A.notNull(job, "job"); this.job = job; - if (cpMeta && job instanceof GridMetadataAware) - copyMeta((GridMetadataAware)job); + if (cpMeta && job instanceof IgniteMetadataAware) + copyMeta((IgniteMetadataAware)job); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/gridgain/grid/util/lang/GridFunc.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/util/lang/GridFunc.java b/modules/core/src/main/java/org/gridgain/grid/util/lang/GridFunc.java index fb1a099..1f5a48a 100644 --- a/modules/core/src/main/java/org/gridgain/grid/util/lang/GridFunc.java +++ b/modules/core/src/main/java/org/gridgain/grid/util/lang/GridFunc.java @@ -23,8 +23,6 @@ import org.apache.ignite.cluster.*; import org.apache.ignite.compute.*; import org.apache.ignite.events.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.util.*; import org.gridgain.grid.util.future.*; import org.gridgain.grid.util.typedef.*; @@ -1635,12 +1633,12 @@ public class GridFunc { * @param <T> Type of the metadata. * @return Collections of metadata value for a given collection of metadata aware objects. */ - public static <T> Collection<T> meta(Collection<? extends GridMetadataAware> objs, String name) { + public static <T> Collection<T> meta(Collection<? extends IgniteMetadataAware> objs, String name) { A.notNull(objs, "objs", name, "attach"); Collection<T> c = new ArrayList<>(objs.size()); - for (GridMetadataAware n : objs) { + for (IgniteMetadataAware n : objs) { c.add(n.<T>meta(name)); } @@ -2804,7 +2802,7 @@ public class GridFunc { catch (IgniteFutureCancelledException ignore) { throw new CancellationException("The computation was cancelled."); } - catch (GridInterruptedException ignore) { + catch (IgniteInterruptedException ignore) { throw new InterruptedException("The computation was interrupted."); } catch (IgniteCheckedException e) { @@ -2820,7 +2818,7 @@ public class GridFunc { catch (IgniteFutureCancelledException ignore) { throw new CancellationException("The computation was cancelled."); } - catch (GridInterruptedException ignore) { + catch (IgniteInterruptedException ignore) { throw new InterruptedException("The computation was interrupted."); } catch (IgniteFutureTimeoutException e) { @@ -5681,34 +5679,34 @@ public class GridFunc { } /** - * Creates predicate that accepts subclass of {@link GridMetadataAware} + * Creates predicate that accepts subclass of {@link org.apache.ignite.IgniteMetadataAware} * interface and evaluates to {@code true} if it contains all provided metadata. * * @param meta Collection of metadata. * @param <T> Type of returned predicate. - * @return Predicate that accepts subclass of {@link GridMetadataAware} interface and + * @return Predicate that accepts subclass of {@link org.apache.ignite.IgniteMetadataAware} interface and * evaluates to {@code true} if it contains all provided metadata. * @see #meta(String...) * @see #meta(Iterable) * @see #meta(String, Object) */ - public static <T extends GridMetadataAware> IgnitePredicate<T> metaEntry(@Nullable Map.Entry<String, ?>... meta) { + public static <T extends IgniteMetadataAware> IgnitePredicate<T> metaEntry(@Nullable Map.Entry<String, ?>... meta) { return metaEntry(isEmpty(meta) ? Collections.<Map.Entry<String, ?>>emptyList() : asList(meta)); } /** - * Creates predicate that accepts subclass of {@link GridMetadataAware} interface + * Creates predicate that accepts subclass of {@link org.apache.ignite.IgniteMetadataAware} interface * and evaluates to {@code true} if it contains all provided metadata. * * @param meta Collection of metadata. * @param <T> Type of returned predicate. - * @return Predicate that accepts subclass of {@link GridMetadataAware} interface and + * @return Predicate that accepts subclass of {@link org.apache.ignite.IgniteMetadataAware} interface and * evaluates to {@code true} if it contains all provided metadata. * @see #meta(String...) * @see #meta(Iterable) * @see #meta(String, Object) */ - public static <T extends GridMetadataAware> IgnitePredicate<T> metaEntry( + public static <T extends IgniteMetadataAware> IgnitePredicate<T> metaEntry( @Nullable final Collection<? extends Map.Entry<String, ?>> meta) { return isEmpty(meta) ? GridFunc.<T>alwaysFalse() : new P1<T>() { @Override public boolean apply(T e) { @@ -5725,12 +5723,12 @@ public class GridFunc { } /** - * Creates predicate that accepts subclass of {@link GridMetadataAware} interface + * Creates predicate that accepts subclass of {@link org.apache.ignite.IgniteMetadataAware} interface * and evaluates to {@code true} if it contains all provided metadata. * * @param meta Collection of metadata as a map. * @param <T> Type of returned predicate. - * @return Predicate that accepts subclass of {@link GridMetadataAware} + * @return Predicate that accepts subclass of {@link org.apache.ignite.IgniteMetadataAware} * interface and evaluates to {@code true} if it contains all provided metadata. * @see #meta(String...) * @see #meta(Iterable) @@ -5738,7 +5736,7 @@ public class GridFunc { * @see #metaEntry(Entry[]) * @see #metaEntry(Collection) */ - public static <T extends GridMetadataAware> IgnitePredicate<T> meta(@Nullable Map<String, ?> meta) { + public static <T extends IgniteMetadataAware> IgnitePredicate<T> meta(@Nullable Map<String, ?> meta) { if (isEmpty(meta)) return metaEntry(Collections.<Entry<String, ?>>emptySet()); else { @@ -5749,47 +5747,47 @@ public class GridFunc { } /** - * Creates predicate that accepts subclass of {@link GridMetadataAware} interface + * Creates predicate that accepts subclass of {@link org.apache.ignite.IgniteMetadataAware} interface * and evaluates to {@code true} if it contains given metadata. * * @param name Metadata name. * @param val Metadata value. * @param <T> Type of returned predicate. - * @return Predicate that accepts subclass of {@link GridMetadataAware} interface + * @return Predicate that accepts subclass of {@link org.apache.ignite.IgniteMetadataAware} interface * and evaluates to {@code true} if it contains given metadata. * @see #metaEntry(Entry[]) * @see #meta(String...) * @see #meta(Iterable) */ - public static <T extends GridMetadataAware> IgnitePredicate<T> meta(String name, Object val) { + public static <T extends IgniteMetadataAware> IgnitePredicate<T> meta(String name, Object val) { A.notNull(name, "name", val, "val"); return metaEntry(F.t(name, val)); } /** - * Creates predicate that accepts subclass of {@link GridMetadataAware} interface + * Creates predicate that accepts subclass of {@link org.apache.ignite.IgniteMetadataAware} interface * and evaluates to {@code true} if it contains given metadata names (values are ignored). * * @param names Metadata names to evaluate by. * @param <T> Type of returned predicate. - * @return Predicate that accepts subclass of {@link GridMetadataAware} interface and + * @return Predicate that accepts subclass of {@link org.apache.ignite.IgniteMetadataAware} interface and * evaluates to {@code true} if it contains given metadata names (values are ignored). */ - public static <T extends GridMetadataAware> IgnitePredicate<T> meta(@Nullable String... names) { + public static <T extends IgniteMetadataAware> IgnitePredicate<T> meta(@Nullable String... names) { return meta(isEmpty(names) ? Collections.<String>emptyList() : asList(names)); } /** - * Creates predicate that accepts subclass of {@link GridMetadataAware} interface and + * Creates predicate that accepts subclass of {@link org.apache.ignite.IgniteMetadataAware} interface and * evaluates to {@code true} if it contains given metadata names (values are ignored). * * @param names Metadata names to evaluate by. * @param <T> Type of returned predicate. - * @return Predicate that accepts subclass of {@link GridMetadataAware} interface and + * @return Predicate that accepts subclass of {@link org.apache.ignite.IgniteMetadataAware} interface and * evaluates to {@code true} if it contains given metadata names (values are ignored). */ - public static <T extends GridMetadataAware> IgnitePredicate<T> meta(@Nullable final Iterable<String> names) { + public static <T extends IgniteMetadataAware> IgnitePredicate<T> meta(@Nullable final Iterable<String> names) { return isEmpty(names) ? GridFunc.<T>alwaysFalse() : new P1<T>() { @Override public boolean apply(T e) { assert names != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/gridgain/grid/util/lang/GridMetadataAwareAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/util/lang/GridMetadataAwareAdapter.java b/modules/core/src/main/java/org/gridgain/grid/util/lang/GridMetadataAwareAdapter.java index 6c9426d..84a731c 100644 --- a/modules/core/src/main/java/org/gridgain/grid/util/lang/GridMetadataAwareAdapter.java +++ b/modules/core/src/main/java/org/gridgain/grid/util/lang/GridMetadataAwareAdapter.java @@ -17,6 +17,7 @@ package org.gridgain.grid.util.lang; +import org.apache.ignite.*; import org.gridgain.grid.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; @@ -28,12 +29,12 @@ import java.util.*; import java.util.concurrent.*; /** - * Convenient adapter for {@link GridMetadataAware}. + * Convenient adapter for {@link IgniteMetadataAware}. * <h2 class="header">Thread Safety</h2> * This class provides necessary synchronization for thread-safe access. */ @SuppressWarnings( {"SynchronizeOnNonFinalField"}) -public class GridMetadataAwareAdapter implements GridMetadataAware { +public class GridMetadataAwareAdapter implements IgniteMetadataAware { /** */ private static final long serialVersionUID = 0L; @@ -81,7 +82,7 @@ public class GridMetadataAwareAdapter implements GridMetadataAware { } /** {@inheritDoc} */ - @Override public void copyMeta(GridMetadataAware from) { + @Override public void copyMeta(IgniteMetadataAware from) { A.notNull(from, "from"); synchronized (mux) {
