http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/examples/src/main/java/org/gridgain/examples/messaging/MessagingPingPongListenActorExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/gridgain/examples/messaging/MessagingPingPongListenActorExample.java b/examples/src/main/java/org/gridgain/examples/messaging/MessagingPingPongListenActorExample.java index 6043ac9..175e960 100644 --- a/examples/src/main/java/org/gridgain/examples/messaging/MessagingPingPongListenActorExample.java +++ b/examples/src/main/java/org/gridgain/examples/messaging/MessagingPingPongListenActorExample.java @@ -34,9 +34,9 @@ public class MessagingPingPongListenActorExample { * Executes example. * * @param args Command line arguments, none required. - * @throws GridException If example execution failed. + * @throws IgniteCheckedException If example execution failed. */ - public static void main(String[] args) throws GridException { + public static void main(String[] args) throws IgniteCheckedException { // Game is played over the default grid. try (Ignite g = Ignition.start("examples/config/example-compute.xml")) { if (!ExamplesUtils.checkMinTopologySize(g.cluster(), 2)) @@ -57,7 +57,7 @@ public class MessagingPingPongListenActorExample { // Set up remote player. g.message(nodeB).remoteListen(null, new MessagingListenActor<String>() { - @Override public void receive(UUID nodeId, String rcvMsg) throws GridException { + @Override public void receive(UUID nodeId, String rcvMsg) throws IgniteCheckedException { System.out.println(rcvMsg); if ("PING".equals(rcvMsg)) @@ -73,7 +73,7 @@ public class MessagingPingPongListenActorExample { // Set up local player. g.message().localListen(null, new MessagingListenActor<String>() { - @Override protected void receive(UUID nodeId, String rcvMsg) throws GridException { + @Override protected void receive(UUID nodeId, String rcvMsg) throws IgniteCheckedException { System.out.println(rcvMsg); if (cnt.getCount() == 1)
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/examples/src/main/java/org/gridgain/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/gridgain/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java b/examples/src/main/java/org/gridgain/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java index 616567a..deb020e 100644 --- a/examples/src/main/java/org/gridgain/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java +++ b/examples/src/main/java/org/gridgain/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java @@ -36,9 +36,9 @@ public class MemcacheRestExampleNodeStartup { * Start up an empty node with specified cache configuration. * * @param args Command line arguments, none required. - * @throws GridException If example execution failed. + * @throws IgniteCheckedException If example execution failed. */ - public static void main(String[] args) throws GridException { + public static void main(String[] args) throws IgniteCheckedException { Ignition.start(configuration()); } @@ -46,9 +46,9 @@ public class MemcacheRestExampleNodeStartup { * Create Grid configuration with GGFS and enabled IPC. * * @return Grid configuration. - * @throws GridException If configuration creation failed. + * @throws IgniteCheckedException If configuration creation failed. */ - public static IgniteConfiguration configuration() throws GridException { + public static IgniteConfiguration configuration() throws IgniteCheckedException { IgniteConfiguration cfg = new IgniteConfiguration(); cfg.setLocalHost("127.0.0.1"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/examples/src/main/java/org/gridgain/examples/misc/deployment/DeploymentExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/gridgain/examples/misc/deployment/DeploymentExample.java b/examples/src/main/java/org/gridgain/examples/misc/deployment/DeploymentExample.java index 3092225..fc59f83 100644 --- a/examples/src/main/java/org/gridgain/examples/misc/deployment/DeploymentExample.java +++ b/examples/src/main/java/org/gridgain/examples/misc/deployment/DeploymentExample.java @@ -46,9 +46,9 @@ public final class DeploymentExample { * Executes example. * * @param args Command line arguments, none required. - * @throws GridException If example execution failed. + * @throws IgniteCheckedException If example execution failed. */ - public static void main(String[] args) throws GridException { + public static void main(String[] args) throws IgniteCheckedException { try (Ignite g = Ignition.start("examples/config/example-compute.xml")) { System.out.println(); System.out.println(">>> Deployment example started."); @@ -97,7 +97,7 @@ public final class DeploymentExample { @ComputeTaskName(TASK_NAME) public static class ExampleTask extends ComputeTaskSplitAdapter<String, Object> { /** {@inheritDoc} */ - @Override protected Collection<? extends ComputeJob> split(int gridSize, String arg) throws GridException { + @Override protected Collection<? extends ComputeJob> split(int gridSize, String arg) throws IgniteCheckedException { Collection<ComputeJob> jobs = new ArrayList<>(gridSize); for (int i = 0; i < gridSize; i++) { @@ -115,7 +115,7 @@ public final class DeploymentExample { } /** {@inheritDoc} */ - @Override public Object reduce(List<ComputeJobResult> results) throws GridException { + @Override public Object reduce(List<ComputeJobResult> results) throws IgniteCheckedException { return null; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/examples/src/main/java/org/gridgain/examples/misc/lifecycle/LifecycleExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/gridgain/examples/misc/lifecycle/LifecycleExample.java b/examples/src/main/java/org/gridgain/examples/misc/lifecycle/LifecycleExample.java index 103cf9f..69800c2 100644 --- a/examples/src/main/java/org/gridgain/examples/misc/lifecycle/LifecycleExample.java +++ b/examples/src/main/java/org/gridgain/examples/misc/lifecycle/LifecycleExample.java @@ -29,9 +29,9 @@ public final class LifecycleExample { * Executes example. * * @param args Command line arguments, none required. - * @throws GridException If example execution failed. + * @throws IgniteCheckedException If example execution failed. */ - public static void main(String[] args) throws GridException { + public static void main(String[] args) throws IgniteCheckedException { System.out.println(); System.out.println(">>> Lifecycle example started."); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/examples/src/main/java/org/gridgain/examples/misc/springbean/SpringBeanExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/gridgain/examples/misc/springbean/SpringBeanExample.java b/examples/src/main/java/org/gridgain/examples/misc/springbean/SpringBeanExample.java index 9234be6..b9215fb 100644 --- a/examples/src/main/java/org/gridgain/examples/misc/springbean/SpringBeanExample.java +++ b/examples/src/main/java/org/gridgain/examples/misc/springbean/SpringBeanExample.java @@ -39,7 +39,7 @@ public final class SpringBeanExample { * Executes example. * * @param args Command line arguments, none required. - * @throws GridException If example execution failed. + * @throws IgniteCheckedException If example execution failed. */ public static void main(String[] args) throws Exception { System.out.println(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/examples/src/main/java/org/gridgain/examples/streaming/StreamingCheckInExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/gridgain/examples/streaming/StreamingCheckInExample.java b/examples/src/main/java/org/gridgain/examples/streaming/StreamingCheckInExample.java index 45211d1..28fc25d 100644 --- a/examples/src/main/java/org/gridgain/examples/streaming/StreamingCheckInExample.java +++ b/examples/src/main/java/org/gridgain/examples/streaming/StreamingCheckInExample.java @@ -94,7 +94,7 @@ public class StreamingCheckInExample { * Executes example. * * @param args Command line arguments, none required. - * @throws GridException If example execution failed. + * @throws IgniteCheckedException If example execution failed. */ public static void main(String[] args) throws Exception { Timer timer = new Timer("check-in-query-worker"); @@ -214,7 +214,7 @@ public class StreamingCheckInExample { System.out.print(sb.toString()); } - catch (GridException e) { + catch (IgniteCheckedException e) { e.printStackTrace(); } } @@ -228,10 +228,10 @@ public class StreamingCheckInExample { * Streams check-in events into the system. * * @param streamer Streamer. - * @throws GridException If failed. + * @throws IgniteCheckedException If failed. */ @SuppressWarnings("BusyWait") - private static void streamData(IgniteStreamer streamer) throws GridException { + private static void streamData(IgniteStreamer streamer) throws IgniteCheckedException { try { for (int i = 0; i < CNT; i++) { CheckInEvent evt = new CheckInEvent( @@ -424,7 +424,7 @@ public class StreamingCheckInExample { /** {@inheritDoc} */ @Nullable @Override public Map<String, Collection<?>> run( - StreamerContext ctx, Collection<CheckInEvent> evts) throws GridException { + StreamerContext ctx, Collection<CheckInEvent> evts) throws IgniteCheckedException { StreamerWindow<CheckInEvent> win = ctx.window(name()); assert win != null; @@ -440,7 +440,7 @@ public class StreamingCheckInExample { evts0.add(evt); } - catch (GridException e) { + catch (IgniteCheckedException e) { if (e.getMessage().contains("Index unique key violation")) System.err.println("Cannot check-in twice within the specified period of time [evt=" + evt + ']'); else @@ -472,7 +472,7 @@ public class StreamingCheckInExample { /** {@inheritDoc} */ @Nullable @Override public Map<String, Collection<?>> run(StreamerContext ctx, - Collection<CheckInEvent> evts) throws GridException { + Collection<CheckInEvent> evts) throws IgniteCheckedException { StreamerWindow<LocationInfo> win = ctx.window(name()); assert win != null; @@ -530,7 +530,7 @@ public class StreamingCheckInExample { /** {@inheritDoc} */ @Nullable @Override public Location onAdded( StreamerIndexEntry<CheckInEvent, String, Location> entry, - CheckInEvent evt) throws GridException { + CheckInEvent evt) throws IgniteCheckedException { throw new AssertionError("onAdded() shouldn't be called on unique index."); } @@ -561,7 +561,7 @@ public class StreamingCheckInExample { /** {@inheritDoc} */ @Nullable @Override public Place onAdded( StreamerIndexEntry<LocationInfo, String, Place> entry, - LocationInfo evt) throws GridException { + LocationInfo evt) throws IgniteCheckedException { throw new AssertionError("onAdded() shouldn't be called on unique index."); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/examples/src/main/java/org/gridgain/examples/streaming/StreamingNodeStartup.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/gridgain/examples/streaming/StreamingNodeStartup.java b/examples/src/main/java/org/gridgain/examples/streaming/StreamingNodeStartup.java index aed3395..b4dce41 100644 --- a/examples/src/main/java/org/gridgain/examples/streaming/StreamingNodeStartup.java +++ b/examples/src/main/java/org/gridgain/examples/streaming/StreamingNodeStartup.java @@ -20,9 +20,9 @@ public class StreamingNodeStartup { * Start up an empty node with specified cache configuration. * * @param args Command line arguments, none required. - * @throws GridException If example execution failed. + * @throws IgniteCheckedException If example execution failed. */ - public static void main(String[] args) throws GridException { + public static void main(String[] args) throws IgniteCheckedException { Ignition.start("examples/config/example-streamer.xml"); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/examples/src/main/java/org/gridgain/examples/streaming/StreamingPopularNumbersExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/gridgain/examples/streaming/StreamingPopularNumbersExample.java b/examples/src/main/java/org/gridgain/examples/streaming/StreamingPopularNumbersExample.java index 0d8ff94..2415195 100644 --- a/examples/src/main/java/org/gridgain/examples/streaming/StreamingPopularNumbersExample.java +++ b/examples/src/main/java/org/gridgain/examples/streaming/StreamingPopularNumbersExample.java @@ -84,7 +84,7 @@ public class StreamingPopularNumbersExample { * Executes example. * * @param args Command line arguments, none required. - * @throws GridException If example execution failed. + * @throws IgniteCheckedException If example execution failed. */ public static void main(String[] args) throws Exception { Timer popularNumbersQryTimer = new Timer("numbers-query-worker"); @@ -132,9 +132,9 @@ public class StreamingPopularNumbersExample { * Streams random numbers into the system. * * @param g Grid. - * @throws GridException If failed. + * @throws IgniteCheckedException If failed. */ - private static void streamData(final Ignite g) throws GridException { + private static void streamData(final Ignite g) throws IgniteCheckedException { final IgniteStreamer streamer = g.streamer("popular-numbers"); // Use gaussian distribution to ensure that @@ -178,7 +178,7 @@ public class StreamingPopularNumbersExample { System.out.println("----------------"); } - catch (GridException e) { + catch (IgniteCheckedException e) { e.printStackTrace(); } } @@ -201,7 +201,7 @@ public class StreamingPopularNumbersExample { /** {@inheritDoc} */ @Nullable @Override public Map<String, Collection<?>> run(StreamerContext ctx, Collection<Integer> nums) - throws GridException { + throws IgniteCheckedException { StreamerWindow<Integer> win = ctx.window(); // Add numbers to window. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/examples/src/main/java/org/gridgain/examples/streaming/StreamingPriceBarsExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/gridgain/examples/streaming/StreamingPriceBarsExample.java b/examples/src/main/java/org/gridgain/examples/streaming/StreamingPriceBarsExample.java index 1e22a46..14d4885 100644 --- a/examples/src/main/java/org/gridgain/examples/streaming/StreamingPriceBarsExample.java +++ b/examples/src/main/java/org/gridgain/examples/streaming/StreamingPriceBarsExample.java @@ -66,7 +66,7 @@ public class StreamingPriceBarsExample { * Executes example. * * @param args Command line arguments, none required. - * @throws GridException If example execution failed. + * @throws IgniteCheckedException If example execution failed. */ public static void main(String[] args) throws Exception { Timer timer = new Timer("priceBars"); @@ -158,7 +158,7 @@ public class StreamingPriceBarsExample { System.out.println("-----------------"); } - catch (GridException e) { + catch (IgniteCheckedException e) { e.printStackTrace(); } } @@ -173,9 +173,9 @@ public class StreamingPriceBarsExample { * Streams random prices into the system. * * @param g Grid. - * @throws GridException If failed. + * @throws IgniteCheckedException If failed. */ - private static void streamData(final Ignite g) throws GridException { + private static void streamData(final Ignite g) throws IgniteCheckedException { IgniteStreamer streamer = g.streamer("priceBars"); for (int i = 0; i < CNT; i++) { @@ -372,7 +372,7 @@ public class StreamingPriceBarsExample { /** {@inheritDoc} */ @Nullable @Override public Map<String, Collection<?>> run(StreamerContext ctx, Collection<Quote> quotes) - throws GridException { + throws IgniteCheckedException { StreamerWindow win = ctx.window("stage1"); // Add numbers to window. @@ -413,7 +413,7 @@ public class StreamingPriceBarsExample { /** {@inheritDoc} */ @Nullable @Override public Map<String, Collection<?>> run(StreamerContext ctx, Collection<Bar> bars) - throws GridException { + throws IgniteCheckedException { ConcurrentMap<String, Bar> loc = ctx.localSpace(); StreamerWindow win = ctx.window("stage2"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/examples/src/main/java/org/gridgain/examples/streaming/StreamingRunningAverageExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/gridgain/examples/streaming/StreamingRunningAverageExample.java b/examples/src/main/java/org/gridgain/examples/streaming/StreamingRunningAverageExample.java index 9a69330..3eff875 100644 --- a/examples/src/main/java/org/gridgain/examples/streaming/StreamingRunningAverageExample.java +++ b/examples/src/main/java/org/gridgain/examples/streaming/StreamingRunningAverageExample.java @@ -93,7 +93,7 @@ public class StreamingRunningAverageExample { System.out.println("Got streamer query result [avg=" + avg + ", idealAvg=" + (rndRange / 2) + ']'); } - catch (GridException e) { + catch (IgniteCheckedException e) { System.out.println("Failed to execute streamer query: " + e); } } @@ -110,7 +110,7 @@ public class StreamingRunningAverageExample { try { streamer.addEvent(rnd.nextInt(rndRange)); } - catch (GridException e) { + catch (IgniteCheckedException e) { System.out.println("Failed to add streamer event: " + e); } } @@ -149,7 +149,7 @@ public class StreamingRunningAverageExample { /** {@inheritDoc} */ @Nullable @Override public Map<String, Collection<?>> run(StreamerContext ctx, Collection<Integer> evts) - throws GridException { + throws IgniteCheckedException { ConcurrentMap<String, Average> loc = ctx.localSpace(); Average avg = loc.get("avg"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/examples/src/main/java8/org/gridgain/examples/ComputeExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java8/org/gridgain/examples/ComputeExample.java b/examples/src/main/java8/org/gridgain/examples/ComputeExample.java index 6b72ff9..061e92d 100644 --- a/examples/src/main/java8/org/gridgain/examples/ComputeExample.java +++ b/examples/src/main/java8/org/gridgain/examples/ComputeExample.java @@ -25,7 +25,7 @@ public class ComputeExample { * Executes example. * * @param args Command line arguments, none required. - * @throws GridException If example execution failed. + * @throws IgniteCheckedException If example execution failed. */ public static void main(String[] args) throws Exception { try (Ignite ignite = Ignition.start("examples/config/example-compute.xml")) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/examples/src/main/java8/org/gridgain/examples/MessagingExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java8/org/gridgain/examples/MessagingExample.java b/examples/src/main/java8/org/gridgain/examples/MessagingExample.java index fea0090..3355c0a 100644 --- a/examples/src/main/java8/org/gridgain/examples/MessagingExample.java +++ b/examples/src/main/java8/org/gridgain/examples/MessagingExample.java @@ -39,7 +39,7 @@ public final class MessagingExample { * Executes example. * * @param args Command line arguments, none required. - * @throws GridException If example execution failed. + * @throws IgniteCheckedException If example execution failed. */ public static void main(String[] args) throws Exception { try (Ignite g = Ignition.start("examples/config/example-compute.xml")) { @@ -93,9 +93,9 @@ public final class MessagingExample { * Start listening to messages on all grid nodes within passed in projection. * * @param prj Grid projection. - * @throws GridException If failed. + * @throws IgniteCheckedException If failed. */ - private static void startListening(ClusterGroup prj) throws GridException { + private static void startListening(ClusterGroup prj) throws IgniteCheckedException { // Add ordered message listener. prj.message().remoteListen(TOPIC.ORDERED, (nodeId, msg) -> { System.out.println("Received ordered message [msg=" + msg + ", fromNodeId=" + nodeId + ']'); @@ -105,7 +105,7 @@ public final class MessagingExample { // So, need to get projection for sender node through entire grid. prj.ignite().forNodeId(nodeId).message().send(TOPIC.ORDERED, msg); } - catch (GridException e) { + catch (IgniteCheckedException e) { e.printStackTrace(); } @@ -121,7 +121,7 @@ public final class MessagingExample { // So, need to get projection for sender node through entire grid. prj.ignite().forNodeId(nodeId).message().send(TOPIC.UNORDERED, msg); } - catch (GridException e) { + catch (IgniteCheckedException e) { e.printStackTrace(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/aop/src/main/java/org/gridgain/grid/compute/gridify/aop/aspectj/GridifyAspectJAspect.java ---------------------------------------------------------------------- diff --git a/modules/aop/src/main/java/org/gridgain/grid/compute/gridify/aop/aspectj/GridifyAspectJAspect.java b/modules/aop/src/main/java/org/gridgain/grid/compute/gridify/aop/aspectj/GridifyAspectJAspect.java index a42d3a0..63c2447 100644 --- a/modules/aop/src/main/java/org/gridgain/grid/compute/gridify/aop/aspectj/GridifyAspectJAspect.java +++ b/modules/aop/src/main/java/org/gridgain/grid/compute/gridify/aop/aspectj/GridifyAspectJAspect.java @@ -59,7 +59,7 @@ public class GridifyAspectJAspect { String gridName = F.isEmpty(ann.gridName()) ? null : ann.gridName(); if (G.state(gridName) != STARTED) - throw new GridException("Grid is not locally started: " + gridName); + throw new IgniteCheckedException("Grid is not locally started: " + gridName); // Initialize defaults. GridifyArgument arg = new GridifyArgumentAdapter(mtd.getDeclaringClass(), mtd.getName(), @@ -72,7 +72,7 @@ public class GridifyAspectJAspect { } if (!ann.taskClass().equals(GridifyDefaultTask.class) && !ann.taskName().isEmpty()) { - throw new GridException("Gridify annotation must specify either Gridify.taskName() or " + + throw new IgniteCheckedException("Gridify annotation must specify either Gridify.taskName() or " + "Gridify.taskClass(), but not both: " + ann); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/aop/src/main/java/org/gridgain/grid/compute/gridify/aop/aspectj/GridifySetToSetAspectJAspect.java ---------------------------------------------------------------------- diff --git a/modules/aop/src/main/java/org/gridgain/grid/compute/gridify/aop/aspectj/GridifySetToSetAspectJAspect.java b/modules/aop/src/main/java/org/gridgain/grid/compute/gridify/aop/aspectj/GridifySetToSetAspectJAspect.java index f1a1417..3120bf3 100644 --- a/modules/aop/src/main/java/org/gridgain/grid/compute/gridify/aop/aspectj/GridifySetToSetAspectJAspect.java +++ b/modules/aop/src/main/java/org/gridgain/grid/compute/gridify/aop/aspectj/GridifySetToSetAspectJAspect.java @@ -60,7 +60,7 @@ public class GridifySetToSetAspectJAspect extends GridifySetToSetAbstractAspect String gridName = F.isEmpty(ann.gridName()) ? null : ann.gridName(); if (G.state(gridName) != STARTED) - throw new GridException("Grid is not locally started: " + gridName); + throw new IgniteCheckedException("Grid is not locally started: " + gridName); GridifyNodeFilter nodeFilter = null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/aop/src/main/java/org/gridgain/grid/compute/gridify/aop/aspectj/GridifySetToValueAspectJAspect.java ---------------------------------------------------------------------- diff --git a/modules/aop/src/main/java/org/gridgain/grid/compute/gridify/aop/aspectj/GridifySetToValueAspectJAspect.java b/modules/aop/src/main/java/org/gridgain/grid/compute/gridify/aop/aspectj/GridifySetToValueAspectJAspect.java index 706daa4..0779c2c 100644 --- a/modules/aop/src/main/java/org/gridgain/grid/compute/gridify/aop/aspectj/GridifySetToValueAspectJAspect.java +++ b/modules/aop/src/main/java/org/gridgain/grid/compute/gridify/aop/aspectj/GridifySetToValueAspectJAspect.java @@ -60,7 +60,7 @@ public class GridifySetToValueAspectJAspect extends GridifySetToValueAbstractAsp String gridName = F.isEmpty(ann.gridName()) ? null : ann.gridName(); if (G.state(gridName) != STARTED) - throw new GridException("Grid is not locally started: " + gridName); + throw new IgniteCheckedException("Grid is not locally started: " + gridName); GridifyNodeFilter nodeFilter = null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/aop/src/main/java/org/gridgain/grid/compute/gridify/aop/spring/GridifySetToSetSpringAspect.java ---------------------------------------------------------------------- diff --git a/modules/aop/src/main/java/org/gridgain/grid/compute/gridify/aop/spring/GridifySetToSetSpringAspect.java b/modules/aop/src/main/java/org/gridgain/grid/compute/gridify/aop/spring/GridifySetToSetSpringAspect.java index 324b40e..2ba0af2 100644 --- a/modules/aop/src/main/java/org/gridgain/grid/compute/gridify/aop/spring/GridifySetToSetSpringAspect.java +++ b/modules/aop/src/main/java/org/gridgain/grid/compute/gridify/aop/spring/GridifySetToSetSpringAspect.java @@ -58,7 +58,7 @@ public class GridifySetToSetSpringAspect extends GridifySetToSetAbstractAspect i String gridName = F.isEmpty(ann.gridName()) ? null : ann.gridName(); if (G.state(gridName) != STARTED) - throw new GridException("Grid is not locally started: " + gridName); + throw new IgniteCheckedException("Grid is not locally started: " + gridName); GridifyNodeFilter nodeFilter = null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/aop/src/main/java/org/gridgain/grid/compute/gridify/aop/spring/GridifySetToValueSpringAspect.java ---------------------------------------------------------------------- diff --git a/modules/aop/src/main/java/org/gridgain/grid/compute/gridify/aop/spring/GridifySetToValueSpringAspect.java b/modules/aop/src/main/java/org/gridgain/grid/compute/gridify/aop/spring/GridifySetToValueSpringAspect.java index b011786..4aaac0f 100644 --- a/modules/aop/src/main/java/org/gridgain/grid/compute/gridify/aop/spring/GridifySetToValueSpringAspect.java +++ b/modules/aop/src/main/java/org/gridgain/grid/compute/gridify/aop/spring/GridifySetToValueSpringAspect.java @@ -58,7 +58,7 @@ public class GridifySetToValueSpringAspect extends GridifySetToValueAbstractAspe String gridName = F.isEmpty(ann.gridName()) ? null : ann.gridName(); if (G.state(gridName) != STARTED) - throw new GridException("Grid is not locally started: " + gridName); + throw new IgniteCheckedException("Grid is not locally started: " + gridName); GridifyNodeFilter nodeFilter = null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/aop/src/main/java/org/gridgain/grid/compute/gridify/aop/spring/GridifySpringAspect.java ---------------------------------------------------------------------- diff --git a/modules/aop/src/main/java/org/gridgain/grid/compute/gridify/aop/spring/GridifySpringAspect.java b/modules/aop/src/main/java/org/gridgain/grid/compute/gridify/aop/spring/GridifySpringAspect.java index 2612c93..646a47d 100644 --- a/modules/aop/src/main/java/org/gridgain/grid/compute/gridify/aop/spring/GridifySpringAspect.java +++ b/modules/aop/src/main/java/org/gridgain/grid/compute/gridify/aop/spring/GridifySpringAspect.java @@ -58,7 +58,7 @@ public class GridifySpringAspect implements MethodInterceptor { String gridName = F.isEmpty(ann.gridName()) ? null : ann.gridName(); if (G.state(gridName) != STARTED) - throw new GridException("Grid is not locally started: " + gridName); + throw new IgniteCheckedException("Grid is not locally started: " + gridName); // Initialize defaults. GridifyArgument arg = new GridifyArgumentAdapter(mtd.getDeclaringClass(), mtd.getName(), @@ -71,7 +71,7 @@ public class GridifySpringAspect implements MethodInterceptor { } if (!ann.taskClass().equals(GridifyDefaultTask.class) && !ann.taskName().isEmpty()) - throw new GridException("Gridify annotation must specify either Gridify.taskName() or " + + throw new IgniteCheckedException("Gridify annotation must specify either Gridify.taskName() or " + "Gridify.taskClass(), but not both: " + ann); try { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/aop/src/test/java/org/gridgain/grid/gridify/GridBasicAopSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/aop/src/test/java/org/gridgain/grid/gridify/GridBasicAopSelfTest.java b/modules/aop/src/test/java/org/gridgain/grid/gridify/GridBasicAopSelfTest.java index 2c9f85a..4bdd81d 100644 --- a/modules/aop/src/test/java/org/gridgain/grid/gridify/GridBasicAopSelfTest.java +++ b/modules/aop/src/test/java/org/gridgain/grid/gridify/GridBasicAopSelfTest.java @@ -9,9 +9,9 @@ package org.gridgain.grid.gridify; +import org.apache.ignite.*; import org.apache.ignite.compute.*; import org.apache.ignite.compute.gridify.*; -import org.gridgain.grid.*; import org.gridgain.testframework.*; import org.gridgain.testframework.junits.common.*; @@ -38,7 +38,7 @@ public class GridBasicAopSelfTest extends GridCommonAbstractTest { return null; } }, - GridException.class, + IgniteCheckedException.class, "Grid is not locally started: null" ); } @@ -57,12 +57,12 @@ public class GridBasicAopSelfTest extends GridCommonAbstractTest { private static class TestTask extends GridifyTaskSplitAdapter<Void> { /** {@inheritDoc} */ @Override protected Collection<? extends ComputeJob> split(int gridSize, - GridifyArgument arg) throws GridException { + GridifyArgument arg) throws IgniteCheckedException { return null; } /** {@inheritDoc} */ - @Override public Void reduce(List<ComputeJobResult> results) throws GridException { + @Override public Void reduce(List<ComputeJobResult> results) throws IgniteCheckedException { return null; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/aop/src/test/java/org/gridgain/grid/gridify/GridTestGridifyJob.java ---------------------------------------------------------------------- diff --git a/modules/aop/src/test/java/org/gridgain/grid/gridify/GridTestGridifyJob.java b/modules/aop/src/test/java/org/gridgain/grid/gridify/GridTestGridifyJob.java index 28d5418..948b147 100644 --- a/modules/aop/src/test/java/org/gridgain/grid/gridify/GridTestGridifyJob.java +++ b/modules/aop/src/test/java/org/gridgain/grid/gridify/GridTestGridifyJob.java @@ -32,7 +32,7 @@ public class GridTestGridifyJob extends ComputeJobAdapter { } /** {@inheritDoc} */ - @Override public Serializable execute() throws GridException { + @Override public Serializable execute() throws IgniteCheckedException { if (log.isInfoEnabled()) log.info("Execute GridTestGridifyJob.execute(" + argument(0) + ')'); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/aop/src/test/java/org/gridgain/grid/gridify/GridTestGridifyTask.java ---------------------------------------------------------------------- diff --git a/modules/aop/src/test/java/org/gridgain/grid/gridify/GridTestGridifyTask.java b/modules/aop/src/test/java/org/gridgain/grid/gridify/GridTestGridifyTask.java index 60d28a1..d6339e6 100644 --- a/modules/aop/src/test/java/org/gridgain/grid/gridify/GridTestGridifyTask.java +++ b/modules/aop/src/test/java/org/gridgain/grid/gridify/GridTestGridifyTask.java @@ -8,9 +8,9 @@ */ package org.gridgain.grid.gridify; +import org.apache.ignite.*; import org.apache.ignite.compute.*; import org.apache.ignite.compute.gridify.*; -import org.gridgain.grid.*; import java.util.*; @@ -23,14 +23,14 @@ public class GridTestGridifyTask extends ComputeTaskSplitAdapter<GridifyArgument public static final String TASK_NAME = "org.gridgain.grid.gridify.GridTestGridifyTask"; /** {@inheritDoc} */ - @Override public Collection<? extends ComputeJob> split(int gridSize, GridifyArgument arg) throws GridException { + @Override public Collection<? extends ComputeJob> split(int gridSize, GridifyArgument arg) throws IgniteCheckedException { assert arg.getMethodParameters().length == 1; return Collections.singletonList(new GridTestGridifyJob((String)arg.getMethodParameters()[0])); } /** {@inheritDoc} */ - @Override public Object reduce(List<ComputeJobResult> results) throws GridException { + @Override public Object reduce(List<ComputeJobResult> results) throws IgniteCheckedException { assert results.size() == 1; return results.get(0).getData(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/aop/src/test/java/org/gridgain/loadtests/direct/singlesplit/GridSingleSplitTestJobTarget.java ---------------------------------------------------------------------- diff --git a/modules/aop/src/test/java/org/gridgain/loadtests/direct/singlesplit/GridSingleSplitTestJobTarget.java b/modules/aop/src/test/java/org/gridgain/loadtests/direct/singlesplit/GridSingleSplitTestJobTarget.java index 6c82d54..a6dc283 100644 --- a/modules/aop/src/test/java/org/gridgain/loadtests/direct/singlesplit/GridSingleSplitTestJobTarget.java +++ b/modules/aop/src/test/java/org/gridgain/loadtests/direct/singlesplit/GridSingleSplitTestJobTarget.java @@ -9,9 +9,9 @@ package org.gridgain.loadtests.direct.singlesplit; +import org.apache.ignite.*; import org.apache.ignite.compute.*; import org.apache.ignite.compute.gridify.*; -import org.gridgain.grid.*; import org.gridgain.loadtests.gridify.*; /** @@ -22,11 +22,11 @@ public class GridSingleSplitTestJobTarget { * @param level Level. * @param jobSes Job session. * @return ALways returns {@code 1}. - * @throws GridException If failed. + * @throws IgniteCheckedException If failed. */ @SuppressWarnings("unused") @Gridify(taskClass = GridifyLoadTestTask.class, timeout = 10000) - public int executeLoadTestJob(int level, ComputeTaskSession jobSes) throws GridException { + public int executeLoadTestJob(int level, ComputeTaskSession jobSes) throws IgniteCheckedException { assert level > 0; assert jobSes != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/aop/src/test/java/org/gridgain/loadtests/direct/singlesplit/GridSingleSplitTestTask.java ---------------------------------------------------------------------- diff --git a/modules/aop/src/test/java/org/gridgain/loadtests/direct/singlesplit/GridSingleSplitTestTask.java b/modules/aop/src/test/java/org/gridgain/loadtests/direct/singlesplit/GridSingleSplitTestTask.java index 3c94bd7..7754928 100644 --- a/modules/aop/src/test/java/org/gridgain/loadtests/direct/singlesplit/GridSingleSplitTestTask.java +++ b/modules/aop/src/test/java/org/gridgain/loadtests/direct/singlesplit/GridSingleSplitTestTask.java @@ -9,10 +9,10 @@ package org.gridgain.loadtests.direct.singlesplit; +import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.compute.*; import org.apache.ignite.resources.*; -import org.gridgain.grid.*; import java.util.*; @@ -29,7 +29,7 @@ public class GridSingleSplitTestTask extends ComputeTaskAdapter<Integer, Integer private ComputeLoadBalancer balancer; /** {@inheritDoc} */ - @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, Integer arg) throws GridException { + @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, Integer arg) throws IgniteCheckedException { assert !subgrid.isEmpty() : "Subgrid cannot be empty."; Map<ComputeJobAdapter, ClusterNode> jobs = new HashMap<>(subgrid.size()); @@ -46,7 +46,7 @@ public class GridSingleSplitTestTask extends ComputeTaskAdapter<Integer, Integer private ComputeTaskSession jobSes; /** {@inheritDoc} */ - @Override public Object execute() throws GridException { + @Override public Object execute() throws IgniteCheckedException { assert jobSes != null; Integer arg = this.<Integer>argument(0); @@ -72,7 +72,7 @@ public class GridSingleSplitTestTask extends ComputeTaskAdapter<Integer, Integer } /** {@inheritDoc} */ - @Override public Integer reduce(List<ComputeJobResult> results) throws GridException { + @Override public Integer reduce(List<ComputeJobResult> results) throws IgniteCheckedException { int retVal = 0; for (ComputeJobResult res : results) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/aop/src/test/java/org/gridgain/loadtests/direct/singlesplit/GridSingleSplitsLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/aop/src/test/java/org/gridgain/loadtests/direct/singlesplit/GridSingleSplitsLoadTest.java b/modules/aop/src/test/java/org/gridgain/loadtests/direct/singlesplit/GridSingleSplitsLoadTest.java index acbe20c..0266d3a 100644 --- a/modules/aop/src/test/java/org/gridgain/loadtests/direct/singlesplit/GridSingleSplitsLoadTest.java +++ b/modules/aop/src/test/java/org/gridgain/loadtests/direct/singlesplit/GridSingleSplitsLoadTest.java @@ -114,7 +114,7 @@ public class GridSingleSplitsLoadTest extends GridCommonAbstractTest { if (taskCnt % 500 == 0) info(stats.toString()); } - catch (GridException e) { + catch (IgniteCheckedException e) { error("Failed to execute grid task.", e); fail(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/aop/src/test/java/org/gridgain/loadtests/gridify/GridifyLoadTestTask.java ---------------------------------------------------------------------- diff --git a/modules/aop/src/test/java/org/gridgain/loadtests/gridify/GridifyLoadTestTask.java b/modules/aop/src/test/java/org/gridgain/loadtests/gridify/GridifyLoadTestTask.java index 90bcd89..a1d66a7 100644 --- a/modules/aop/src/test/java/org/gridgain/loadtests/gridify/GridifyLoadTestTask.java +++ b/modules/aop/src/test/java/org/gridgain/loadtests/gridify/GridifyLoadTestTask.java @@ -9,9 +9,9 @@ package org.gridgain.loadtests.gridify; +import org.apache.ignite.*; import org.apache.ignite.compute.*; import org.apache.ignite.compute.gridify.*; -import org.gridgain.grid.*; import java.io.*; import java.util.*; @@ -21,7 +21,7 @@ import java.util.*; */ public class GridifyLoadTestTask extends ComputeTaskSplitAdapter<GridifyArgument, Integer> { /** {@inheritDoc} */ - @Override protected Collection<? extends ComputeJob> split(int gridSize, GridifyArgument arg) throws GridException { + @Override protected Collection<? extends ComputeJob> split(int gridSize, GridifyArgument arg) throws IgniteCheckedException { assert gridSize > 0 : "Subgrid cannot be empty."; int jobsNum = (Integer)arg.getMethodParameters()[0]; @@ -45,12 +45,12 @@ public class GridifyLoadTestTask extends ComputeTaskSplitAdapter<GridifyArgument } /** {@inheritDoc} */ - @Override public Integer reduce(List<ComputeJobResult> results) throws GridException { + @Override public Integer reduce(List<ComputeJobResult> results) throws IgniteCheckedException { int retVal = 0; for (ComputeJobResult res : results) { if (res.getException() != null) { - throw new GridException("Received exception in reduce method (load test jobs can never fail): " + res, + throw new IgniteCheckedException("Received exception in reduce method (load test jobs can never fail): " + res, res.getException()); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/aop/src/test/java/org/test/gridify/GridExternalGridifyTask.java ---------------------------------------------------------------------- diff --git a/modules/aop/src/test/java/org/test/gridify/GridExternalGridifyTask.java b/modules/aop/src/test/java/org/test/gridify/GridExternalGridifyTask.java index 7e95f0f..82fc40a 100644 --- a/modules/aop/src/test/java/org/test/gridify/GridExternalGridifyTask.java +++ b/modules/aop/src/test/java/org/test/gridify/GridExternalGridifyTask.java @@ -26,7 +26,7 @@ public class GridExternalGridifyTask extends ComputeTaskSplitAdapter<GridifyArgu public static final String TASK_NAME = "org.test.gridify.GridExternalGridifyTask"; /** {@inheritDoc} */ - @Override public Collection<? extends ComputeJob> split(int gridSize, GridifyArgument arg) throws GridException { + @Override public Collection<? extends ComputeJob> split(int gridSize, GridifyArgument arg) throws IgniteCheckedException { assert arg.getMethodParameters().length == 1; return Collections.singletonList(new ComputeJobAdapter((String)arg.getMethodParameters()[0]) { @@ -64,7 +64,7 @@ public class GridExternalGridifyTask extends ComputeTaskSplitAdapter<GridifyArgu } /** {@inheritDoc} */ - @Override public Object reduce(List<ComputeJobResult> results) throws GridException { + @Override public Object reduce(List<ComputeJobResult> results) throws IgniteCheckedException { assert results.size() == 1; return results.get(0).getData(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/GridS3CheckpointSpi.java ---------------------------------------------------------------------- diff --git a/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/GridS3CheckpointSpi.java b/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/GridS3CheckpointSpi.java index a95cf9b..316e014 100644 --- a/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/GridS3CheckpointSpi.java +++ b/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/GridS3CheckpointSpi.java @@ -315,7 +315,7 @@ public class GridS3CheckpointSpi extends IgniteSpiAdapter implements CheckpointS catch (AmazonClientException e) { throw new IgniteSpiException("Failed to read checkpoint bucket: " + bucketName, e); } - catch (GridException e) { + catch (IgniteCheckedException e) { throw new IgniteSpiException("Failed to marshal/unmarshal objects in bucket: " + bucketName, e); } @@ -363,7 +363,7 @@ public class GridS3CheckpointSpi extends IgniteSpiAdapter implements CheckpointS catch (AmazonClientException e) { throw new IgniteSpiException("Failed to read checkpoint key: " + key, e); } - catch (GridException e) { + catch (IgniteCheckedException e) { throw new IgniteSpiException("Failed to marshal/unmarshal objects in checkpoint key: " + key, e); } } @@ -399,7 +399,7 @@ public class GridS3CheckpointSpi extends IgniteSpiAdapter implements CheckpointS throw new IgniteSpiException("Failed to write checkpoint data [key=" + key + ", state=" + Arrays.toString(state) + ']', e); } - catch (GridException e) { + catch (IgniteCheckedException e) { throw new IgniteSpiException("Failed to marshal checkpoint data [key=" + key + ", state=" + Arrays.toString(state) + ']', e); } @@ -440,10 +440,10 @@ public class GridS3CheckpointSpi extends IgniteSpiAdapter implements CheckpointS * * @param key Key name to read data from. * @return Checkpoint data object. - * @throws GridException Thrown if an error occurs while unmarshalling. + * @throws IgniteCheckedException Thrown if an error occurs while unmarshalling. * @throws AmazonClientException If an error occurs while querying Amazon S3. */ - @Nullable private GridS3CheckpointData read(String key) throws GridException, AmazonClientException { + @Nullable private GridS3CheckpointData read(String key) throws IgniteCheckedException, AmazonClientException { assert !F.isEmpty(key); if (log.isDebugEnabled()) @@ -474,10 +474,10 @@ public class GridS3CheckpointSpi extends IgniteSpiAdapter implements CheckpointS * the binary stream and saved to the S3. * * @param data Checkpoint data. - * @throws GridException Thrown if an error occurs while marshalling. + * @throws IgniteCheckedException Thrown if an error occurs while marshalling. * @throws AmazonClientException If an error occurs while querying Amazon S3. */ - private void write(GridS3CheckpointData data) throws GridException, AmazonClientException { + private void write(GridS3CheckpointData data) throws IgniteCheckedException, AmazonClientException { assert data != null; if (log.isDebugEnabled()) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/GridS3CheckpointSpiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/GridS3CheckpointSpiSelfTest.java b/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/GridS3CheckpointSpiSelfTest.java index 2bebf46..f31919f 100644 --- a/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/GridS3CheckpointSpiSelfTest.java +++ b/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/GridS3CheckpointSpiSelfTest.java @@ -13,9 +13,10 @@ import com.amazonaws.*; import com.amazonaws.auth.*; import com.amazonaws.services.s3.*; import com.amazonaws.services.s3.model.*; +import org.apache.ignite.*; import org.apache.ignite.spi.*; -import org.gridgain.grid.*; import org.apache.ignite.spi.checkpoint.*; +import org.gridgain.grid.*; import org.gridgain.grid.util.lang.*; import org.gridgain.testframework.*; import org.gridgain.testframework.junits.spi.*; @@ -91,7 +92,7 @@ public class GridS3CheckpointSpiSelfTest extends GridSpiAbstractTest<GridS3Check final String key = KEY_PREFIX + i; assertWithRetries(new GridAbsClosureX() { - @Override public void applyx() throws GridException { + @Override public void applyx() throws IgniteCheckedException { assertNotNull("Missing checkpoint: " + key, getSpi().loadCheckpoint(key)); } @@ -124,7 +125,7 @@ public class GridS3CheckpointSpiSelfTest extends GridSpiAbstractTest<GridS3Check final String key = KEY_PREFIX + i; assertWithRetries(new GridAbsClosureX() { - @Override public void applyx() throws GridException { + @Override public void applyx() throws IgniteCheckedException { assertNull(getSpi().loadCheckpoint(key)); } }); @@ -150,7 +151,7 @@ public class GridS3CheckpointSpiSelfTest extends GridSpiAbstractTest<GridS3Check final String key = KEY_PREFIX + i; assertWithRetries(new GridAbsClosureX() { - @Override public void applyx() throws GridException { + @Override public void applyx() throws IgniteCheckedException { assertNull("Checkpoint state should not be loaded with key: " + key, getSpi().loadCheckpoint(key)); } @@ -172,7 +173,7 @@ public class GridS3CheckpointSpiSelfTest extends GridSpiAbstractTest<GridS3Check getSpi().saveCheckpoint(KEY_PREFIX, GridTestIoUtils.serializeJdk(state2), 0, true); assertWithRetries(new GridAbsClosureX() { - @Override public void applyx() throws GridException { + @Override public void applyx() throws IgniteCheckedException { assertNotNull(getSpi().loadCheckpoint(KEY_PREFIX)); } }); @@ -188,7 +189,7 @@ public class GridS3CheckpointSpiSelfTest extends GridSpiAbstractTest<GridS3Check getSpi().removeCheckpoint(KEY_PREFIX); assertWithRetries(new GridAbsClosureX() { - @Override public void applyx() throws GridException { + @Override public void applyx() throws IgniteCheckedException { assertNull(getSpi().loadCheckpoint(KEY_PREFIX)); } }); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/clients/src/test/java/org/gridgain/client/GridClientAbstractMultiThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/client/GridClientAbstractMultiThreadedSelfTest.java b/modules/clients/src/test/java/org/gridgain/client/GridClientAbstractMultiThreadedSelfTest.java index 21960b8..306764e 100644 --- a/modules/clients/src/test/java/org/gridgain/client/GridClientAbstractMultiThreadedSelfTest.java +++ b/modules/clients/src/test/java/org/gridgain/client/GridClientAbstractMultiThreadedSelfTest.java @@ -566,7 +566,7 @@ public abstract class GridClientAbstractMultiThreadedSelfTest extends GridCommon /** {@inheritDoc} */ @Override protected Collection<? extends ComputeJob> split(int gridSize, Object arg) - throws GridException { + throws IgniteCheckedException { Collection<ComputeJobAdapter> jobs = new ArrayList<>(gridSize); this.gridSize = gridSize; @@ -585,7 +585,7 @@ public abstract class GridClientAbstractMultiThreadedSelfTest extends GridCommon } /** {@inheritDoc} */ - @Override public String reduce(List<ComputeJobResult> results) throws GridException { + @Override public String reduce(List<ComputeJobResult> results) throws IgniteCheckedException { int sum = 0; String locNodeId = null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/clients/src/test/java/org/gridgain/client/GridClientGetAffinityTask.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/client/GridClientGetAffinityTask.java b/modules/clients/src/test/java/org/gridgain/client/GridClientGetAffinityTask.java index 3fc05bb..e13b6eb 100644 --- a/modules/clients/src/test/java/org/gridgain/client/GridClientGetAffinityTask.java +++ b/modules/clients/src/test/java/org/gridgain/client/GridClientGetAffinityTask.java @@ -29,7 +29,7 @@ public class GridClientGetAffinityTask extends GridTaskSingleJobSplitAdapter<Str private transient Ignite ignite; /** {@inheritDoc} */ - @Override protected Object executeJob(int gridSize, String arg) throws GridException { + @Override protected Object executeJob(int gridSize, String arg) throws IgniteCheckedException { A.notNull(arg, "task argument"); String[] split = arg.split(":", 2); @@ -48,7 +48,7 @@ public class GridClientGetAffinityTask extends GridTaskSingleJobSplitAdapter<Str } /** {@inheritDoc} */ - @Override public ComputeJobResultPolicy result(ComputeJobResult res, List<ComputeJobResult> rcvd) throws GridException { + @Override public ComputeJobResultPolicy result(ComputeJobResult res, List<ComputeJobResult> rcvd) throws IgniteCheckedException { if (res.getException() != null) return FAILOVER; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/clients/src/test/java/org/gridgain/client/GridClientHttpTask.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/client/GridClientHttpTask.java b/modules/clients/src/test/java/org/gridgain/client/GridClientHttpTask.java index 1388953..c018aef 100644 --- a/modules/clients/src/test/java/org/gridgain/client/GridClientHttpTask.java +++ b/modules/clients/src/test/java/org/gridgain/client/GridClientHttpTask.java @@ -10,8 +10,8 @@ package org.gridgain.client; import net.sf.json.*; +import org.apache.ignite.*; import org.apache.ignite.compute.*; -import org.gridgain.grid.*; import java.util.*; @@ -27,7 +27,7 @@ public class GridClientHttpTask extends ComputeTaskSplitAdapter<String, Integer> private final GridClientTcpTask delegate = new GridClientTcpTask(); /** {@inheritDoc} */ - @Override protected Collection<? extends ComputeJob> split(int gridSize, String arg) throws GridException { + @Override protected Collection<? extends ComputeJob> split(int gridSize, String arg) throws IgniteCheckedException { JSON json = JSONSerializer.toJSON(arg); List list = json.isArray() ? JSONArray.toList((JSONArray)json, String.class, new JsonConfig()) : null; @@ -37,12 +37,12 @@ public class GridClientHttpTask extends ComputeTaskSplitAdapter<String, Integer> } /** {@inheritDoc} */ - @Override public Integer reduce(List<ComputeJobResult> results) throws GridException { + @Override public Integer reduce(List<ComputeJobResult> results) throws IgniteCheckedException { return delegate.reduce(results); } /** {@inheritDoc} */ - @Override public ComputeJobResultPolicy result(ComputeJobResult res, List<ComputeJobResult> rcvd) throws GridException { + @Override public ComputeJobResultPolicy result(ComputeJobResult res, List<ComputeJobResult> rcvd) throws IgniteCheckedException { if (res.getException() != null) return FAILOVER; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/clients/src/test/java/org/gridgain/client/GridClientNodeStartup.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/client/GridClientNodeStartup.java b/modules/clients/src/test/java/org/gridgain/client/GridClientNodeStartup.java index ac50ccb..02bfb48 100644 --- a/modules/clients/src/test/java/org/gridgain/client/GridClientNodeStartup.java +++ b/modules/clients/src/test/java/org/gridgain/client/GridClientNodeStartup.java @@ -40,9 +40,9 @@ public class GridClientNodeStartup { * Starts up two nodes with specified cache configuration on pre-defined endpoints. * * @param args Command line arguments, none required. - * @throws GridException In case of any exception. + * @throws IgniteCheckedException In case of any exception. */ - public static void main(String[] args) throws GridException { + public static void main(String[] args) throws IgniteCheckedException { try (Ignite g = G.start("modules/clients/src/test/resources/spring-server-node.xml")) { U.sleep(Long.MAX_VALUE); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/clients/src/test/java/org/gridgain/client/GridClientPortableArgumentTask.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/client/GridClientPortableArgumentTask.java b/modules/clients/src/test/java/org/gridgain/client/GridClientPortableArgumentTask.java index 37875f8..4a086e4 100644 --- a/modules/clients/src/test/java/org/gridgain/client/GridClientPortableArgumentTask.java +++ b/modules/clients/src/test/java/org/gridgain/client/GridClientPortableArgumentTask.java @@ -9,8 +9,8 @@ package org.gridgain.client; +import org.apache.ignite.*; import org.apache.ignite.portables.*; -import org.gridgain.grid.*; import java.util.*; @@ -19,7 +19,7 @@ import java.util.*; */ public class GridClientPortableArgumentTask extends GridTaskSingleJobSplitAdapter { /** {@inheritDoc} */ - @Override protected Object executeJob(int gridSize, Object arg) throws GridException { + @Override protected Object executeJob(int gridSize, Object arg) throws IgniteCheckedException { Collection args = (Collection)arg; Iterator<Object> it = args.iterator(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/clients/src/test/java/org/gridgain/client/GridClientPutPortableTask.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/client/GridClientPutPortableTask.java b/modules/clients/src/test/java/org/gridgain/client/GridClientPutPortableTask.java index 8e275bb..2c6fb6c 100644 --- a/modules/clients/src/test/java/org/gridgain/client/GridClientPutPortableTask.java +++ b/modules/clients/src/test/java/org/gridgain/client/GridClientPutPortableTask.java @@ -23,7 +23,7 @@ public class GridClientPutPortableTask extends GridTaskSingleJobSplitAdapter { private Ignite ignite; /** {@inheritDoc} */ - @Override protected Object executeJob(int gridSize, Object arg) throws GridException { + @Override protected Object executeJob(int gridSize, Object arg) throws IgniteCheckedException { String cacheName = (String)arg; GridCache<Object, Object> cache = ignite.cache(cacheName); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/clients/src/test/java/org/gridgain/client/GridClientReconnectionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/client/GridClientReconnectionSelfTest.java b/modules/clients/src/test/java/org/gridgain/client/GridClientReconnectionSelfTest.java index f8cbab9..2a8116c 100644 --- a/modules/clients/src/test/java/org/gridgain/client/GridClientReconnectionSelfTest.java +++ b/modules/clients/src/test/java/org/gridgain/client/GridClientReconnectionSelfTest.java @@ -9,8 +9,8 @@ package org.gridgain.client; +import org.apache.ignite.*; import org.gridgain.client.impl.connection.*; -import org.gridgain.grid.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.testframework.junits.common.*; @@ -213,9 +213,9 @@ public class GridClientReconnectionSelfTest extends GridCommonAbstractTest { * @param idx Server index, same as in client configuration's servers property. * @param failOnConnect If {@code true} the server should fail incoming connection immediately. * @return Server instance. - * @throws GridException If failed. + * @throws IgniteCheckedException If failed. */ - private GridClientTestRestServer runServer(int idx, boolean failOnConnect) throws GridException { + private GridClientTestRestServer runServer(int idx, boolean failOnConnect) throws IgniteCheckedException { GridClientTestRestServer srv = new GridClientTestRestServer(FIRST_SERVER_PORT + idx, failOnConnect, log()); srv.start(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/clients/src/test/java/org/gridgain/client/GridClientSslNodeStartup.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/client/GridClientSslNodeStartup.java b/modules/clients/src/test/java/org/gridgain/client/GridClientSslNodeStartup.java index 5c71a3f..eb0c9be 100644 --- a/modules/clients/src/test/java/org/gridgain/client/GridClientSslNodeStartup.java +++ b/modules/clients/src/test/java/org/gridgain/client/GridClientSslNodeStartup.java @@ -40,9 +40,9 @@ public class GridClientSslNodeStartup { * Starts up two nodes with specified cache configuration on pre-defined endpoints. * * @param args Command line arguments, none required. - * @throws GridException In case of any exception. + * @throws IgniteCheckedException In case of any exception. */ - public static void main(String[] args) throws GridException { + public static void main(String[] args) throws IgniteCheckedException { System.setProperty("CLIENTS_MODULE_PATH", U.resolveGridGainPath("modules/clients").getAbsolutePath()); try (Ignite g = G.start("modules/clients/src/test/resources/spring-server-ssl-node.xml")) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/clients/src/test/java/org/gridgain/client/GridClientStartNodeTask.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/client/GridClientStartNodeTask.java b/modules/clients/src/test/java/org/gridgain/client/GridClientStartNodeTask.java index 7074175..ada470e 100644 --- a/modules/clients/src/test/java/org/gridgain/client/GridClientStartNodeTask.java +++ b/modules/clients/src/test/java/org/gridgain/client/GridClientStartNodeTask.java @@ -53,7 +53,7 @@ public class GridClientStartNodeTask extends GridTaskSingleJobSplitAdapter<Strin private transient Ignite ignite; /** {@inheritDoc} */ - @Override protected Object executeJob(int gridSize, String type) throws GridException { + @Override protected Object executeJob(int gridSize, String type) throws IgniteCheckedException { log.info(">>> Starting new grid node [currGridSize=" + gridSize + ", arg=" + type + "]"); if (type == null) @@ -77,7 +77,7 @@ public class GridClientStartNodeTask extends GridTaskSingleJobSplitAdapter<Strin /** {@inheritDoc} */ @Override public ComputeJobResultPolicy result(ComputeJobResult res, List<ComputeJobResult> rcvd) - throws GridException { + throws IgniteCheckedException { if (res.getException() != null) return FAILOVER; @@ -125,7 +125,7 @@ public class GridClientStartNodeTask extends GridTaskSingleJobSplitAdapter<Strin assert G.allGrids().isEmpty(); } - catch (GridException e) { + catch (IgniteCheckedException e) { System.err.println("Uncaught exception: " + e.getMessage()); e.printStackTrace(System.err); @@ -139,9 +139,9 @@ public class GridClientStartNodeTask extends GridTaskSingleJobSplitAdapter<Strin * @param add New nodes count. * @param rmv Remove nodes count. * @param type Type of nodes to manipulate. - * @throws GridException On any exception. + * @throws IgniteCheckedException On any exception. */ - private static void changeTopology(Ignite parent, int add, int rmv, String type) throws GridException { + private static void changeTopology(Ignite parent, int add, int rmv, String type) throws IgniteCheckedException { Collection<ComputeTaskFuture<?>> tasks = new ArrayList<>(); IgniteCompute comp = parent.compute().enableAsync(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/clients/src/test/java/org/gridgain/client/GridClientStopNodeTask.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/client/GridClientStopNodeTask.java b/modules/clients/src/test/java/org/gridgain/client/GridClientStopNodeTask.java index efa2326..70de84c 100644 --- a/modules/clients/src/test/java/org/gridgain/client/GridClientStopNodeTask.java +++ b/modules/clients/src/test/java/org/gridgain/client/GridClientStopNodeTask.java @@ -36,7 +36,7 @@ public class GridClientStopNodeTask extends ComputeTaskSplitAdapter<String, Inte private transient Ignite ignite; /** {@inheritDoc} */ - @Override protected Collection<? extends ComputeJob> split(int gridSize, String arg) throws GridException { + @Override protected Collection<? extends ComputeJob> split(int gridSize, String arg) throws IgniteCheckedException { Collection<ComputeJob> jobs = new ArrayList<>(); for (int i = 0; i < gridSize; i++) @@ -46,7 +46,7 @@ public class GridClientStopNodeTask extends ComputeTaskSplitAdapter<String, Inte } /** {@inheritDoc} */ - @Override public ComputeJobResultPolicy result(ComputeJobResult res, List<ComputeJobResult> rcvd) throws GridException { + @Override public ComputeJobResultPolicy result(ComputeJobResult res, List<ComputeJobResult> rcvd) throws IgniteCheckedException { ComputeJobResultPolicy superRes = super.result(res, rcvd); // Deny failover. @@ -57,7 +57,7 @@ public class GridClientStopNodeTask extends ComputeTaskSplitAdapter<String, Inte } /** {@inheritDoc} */ - @Override public Integer reduce(List<ComputeJobResult> results) throws GridException { + @Override public Integer reduce(List<ComputeJobResult> results) throws IgniteCheckedException { int stoppedCnt = 0; for (ComputeJobResult res : results) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/clients/src/test/java/org/gridgain/client/GridClientStringLengthTask.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/client/GridClientStringLengthTask.java b/modules/clients/src/test/java/org/gridgain/client/GridClientStringLengthTask.java index fe95515..d3e8030 100644 --- a/modules/clients/src/test/java/org/gridgain/client/GridClientStringLengthTask.java +++ b/modules/clients/src/test/java/org/gridgain/client/GridClientStringLengthTask.java @@ -9,8 +9,8 @@ package org.gridgain.client; +import org.apache.ignite.*; import org.apache.ignite.compute.*; -import org.gridgain.grid.*; import java.util.*; @@ -23,7 +23,7 @@ import static org.apache.ignite.compute.ComputeJobResultPolicy.*; */ public class GridClientStringLengthTask extends ComputeTaskSplitAdapter<String, Integer> { /** {@inheritDoc} */ - @Override protected Collection<? extends ComputeJob> split(int gridSize, String arg) throws GridException { + @Override protected Collection<? extends ComputeJob> split(int gridSize, String arg) throws IgniteCheckedException { Collection<ComputeJobAdapter> jobs = new ArrayList<>(); if (arg != null) @@ -45,7 +45,7 @@ public class GridClientStringLengthTask extends ComputeTaskSplitAdapter<String, } /** {@inheritDoc} */ - @Override public Integer reduce(List<ComputeJobResult> results) throws GridException { + @Override public Integer reduce(List<ComputeJobResult> results) throws IgniteCheckedException { int sum = 0; for (ComputeJobResult res : results) @@ -56,7 +56,7 @@ public class GridClientStringLengthTask extends ComputeTaskSplitAdapter<String, /** {@inheritDoc} */ @Override public ComputeJobResultPolicy result(ComputeJobResult res, List<ComputeJobResult> rcvd) - throws GridException { + throws IgniteCheckedException { if (res.getException() != null) return FAILOVER; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/clients/src/test/java/org/gridgain/client/GridClientTcpTask.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/client/GridClientTcpTask.java b/modules/clients/src/test/java/org/gridgain/client/GridClientTcpTask.java index 46b65e7..3fc54b1 100644 --- a/modules/clients/src/test/java/org/gridgain/client/GridClientTcpTask.java +++ b/modules/clients/src/test/java/org/gridgain/client/GridClientTcpTask.java @@ -9,8 +9,8 @@ package org.gridgain.client; +import org.apache.ignite.*; import org.apache.ignite.compute.*; -import org.gridgain.grid.*; import java.util.*; @@ -24,7 +24,7 @@ import static org.apache.ignite.compute.ComputeJobResultPolicy.*; public class GridClientTcpTask extends ComputeTaskSplitAdapter<List<Object>, Integer> { /** {@inheritDoc} */ @Override protected Collection<? extends ComputeJob> split(int gridSize, List<Object> list) - throws GridException { + throws IgniteCheckedException { Collection<ComputeJobAdapter> jobs = new ArrayList<>(); if (list != null) @@ -46,7 +46,7 @@ public class GridClientTcpTask extends ComputeTaskSplitAdapter<List<Object>, Int } /** {@inheritDoc} */ - @Override public Integer reduce(List<ComputeJobResult> results) throws GridException { + @Override public Integer reduce(List<ComputeJobResult> results) throws IgniteCheckedException { int sum = 0; for (ComputeJobResult res : results) @@ -56,7 +56,7 @@ public class GridClientTcpTask extends ComputeTaskSplitAdapter<List<Object>, Int } /** {@inheritDoc} */ - @Override public ComputeJobResultPolicy result(ComputeJobResult res, List<ComputeJobResult> rcvd) throws GridException { + @Override public ComputeJobResultPolicy result(ComputeJobResult res, List<ComputeJobResult> rcvd) throws IgniteCheckedException { if (res.getException() != null) return FAILOVER; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/clients/src/test/java/org/gridgain/client/GridClientTestPortableAffinityKeyTask.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/client/GridClientTestPortableAffinityKeyTask.java b/modules/clients/src/test/java/org/gridgain/client/GridClientTestPortableAffinityKeyTask.java index 883b370..f997eab 100644 --- a/modules/clients/src/test/java/org/gridgain/client/GridClientTestPortableAffinityKeyTask.java +++ b/modules/clients/src/test/java/org/gridgain/client/GridClientTestPortableAffinityKeyTask.java @@ -29,30 +29,30 @@ public class GridClientTestPortableAffinityKeyTask extends ComputeTaskAdapter<Ob /** {@inheritDoc} */ @Nullable @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> clusterNodes, - @Nullable final Object arg) throws GridException { + @Nullable final Object arg) throws IgniteCheckedException { for (ClusterNode node : clusterNodes) { if (node.isLocal()) return Collections.singletonMap(new ComputeJobAdapter() { - @Override public Object execute() throws GridException { + @Override public Object execute() throws IgniteCheckedException { return executeJob(arg); } }, node); } - throw new GridException("Failed to find local node in task topology: " + clusterNodes); + throw new IgniteCheckedException("Failed to find local node in task topology: " + clusterNodes); } /** {@inheritDoc} */ - @Nullable @Override public Boolean reduce(List<ComputeJobResult> results) throws GridException { + @Nullable @Override public Boolean reduce(List<ComputeJobResult> results) throws IgniteCheckedException { return results.get(0).getData(); } /** * @param arg Argument. * @return Execution result. - * @throws GridException If failed. + * @throws IgniteCheckedException If failed. */ - protected Boolean executeJob(Object arg) throws GridException { + protected Boolean executeJob(Object arg) throws IgniteCheckedException { Collection args = (Collection)arg; Iterator<Object> it = args.iterator(); @@ -68,10 +68,10 @@ public class GridClientTestPortableAffinityKeyTask extends ComputeTaskAdapter<Ob Object affKey = ignite.cache(cacheName).affinity().affinityKey(obj); if (!expAffKey.equals(affKey)) - throw new GridException("Unexpected affinity key: " + affKey); + throw new IgniteCheckedException("Unexpected affinity key: " + affKey); if (!ignite.cache(cacheName).affinity().mapKeyToNode(obj).isLocal()) - throw new GridException("Job is not run on primary node."); + throw new IgniteCheckedException("Job is not run on primary node."); return true; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/clients/src/test/java/org/gridgain/client/GridClientTestRestServer.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/client/GridClientTestRestServer.java b/modules/clients/src/test/java/org/gridgain/client/GridClientTestRestServer.java index 7308bf0..9fa7cda 100644 --- a/modules/clients/src/test/java/org/gridgain/client/GridClientTestRestServer.java +++ b/modules/clients/src/test/java/org/gridgain/client/GridClientTestRestServer.java @@ -101,9 +101,9 @@ public class GridClientTestRestServer { /** * Starts the server. * - * @throws GridException If failed. + * @throws IgniteCheckedException If failed. */ - public void start() throws GridException { + public void start() throws IgniteCheckedException { try { String gridName = "test"; @@ -124,7 +124,7 @@ public class GridClientTestRestServer { .build(); } catch (UnknownHostException e) { - throw new GridException("Failed to determine localhost address.", e); + throw new IgniteCheckedException("Failed to determine localhost address.", e); } srv.start(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/clients/src/test/java/org/gridgain/client/GridHashMapStore.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/client/GridHashMapStore.java b/modules/clients/src/test/java/org/gridgain/client/GridHashMapStore.java index 2a18ec7..3e2bc44 100644 --- a/modules/clients/src/test/java/org/gridgain/client/GridHashMapStore.java +++ b/modules/clients/src/test/java/org/gridgain/client/GridHashMapStore.java @@ -9,8 +9,8 @@ package org.gridgain.client; +import org.apache.ignite.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.store.*; import org.jetbrains.annotations.*; @@ -26,26 +26,26 @@ public class GridHashMapStore extends GridCacheStoreAdapter { /** {@inheritDoc} */ @Override public void loadCache(IgniteBiInClosure c, Object... args) - throws GridException { + throws IgniteCheckedException { for (Map.Entry e : map.entrySet()) c.apply(e.getKey(), e.getValue()); } /** {@inheritDoc} */ @Override public Object load(@Nullable GridCacheTx tx, Object key) - throws GridException { + throws IgniteCheckedException { return map.get(key); } /** {@inheritDoc} */ @Override public void put(@Nullable GridCacheTx tx, Object key, - @Nullable Object val) throws GridException { + @Nullable Object val) throws IgniteCheckedException { map.put(key, val); } /** {@inheritDoc} */ @Override public void remove(@Nullable GridCacheTx tx, Object key) - throws GridException { + throws IgniteCheckedException { map.remove(key); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/clients/src/test/java/org/gridgain/client/GridSleepTestTask.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/client/GridSleepTestTask.java b/modules/clients/src/test/java/org/gridgain/client/GridSleepTestTask.java index 72efcec..64b6351 100644 --- a/modules/clients/src/test/java/org/gridgain/client/GridSleepTestTask.java +++ b/modules/clients/src/test/java/org/gridgain/client/GridSleepTestTask.java @@ -1,7 +1,7 @@ package org.gridgain.client; +import org.apache.ignite.*; import org.apache.ignite.compute.*; -import org.gridgain.grid.*; import java.util.*; @@ -14,7 +14,7 @@ import static org.apache.ignite.compute.ComputeJobResultPolicy.*; public class GridSleepTestTask extends ComputeTaskSplitAdapter<String, Integer> { /** {@inheritDoc} */ @Override public Collection<? extends ComputeJob> split(int gridSize, String arg) - throws GridException { + throws IgniteCheckedException { return Collections.singleton(new ComputeJobAdapter(arg) { @Override public Object execute() { try { @@ -32,7 +32,7 @@ public class GridSleepTestTask extends ComputeTaskSplitAdapter<String, Integer> } /** {@inheritDoc} */ - @Override public Integer reduce(List<ComputeJobResult> results) throws GridException { + @Override public Integer reduce(List<ComputeJobResult> results) throws IgniteCheckedException { int sum = 0; for (ComputeJobResult res : results) @@ -42,7 +42,7 @@ public class GridSleepTestTask extends ComputeTaskSplitAdapter<String, Integer> } /** {@inheritDoc} */ - @Override public ComputeJobResultPolicy result(ComputeJobResult res, List<ComputeJobResult> rcvd) throws GridException { + @Override public ComputeJobResultPolicy result(ComputeJobResult res, List<ComputeJobResult> rcvd) throws IgniteCheckedException { if (res.getException() != null) return FAILOVER; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/clients/src/test/java/org/gridgain/client/GridTaskSingleJobSplitAdapter.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/client/GridTaskSingleJobSplitAdapter.java b/modules/clients/src/test/java/org/gridgain/client/GridTaskSingleJobSplitAdapter.java index 5cb82b7..d746409 100644 --- a/modules/clients/src/test/java/org/gridgain/client/GridTaskSingleJobSplitAdapter.java +++ b/modules/clients/src/test/java/org/gridgain/client/GridTaskSingleJobSplitAdapter.java @@ -9,8 +9,8 @@ package org.gridgain.client; +import org.apache.ignite.*; import org.apache.ignite.compute.*; -import org.gridgain.grid.*; import java.util.*; @@ -28,22 +28,22 @@ public abstract class GridTaskSingleJobSplitAdapter<T, R> extends ComputeTaskSpl } /** {@inheritDoc} */ - @Override protected Collection<? extends ComputeJob> split(final int gridSize, final T arg) throws GridException { + @Override protected Collection<? extends ComputeJob> split(final int gridSize, final T arg) throws IgniteCheckedException { return Collections.singleton(new ComputeJobAdapter() { - @Override public Object execute() throws GridException { + @Override public Object execute() throws IgniteCheckedException { return executeJob(gridSize, arg); } }); } /** {@inheritDoc} */ - @Override public R reduce(List<ComputeJobResult> results) throws GridException { + @Override public R reduce(List<ComputeJobResult> results) throws IgniteCheckedException { assert results.size() == 1; ComputeJobResult res = results.get(0); if (res.isCancelled()) - throw new GridException("Reduce receives failed job."); + throw new IgniteCheckedException("Reduce receives failed job."); return res.getData(); } @@ -57,11 +57,11 @@ public abstract class GridTaskSingleJobSplitAdapter<T, R> extends ComputeTaskSpl * @return Job execution result (possibly {@code null}). This result will be returned * in {@link org.apache.ignite.compute.ComputeJobResult#getData()} method passed into * {@link org.apache.ignite.compute.ComputeTask#result(org.apache.ignite.compute.ComputeJobResult, List)} method into task on caller node. - * @throws GridException If job execution caused an exception. This exception will be + * @throws IgniteCheckedException If job execution caused an exception. This exception will be * returned in {@link org.apache.ignite.compute.ComputeJobResult#getException()} method passed into * {@link org.apache.ignite.compute.ComputeTask#result(org.apache.ignite.compute.ComputeJobResult, List)} method into task on caller node. * If execution produces a {@link RuntimeException} or {@link Error}, then - * it will be wrapped into {@link GridException}. + * it will be wrapped into {@link IgniteCheckedException}. */ - protected abstract Object executeJob(int gridSize, T arg) throws GridException; + protected abstract Object executeJob(int gridSize, T arg) throws IgniteCheckedException; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/clients/src/test/java/org/gridgain/client/integration/GridClientAbstractMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/client/integration/GridClientAbstractMultiNodeSelfTest.java b/modules/clients/src/test/java/org/gridgain/client/integration/GridClientAbstractMultiNodeSelfTest.java index 259ee3a..96fb9d6 100644 --- a/modules/clients/src/test/java/org/gridgain/client/integration/GridClientAbstractMultiNodeSelfTest.java +++ b/modules/clients/src/test/java/org/gridgain/client/integration/GridClientAbstractMultiNodeSelfTest.java @@ -697,7 +697,7 @@ public abstract class GridClientAbstractMultiNodeSelfTest extends GridCommonAbst /** {@inheritDoc} */ @Override protected Collection<? extends ComputeJob> split(int gridSize, Object arg) - throws GridException { + throws IgniteCheckedException { Collection<ComputeJobAdapter> jobs = new ArrayList<>(gridSize); this.gridSize = gridSize; @@ -724,7 +724,7 @@ public abstract class GridClientAbstractMultiNodeSelfTest extends GridCommonAbst } /** {@inheritDoc} */ - @Override public String reduce(List<ComputeJobResult> results) throws GridException { + @Override public String reduce(List<ComputeJobResult> results) throws IgniteCheckedException { int sum = 0; String locNodeId = null;
