Ignite-107 review
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4ea72517 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4ea72517 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4ea72517 Branch: refs/heads/ignite-99-2 Commit: 4ea725173c6b7dec3a61ebc43c7515b224a2100e Parents: 9233570 Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Mon Jan 26 18:54:08 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Mon Jan 26 18:54:08 2015 +0300 ---------------------------------------------------------------------- .../closure/GridClosureProcessor.java | 108 ++++++++++++------- 1 file changed, 71 insertions(+), 37 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ea72517/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java index 6246bcb..a6c26e9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java @@ -1602,11 +1602,6 @@ public class GridClosureProcessor extends GridProcessorAdapter { /** */ private static final long serialVersionUID = 0L; - /** {@inheritDoc} */ - @Override public void cancel() { - // No-op. - } - /** */ protected IgniteClosure<T, R> job; @@ -1622,7 +1617,8 @@ public class GridClosureProcessor extends GridProcessorAdapter { } /** - * + * @param job Job. + * @param arg Argument. */ public C1(IgniteClosure<T, R> job, T arg) { this.job = job; @@ -1635,6 +1631,11 @@ public class GridClosureProcessor extends GridProcessorAdapter { } /** {@inheritDoc} */ + @Override public void cancel() { + // No-op. + } + + /** {@inheritDoc} */ @Override public void writeExternal(ObjectOutput out) throws IOException { out.writeObject(job); out.writeObject(arg); @@ -1655,7 +1656,7 @@ public class GridClosureProcessor extends GridProcessorAdapter { /** * */ - private static class C1MLA<T, R> extends C1<T, R> implements ComputeJobMasterLeaveAware{ + private static class C1MLA<T, R> extends C1<T, R> implements ComputeJobMasterLeaveAware { /** * */ @@ -1664,7 +1665,8 @@ public class GridClosureProcessor extends GridProcessorAdapter { } /** - * + * @param job Job. + * @param arg Argument. */ public C1MLA(IgniteClosure<T, R> job, T arg) { super(job, arg); @@ -1674,6 +1676,11 @@ public class GridClosureProcessor extends GridProcessorAdapter { @Override public void onMasterNodeLeft(ComputeTaskSession ses) throws IgniteCheckedException { ((ComputeJobMasterLeaveAware)job).onMasterNodeLeft(ses); } + + /** {@inheritDoc} */ + @Override public String toString() { + return S.toString(C1MLA.class, this, super.toString()); + } } /** @@ -1683,11 +1690,6 @@ public class GridClosureProcessor extends GridProcessorAdapter { /** */ private static final long serialVersionUID = 0L; - /** {@inheritDoc} */ - @Override public void cancel() { - // No-op. - } - /** */ protected Callable<R> c; @@ -1699,7 +1701,7 @@ public class GridClosureProcessor extends GridProcessorAdapter { } /** - * + * @param c Callable. */ public C2(Callable<R> c) { this.c = c; @@ -1716,6 +1718,11 @@ public class GridClosureProcessor extends GridProcessorAdapter { } /** {@inheritDoc} */ + @Override public void cancel() { + // No-op. + } + + /** {@inheritDoc} */ @Override public void writeExternal(ObjectOutput out) throws IOException { out.writeObject(c); } @@ -1743,7 +1750,7 @@ public class GridClosureProcessor extends GridProcessorAdapter { } /** - * + * @param c Callable. */ public C2MLA(Callable<R> c) { super(c); @@ -1753,19 +1760,20 @@ public class GridClosureProcessor extends GridProcessorAdapter { @Override public void onMasterNodeLeft(ComputeTaskSession ses) throws IgniteCheckedException { ((ComputeJobMasterLeaveAware)c).onMasterNodeLeft(ses); } + + /** {@inheritDoc} */ + @Override public String toString() { + return S.toString(C2MLA.class, this, super.toString()); + } } /** + * */ private static class C3<R> implements ComputeJob, Externalizable { /** */ private static final long serialVersionUID = 0L; - /** {@inheritDoc} */ - @Override public void cancel() { - // No-op. - } - /** */ @CacheName private String cn; @@ -1786,7 +1794,9 @@ public class GridClosureProcessor extends GridProcessorAdapter { } /** - * + * @param c Callable. + * @param cacheName Cache name. + * @param affKey Affinity key. */ public C3(Callable<R> c, @Nullable String cacheName, Object affKey) { this.cn = cacheName; @@ -1805,6 +1815,11 @@ public class GridClosureProcessor extends GridProcessorAdapter { } /** {@inheritDoc} */ + @Override public void cancel() { + // No-op. + } + + /** {@inheritDoc} */ @Override public void writeExternal(ObjectOutput out) throws IOException { out.writeObject(cn); out.writeObject(ak); @@ -1836,7 +1851,9 @@ public class GridClosureProcessor extends GridProcessorAdapter { } /** - * + * @param c Callable. + * @param cacheName Cache name. + * @param affKey Affinity key. */ public C3MLA(Callable<R> c, @Nullable String cacheName, Object affKey) { super(c, cacheName, affKey); @@ -1846,6 +1863,11 @@ public class GridClosureProcessor extends GridProcessorAdapter { @Override public void onMasterNodeLeft(ComputeTaskSession ses) throws IgniteCheckedException { ((ComputeJobMasterLeaveAware)c).onMasterNodeLeft(ses); } + + /** {@inheritDoc} */ + @Override public String toString() { + return S.toString(C3MLA.class, this, super.toString()); + } } /** @@ -1854,11 +1876,6 @@ public class GridClosureProcessor extends GridProcessorAdapter { /** */ private static final long serialVersionUID = 0L; - /** {@inheritDoc} */ - @Override public void cancel() { - // No-op. - } - /** */ protected Runnable r; @@ -1870,7 +1887,7 @@ public class GridClosureProcessor extends GridProcessorAdapter { } /** - * + * @param r Runnable. */ public C4(Runnable r) { this.r = r; @@ -1884,6 +1901,11 @@ public class GridClosureProcessor extends GridProcessorAdapter { } /** {@inheritDoc} */ + @Override public void cancel() { + // No-op. + } + + /** {@inheritDoc} */ @Override public void writeExternal(ObjectOutput out) throws IOException { out.writeObject(r); } @@ -1911,7 +1933,7 @@ public class GridClosureProcessor extends GridProcessorAdapter { } /** - * + * @param r Runnable. */ public C4MLA(Runnable r) { super(r); @@ -1922,6 +1944,10 @@ public class GridClosureProcessor extends GridProcessorAdapter { ((ComputeJobMasterLeaveAware)r).onMasterNodeLeft(ses); } + /** {@inheritDoc} */ + @Override public String toString() { + return S.toString(C4MLA.class, this, super.toString()); + } } /** @@ -1930,11 +1956,6 @@ public class GridClosureProcessor extends GridProcessorAdapter { /** */ private static final long serialVersionUID = 0L; - /** {@inheritDoc} */ - @Override public void cancel() { - // No-op. - } - /** */ @CacheName private String cn; @@ -1954,7 +1975,9 @@ public class GridClosureProcessor extends GridProcessorAdapter { } /** - * + * @param r Runnable. + * @param cacheName Cache name. + * @param affKey Affinity key. */ public C5(Runnable r, @Nullable String cacheName, Object affKey) { this.cn = cacheName; @@ -1970,6 +1993,11 @@ public class GridClosureProcessor extends GridProcessorAdapter { } /** {@inheritDoc} */ + @Override public void cancel() { + // No-op. + } + + /** {@inheritDoc} */ @Override public void writeExternal(ObjectOutput out) throws IOException { out.writeObject(cn); out.writeObject(ak); @@ -1985,7 +2013,7 @@ public class GridClosureProcessor extends GridProcessorAdapter { /** {@inheritDoc} */ @Override public String toString() { - return S.toString(C5.class, this); + return S.toString(C5.class, this, super.toString()); } } @@ -2001,7 +2029,9 @@ public class GridClosureProcessor extends GridProcessorAdapter { } /** - * + * @param r Runnable. + * @param cacheName Cache name. + * @param affKey Affinity key. */ public C5MLA(Runnable r, @Nullable String cacheName, Object affKey) { super(r, cacheName, affKey); @@ -2012,5 +2042,9 @@ public class GridClosureProcessor extends GridProcessorAdapter { ((ComputeJobMasterLeaveAware)r).onMasterNodeLeft(ses); } + /** {@inheritDoc} */ + @Override public String toString() { + return S.toString(C5MLA.class, this, super.toString()); + } } }
