http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/internal/GridCancelUnusedJobSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridCancelUnusedJobSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridCancelUnusedJobSelfTest.java index e9a4e8c..d315a8a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridCancelUnusedJobSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridCancelUnusedJobSelfTest.java @@ -120,7 +120,7 @@ public class GridCancelUnusedJobSelfTest extends GridCommonAbstractTest { */ private static class GridCancelTestTask extends ComputeTaskSplitAdapter<Object, Object> { /** */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** {@inheritDoc} */ @@ -158,11 +158,11 @@ public class GridCancelUnusedJobSelfTest extends GridCommonAbstractTest { */ private static class GridCancelTestJob extends ComputeJobAdapter { /** */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** */ - @IgniteTaskSessionResource + @TaskSessionResource private ComputeTaskSession ses; /**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/internal/GridCancelledJobsMetricsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridCancelledJobsMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridCancelledJobsMetricsSelfTest.java index 2b0e21f..1538a96 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridCancelledJobsMetricsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridCancelledJobsMetricsSelfTest.java @@ -160,7 +160,7 @@ public class GridCancelledJobsMetricsSelfTest extends GridCommonAbstractTest { private static class GridCancelCollisionSpi extends IgniteSpiAdapter implements CollisionSpi { /** */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/internal/GridCollisionJobsContextSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridCollisionJobsContextSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridCollisionJobsContextSelfTest.java index 48a5d88..2dd711f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridCollisionJobsContextSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridCollisionJobsContextSelfTest.java @@ -65,7 +65,7 @@ public class GridCollisionJobsContextSelfTest extends GridCommonAbstractTest { @IgniteSpiMultipleInstancesSupport(true) public static class TestCollisionSpi extends IgniteSpiAdapter implements CollisionSpi { /** Grid logger. */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/internal/GridContinuousJobAnnotationSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridContinuousJobAnnotationSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridContinuousJobAnnotationSelfTest.java index d11bced..8f0aeab 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridContinuousJobAnnotationSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridContinuousJobAnnotationSelfTest.java @@ -100,7 +100,7 @@ public class GridContinuousJobAnnotationSelfTest extends GridCommonAbstractTest @SuppressWarnings({"PublicInnerClass", "unused"}) public static class TestTask implements ComputeTask<Object, Object> { /** */ - @IgniteTaskContinuousMapperResource + @TaskContinuousMapperResource private ComputeTaskContinuousMapper mapper; /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/internal/GridContinuousJobSiblingsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridContinuousJobSiblingsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridContinuousJobSiblingsSelfTest.java index adbe08d..5e50456 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridContinuousJobSiblingsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridContinuousJobSiblingsSelfTest.java @@ -65,11 +65,11 @@ public class GridContinuousJobSiblingsSelfTest extends GridCommonAbstractTest { /** */ private static class TestTask extends ComputeTaskSplitAdapter<Object, Object> { /** */ - @IgniteTaskContinuousMapperResource + @TaskContinuousMapperResource private ComputeTaskContinuousMapper mapper; /** */ - @IgniteTaskSessionResource + @TaskSessionResource private ComputeTaskSession ses; /** */ @@ -107,11 +107,11 @@ public class GridContinuousJobSiblingsSelfTest extends GridCommonAbstractTest { /** */ private static class TestJob extends ComputeJobAdapter { /** */ - @IgniteTaskSessionResource + @TaskSessionResource private ComputeTaskSession ses; /** */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/internal/GridContinuousTaskSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridContinuousTaskSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridContinuousTaskSelfTest.java index 5536a7a..7c6bacc 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridContinuousTaskSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridContinuousTaskSelfTest.java @@ -138,11 +138,11 @@ public class GridContinuousTaskSelfTest extends GridCommonAbstractTest { @SuppressWarnings({"PublicInnerClass"}) public static class TestJobsChainTask implements ComputeTask<Boolean, Integer> { /** */ - @IgniteTaskContinuousMapperResource + @TaskContinuousMapperResource private ComputeTaskContinuousMapper mapper; /** */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** */ @@ -231,15 +231,15 @@ public class GridContinuousTaskSelfTest extends GridCommonAbstractTest { @ComputeTaskSessionFullSupport public static class SessionChainTestTask extends ComputeTaskSplitAdapter<Object, Object> { /** */ - @IgniteTaskSessionResource + @TaskSessionResource private ComputeTaskSession ses; /** */ - @IgniteTaskContinuousMapperResource + @TaskContinuousMapperResource private ComputeTaskContinuousMapper mapper; /** */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** {@inheritDoc} */ @@ -285,11 +285,11 @@ public class GridContinuousTaskSelfTest extends GridCommonAbstractTest { @SuppressWarnings({"PublicInnerClass"}) public static class SessionChainTestJob extends ComputeJobAdapter { /** */ - @IgniteTaskSessionResource + @TaskSessionResource private ComputeTaskSession ses; /** */ - @IgniteJobContextResource + @JobContextResource private ComputeJobContext ctx; /** */ @@ -318,7 +318,7 @@ public class GridContinuousTaskSelfTest extends GridCommonAbstractTest { @SuppressWarnings({"PublicInnerClass"}) public static class SlowMapTestTask extends ComputeTaskAdapter<Object, Integer> { /** */ - @IgniteTaskContinuousMapperResource + @TaskContinuousMapperResource private ComputeTaskContinuousMapper mapper; /** */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/internal/GridDeploymentSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridDeploymentSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridDeploymentSelfTest.java index 593c663..a159e4d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridDeploymentSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridDeploymentSelfTest.java @@ -357,7 +357,7 @@ public class GridDeploymentSelfTest extends GridCommonAbstractTest { */ private static class GridDeploymentTestTask extends ComputeTaskAdapter<Object, Object> { /** */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** {@inheritDoc} */ @@ -390,7 +390,7 @@ public class GridDeploymentSelfTest extends GridCommonAbstractTest { @ComputeTaskName(value = "GridDeploymentTestTask") private static class GridDeploymentTestTask1 extends ComputeTaskAdapter<Object, Object> { /** */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** {@inheritDoc} */ @@ -422,7 +422,7 @@ public class GridDeploymentSelfTest extends GridCommonAbstractTest { @ComputeTaskName(value = "GridDeploymentTestTask") private static class GridDeploymentTestTask2 extends ComputeTaskAdapter<Object, Object> { /** */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/internal/GridEventStorageCheckAllEventsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridEventStorageCheckAllEventsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridEventStorageCheckAllEventsSelfTest.java index 25b5eb7..aaac93f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridEventStorageCheckAllEventsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridEventStorageCheckAllEventsSelfTest.java @@ -343,7 +343,7 @@ public class GridEventStorageCheckAllEventsSelfTest extends GridCommonAbstractTe */ private static class GridAllEventsSuccessTestJob extends ComputeJobAdapter { /** */ - @IgniteTaskSessionResource + @TaskSessionResource private ComputeTaskSession taskSes; /** {@inheritDoc} */ @@ -371,7 +371,7 @@ public class GridEventStorageCheckAllEventsSelfTest extends GridCommonAbstractTe */ private static class GridAllEventsTimeoutTestJob extends ComputeJobAdapter { /** */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** {@inheritDoc} */ @@ -397,7 +397,7 @@ public class GridEventStorageCheckAllEventsSelfTest extends GridCommonAbstractTe */ private static class GridAllCheckpointEventsTestJob extends ComputeJobAdapter { /** */ - @IgniteTaskSessionResource + @TaskSessionResource private ComputeTaskSession taskSes; /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/internal/GridFailoverCustomTopologySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridFailoverCustomTopologySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridFailoverCustomTopologySelfTest.java index cb4da2d..0e140ba 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridFailoverCustomTopologySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridFailoverCustomTopologySelfTest.java @@ -119,7 +119,7 @@ public class GridFailoverCustomTopologySelfTest extends GridCommonAbstractTest { @SuppressWarnings("PublicInnerClass") public static class JobTask extends ComputeTaskAdapter<String, String> { /** */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/internal/GridFailoverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridFailoverSelfTest.java index c7a75df..f0205c2 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridFailoverSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridFailoverSelfTest.java @@ -79,7 +79,7 @@ public class GridFailoverSelfTest extends GridCommonAbstractTest { @ComputeTaskSessionFullSupport private static class JobFailTask implements ComputeTask<String, Object> { /** */ - @IgniteTaskSessionResource + @TaskSessionResource private ComputeTaskSession ses; /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/internal/GridFailoverTaskWithPredicateSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridFailoverTaskWithPredicateSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridFailoverTaskWithPredicateSelfTest.java index bc142a3..b422bf4 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridFailoverTaskWithPredicateSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridFailoverTaskWithPredicateSelfTest.java @@ -197,7 +197,7 @@ public class GridFailoverTaskWithPredicateSelfTest extends GridCommonAbstractTes @ComputeTaskSessionFullSupport private static class JobFailTask implements ComputeTask<String, Object> { /** */ - @IgniteTaskSessionResource + @TaskSessionResource private ComputeTaskSession ses; /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/internal/GridJobCheckpointCleanupSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridJobCheckpointCleanupSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridJobCheckpointCleanupSelfTest.java index c9454ef..c3ab123 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridJobCheckpointCleanupSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridJobCheckpointCleanupSelfTest.java @@ -138,7 +138,7 @@ public class GridJobCheckpointCleanupSelfTest extends GridCommonAbstractTest { for (ClusterNode node : subgrid) { if (node.id().equals(arg.id())) return Collections.singletonMap(new ComputeJobAdapter() { - @IgniteTaskSessionResource + @TaskSessionResource private ComputeTaskSession ses; @Nullable @Override public Object execute() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/internal/GridJobCollisionCancelSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridJobCollisionCancelSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridJobCollisionCancelSelfTest.java index f3e5339..5fd30df 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridJobCollisionCancelSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridJobCollisionCancelSelfTest.java @@ -123,7 +123,7 @@ public class GridJobCollisionCancelSelfTest extends GridCommonAbstractTest { */ public static class GridCancelTestTask extends ComputeTaskSplitAdapter<Serializable, Object> { /** */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** {@inheritDoc} */ @@ -163,11 +163,11 @@ public class GridJobCollisionCancelSelfTest extends GridCommonAbstractTest { */ public static class GridCancelTestJob extends ComputeJobAdapter { /** */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** */ - @IgniteJobContextResource + @JobContextResource private ComputeJobContext jobCtx; /** */ @@ -232,7 +232,7 @@ public class GridJobCollisionCancelSelfTest extends GridCommonAbstractTest { @IgniteSpiMultipleInstancesSupport(true) public static class GridTestCollision extends IgniteSpiAdapter implements CollisionSpi { /** */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/internal/GridJobContextSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridJobContextSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridJobContextSelfTest.java index 0188b35..81f0f13 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridJobContextSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridJobContextSelfTest.java @@ -60,7 +60,7 @@ public class GridJobContextSelfTest extends GridCommonAbstractTest { for (int i = 0; i < gridSize; i++) { jobs.add(new ComputeJobAdapter() { /** */ - @IgniteJobContextResource + @JobContextResource private ComputeJobContext jobCtx; /** Ignite instance. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/internal/GridJobMasterLeaveAwareSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridJobMasterLeaveAwareSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridJobMasterLeaveAwareSelfTest.java index eb012b6..1c28403 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridJobMasterLeaveAwareSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridJobMasterLeaveAwareSelfTest.java @@ -583,7 +583,7 @@ public class GridJobMasterLeaveAwareSelfTest extends GridCommonAbstractTest { */ private static class TestCallable implements Callable<Void>, ComputeJobMasterLeaveAware { /** Task session. */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** */ @@ -607,7 +607,7 @@ public class GridJobMasterLeaveAwareSelfTest extends GridCommonAbstractTest { */ private static class TestRunnable implements Runnable, ComputeJobMasterLeaveAware { /** Task session. */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** */ @@ -629,7 +629,7 @@ public class GridJobMasterLeaveAwareSelfTest extends GridCommonAbstractTest { */ private static class TestClosure implements IgniteClosure<String, Void>, ComputeJobMasterLeaveAware { /** Task session. */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** */ @@ -656,7 +656,7 @@ public class GridJobMasterLeaveAwareSelfTest extends GridCommonAbstractTest { private int jobCnt; /** */ - @IgniteTaskSessionResource + @TaskSessionResource private ComputeTaskSession taskSes; /** @@ -689,7 +689,7 @@ public class GridJobMasterLeaveAwareSelfTest extends GridCommonAbstractTest { */ private static class TestJob extends ComputeJobAdapter implements ComputeJobMasterLeaveAware { /** Task session. */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/internal/GridJobStealingSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridJobStealingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridJobStealingSelfTest.java index 477db7f..0980010 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridJobStealingSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridJobStealingSelfTest.java @@ -304,7 +304,7 @@ public class GridJobStealingSelfTest extends GridCommonAbstractTest { private Ignite ignite; /** Logger. */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** Number of jobs to spawn from task. */ @@ -393,7 +393,7 @@ public class GridJobStealingSelfTest extends GridCommonAbstractTest { private Ignite ignite; /** Logger. */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/internal/GridJobStealingZeroActiveJobsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridJobStealingZeroActiveJobsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridJobStealingZeroActiveJobsSelfTest.java index 3768476..94377cc 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridJobStealingZeroActiveJobsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridJobStealingZeroActiveJobsSelfTest.java @@ -98,7 +98,7 @@ public class GridJobStealingZeroActiveJobsSelfTest extends GridCommonAbstractTes private Ignite ignite; /** Logger. */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/internal/GridJobSubjectIdSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridJobSubjectIdSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridJobSubjectIdSelfTest.java index eb1288b..8866549 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridJobSubjectIdSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridJobSubjectIdSelfTest.java @@ -95,7 +95,7 @@ public class GridJobSubjectIdSelfTest extends GridCommonAbstractTest { private UUID targetNodeId; /** Session. */ - @IgniteTaskSessionResource + @TaskSessionResource private ComputeTaskSession ses; /** @@ -139,7 +139,7 @@ public class GridJobSubjectIdSelfTest extends GridCommonAbstractTest { @SuppressWarnings("PublicInnerClass") public static class Job extends ComputeJobAdapter { /** Session. */ - @IgniteTaskSessionResource + @TaskSessionResource private ComputeTaskSession ses; /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/internal/GridManagementJobSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridManagementJobSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridManagementJobSelfTest.java index b8c16db..ffa9579 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridManagementJobSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridManagementJobSelfTest.java @@ -136,7 +136,7 @@ public class GridManagementJobSelfTest extends GridCommonAbstractTest { */ private static class TestJob implements Callable<Object>, Serializable { /** Task session. */ - @IgniteTaskSessionResource + @TaskSessionResource protected ComputeTaskSession ses; /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/internal/GridMultipleSpisSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridMultipleSpisSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridMultipleSpisSelfTest.java index f3c46fb..71c5912 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridMultipleSpisSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridMultipleSpisSelfTest.java @@ -229,7 +229,7 @@ public class GridMultipleSpisSelfTest extends GridCommonAbstractTest { @ComputeTaskSessionFullSupport public static final class GridTestMultipleSpisTask extends ComputeTaskAdapter<UUID, Integer> { /** */ - @IgniteTaskSessionResource + @TaskSessionResource private ComputeTaskSession taskSes; /** */ @@ -273,7 +273,7 @@ public class GridMultipleSpisSelfTest extends GridCommonAbstractTest { private Ignite ignite; /** */ - @IgniteTaskSessionResource + @TaskSessionResource private ComputeTaskSession jobSes; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/internal/GridMultipleVersionsDeploymentSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridMultipleVersionsDeploymentSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridMultipleVersionsDeploymentSelfTest.java index 4022f4a..e20b613 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridMultipleVersionsDeploymentSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridMultipleVersionsDeploymentSelfTest.java @@ -278,7 +278,7 @@ public class GridMultipleVersionsDeploymentSelfTest extends GridCommonAbstractTe @SuppressWarnings({"PublicInnerClass"}) public static class GridDeploymentTestJob extends ComputeJobAdapter { /** */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/internal/GridMultithreadedJobStealingSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridMultithreadedJobStealingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridMultithreadedJobStealingSelfTest.java index 7de51ea..65a5b07 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridMultithreadedJobStealingSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridMultithreadedJobStealingSelfTest.java @@ -153,7 +153,7 @@ public class GridMultithreadedJobStealingSelfTest extends GridCommonAbstractTest private Ignite ignite; /** Logger. */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/internal/GridNonHistoryMetricsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridNonHistoryMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridNonHistoryMetricsSelfTest.java index f8ae1ca..df1b2df 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridNonHistoryMetricsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridNonHistoryMetricsSelfTest.java @@ -103,7 +103,7 @@ public class GridNonHistoryMetricsSelfTest extends GridCommonAbstractTest { */ private static class TestTask extends ComputeTaskSplitAdapter<Object, Object> { /** Logger. */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/internal/GridReduceSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridReduceSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridReduceSelfTest.java index 9407226..2130c64 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridReduceSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridReduceSelfTest.java @@ -144,7 +144,7 @@ public class GridReduceSelfTest extends GridCommonAbstractTest { @SuppressWarnings("PackageVisibleField") private static class ReducerTestClosure implements IgniteCallable<Long> { /** Logger. */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** Test flag to check the thread was interrupted. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/internal/GridRuntimeExceptionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridRuntimeExceptionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridRuntimeExceptionSelfTest.java index 2581927..e5533ef 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridRuntimeExceptionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridRuntimeExceptionSelfTest.java @@ -211,7 +211,7 @@ public class GridRuntimeExceptionSelfTest extends GridCommonAbstractTest { /** */ private static class GridTaskFailedTestTask extends ComputeTaskAdapter<Serializable, Serializable> { /** */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** Ignite instance. */ @@ -270,7 +270,7 @@ public class GridRuntimeExceptionSelfTest extends GridCommonAbstractTest { /** */ private static class GridTaskFailedTestJob extends ComputeJobAdapter { /** */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/internal/GridStopWithWaitSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridStopWithWaitSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridStopWithWaitSelfTest.java index 34b9787..03635e7 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridStopWithWaitSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridStopWithWaitSelfTest.java @@ -166,7 +166,7 @@ public class GridStopWithWaitSelfTest extends GridCommonAbstractTest { @ComputeTaskSessionFullSupport private static class JobFailTask implements ComputeTask<String, Object> { /** */ - @IgniteTaskSessionResource + @TaskSessionResource private ComputeTaskSession ses; /** Ignite instance. */ @@ -187,7 +187,7 @@ public class GridStopWithWaitSelfTest extends GridCommonAbstractTest { private Ignite ignite; /** Logger. */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; @Override public Serializable execute() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/internal/GridTaskCancelSingleNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskCancelSingleNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskCancelSingleNodeSelfTest.java index 28e572e..92cdb14 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskCancelSingleNodeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskCancelSingleNodeSelfTest.java @@ -152,7 +152,7 @@ public class GridTaskCancelSingleNodeSelfTest extends GridCommonAbstractTest { @Override protected Collection<? extends ComputeJob> split(int gridSize, Void arg) { return F.asSet(new ComputeJobAdapter() { /** */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/internal/GridTaskContinuousMapperSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskContinuousMapperSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskContinuousMapperSelfTest.java index 179c5fb..e254957 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskContinuousMapperSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskContinuousMapperSelfTest.java @@ -80,7 +80,7 @@ public class GridTaskContinuousMapperSelfTest extends GridCommonAbstractTest { public static class TestAllMethodsTask extends ComputeTaskAdapter<Object, Object> { /** */ @SuppressWarnings({"UnusedDeclaration"}) - @IgniteTaskContinuousMapperResource + @TaskContinuousMapperResource private ComputeTaskContinuousMapper mapper; /** */ @@ -125,7 +125,7 @@ public class GridTaskContinuousMapperSelfTest extends GridCommonAbstractTest { @SuppressWarnings({"PublicInnerClass"}) public static class TestLifeCycleTask extends ComputeTaskAdapter<Object, Object> { /** */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** */ @@ -136,7 +136,7 @@ public class GridTaskContinuousMapperSelfTest extends GridCommonAbstractTest { * @throws IgniteCheckedException Thrown if any exception occurs. */ @SuppressWarnings("unused") - @IgniteTaskContinuousMapperResource + @TaskContinuousMapperResource private void setMapper(ComputeTaskContinuousMapper mapper) throws IgniteCheckedException { this.mapper = mapper; @@ -215,11 +215,11 @@ public class GridTaskContinuousMapperSelfTest extends GridCommonAbstractTest { public static class TestNegativeTask extends ComputeTaskAdapter<Object, Object> { /** */ @SuppressWarnings({"UnusedDeclaration"}) - @IgniteTaskContinuousMapperResource + @TaskContinuousMapperResource private ComputeTaskContinuousMapper mapper; /** */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/internal/GridTaskExecutionContextSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskExecutionContextSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskExecutionContextSelfTest.java index 01fcdf6..70573a3 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskExecutionContextSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskExecutionContextSelfTest.java @@ -68,7 +68,7 @@ public class GridTaskExecutionContextSelfTest extends GridCommonAbstractTest { */ public void testWithName() throws Exception { Callable<String> f = new IgniteCallable<String>() { - @IgniteTaskSessionResource + @TaskSessionResource private ComputeTaskSession ses; @Override public String call() { @@ -156,7 +156,7 @@ public class GridTaskExecutionContextSelfTest extends GridCommonAbstractTest { /** {@inheritDoc} */ @Override protected Collection<? extends ComputeJob> split(int gridSize, Void arg) { return F.asSet(new ComputeJobAdapter() { - @IgniteTaskSessionResource + @TaskSessionResource private ComputeTaskSession ses; @Override public Object execute() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/internal/GridTaskFailoverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskFailoverSelfTest.java index 1856137..28a7758 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskFailoverSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskFailoverSelfTest.java @@ -69,7 +69,7 @@ public class GridTaskFailoverSelfTest extends GridCommonAbstractTest { @SuppressWarnings({"PublicInnerClass"}) public static class GridFailoverTestTask extends ComputeTaskSplitAdapter<Serializable, Integer> { /** */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/internal/GridTaskFutureImplStopGridSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskFutureImplStopGridSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskFutureImplStopGridSelfTest.java index f9fc1f9..3718373 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskFutureImplStopGridSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskFutureImplStopGridSelfTest.java @@ -145,7 +145,7 @@ public class GridTaskFutureImplStopGridSelfTest extends GridCommonAbstractTest { @SuppressWarnings({"PublicInnerClass", "UnusedDeclaration"}) public static class GridStopTestTask extends ComputeTaskSplitAdapter<Object, Object> { /** */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** {@inheritDoc} */ @@ -180,7 +180,7 @@ public class GridTaskFutureImplStopGridSelfTest extends GridCommonAbstractTest { @SuppressWarnings({"PublicInnerClass"}) public static class GridStopTestJob extends ComputeJobAdapter { /** */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/internal/GridTaskInstanceExecutionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskInstanceExecutionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskInstanceExecutionSelfTest.java index 5e8c9f7..3bdeb10 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskInstanceExecutionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskInstanceExecutionSelfTest.java @@ -71,7 +71,7 @@ public class GridTaskInstanceExecutionSelfTest extends GridCommonAbstractTest { private Object state; /** */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/internal/GridTaskMapAsyncSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskMapAsyncSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskMapAsyncSelfTest.java index 6420353..09d17bf 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskMapAsyncSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskMapAsyncSelfTest.java @@ -113,7 +113,7 @@ public class GridTaskMapAsyncSelfTest extends GridCommonAbstractTest { protected Thread runner; /** */ - @IgniteLoggerResource + @LoggerResource protected IgniteLogger log; /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/internal/GridTaskNameAnnotationSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskNameAnnotationSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskNameAnnotationSelfTest.java index 401e215..1b1a347 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskNameAnnotationSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskNameAnnotationSelfTest.java @@ -84,7 +84,7 @@ public class GridTaskNameAnnotationSelfTest extends GridCommonAbstractTest { @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, @Nullable Void arg) { return F.asMap(new ComputeJobAdapter() { - @IgniteTaskSessionResource + @TaskSessionResource private ComputeTaskSession ses; @Override public Object execute() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/internal/GridTaskTimeoutSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskTimeoutSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskTimeoutSelfTest.java index 061b9b8..491bcf5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskTimeoutSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskTimeoutSelfTest.java @@ -205,7 +205,7 @@ public class GridTaskTimeoutSelfTest extends GridCommonAbstractTest { */ private static class GridTaskTimeoutTestJob extends ComputeJobAdapter { /** Injected logger. */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/internal/IgniteExplicitImplicitDeploymentSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteExplicitImplicitDeploymentSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteExplicitImplicitDeploymentSelfTest.java index 2064bae..b55bb30 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteExplicitImplicitDeploymentSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteExplicitImplicitDeploymentSelfTest.java @@ -437,7 +437,7 @@ public class IgniteExplicitImplicitDeploymentSelfTest extends GridCommonAbstract @SuppressWarnings({"PublicInnerClass"}) public static final class GridDeploymentResourceTestJob extends ComputeJobAdapter { /** */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/internal/managers/GridManagerStopSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/GridManagerStopSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/GridManagerStopSelfTest.java index 40a6192..4ed112d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/managers/GridManagerStopSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/GridManagerStopSelfTest.java @@ -80,7 +80,7 @@ public class GridManagerStopSelfTest extends GridCommonAbstractTest { private void injectLogger(IgniteSpi target) throws IgniteCheckedException { ctx.resource().injectBasicResource( target, - IgniteLoggerResource.class, + LoggerResource.class, ctx.config().getGridLogger().getLogger(target.getClass()) ); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java index 017c652..e31ae8e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java @@ -296,7 +296,7 @@ public abstract class GridCheckpointManagerAbstractSelfTest extends GridCommonAb private Ignite ignite; /** */ - @IgniteTaskSessionResource + @TaskSessionResource private ComputeTaskSession taskSes; /** {@inheritDoc} */ @@ -413,7 +413,7 @@ public abstract class GridCheckpointManagerAbstractSelfTest extends GridCommonAb private Ignite ignite; /** */ - @IgniteTaskSessionResource + @TaskSessionResource private ComputeTaskSession taskSes; /** {@inheritDoc} */ @@ -517,7 +517,7 @@ public abstract class GridCheckpointManagerAbstractSelfTest extends GridCommonAb */ private static class GridMultiNodeTestCheckpointConsumerJob extends ComputeJobAdapter { /** */ - @IgniteTaskSessionResource + @TaskSessionResource private ComputeTaskSession taskSes; /** {@inheritDoc} */ @@ -643,7 +643,7 @@ public abstract class GridCheckpointManagerAbstractSelfTest extends GridCommonAb @ComputeTaskSessionFullSupport private static class GridMultiNodeGlobalConsumerTask extends ComputeTaskSplitAdapter<Object, Integer> { /** */ - @IgniteTaskSessionResource + @TaskSessionResource private ComputeTaskSession taskSes; /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointTaskSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointTaskSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointTaskSelfTest.java index 95e6875..b5b892b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointTaskSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointTaskSelfTest.java @@ -134,7 +134,7 @@ public class GridCheckpointTaskSelfTest extends GridCommonAbstractTest { private Ignite ignite; /** Task session. */ - @IgniteTaskSessionResource + @TaskSessionResource private ComputeTaskSession ses; /** {@inheritDoc} */ @@ -152,7 +152,7 @@ public class GridCheckpointTaskSelfTest extends GridCommonAbstractTest { @IgniteInstanceResource private Ignite ignite; - @IgniteTaskSessionResource + @TaskSessionResource private ComputeTaskSession ses; @Override public Object execute() { @@ -191,7 +191,7 @@ public class GridCheckpointTaskSelfTest extends GridCommonAbstractTest { private Ignite ignite; /** Task session. */ - @IgniteTaskSessionResource + @TaskSessionResource private ComputeTaskSession ses; /** {@inheritDoc} */ @@ -207,7 +207,7 @@ public class GridCheckpointTaskSelfTest extends GridCommonAbstractTest { @IgniteInstanceResource private Ignite ignite; - @IgniteTaskSessionResource + @TaskSessionResource private ComputeTaskSession ses; @Override public Object execute() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityRoutingSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityRoutingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityRoutingSelfTest.java index 6da1bce..64fa603 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityRoutingSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityRoutingSelfTest.java @@ -281,11 +281,11 @@ public class GridCacheAffinityRoutingSelfTest extends GridCommonAbstractTest { private Ignite ignite; /** */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** */ - @IgniteJobContextResource + @JobContextResource private ComputeJobContext jobCtx; /** @@ -329,11 +329,11 @@ public class GridCacheAffinityRoutingSelfTest extends GridCommonAbstractTest { private Ignite ignite; /** */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** */ - @IgniteJobContextResource + @JobContextResource private ComputeJobContext jobCtx; /** @@ -389,11 +389,11 @@ public class GridCacheAffinityRoutingSelfTest extends GridCommonAbstractTest { private Ignite ignite; /** */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** */ - @IgniteJobContextResource + @JobContextResource private ComputeJobContext jobCtx; /** @@ -445,11 +445,11 @@ public class GridCacheAffinityRoutingSelfTest extends GridCommonAbstractTest { private Ignite ignite; /** */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** */ - @IgniteJobContextResource + @JobContextResource private ComputeJobContext jobCtx; /** @@ -515,7 +515,7 @@ public class GridCacheAffinityRoutingSelfTest extends GridCommonAbstractTest { private Ignite ignite; /** */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** @@ -554,7 +554,7 @@ public class GridCacheAffinityRoutingSelfTest extends GridCommonAbstractTest { private Object affKey; /** */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** */ @@ -628,7 +628,7 @@ public class GridCacheAffinityRoutingSelfTest extends GridCommonAbstractTest { private Ignite ignite; /** */ - @IgniteJobContextResource + @JobContextResource private ComputeJobContext jobCtx; /** @@ -664,7 +664,7 @@ public class GridCacheAffinityRoutingSelfTest extends GridCommonAbstractTest { private Ignite ignite; /** */ - @IgniteJobContextResource + @JobContextResource private ComputeJobContext jobCtx; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGroupLockPutTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGroupLockPutTask.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGroupLockPutTask.java index 44db201..d17be2f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGroupLockPutTask.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGroupLockPutTask.java @@ -84,7 +84,7 @@ class GridCacheGroupLockPutTask extends ComputeTaskAdapter<Collection<Integer>, return Collections.singletonMap( new ComputeJobAdapter() { - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; @IgniteInstanceResource http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLifecycleAwareSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLifecycleAwareSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLifecycleAwareSelfTest.java index 652d779..bd2074c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLifecycleAwareSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLifecycleAwareSelfTest.java @@ -72,7 +72,7 @@ public class GridCacheLifecycleAwareSelfTest extends GridAbstractLifecycleAwareS /** * @param cacheName Cache name. */ - @IgniteCacheNameResource + @CacheNameResource public void setCacheName(String cacheName) { lifecycleAware.cacheName(cacheName); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllFailoverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllFailoverSelfTest.java index 28712df..bdefe70 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllFailoverSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllFailoverSelfTest.java @@ -651,7 +651,7 @@ public class GridCachePutAllFailoverSelfTest extends GridCommonAbstractTest { private IgnitePredicate<? super ClusterNode>[] filter; /** */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllTask.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllTask.java index 0ea05e4..63da2a0 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllTask.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllTask.java @@ -66,7 +66,7 @@ class GridCachePutAllTask extends ComputeTaskAdapter<Collection<Integer>, Void> return Collections.singletonMap( new ComputeJobAdapter() { - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; @IgniteInstanceResource http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSequenceMultiNodeAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSequenceMultiNodeAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSequenceMultiNodeAbstractSelfTest.java index 8fd941d..ee515ef 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSequenceMultiNodeAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSequenceMultiNodeAbstractSelfTest.java @@ -18,15 +18,10 @@ package org.apache.ignite.internal.processors.cache.datastructures; import org.apache.ignite.*; -import org.apache.ignite.configuration.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.lang.*; import org.apache.ignite.resources.*; -import org.apache.ignite.spi.discovery.tcp.*; -import org.apache.ignite.spi.discovery.tcp.ipfinder.*; -import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; -import org.apache.ignite.testframework.junits.common.*; import java.io.*; import java.util.*; @@ -159,7 +154,7 @@ public abstract class GridCacheSequenceMultiNodeAbstractSelfTest extends IgniteA private Ignite ignite; /** */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** Sequence name. */ @@ -213,7 +208,7 @@ public abstract class GridCacheSequenceMultiNodeAbstractSelfTest extends IgniteA private Ignite ignite; /** */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** Sequence name. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteCountDownLatchAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteCountDownLatchAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteCountDownLatchAbstractSelfTest.java index 518c22d..0f2a898 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteCountDownLatchAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteCountDownLatchAbstractSelfTest.java @@ -79,7 +79,7 @@ public abstract class IgniteCountDownLatchAbstractSelfTest extends IgniteAtomics @IgniteInstanceResource private Ignite ignite; - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; @Nullable @Override public Object call() throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java index 2588456..1bcc5ff 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java @@ -432,7 +432,7 @@ public class GridCachePartitionedAffinitySelfTest extends GridCommonAbstractTest private Ignite ignite; /** Logger. */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java index 16584b5..66e739d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java @@ -595,7 +595,7 @@ public class GridCachePartitionedMultiNodeCounterSelfTest extends GridCommonAbst private Ignite ignite; /** */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java index 6623569..e49938b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java @@ -196,7 +196,7 @@ public class GridCacheReplicatedPreloadLifecycleSelfTest extends GridCachePreloa @IgniteInstanceResource private Ignite grid; - @IgniteLoggerResource + @LoggerResource private IgniteLogger log0; private int cnt; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/internal/processors/closure/GridClosureProcessorSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/closure/GridClosureProcessorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/closure/GridClosureProcessorSelfTest.java index 463b178..f31ad36 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/closure/GridClosureProcessorSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/closure/GridClosureProcessorSelfTest.java @@ -101,7 +101,7 @@ public class GridClosureProcessorSelfTest extends GridCommonAbstractTest { private Ignite ignite; /** */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** @{inheritDoc} */ @@ -123,7 +123,7 @@ public class GridClosureProcessorSelfTest extends GridCommonAbstractTest { protected Ignite ignite; /** */ - @IgniteLoggerResource + @LoggerResource protected IgniteLogger log; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsTaskSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsTaskSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsTaskSelfTest.java index 6d0cace..07cb046 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsTaskSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsTaskSelfTest.java @@ -262,10 +262,10 @@ public class GridGgfsTaskSelfTest extends GridGgfsCommonAbstractTest { @IgniteInstanceResource private Ignite ignite; - @IgniteTaskSessionResource + @TaskSessionResource private ComputeTaskSession ses; - @IgniteJobContextResource + @JobContextResource private ComputeJobContext ctx; /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/internal/processors/streamer/GridStreamerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/streamer/GridStreamerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/streamer/GridStreamerSelfTest.java index bc66b56..e3009df 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/streamer/GridStreamerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/streamer/GridStreamerSelfTest.java @@ -115,7 +115,7 @@ public class GridStreamerSelfTest extends GridCommonAbstractTest { @IgniteInstanceResource private Ignite g; - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; @Override public String name() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/loadtest/GridSingleExecutionTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtest/GridSingleExecutionTest.java b/modules/core/src/test/java/org/apache/ignite/loadtest/GridSingleExecutionTest.java index cd7d8e7..60ca4f8 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtest/GridSingleExecutionTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtest/GridSingleExecutionTest.java @@ -247,7 +247,7 @@ public final class GridSingleExecutionTest { for (int i = 0; i < JOB_COUNT; i++) { jobs.add(new ComputeJobAdapter(i) { - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; @Override public Serializable execute() { @@ -274,7 +274,7 @@ public final class GridSingleExecutionTest { /** */ public static class TestSessionTask extends ComputeTaskSplitAdapter<Object, Object> { /** */ - @IgniteTaskSessionResource + @TaskSessionResource private ComputeTaskSession ses; /** {@inheritDoc} */ @@ -283,7 +283,7 @@ public final class GridSingleExecutionTest { for (int i = 0; i < JOB_COUNT; i++) { jobs.add(new ComputeJobAdapter(i) { - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; @Override public Serializable execute() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestCacheStore.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestCacheStore.java b/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestCacheStore.java index f3296a5..6f6ba52 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestCacheStore.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestCacheStore.java @@ -36,7 +36,7 @@ public class GridTestCacheStore extends CacheStoreAdapter<GridTestKey, Long> { private Ignite ignite; /** */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/loadtests/direct/multisplit/GridLoadTestTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/direct/multisplit/GridLoadTestTask.java b/modules/core/src/test/java/org/apache/ignite/loadtests/direct/multisplit/GridLoadTestTask.java index b6769d5..d7784ac 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/direct/multisplit/GridLoadTestTask.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/direct/multisplit/GridLoadTestTask.java @@ -29,7 +29,7 @@ import java.util.*; */ public class GridLoadTestTask extends ComputeTaskAdapter<Integer, Integer> { /** Injected job context. */ - @IgniteTaskSessionResource + @TaskSessionResource private ComputeTaskSession ctx; /** */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/loadtests/direct/newnodes/GridSingleSplitNewNodesTestTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/direct/newnodes/GridSingleSplitNewNodesTestTask.java b/modules/core/src/test/java/org/apache/ignite/loadtests/direct/newnodes/GridSingleSplitNewNodesTestTask.java index 176fbe5..dbdbc98 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/direct/newnodes/GridSingleSplitNewNodesTestTask.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/direct/newnodes/GridSingleSplitNewNodesTestTask.java @@ -29,11 +29,11 @@ import java.util.*; */ public class GridSingleSplitNewNodesTestTask extends ComputeTaskAdapter<Integer, Integer> { /** */ - @IgniteTaskSessionResource + @TaskSessionResource private ComputeTaskSession taskSes; /** */ - @IgniteLoadBalancerResource + @LoadBalancerResource private ComputeLoadBalancer balancer; /** {@inheritDoc} */ @@ -50,7 +50,7 @@ public class GridSingleSplitNewNodesTestTask extends ComputeTaskAdapter<Integer, for (int i = 0; i < arg; i++) { ComputeJobAdapter job = new ComputeJobAdapter(1) { /** */ - @IgniteTaskSessionResource + @TaskSessionResource private ComputeTaskSession jobSes; /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/loadtests/direct/session/GridSessionLoadTestJob.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/direct/session/GridSessionLoadTestJob.java b/modules/core/src/test/java/org/apache/ignite/loadtests/direct/session/GridSessionLoadTestJob.java index 62d5c9e..c323e20 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/direct/session/GridSessionLoadTestJob.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/direct/session/GridSessionLoadTestJob.java @@ -28,11 +28,11 @@ import java.io.*; */ public class GridSessionLoadTestJob extends ComputeJobAdapter { /** */ - @IgniteTaskSessionResource + @TaskSessionResource private ComputeTaskSession taskSes; /** */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/loadtests/direct/session/GridSessionLoadTestTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/direct/session/GridSessionLoadTestTask.java b/modules/core/src/test/java/org/apache/ignite/loadtests/direct/session/GridSessionLoadTestTask.java index 7e92fcd..754028a 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/direct/session/GridSessionLoadTestTask.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/direct/session/GridSessionLoadTestTask.java @@ -29,11 +29,11 @@ import java.util.*; */ public class GridSessionLoadTestTask extends ComputeTaskAdapter<Integer, Boolean> { /** */ - @IgniteTaskSessionResource + @TaskSessionResource private ComputeTaskSession taskSes; /** */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/loadtests/direct/stealing/GridStealingLoadTestJob.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/direct/stealing/GridStealingLoadTestJob.java b/modules/core/src/test/java/org/apache/ignite/loadtests/direct/stealing/GridStealingLoadTestJob.java index 8d24c2c..3d8bd84 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/direct/stealing/GridStealingLoadTestJob.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/direct/stealing/GridStealingLoadTestJob.java @@ -29,7 +29,7 @@ import java.util.*; */ public class GridStealingLoadTestJob extends ComputeJobAdapter { /** */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** Ignite instance. */ @@ -37,7 +37,7 @@ public class GridStealingLoadTestJob extends ComputeJobAdapter { private Ignite ignite; /** */ - @IgniteJobContextResource + @JobContextResource private ComputeJobContext ctx; /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/loadtests/direct/stealing/GridStealingLoadTestTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/direct/stealing/GridStealingLoadTestTask.java b/modules/core/src/test/java/org/apache/ignite/loadtests/direct/stealing/GridStealingLoadTestTask.java index a61df95..6d733b3 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/direct/stealing/GridStealingLoadTestTask.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/direct/stealing/GridStealingLoadTestTask.java @@ -28,7 +28,7 @@ import java.util.*; */ public class GridStealingLoadTestTask extends ComputeTaskAdapter<UUID, Integer> { /** */ - @IgniteTaskSessionResource + @TaskSessionResource private ComputeTaskSession taskSes; /** */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiLifecycleBean.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiLifecycleBean.java b/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiLifecycleBean.java index 2b4b81d..c0f5443 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiLifecycleBean.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiLifecycleBean.java @@ -36,7 +36,7 @@ public class GridDsiLifecycleBean implements LifecycleBean { /** */ @SuppressWarnings("UnusedDeclaration") - @IgniteSpringApplicationContextResource + @SpringApplicationContextResource private ApplicationContext springCtx; /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobLoadTestJob.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobLoadTestJob.java b/modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobLoadTestJob.java index df7ab83..274c5e7 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobLoadTestJob.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobLoadTestJob.java @@ -45,7 +45,7 @@ public class GridJobLoadTestJob implements ComputeJob { private final int completionDelay; /** Logger. */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** Ignite instance. */ @@ -53,11 +53,11 @@ public class GridJobLoadTestJob implements ComputeJob { private Ignite ignite; /** Job context. */ - @IgniteJobContextResource + @JobContextResource private ComputeJobContext cntx; /** Task session. */ - @IgniteTaskSessionResource + @TaskSessionResource private ComputeTaskSession taskSes; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/loadtests/mapper/GridContinuousMapperTask1.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/mapper/GridContinuousMapperTask1.java b/modules/core/src/test/java/org/apache/ignite/loadtests/mapper/GridContinuousMapperTask1.java index dcaa1c5..1b13fbe 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/mapper/GridContinuousMapperTask1.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/mapper/GridContinuousMapperTask1.java @@ -38,7 +38,7 @@ public class GridContinuousMapperTask1 extends ComputeTaskAdapter<Integer, Integ private final transient AtomicInteger jobIdGen = new AtomicInteger(); /** Mapper. */ - @IgniteTaskContinuousMapperResource + @TaskContinuousMapperResource private ComputeTaskContinuousMapper mapper; /** Grid. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/loadtests/mergesort/GridMergeSortLoadTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/mergesort/GridMergeSortLoadTask.java b/modules/core/src/test/java/org/apache/ignite/loadtests/mergesort/GridMergeSortLoadTask.java index cfb2a83..34c8fb9 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/mergesort/GridMergeSortLoadTask.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/mergesort/GridMergeSortLoadTask.java @@ -55,7 +55,7 @@ public class GridMergeSortLoadTask extends ComputeTaskSplitAdapter<int[], int[]> for (final int[] arr : splitArray(initArr)) { jobs.add(new ComputeJobAdapter() { // Auto-inject job context. - @IgniteJobContextResource + @JobContextResource private ComputeJobContext jobCtx; // Task execution result future. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PRemoteClassLoadersSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PRemoteClassLoadersSelfTest.java b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PRemoteClassLoadersSelfTest.java index 84d8002..a6e3411 100644 --- a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PRemoteClassLoadersSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PRemoteClassLoadersSelfTest.java @@ -237,7 +237,7 @@ public class GridP2PRemoteClassLoadersSelfTest extends GridCommonAbstractTest { */ public static class GridP2PTestTask extends ComputeTaskAdapter<Serializable, Object> { /** */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** Ignite instance. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PTestJob.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PTestJob.java b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PTestJob.java index 2f3f7b4..dd02c1f 100644 --- a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PTestJob.java +++ b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PTestJob.java @@ -28,11 +28,11 @@ import java.io.*; */ public class GridP2PTestJob extends ComputeJobAdapter { /** Injected job context. */ - @IgniteTaskSessionResource + @TaskSessionResource private ComputeTaskSession taskSes; /** Injected logger. */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** Ignite instance. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PTestTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PTestTask.java b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PTestTask.java index 6b0811f..77ce8fc 100644 --- a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PTestTask.java +++ b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PTestTask.java @@ -33,7 +33,7 @@ public class GridP2PTestTask extends ComputeTaskAdapter<Object, Integer> { public static final String TASK_NAME = GridP2PTestTask.class.getName(); /** */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** Ignite instance. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromFutureSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromFutureSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromFutureSelfTest.java index e40a293..e49597d 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromFutureSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromFutureSelfTest.java @@ -189,11 +189,11 @@ public class GridSessionCancelSiblingsFromFutureSelfTest extends GridCommonAbstr */ private static class GridTaskSessionTestTask extends ComputeTaskSplitAdapter<Serializable, String> { /** */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** */ - @IgniteTaskSessionResource + @TaskSessionResource private ComputeTaskSession taskSes; /** */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromJobSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromJobSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromJobSelfTest.java index 53f5d15..4e62c63 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromJobSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromJobSelfTest.java @@ -176,11 +176,11 @@ public class GridSessionCancelSiblingsFromJobSelfTest extends GridCommonAbstract */ public static class GridTaskSessionTestTask extends ComputeTaskSplitAdapter<Serializable, String> { /** */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** */ - @IgniteTaskSessionResource + @TaskSessionResource private ComputeTaskSession taskSes; /** */ @@ -205,7 +205,7 @@ public class GridSessionCancelSiblingsFromJobSelfTest extends GridCommonAbstract private volatile Thread thread; /** */ - @IgniteJobContextResource + @JobContextResource private ComputeJobContext jobCtx; /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromTaskSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromTaskSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromTaskSelfTest.java index fe9611f..90ed6fa 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromTaskSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromTaskSelfTest.java @@ -183,11 +183,11 @@ public class GridSessionCancelSiblingsFromTaskSelfTest extends GridCommonAbstrac @SuppressWarnings({"PublicInnerClass"}) public static class GridTaskSessionTestTask extends ComputeTaskSplitAdapter<Serializable, String> { /** */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** */ - @IgniteTaskSessionResource + @TaskSessionResource private ComputeTaskSession taskSes; /** */
