http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointAbstractSelfTest.java index 0d4938a..d6d34fa 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointAbstractSelfTest.java @@ -146,7 +146,7 @@ public abstract class GridSessionCheckpointAbstractSelfTest extends GridCommonAb @ComputeTaskSessionFullSupport private static class GridCheckpointTestTask extends ComputeTaskSplitAdapter<Object, Object> { /** */ - @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/session/GridSessionCollisionSpiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCollisionSpiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCollisionSpiSelfTest.java index b2a32bd..e1e9fb8 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCollisionSpiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCollisionSpiSelfTest.java @@ -73,15 +73,15 @@ public class GridSessionCollisionSpiSelfTest extends GridCommonAbstractTest { for (int i = 0; i < gridSize; i++) { jobs.add(new ComputeJobAdapter() { /** */ - @IgniteTaskSessionResource + @TaskSessionResource private ComputeTaskSession taskSes; /** */ - @IgniteJobContextResource + @JobContextResource private ComputeJobContext jobCtx; /** */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** {@inheritDoc} */ @@ -116,7 +116,7 @@ public class GridSessionCollisionSpiSelfTest extends GridCommonAbstractTest { */ private static class GridSessionCollisionSpi extends FifoQueueCollisionSpi { /** */ - @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/session/GridSessionFutureWaitJobAttributeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionFutureWaitJobAttributeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionFutureWaitJobAttributeSelfTest.java index 3936c14..02c9119 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionFutureWaitJobAttributeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionFutureWaitJobAttributeSelfTest.java @@ -162,11 +162,11 @@ public class GridSessionFutureWaitJobAttributeSelfTest extends GridCommonAbstrac @ComputeTaskSessionFullSupport private static class GridTaskSessionTestTask extends ComputeTaskSplitAdapter<Serializable, Integer> { /** */ - @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/GridSessionFutureWaitTaskAttributeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionFutureWaitTaskAttributeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionFutureWaitTaskAttributeSelfTest.java index e330c2d..7614763 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionFutureWaitTaskAttributeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionFutureWaitTaskAttributeSelfTest.java @@ -159,11 +159,11 @@ public class GridSessionFutureWaitTaskAttributeSelfTest extends GridCommonAbstra @ComputeTaskSessionFullSupport private static class GridTaskSessionTestTask extends ComputeTaskSplitAdapter<Serializable, Integer> { /** */ - @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/GridSessionJobFailoverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionJobFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionJobFailoverSelfTest.java index 2fc8677..fe48554 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionJobFailoverSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionJobFailoverSelfTest.java @@ -77,7 +77,7 @@ public class GridSessionJobFailoverSelfTest extends GridCommonAbstractTest { @ComputeTaskSessionFullSupport private static class SessionTestTask implements ComputeTask<String, Object> { /** */ - @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/session/GridSessionJobWaitTaskAttributeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionJobWaitTaskAttributeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionJobWaitTaskAttributeSelfTest.java index 3e4f0f5..9ebee0f 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionJobWaitTaskAttributeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionJobWaitTaskAttributeSelfTest.java @@ -129,11 +129,11 @@ public class GridSessionJobWaitTaskAttributeSelfTest extends GridCommonAbstractT @ComputeTaskSessionFullSupport private static class GridTaskSessionTestTask extends ComputeTaskSplitAdapter<Serializable, Integer> { /** */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** */ - @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/session/GridSessionLoadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionLoadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionLoadSelfTest.java index d0e484a..bfb02e0 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionLoadSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionLoadSelfTest.java @@ -126,11 +126,11 @@ public class GridSessionLoadSelfTest extends GridCommonAbstractTest { @ComputeTaskSessionFullSupport private static class SessionLoadTestTask extends ComputeTaskAdapter<Integer, Boolean> { /** */ - @IgniteTaskSessionResource + @TaskSessionResource private ComputeTaskSession taskSes; /** */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** */ @@ -229,11 +229,11 @@ public class GridSessionLoadSelfTest extends GridCommonAbstractTest { */ private static class SessionLoadTestJob 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/session/GridSessionSetFutureAttributeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetFutureAttributeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetFutureAttributeSelfTest.java index 9abc31e..57a89fc 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetFutureAttributeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetFutureAttributeSelfTest.java @@ -166,11 +166,11 @@ public class GridSessionSetFutureAttributeSelfTest extends GridCommonAbstractTes @ComputeTaskSessionFullSupport private static class GridTaskSessionTestTask extends ComputeTaskSplitAdapter<Serializable, Integer> { /** */ - @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/GridSessionSetFutureAttributeWaitListenerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetFutureAttributeWaitListenerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetFutureAttributeWaitListenerSelfTest.java index 20326c5..a388738 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetFutureAttributeWaitListenerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetFutureAttributeWaitListenerSelfTest.java @@ -131,11 +131,11 @@ public class GridSessionSetFutureAttributeWaitListenerSelfTest extends GridCommo @ComputeTaskSessionFullSupport public static class GridTaskSessionTestTask extends ComputeTaskSplitAdapter<Serializable, Integer> { /** */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** */ - @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/session/GridSessionSetJobAttribute2SelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttribute2SelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttribute2SelfTest.java index bb4f58a..d42e4d8 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttribute2SelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttribute2SelfTest.java @@ -66,7 +66,7 @@ public class GridSessionSetJobAttribute2SelfTest extends GridCommonAbstractTest @ComputeTaskSessionFullSupport private static class SessionTestTask extends ComputeTaskAdapter<UUID, Object> { /** */ - @IgniteTaskSessionResource + @TaskSessionResource private ComputeTaskSession taskSes; /** */ @@ -111,7 +111,7 @@ public class GridSessionSetJobAttribute2SelfTest extends GridCommonAbstractTest /** */ private static class SessionTestJob extends ComputeJobAdapter { /** */ - @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/GridSessionSetJobAttributeOrderSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeOrderSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeOrderSelfTest.java index 2182351..aa15311 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeOrderSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeOrderSelfTest.java @@ -77,11 +77,11 @@ public class GridSessionSetJobAttributeOrderSelfTest extends GridCommonAbstractT @ComputeTaskSessionFullSupport private static class SessionTestTask extends ComputeTaskAdapter<UUID, Serializable> { /** */ - @IgniteTaskSessionResource + @TaskSessionResource private ComputeTaskSession taskSes; /** */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** {@inheritDoc} */ @@ -118,11 +118,11 @@ public class GridSessionSetJobAttributeOrderSelfTest extends GridCommonAbstractT /** */ private static class SessionTestJob extends ComputeJobAdapter { /** */ - @IgniteTaskSessionResource + @TaskSessionResource private ComputeTaskSession taskSes; /** */ - @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/session/GridSessionSetJobAttributeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeSelfTest.java index 5c07e19..6e9714c 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeSelfTest.java @@ -126,11 +126,11 @@ public class GridSessionSetJobAttributeSelfTest extends GridCommonAbstractTest { @ComputeTaskSessionFullSupport private static class GridTaskSessionTestTask extends ComputeTaskSplitAdapter<Serializable, Integer> { /** */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** */ - @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/session/GridSessionSetJobAttributeWaitListenerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeWaitListenerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeWaitListenerSelfTest.java index 5b1c1c4..d19f9f1 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeWaitListenerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeWaitListenerSelfTest.java @@ -119,11 +119,11 @@ public class GridSessionSetJobAttributeWaitListenerSelfTest extends GridCommonAb @ComputeTaskSessionFullSupport public static class GridTaskSessionTestTask extends ComputeTaskSplitAdapter<Serializable, Integer> { /** */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** */ - @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/session/GridSessionSetTaskAttributeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetTaskAttributeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetTaskAttributeSelfTest.java index a881202..0a21397 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetTaskAttributeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetTaskAttributeSelfTest.java @@ -112,11 +112,11 @@ public class GridSessionSetTaskAttributeSelfTest extends GridCommonAbstractTest @ComputeTaskSessionFullSupport private static class GridTaskSessionTestTask extends ComputeTaskSplitAdapter<Serializable, Integer> { /** */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** */ - @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/session/GridSessionTaskWaitJobAttributeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionTaskWaitJobAttributeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionTaskWaitJobAttributeSelfTest.java index c0ebc91..5d5cb72 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionTaskWaitJobAttributeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionTaskWaitJobAttributeSelfTest.java @@ -112,11 +112,11 @@ public class GridSessionTaskWaitJobAttributeSelfTest extends GridCommonAbstractT @ComputeTaskSessionFullSupport private static class GridTaskSessionTestTask extends ComputeTaskSplitAdapter<Serializable, Integer> { /** */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** */ - @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/session/GridSessionWaitAttributeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionWaitAttributeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionWaitAttributeSelfTest.java index a2416fe..9404c5d 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionWaitAttributeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionWaitAttributeSelfTest.java @@ -419,15 +419,15 @@ public class GridSessionWaitAttributeSelfTest extends GridCommonAbstractTest { /** */ public static class TestSessionJob extends ComputeJobAdapter { /** */ - @IgniteTaskSessionResource + @TaskSessionResource private ComputeTaskSession taskSes; /** */ - @IgniteJobContextResource + @JobContextResource private ComputeJobContext jobCtx; /** 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/spi/discovery/tcp/ipfinder/GridTcpDiscoveryIpFinderAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/GridTcpDiscoveryIpFinderAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/GridTcpDiscoveryIpFinderAbstractSelfTest.java index 9640610..e672a52 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/GridTcpDiscoveryIpFinderAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/GridTcpDiscoveryIpFinderAbstractSelfTest.java @@ -104,7 +104,7 @@ public abstract class GridTcpDiscoveryIpFinderAbstractSelfTest<T extends TcpDisc for (Class cls = finder.getClass(); cls != Object.class; cls = cls.getSuperclass()) for (Field fld : cls.getDeclaredFields()) - if (fld.getAnnotation(IgniteLoggerResource.class) != null) { + if (fld.getAnnotation(LoggerResource.class) != null) { boolean accessible = fld.isAccessible(); fld.setAccessible(true); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java index bf2a5a3..786fa20 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java @@ -173,7 +173,7 @@ public class IgniteTestResources { assert target != null; assert getLogger() != null; - rsrcProc.injectBasicResource(target, IgniteLoggerResource.class, getLogger().getLogger(target.getClass())); + rsrcProc.injectBasicResource(target, LoggerResource.class, getLogger().getLogger(target.getClass())); rsrcProc.injectBasicResource(target, IgniteInstanceResource.class, new IgniteMock(null, locHost, nodeId, getMarshaller(), jmx, home)); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridAbstractLifecycleAwareSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridAbstractLifecycleAwareSelfTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridAbstractLifecycleAwareSelfTest.java index a7c327d..c4e0f26 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridAbstractLifecycleAwareSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridAbstractLifecycleAwareSelfTest.java @@ -42,7 +42,7 @@ public abstract class GridAbstractLifecycleAwareSelfTest extends GridCommonAbstr private AtomicInteger stopCnt = new AtomicInteger(); /** */ - @IgniteCacheNameResource + @CacheNameResource private String cacheName; /** */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/testframework/junits/logger/GridTestLog4jLogger.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/logger/GridTestLog4jLogger.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/logger/GridTestLog4jLogger.java index 6b591ae..6203f2d 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/logger/GridTestLog4jLogger.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/logger/GridTestLog4jLogger.java @@ -61,7 +61,7 @@ import static org.apache.ignite.IgniteSystemProperties.*; * for additional information. * <p> * It's recommended to use GridGain logger injection instead of using/instantiating - * logger in your task/job code. See {@link org.apache.ignite.resources.IgniteLoggerResource} annotation about logger + * logger in your task/job code. See {@link org.apache.ignite.resources.LoggerResource} annotation about logger * injection. */ public class GridTestLog4jLogger implements IgniteLogger, LoggerNodeIdAware { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridP2PAwareTestUserResource.java ---------------------------------------------------------------------- diff --git a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridP2PAwareTestUserResource.java b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridP2PAwareTestUserResource.java index 2641f9c..562f651 100644 --- a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridP2PAwareTestUserResource.java +++ b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridP2PAwareTestUserResource.java @@ -37,7 +37,7 @@ public class GridP2PAwareTestUserResource { private Ignite ignite; /** Grid logger. */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/JobStealingTask.java ---------------------------------------------------------------------- diff --git a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/JobStealingTask.java b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/JobStealingTask.java index bf3b7eb..688e271 100644 --- a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/JobStealingTask.java +++ b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/JobStealingTask.java @@ -39,7 +39,7 @@ public class JobStealingTask extends ComputeTaskAdapter<Object, Map<UUID, Intege private Ignite ignite; /** Logger. */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** {@inheritDoc} */ @@ -83,7 +83,7 @@ public class JobStealingTask extends ComputeTaskAdapter<Object, Map<UUID, Intege private Ignite ignite; /** Logger. */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/P2PTestTaskExternalPath1.java ---------------------------------------------------------------------- diff --git a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/P2PTestTaskExternalPath1.java b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/P2PTestTaskExternalPath1.java index e126414..c997358 100644 --- a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/P2PTestTaskExternalPath1.java +++ b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/P2PTestTaskExternalPath1.java @@ -31,7 +31,7 @@ import java.util.*; */ public class P2PTestTaskExternalPath1 extends ComputeTaskAdapter<Object, Integer> { /** */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** @@ -90,11 +90,11 @@ public class P2PTestTaskExternalPath1 extends ComputeTaskAdapter<Object, Integer @SuppressWarnings({"PublicInnerClass"}) public static class TestJob extends ComputeJobAdapter { /** Task session. */ - @IgniteTaskSessionResource + @TaskSessionResource private ComputeTaskSession ses; /** */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/P2PTestTaskExternalPath2.java ---------------------------------------------------------------------- diff --git a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/P2PTestTaskExternalPath2.java b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/P2PTestTaskExternalPath2.java index c562a34..6c7565b 100644 --- a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/P2PTestTaskExternalPath2.java +++ b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/P2PTestTaskExternalPath2.java @@ -31,7 +31,7 @@ import java.util.*; */ public class P2PTestTaskExternalPath2 extends ComputeTaskAdapter<Object, Integer> { /** */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** @@ -94,11 +94,11 @@ public class P2PTestTaskExternalPath2 extends ComputeTaskAdapter<Object, Integer private Ignite ignite; /** Task session. */ - @IgniteTaskSessionResource + @TaskSessionResource private ComputeTaskSession ses; /** */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/planner/GridHadoopDefaultMapReducePlanner.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/planner/GridHadoopDefaultMapReducePlanner.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/planner/GridHadoopDefaultMapReducePlanner.java index be4fede..5847fda 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/planner/GridHadoopDefaultMapReducePlanner.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/planner/GridHadoopDefaultMapReducePlanner.java @@ -43,7 +43,7 @@ public class GridHadoopDefaultMapReducePlanner implements GridHadoopMapReducePla /** Logger. */ @SuppressWarnings("UnusedDeclaration") - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/proto/GridHadoopProtocolTaskAdapter.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/proto/GridHadoopProtocolTaskAdapter.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/proto/GridHadoopProtocolTaskAdapter.java index 81b97f0..086545c 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/proto/GridHadoopProtocolTaskAdapter.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/proto/GridHadoopProtocolTaskAdapter.java @@ -68,7 +68,7 @@ public abstract class GridHadoopProtocolTaskAdapter<R> implements ComputeTask<Gr /** */ @SuppressWarnings("UnusedDeclaration") - @IgniteJobContextResource + @JobContextResource private ComputeJobContext jobCtx; /** Argument. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/hibernate/src/main/java/org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStore.java ---------------------------------------------------------------------- diff --git a/modules/hibernate/src/main/java/org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStore.java b/modules/hibernate/src/main/java/org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStore.java index ac54a79..0b0b1b1 100644 --- a/modules/hibernate/src/main/java/org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStore.java +++ b/modules/hibernate/src/main/java/org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStore.java @@ -185,7 +185,7 @@ public class CacheHibernateBlobStore<K, V> extends CacheStoreAdapter<K, V> { private String hibernateCfgPath; /** Log. */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** Ignite instance. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java index a8dcb62..47c7a79 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java @@ -130,7 +130,7 @@ public class IgniteH2Indexing implements GridQueryIndexing { private CacheLongKeyLIRS<GridH2KeyValueRowOffheap> rowCache = new CacheLongKeyLIRS<>(32 * 1024, 1, 128, 256); /** Logger. */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** Node ID. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/jcl/src/main/java/org/apache/ignite/logger/jcl/GridJclLogger.java ---------------------------------------------------------------------- diff --git a/modules/jcl/src/main/java/org/apache/ignite/logger/jcl/GridJclLogger.java b/modules/jcl/src/main/java/org/apache/ignite/logger/jcl/GridJclLogger.java index 3af7890..aad5cd3 100644 --- a/modules/jcl/src/main/java/org/apache/ignite/logger/jcl/GridJclLogger.java +++ b/modules/jcl/src/main/java/org/apache/ignite/logger/jcl/GridJclLogger.java @@ -69,7 +69,7 @@ import org.jetbrains.annotations.*; * * <p> * It's recommended to use GridGain logger injection instead of using/instantiating - * logger in your task/job code. See {@link org.apache.ignite.resources.IgniteLoggerResource} annotation about logger + * logger in your task/job code. See {@link org.apache.ignite.resources.LoggerResource} annotation about logger * injection. */ public class GridJclLogger implements IgniteLogger { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/Log4JLogger.java ---------------------------------------------------------------------- diff --git a/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/Log4JLogger.java b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/Log4JLogger.java index 6169470..b170ebc 100644 --- a/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/Log4JLogger.java +++ b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/Log4JLogger.java @@ -61,7 +61,7 @@ import static org.apache.ignite.IgniteSystemProperties.*; * for additional information. * <p> * It's recommended to use GridGain logger injection instead of using/instantiating - * logger in your task/job code. See {@link org.apache.ignite.resources.IgniteLoggerResource} annotation about logger + * logger in your task/job code. See {@link org.apache.ignite.resources.LoggerResource} annotation about logger * injection. */ public class Log4JLogger implements IgniteLogger, LoggerNodeIdAware, http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/schedule/src/test/java/org/apache/ignite/internal/processors/schedule/GridScheduleSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/schedule/src/test/java/org/apache/ignite/internal/processors/schedule/GridScheduleSelfTest.java b/modules/schedule/src/test/java/org/apache/ignite/internal/processors/schedule/GridScheduleSelfTest.java index 3ca08ee..c9444bf 100644 --- a/modules/schedule/src/test/java/org/apache/ignite/internal/processors/schedule/GridScheduleSelfTest.java +++ b/modules/schedule/src/test/java/org/apache/ignite/internal/processors/schedule/GridScheduleSelfTest.java @@ -366,7 +366,7 @@ public class GridScheduleSelfTest extends GridCommonAbstractTest { private Ignite ignite; /** */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** @{inheritDoc} */ @@ -387,7 +387,7 @@ public class GridScheduleSelfTest extends GridCommonAbstractTest { private Ignite ignite; /** */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/slf4j/src/main/java/org/apache/ignite/logger/slf4j/GridSlf4jLogger.java ---------------------------------------------------------------------- diff --git a/modules/slf4j/src/main/java/org/apache/ignite/logger/slf4j/GridSlf4jLogger.java b/modules/slf4j/src/main/java/org/apache/ignite/logger/slf4j/GridSlf4jLogger.java index 76d37d9..3533b0d 100644 --- a/modules/slf4j/src/main/java/org/apache/ignite/logger/slf4j/GridSlf4jLogger.java +++ b/modules/slf4j/src/main/java/org/apache/ignite/logger/slf4j/GridSlf4jLogger.java @@ -33,7 +33,7 @@ import org.slf4j.*; * </pre> * <p> * It's recommended to use GridGain's logger injection instead of using/instantiating - * logger in your task/job code. See {@link org.apache.ignite.resources.IgniteLoggerResource} annotation about logger + * logger in your task/job code. See {@link org.apache.ignite.resources.LoggerResource} annotation about logger * injection. */ public class GridSlf4jLogger implements IgniteLogger { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/spring/src/main/java/org/apache/ignite/IgniteSpring.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/main/java/org/apache/ignite/IgniteSpring.java b/modules/spring/src/main/java/org/apache/ignite/IgniteSpring.java index 55e8017..a2fdb86 100644 --- a/modules/spring/src/main/java/org/apache/ignite/IgniteSpring.java +++ b/modules/spring/src/main/java/org/apache/ignite/IgniteSpring.java @@ -27,7 +27,7 @@ import java.net.*; /** * Factory methods to start Ignite with optional Spring application context, this context can be injected into - * grid tasks and grid jobs using {@link org.apache.ignite.resources.IgniteSpringApplicationContextResource @IgniteSpringApplicationContextResource} + * grid tasks and grid jobs using {@link org.apache.ignite.resources.SpringApplicationContextResource @IgniteSpringApplicationContextResource} * annotation. * <p> * You can also instantiate grid directly from Spring without using {@code GridGain}. @@ -42,7 +42,7 @@ public class IgniteSpring { * @param springCtx Optional Spring application context, possibly {@code null}. * Spring bean definitions for bean injection are taken from this context. * If provided, this context can be injected into grid tasks and grid jobs using - * {@link org.apache.ignite.resources.IgniteSpringApplicationContextResource @IgniteSpringApplicationContextResource} annotation. + * {@link org.apache.ignite.resources.SpringApplicationContextResource @IgniteSpringApplicationContextResource} annotation. * @return Started grid. * @throws IgniteCheckedException If default grid could not be started. This exception will be thrown * also if default grid has already been started. @@ -58,7 +58,7 @@ public class IgniteSpring { * @param springCtx Optional Spring application context, possibly {@code null}. * Spring bean definitions for bean injection are taken from this context. * If provided, this context can be injected into grid tasks and grid jobs using - * {@link org.apache.ignite.resources.IgniteSpringApplicationContextResource @IgniteSpringApplicationContextResource} annotation. + * {@link org.apache.ignite.resources.SpringApplicationContextResource @IgniteSpringApplicationContextResource} annotation. * @return Started grid. * @throws IgniteCheckedException If grid could not be started. This exception will be thrown * also if named grid has already been started. @@ -80,7 +80,7 @@ public class IgniteSpring { * @param springCtx Optional Spring application context, possibly {@code null}. * Spring bean definitions for bean injection are taken from this context. * If provided, this context can be injected into grid tasks and grid jobs using - * {@link org.apache.ignite.resources.IgniteSpringApplicationContextResource @IgniteSpringApplicationContextResource} annotation. + * {@link org.apache.ignite.resources.SpringApplicationContextResource @IgniteSpringApplicationContextResource} annotation. * @return Started grid. If Spring configuration contains multiple grid instances, * then the 1st found instance is returned. * @throws IgniteCheckedException If grid could not be started or configuration @@ -104,7 +104,7 @@ public class IgniteSpring { * @param springCtx Optional Spring application context, possibly {@code null}. * Spring bean definitions for bean injection are taken from this context. * If provided, this context can be injected into grid tasks and grid jobs using - * {@link org.apache.ignite.resources.IgniteSpringApplicationContextResource @GridSpringApplicationContextResource} annotation. + * {@link org.apache.ignite.resources.SpringApplicationContextResource @GridSpringApplicationContextResource} annotation. * @return Started grid. If Spring configuration contains multiple grid instances, * then the 1st found instance is returned. * @throws IgniteCheckedException If grid could not be started or configuration http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/spring/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceSpringBeanInjector.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceSpringBeanInjector.java b/modules/spring/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceSpringBeanInjector.java index 841e5a9..fb57027 100644 --- a/modules/spring/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceSpringBeanInjector.java +++ b/modules/spring/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceSpringBeanInjector.java @@ -46,7 +46,7 @@ public class GridResourceSpringBeanInjector implements GridResourceInjector { /** {@inheritDoc} */ @Override public void inject(GridResourceField field, Object target, Class<?> cls, GridDeployment depCls) throws IgniteCheckedException { - IgniteSpringResource ann = (IgniteSpringResource)field.getAnnotation(); + SpringResource ann = (SpringResource)field.getAnnotation(); assert ann != null; @@ -72,7 +72,7 @@ public class GridResourceSpringBeanInjector implements GridResourceInjector { /** {@inheritDoc} */ @Override public void inject(GridResourceMethod mtd, Object target, Class<?> cls, GridDeployment depCls) throws IgniteCheckedException { - IgniteSpringResource ann = (IgniteSpringResource)mtd.getAnnotation(); + SpringResource ann = (SpringResource)mtd.getAnnotation(); assert ann != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java b/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java index bf6ef63..d4c1832 100644 --- a/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java +++ b/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java @@ -543,7 +543,7 @@ public class GridFactorySelfTest extends GridCommonAbstractTest { @IgniteSpiMultipleInstancesSupport(true) private static class TestMultipleInstancesCollisionSpi extends IgniteSpiAdapter implements CollisionSpi { /** Grid logger. */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** {@inheritDoc} */ @@ -581,7 +581,7 @@ public class GridFactorySelfTest extends GridCommonAbstractTest { @IgniteSpiMultipleInstancesSupport(true) private static class TestSingleInstancesCollisionSpi extends IgniteSpiAdapter implements CollisionSpi { /** Grid logger. */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** {@inheritDoc} */ @@ -617,11 +617,11 @@ public class GridFactorySelfTest extends GridCommonAbstractTest { */ private static class TestLifecycleBean implements LifecycleBean { /** Grid logger. */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** */ - @IgniteSpringApplicationContextResource + @SpringApplicationContextResource private ApplicationContext appCtx; /** */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridLoggerInjectionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridLoggerInjectionSelfTest.java b/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridLoggerInjectionSelfTest.java index c243753..fe33cc7 100644 --- a/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridLoggerInjectionSelfTest.java +++ b/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridLoggerInjectionSelfTest.java @@ -53,7 +53,7 @@ public class GridLoggerInjectionSelfTest extends GridCommonAbstractTest implemen Ignite ignite = grid(0); ignite.compute().call(new IgniteCallable<Object>() { - @IgniteLoggerResource(categoryClass = GridLoggerInjectionSelfTest.class) + @LoggerResource(categoryClass = GridLoggerInjectionSelfTest.class) private IgniteLogger log; @Override public Object call() throws Exception { @@ -80,7 +80,7 @@ public class GridLoggerInjectionSelfTest extends GridCommonAbstractTest implemen Ignite ignite = grid(0); ignite.compute().call(new IgniteCallable<Object>() { - @IgniteLoggerResource(categoryClass = GridLoggerInjectionSelfTest.class) + @LoggerResource(categoryClass = GridLoggerInjectionSelfTest.class) private void log(IgniteLogger log) { if (log instanceof GridLoggerProxy) { Object category = U.field(log, "ctgr"); @@ -99,7 +99,7 @@ public class GridLoggerInjectionSelfTest extends GridCommonAbstractTest implemen } /** - * Test that closure gets right log category injected through {@link org.apache.ignite.resources.IgniteLoggerResource#categoryName()}. + * Test that closure gets right log category injected through {@link org.apache.ignite.resources.LoggerResource#categoryName()}. * * @throws Exception If failed. */ @@ -107,7 +107,7 @@ public class GridLoggerInjectionSelfTest extends GridCommonAbstractTest implemen Ignite ignite = grid(0); ignite.compute().call(new IgniteCallable<Object>() { - @IgniteLoggerResource(categoryName = "GridLoggerInjectionSelfTest") + @LoggerResource(categoryName = "GridLoggerInjectionSelfTest") private void log(IgniteLogger log) { if (log instanceof GridLoggerProxy) { Object category = U.field(log, "ctgr"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridResourceProcessorSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridResourceProcessorSelfTest.java b/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridResourceProcessorSelfTest.java index 29d7636..80abcc6 100644 --- a/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridResourceProcessorSelfTest.java +++ b/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridResourceProcessorSelfTest.java @@ -307,7 +307,7 @@ public class GridResourceProcessorSelfTest extends GridCommonAbstractTest { @SuppressWarnings({"PublicInnerClass"}) public static class TestTask extends ComputeTaskSplitAdapter<Object, Object> { /** */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger taskLog; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridServiceInjectionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridServiceInjectionSelfTest.java b/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridServiceInjectionSelfTest.java index 7134b56..6467448 100644 --- a/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridServiceInjectionSelfTest.java +++ b/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridServiceInjectionSelfTest.java @@ -64,7 +64,7 @@ public class GridServiceInjectionSelfTest extends GridCommonAbstractTest impleme */ public void testClosureField() throws Exception { grid(0).compute().call(new IgniteCallable<Object>() { - @IgniteServiceResource(serviceName = SERVICE_NAME1) + @ServiceResource(serviceName = SERVICE_NAME1) private DummyService svc; @Override public Object call() throws Exception { @@ -83,7 +83,7 @@ public class GridServiceInjectionSelfTest extends GridCommonAbstractTest impleme */ public void testClosureFieldProxy() throws Exception { grid(0).compute(grid(0).cluster().forRemotes()).call(new IgniteCallable<Object>() { - @IgniteServiceResource(serviceName = SERVICE_NAME2, proxyInterface = DummyService.class) + @ServiceResource(serviceName = SERVICE_NAME2, proxyInterface = DummyService.class) private DummyService svc; @Override public Object call() throws Exception { @@ -104,7 +104,7 @@ public class GridServiceInjectionSelfTest extends GridCommonAbstractTest impleme */ public void testClosureFieldLocalProxy() throws Exception { grid(0).compute(grid(0).cluster().forRemotes()).call(new IgniteCallable<Object>() { - @IgniteServiceResource(serviceName = SERVICE_NAME1, proxyInterface = DummyService.class) + @ServiceResource(serviceName = SERVICE_NAME1, proxyInterface = DummyService.class) private DummyService svc; @Override public Object call() throws Exception { @@ -126,7 +126,7 @@ public class GridServiceInjectionSelfTest extends GridCommonAbstractTest impleme public void testClosureFieldWithIncorrectType() throws Exception { try { grid(0).compute().call(new IgniteCallable<Object>() { - @IgniteServiceResource(serviceName = SERVICE_NAME1) + @ServiceResource(serviceName = SERVICE_NAME1) private String svcName; @Override public Object call() throws Exception { @@ -150,7 +150,7 @@ public class GridServiceInjectionSelfTest extends GridCommonAbstractTest impleme grid(0).compute().call(new IgniteCallable<Object>() { private DummyService svc; - @IgniteServiceResource(serviceName = SERVICE_NAME1) + @ServiceResource(serviceName = SERVICE_NAME1) private void service(DummyService svc) { assertNotNull(svc); @@ -174,7 +174,7 @@ public class GridServiceInjectionSelfTest extends GridCommonAbstractTest impleme grid(0).compute(grid(0).cluster().forRemotes()).call(new IgniteCallable<Object>() { private DummyService svc; - @IgniteServiceResource(serviceName = SERVICE_NAME2, proxyInterface = DummyService.class) + @ServiceResource(serviceName = SERVICE_NAME2, proxyInterface = DummyService.class) private void service(DummyService svc) { assertNotNull(svc); @@ -199,7 +199,7 @@ public class GridServiceInjectionSelfTest extends GridCommonAbstractTest impleme grid(0).compute(grid(0).cluster().forRemotes()).call(new IgniteCallable<Object>() { private DummyService svc; - @IgniteServiceResource(serviceName = SERVICE_NAME1, proxyInterface = DummyService.class) + @ServiceResource(serviceName = SERVICE_NAME1, proxyInterface = DummyService.class) private void service(DummyService svc) { assertNotNull(svc); @@ -223,7 +223,7 @@ public class GridServiceInjectionSelfTest extends GridCommonAbstractTest impleme public void testClosureMethodWithIncorrectType() throws Exception { try { grid(0).compute().call(new IgniteCallable<Object>() { - @IgniteServiceResource(serviceName = SERVICE_NAME1) + @ServiceResource(serviceName = SERVICE_NAME1) private void service(String svcs) { fail(); } @@ -245,7 +245,7 @@ public class GridServiceInjectionSelfTest extends GridCommonAbstractTest impleme */ public void testClosureFieldWithNonExistentService() throws Exception { grid(0).compute().call(new IgniteCallable<Object>() { - @IgniteServiceResource(serviceName = "nonExistentService") + @ServiceResource(serviceName = "nonExistentService") private DummyService svc; @Override public Object call() throws Exception { @@ -261,7 +261,7 @@ public class GridServiceInjectionSelfTest extends GridCommonAbstractTest impleme */ public void testClosureMethodWithNonExistentService() throws Exception { grid(0).compute().call(new IgniteCallable<Object>() { - @IgniteServiceResource(serviceName = "nonExistentService") + @ServiceResource(serviceName = "nonExistentService") private void service(DummyService svc) { assertNull(svc); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/TestClosure.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/TestClosure.java b/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/TestClosure.java index 417888e..1aefcbd 100644 --- a/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/TestClosure.java +++ b/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/TestClosure.java @@ -31,7 +31,7 @@ public class TestClosure implements IgniteClosure<Object, Object> { private Ignite ignite; /** */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; @Override public Object apply(Object o) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/GridNodeCallableImpl.java ---------------------------------------------------------------------- diff --git a/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/GridNodeCallableImpl.java b/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/GridNodeCallableImpl.java index 044d11e..bff8dd7 100644 --- a/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/GridNodeCallableImpl.java +++ b/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/GridNodeCallableImpl.java @@ -66,7 +66,7 @@ public class GridNodeCallableImpl implements GridNodeCallable { private final int timeout; /** Logger. */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/UriDeploymentSpi.java ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/UriDeploymentSpi.java b/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/UriDeploymentSpi.java index 4b46aa8..e448b77 100644 --- a/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/UriDeploymentSpi.java +++ b/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/UriDeploymentSpi.java @@ -377,7 +377,7 @@ public class UriDeploymentSpi extends IgniteSpiAdapter implements DeploymentSpi, private final Object mux = new Object(); /** */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** NOTE: flag for test purposes only. */
