ignite-188 - resources cleanup.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8a065d0c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8a065d0c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8a065d0c Branch: refs/heads/sprint-1 Commit: 8a065d0cd81a62deba292fefe32c9ca4adf6b276 Parents: c9b1dfb Author: Dmitiry Setrakyan <[email protected]> Authored: Thu Feb 5 20:03:59 2015 -0800 Committer: Dmitiry Setrakyan <[email protected]> Committed: Thu Feb 5 20:04:00 2015 -0800 ---------------------------------------------------------------------- .../ComputeContinuousMapperExample.java | 2 +- .../ComputeFibonacciContinuationExample.java | 2 +- .../failover/ComputeFailoverExample.java | 4 +- .../store/dummy/CacheDummyPersonStore.java | 2 +- .../ignite/examples/events/EventsExample.java | 2 +- .../examples/servicegrid/ServicesExample.java | 2 +- .../examples/ScalarContinuationExample.scala | 4 +- .../apache/ignite/gridify/TestGridifyJob.java | 2 +- .../direct/singlesplit/SingleSplitTestTask.java | 6 +- .../org/test/gridify/ExternalGridifyTask.java | 2 +- .../spi/checkpoint/s3/S3CheckpointSpi.java | 2 +- .../tcp/ipfinder/s3/TcpDiscoveryS3IpFinder.java | 2 +- .../ignite/client/ClientStartNodeTask.java | 2 +- .../ignite/client/ClientStopNodeTask.java | 4 +- .../java/org/apache/ignite/IgniteCompute.java | 8 +- .../java/org/apache/ignite/IgniteLogger.java | 2 +- .../java/org/apache/ignite/IgniteServices.java | 6 +- .../CacheConsistentHashAffinityFunction.java | 4 +- .../cache/store/CacheLoadOnlyStoreAdapter.java | 2 +- .../cache/store/jdbc/CacheJdbcBlobStore.java | 2 +- .../ignite/cache/store/jdbc/JdbcCacheStore.java | 2 +- .../org/apache/ignite/compute/ComputeJob.java | 12 +- .../ignite/compute/ComputeJobContext.java | 4 +- .../compute/ComputeJobContinuationAdapter.java | 2 +- .../org/apache/ignite/compute/ComputeTask.java | 8 +- .../compute/ComputeTaskContinuousMapper.java | 2 +- .../ignite/compute/ComputeTaskSession.java | 2 +- .../ignite/compute/ComputeTaskSplitAdapter.java | 2 +- .../gridify/aop/GridifyDefaultRangeTask.java | 8 +- .../compute/gridify/aop/GridifyDefaultTask.java | 2 +- .../org/apache/ignite/internal/IgnitionEx.java | 8 +- .../processors/affinity/GridAffinityUtils.java | 2 +- .../GridCacheDefaultAffinityKeyMapper.java | 2 +- .../jdbc/GridCacheQueryJdbcMetadataTask.java | 2 +- .../query/jdbc/GridCacheQueryJdbcTask.java | 2 +- .../closure/GridClosureProcessor.java | 20 +-- .../internal/processors/fs/GridGgfsJobImpl.java | 2 +- .../resource/GridResourceLoggerInjector.java | 6 +- .../resource/GridResourceProcessor.java | 152 +++++++++---------- .../resource/GridResourceServiceInjector.java | 4 +- .../processors/task/GridTaskWorker.java | 2 +- .../util/ipc/loopback/IpcServerTcpEndpoint.java | 2 +- .../shmem/IpcSharedMemoryServerEndpoint.java | 2 +- .../apache/ignite/lifecycle/LifecycleBean.java | 6 +- .../apache/ignite/logger/java/JavaLogger.java | 2 +- .../ignite/messaging/MessagingListenActor.java | 2 +- .../ignite/resources/CacheNameResource.java | 59 +++++++ .../resources/IgniteCacheNameResource.java | 59 ------- .../resources/IgniteJobContextResource.java | 59 ------- .../resources/IgniteLoadBalancerResource.java | 61 -------- .../ignite/resources/IgniteLoggerResource.java | 85 ----------- .../resources/IgniteMBeanServerResource.java | 65 -------- .../ignite/resources/IgniteServiceResource.java | 87 ----------- .../IgniteSpringApplicationContextResource.java | 68 --------- .../ignite/resources/IgniteSpringResource.java | 112 -------------- .../IgniteTaskContinuousMapperResource.java | 57 ------- .../resources/IgniteTaskSessionResource.java | 60 -------- .../ignite/resources/JobContextResource.java | 59 +++++++ .../ignite/resources/LoadBalancerResource.java | 61 ++++++++ .../apache/ignite/resources/LoggerResource.java | 85 +++++++++++ .../ignite/resources/MBeanServerResource.java | 65 ++++++++ .../ignite/resources/ServiceResource.java | 87 +++++++++++ .../SpringApplicationContextResource.java | 68 +++++++++ .../apache/ignite/resources/SpringResource.java | 112 ++++++++++++++ .../resources/TaskContinuousMapperResource.java | 57 +++++++ .../ignite/resources/TaskSessionResource.java | 60 ++++++++ .../java/org/apache/ignite/spi/IgniteSpi.java | 6 +- .../org/apache/ignite/spi/IgniteSpiAdapter.java | 2 +- .../noop/NoopAuthenticationSpi.java | 2 +- .../checkpoint/cache/CacheCheckpointSpi.java | 2 +- .../spi/checkpoint/jdbc/JdbcCheckpointSpi.java | 2 +- .../spi/checkpoint/noop/NoopCheckpointSpi.java | 2 +- .../sharedfs/SharedFsCheckpointSpi.java | 2 +- .../fifoqueue/FifoQueueCollisionSpi.java | 2 +- .../jobstealing/JobStealingCollisionSpi.java | 2 +- .../PriorityQueueCollisionSpi.java | 2 +- .../communication/tcp/TcpCommunicationSpi.java | 2 +- .../deployment/local/LocalDeploymentSpi.java | 2 +- .../discovery/tcp/TcpDiscoverySpiAdapter.java | 2 +- .../ipfinder/jdbc/TcpDiscoveryJdbcIpFinder.java | 2 +- .../TcpDiscoveryMulticastIpFinder.java | 2 +- .../sharedfs/TcpDiscoverySharedFsIpFinder.java | 2 +- .../tcp/ipfinder/vm/TcpDiscoveryVmIpFinder.java | 2 +- .../memory/MemoryEventStorageSpi.java | 2 +- .../spi/failover/always/AlwaysFailoverSpi.java | 2 +- .../jobstealing/JobStealingFailoverSpi.java | 2 +- .../spi/failover/never/NeverFailoverSpi.java | 2 +- .../adaptive/AdaptiveLoadBalancingSpi.java | 2 +- .../roundrobin/RoundRobinLoadBalancingSpi.java | 2 +- .../WeightedRandomLoadBalancingSpi.java | 2 +- .../noop/NoopSecureSessionSpi.java | 2 +- .../spi/swapspace/file/FileSwapSpaceSpi.java | 2 +- .../spi/swapspace/noop/NoopSwapSpaceSpi.java | 2 +- .../java/org/apache/ignite/GridTestJob.java | 2 +- .../java/org/apache/ignite/GridTestTask.java | 2 +- .../cache/store/GridGeneratingTestStore.java | 2 +- .../internal/GridCancelUnusedJobSelfTest.java | 6 +- .../GridCancelledJobsMetricsSelfTest.java | 2 +- .../GridCollisionJobsContextSelfTest.java | 2 +- .../GridContinuousJobAnnotationSelfTest.java | 2 +- .../GridContinuousJobSiblingsSelfTest.java | 8 +- .../internal/GridContinuousTaskSelfTest.java | 16 +- .../ignite/internal/GridDeploymentSelfTest.java | 6 +- .../GridEventStorageCheckAllEventsSelfTest.java | 6 +- .../GridFailoverCustomTopologySelfTest.java | 2 +- .../ignite/internal/GridFailoverSelfTest.java | 2 +- .../GridFailoverTaskWithPredicateSelfTest.java | 2 +- .../GridJobCheckpointCleanupSelfTest.java | 2 +- .../GridJobCollisionCancelSelfTest.java | 8 +- .../ignite/internal/GridJobContextSelfTest.java | 2 +- .../GridJobMasterLeaveAwareSelfTest.java | 10 +- .../internal/GridJobStealingSelfTest.java | 4 +- .../GridJobStealingZeroActiveJobsSelfTest.java | 2 +- .../internal/GridJobSubjectIdSelfTest.java | 4 +- .../internal/GridManagementJobSelfTest.java | 2 +- .../internal/GridMultipleSpisSelfTest.java | 4 +- .../GridMultipleVersionsDeploymentSelfTest.java | 2 +- .../GridMultithreadedJobStealingSelfTest.java | 2 +- .../internal/GridNonHistoryMetricsSelfTest.java | 2 +- .../ignite/internal/GridReduceSelfTest.java | 2 +- .../internal/GridRuntimeExceptionSelfTest.java | 4 +- .../internal/GridStopWithWaitSelfTest.java | 4 +- .../GridTaskCancelSingleNodeSelfTest.java | 2 +- .../GridTaskContinuousMapperSelfTest.java | 10 +- .../GridTaskExecutionContextSelfTest.java | 4 +- .../internal/GridTaskFailoverSelfTest.java | 2 +- .../GridTaskFutureImplStopGridSelfTest.java | 4 +- .../GridTaskInstanceExecutionSelfTest.java | 2 +- .../internal/GridTaskMapAsyncSelfTest.java | 2 +- .../GridTaskNameAnnotationSelfTest.java | 2 +- .../internal/GridTaskTimeoutSelfTest.java | 2 +- ...gniteExplicitImplicitDeploymentSelfTest.java | 2 +- .../managers/GridManagerStopSelfTest.java | 2 +- .../GridCheckpointManagerAbstractSelfTest.java | 8 +- .../checkpoint/GridCheckpointTaskSelfTest.java | 8 +- .../cache/GridCacheAffinityRoutingSelfTest.java | 24 +-- .../cache/GridCacheGroupLockPutTask.java | 2 +- .../cache/GridCacheLifecycleAwareSelfTest.java | 2 +- .../cache/GridCachePutAllFailoverSelfTest.java | 2 +- .../processors/cache/GridCachePutAllTask.java | 2 +- ...dCacheSequenceMultiNodeAbstractSelfTest.java | 9 +- .../IgniteCountDownLatchAbstractSelfTest.java | 2 +- .../GridCachePartitionedAffinitySelfTest.java | 2 +- ...achePartitionedMultiNodeCounterSelfTest.java | 2 +- ...CacheReplicatedPreloadLifecycleSelfTest.java | 2 +- .../closure/GridClosureProcessorSelfTest.java | 4 +- .../processors/fs/GridGgfsTaskSelfTest.java | 4 +- .../streamer/GridStreamerSelfTest.java | 2 +- .../loadtest/GridSingleExecutionTest.java | 6 +- .../colocation/GridTestCacheStore.java | 2 +- .../direct/multisplit/GridLoadTestTask.java | 2 +- .../GridSingleSplitNewNodesTestTask.java | 6 +- .../direct/session/GridSessionLoadTestJob.java | 4 +- .../direct/session/GridSessionLoadTestTask.java | 4 +- .../stealing/GridStealingLoadTestJob.java | 4 +- .../stealing/GridStealingLoadTestTask.java | 2 +- .../loadtests/dsi/GridDsiLifecycleBean.java | 2 +- .../loadtests/job/GridJobLoadTestJob.java | 6 +- .../mapper/GridContinuousMapperTask1.java | 2 +- .../mergesort/GridMergeSortLoadTask.java | 2 +- .../p2p/GridP2PRemoteClassLoadersSelfTest.java | 2 +- .../org/apache/ignite/p2p/GridP2PTestJob.java | 4 +- .../org/apache/ignite/p2p/GridP2PTestTask.java | 2 +- ...SessionCancelSiblingsFromFutureSelfTest.java | 4 +- ...ridSessionCancelSiblingsFromJobSelfTest.java | 6 +- ...idSessionCancelSiblingsFromTaskSelfTest.java | 4 +- .../GridSessionCheckpointAbstractSelfTest.java | 2 +- .../GridSessionCollisionSpiSelfTest.java | 8 +- ...idSessionFutureWaitJobAttributeSelfTest.java | 4 +- ...dSessionFutureWaitTaskAttributeSelfTest.java | 4 +- .../session/GridSessionJobFailoverSelfTest.java | 2 +- ...GridSessionJobWaitTaskAttributeSelfTest.java | 4 +- .../ignite/session/GridSessionLoadSelfTest.java | 8 +- .../GridSessionSetFutureAttributeSelfTest.java | 4 +- ...nSetFutureAttributeWaitListenerSelfTest.java | 4 +- .../GridSessionSetJobAttribute2SelfTest.java | 4 +- ...GridSessionSetJobAttributeOrderSelfTest.java | 8 +- .../GridSessionSetJobAttributeSelfTest.java | 4 +- ...sionSetJobAttributeWaitListenerSelfTest.java | 4 +- .../GridSessionSetTaskAttributeSelfTest.java | 4 +- ...GridSessionTaskWaitJobAttributeSelfTest.java | 4 +- .../GridSessionWaitAttributeSelfTest.java | 6 +- ...ridTcpDiscoveryIpFinderAbstractSelfTest.java | 2 +- .../junits/IgniteTestResources.java | 2 +- .../GridAbstractLifecycleAwareSelfTest.java | 2 +- .../junits/logger/GridTestLog4jLogger.java | 2 +- .../tests/p2p/GridP2PAwareTestUserResource.java | 2 +- .../ignite/tests/p2p/JobStealingTask.java | 4 +- .../tests/p2p/P2PTestTaskExternalPath1.java | 6 +- .../tests/p2p/P2PTestTaskExternalPath2.java | 6 +- .../GridHadoopDefaultMapReducePlanner.java | 2 +- .../proto/GridHadoopProtocolTaskAdapter.java | 2 +- .../hibernate/CacheHibernateBlobStore.java | 2 +- .../processors/query/h2/IgniteH2Indexing.java | 2 +- .../apache/ignite/logger/jcl/GridJclLogger.java | 2 +- .../apache/ignite/logger/log4j/Log4JLogger.java | 2 +- .../schedule/GridScheduleSelfTest.java | 4 +- .../ignite/logger/slf4j/GridSlf4jLogger.java | 2 +- .../java/org/apache/ignite/IgniteSpring.java | 10 +- .../GridResourceSpringBeanInjector.java | 4 +- .../ignite/internal/GridFactorySelfTest.java | 8 +- .../resource/GridLoggerInjectionSelfTest.java | 8 +- .../resource/GridResourceProcessorSelfTest.java | 2 +- .../resource/GridServiceInjectionSelfTest.java | 20 +-- .../processors/resource/TestClosure.java | 2 +- .../util/nodestart/GridNodeCallableImpl.java | 2 +- .../spi/deployment/uri/UriDeploymentSpi.java | 2 +- 207 files changed, 1132 insertions(+), 1137 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeContinuousMapperExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeContinuousMapperExample.java b/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeContinuousMapperExample.java index 9bc5ead..9834ae1 100644 --- a/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeContinuousMapperExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeContinuousMapperExample.java @@ -77,7 +77,7 @@ public class ComputeContinuousMapperExample { @ComputeTaskNoResultCache private static class ContinuousMapperTask extends ComputeTaskAdapter<String, Integer> { /** This field will be injected with task continuous mapper. */ - @IgniteTaskContinuousMapperResource + @TaskContinuousMapperResource private ComputeTaskContinuousMapper mapper; /** Word queue. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeFibonacciContinuationExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeFibonacciContinuationExample.java b/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeFibonacciContinuationExample.java index e1b8652..0e04607 100644 --- a/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeFibonacciContinuationExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeFibonacciContinuationExample.java @@ -92,7 +92,7 @@ public final class ComputeFibonacciContinuationExample { private IgniteFuture<BigInteger> fut2; /** Auto-inject job context. */ - @IgniteJobContextResource + @JobContextResource private ComputeJobContext jobCtx; /** Auto-inject ignite instance. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/examples/src/main/java/org/apache/ignite/examples/computegrid/failover/ComputeFailoverExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/computegrid/failover/ComputeFailoverExample.java b/examples/src/main/java/org/apache/ignite/examples/computegrid/failover/ComputeFailoverExample.java index e27faaa..9b87c70 100644 --- a/examples/src/main/java/org/apache/ignite/examples/computegrid/failover/ComputeFailoverExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/computegrid/failover/ComputeFailoverExample.java @@ -62,11 +62,11 @@ public class ComputeFailoverExample { @ComputeTaskSessionFullSupport private static final class CheckPointJob implements IgniteClosure<String, Integer> { /** Injected distributed task session. */ - @IgniteTaskSessionResource + @TaskSessionResource private ComputeTaskSession jobSes; /** Injected ignite logger. */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/examples/src/main/java/org/apache/ignite/examples/datagrid/store/dummy/CacheDummyPersonStore.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/dummy/CacheDummyPersonStore.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/dummy/CacheDummyPersonStore.java index 9a3f7e2..619966d 100644 --- a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/dummy/CacheDummyPersonStore.java +++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/dummy/CacheDummyPersonStore.java @@ -37,7 +37,7 @@ public class CacheDummyPersonStore extends CacheStoreAdapter<Long, Person> { private Ignite ignite; /** Auto-inject cache name. */ - @IgniteCacheNameResource + @CacheNameResource private String cacheName; /** Dummy database. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/examples/src/main/java/org/apache/ignite/examples/events/EventsExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/events/EventsExample.java b/examples/src/main/java/org/apache/ignite/examples/events/EventsExample.java index 032f98c..60c8b9e 100644 --- a/examples/src/main/java/org/apache/ignite/examples/events/EventsExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/events/EventsExample.java @@ -132,7 +132,7 @@ public class EventsExample { for (int i = 0; i < 10; i++) { ignite.compute().withName(i < 5 ? "good-task-" + i : "bad-task-" + i).run(new IgniteRunnable() { // Auto-inject task session. - @IgniteTaskSessionResource + @TaskSessionResource private ComputeTaskSession ses; @Override public void run() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/examples/src/main/java/org/apache/ignite/examples/servicegrid/ServicesExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/servicegrid/ServicesExample.java b/examples/src/main/java/org/apache/ignite/examples/servicegrid/ServicesExample.java index c2140c6..e1fdca7 100644 --- a/examples/src/main/java/org/apache/ignite/examples/servicegrid/ServicesExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/servicegrid/ServicesExample.java @@ -152,7 +152,7 @@ public class ServicesExample { */ private static class SimpleClosure implements IgniteCallable<Integer> { // Auto-inject service proxy. - @IgniteServiceResource(serviceName = "myClusterSingletonService", proxyInterface = SimpleMapService.class) + @ServiceResource(serviceName = "myClusterSingletonService", proxyInterface = SimpleMapService.class) private transient SimpleMapService mapSvc; /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarContinuationExample.scala ---------------------------------------------------------------------- diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarContinuationExample.scala b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarContinuationExample.scala index c9808ee..b307af0 100644 --- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarContinuationExample.scala +++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarContinuationExample.scala @@ -22,7 +22,7 @@ import java.util import org.apache.ignite.compute.ComputeJobContext import org.apache.ignite.lang.{IgniteClosure, IgniteFuture} -import org.apache.ignite.resources.IgniteJobContextResource +import org.apache.ignite.resources.JobContextResource import org.apache.ignite.scalar.scalar import org.apache.ignite.scalar.scalar._ import org.jetbrains.annotations.Nullable @@ -84,7 +84,7 @@ class FibonacciClosure ( @transient private var fut1, fut2: IgniteFuture[BigInteger] = null // Auto-inject job context. - @IgniteJobContextResource + @JobContextResource private val jobCtx: ComputeJobContext = null @Nullable override def apply(num: Long): BigInteger = { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/aop/src/test/java/org/apache/ignite/gridify/TestGridifyJob.java ---------------------------------------------------------------------- diff --git a/modules/aop/src/test/java/org/apache/ignite/gridify/TestGridifyJob.java b/modules/aop/src/test/java/org/apache/ignite/gridify/TestGridifyJob.java index d5df695..41f5025 100644 --- a/modules/aop/src/test/java/org/apache/ignite/gridify/TestGridifyJob.java +++ b/modules/aop/src/test/java/org/apache/ignite/gridify/TestGridifyJob.java @@ -28,7 +28,7 @@ import java.io.*; */ public class TestGridifyJob extends ComputeJobAdapter { /** */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/aop/src/test/java/org/apache/loadtests/direct/singlesplit/SingleSplitTestTask.java ---------------------------------------------------------------------- diff --git a/modules/aop/src/test/java/org/apache/loadtests/direct/singlesplit/SingleSplitTestTask.java b/modules/aop/src/test/java/org/apache/loadtests/direct/singlesplit/SingleSplitTestTask.java index 5466e29..0c55204 100644 --- a/modules/aop/src/test/java/org/apache/loadtests/direct/singlesplit/SingleSplitTestTask.java +++ b/modules/aop/src/test/java/org/apache/loadtests/direct/singlesplit/SingleSplitTestTask.java @@ -28,11 +28,11 @@ import java.util.*; */ public class SingleSplitTestTask extends ComputeTaskAdapter<Integer, Integer> { /** */ - @IgniteTaskSessionResource + @TaskSessionResource private ComputeTaskSession taskSes; /** */ - @IgniteLoadBalancerResource + @LoadBalancerResource private ComputeLoadBalancer balancer; /** {@inheritDoc} */ @@ -49,7 +49,7 @@ public class SingleSplitTestTask extends ComputeTaskAdapter<Integer, 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/aop/src/test/java/org/test/gridify/ExternalGridifyTask.java ---------------------------------------------------------------------- diff --git a/modules/aop/src/test/java/org/test/gridify/ExternalGridifyTask.java b/modules/aop/src/test/java/org/test/gridify/ExternalGridifyTask.java index bc0bbe6..31e95ba 100644 --- a/modules/aop/src/test/java/org/test/gridify/ExternalGridifyTask.java +++ b/modules/aop/src/test/java/org/test/gridify/ExternalGridifyTask.java @@ -38,7 +38,7 @@ public class ExternalGridifyTask extends ComputeTaskSplitAdapter<GridifyArgument return Collections.singletonList(new ComputeJobAdapter((String)arg.getMethodParameters()[0]) { /** */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpi.java ---------------------------------------------------------------------- diff --git a/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpi.java b/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpi.java index 0bdf5f5..5f93c1f 100644 --- a/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpi.java +++ b/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpi.java @@ -103,7 +103,7 @@ import java.util.*; public class S3CheckpointSpi extends IgniteSpiAdapter implements CheckpointSpi, S3CheckpointSpiMBean { /** Logger. */ @SuppressWarnings({"FieldAccessedSynchronizedAndUnsynchronized"}) - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** Ignite instance. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/aws/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/TcpDiscoveryS3IpFinder.java ---------------------------------------------------------------------- diff --git a/modules/aws/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/TcpDiscoveryS3IpFinder.java b/modules/aws/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/TcpDiscoveryS3IpFinder.java index 2dc0699..78f4ad1 100644 --- a/modules/aws/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/TcpDiscoveryS3IpFinder.java +++ b/modules/aws/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/TcpDiscoveryS3IpFinder.java @@ -78,7 +78,7 @@ public class TcpDiscoveryS3IpFinder extends TcpDiscoveryIpFinderAdapter { } /** Grid logger. */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** Client to interact with S3 storage. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/clients/src/test/java/org/apache/ignite/client/ClientStartNodeTask.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/client/ClientStartNodeTask.java b/modules/clients/src/test/java/org/apache/ignite/client/ClientStartNodeTask.java index 03f4643..14a498c 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/ClientStartNodeTask.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/ClientStartNodeTask.java @@ -52,7 +52,7 @@ public class ClientStartNodeTask extends TaskSingleJobSplitAdapter<String, Integ }}; /** */ - @IgniteLoggerResource + @LoggerResource private transient IgniteLogger log; /** */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/clients/src/test/java/org/apache/ignite/client/ClientStopNodeTask.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/client/ClientStopNodeTask.java b/modules/clients/src/test/java/org/apache/ignite/client/ClientStopNodeTask.java index 189da73..eaf32b7 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/ClientStopNodeTask.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/ClientStopNodeTask.java @@ -35,7 +35,7 @@ import static org.apache.ignite.compute.ComputeJobResultPolicy.*; */ public class ClientStopNodeTask extends ComputeTaskSplitAdapter<String, Integer> { /** */ - @IgniteLoggerResource + @LoggerResource private transient IgniteLogger log; /** */ @@ -82,7 +82,7 @@ public class ClientStopNodeTask extends ComputeTaskSplitAdapter<String, Integer> private final String gridType; /** */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/main/java/org/apache/ignite/IgniteCompute.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteCompute.java b/modules/core/src/main/java/org/apache/ignite/IgniteCompute.java index fff2d1b..0498d19 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteCompute.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteCompute.java @@ -78,11 +78,11 @@ import java.util.concurrent.*; * ignite resources. Both, field and method based injections are supported. The following grid * resources can be injected: * <ul> - * <li>{@link IgniteTaskSessionResource}</li> + * <li>{@link org.apache.ignite.resources.TaskSessionResource}</li> * <li>{@link IgniteInstanceResource}</li> - * <li>{@link IgniteLoggerResource}</li> - * <li>{@link IgniteSpringApplicationContextResource}</li> - * <li>{@link IgniteSpringResource}</li> + * <li>{@link org.apache.ignite.resources.LoggerResource}</li> + * <li>{@link org.apache.ignite.resources.SpringApplicationContextResource}</li> + * <li>{@link org.apache.ignite.resources.SpringResource}</li> * </ul> * Refer to corresponding resource documentation for more information. * Here is an example of how to inject instance of {@link Ignite} into a computation: http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/main/java/org/apache/ignite/IgniteLogger.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteLogger.java b/modules/core/src/main/java/org/apache/ignite/IgniteLogger.java index 9245e6b..0212212 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteLogger.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteLogger.java @@ -52,7 +52,7 @@ import org.jetbrains.annotations.*; * ... * </pre> * 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. * <h1 class="header">Quiet Mode</h1> * By default GridGain 3.0 and later starts in "quiet" mode suppressing {@code INFO} and {@code DEBUG} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/main/java/org/apache/ignite/IgniteServices.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteServices.java b/modules/core/src/main/java/org/apache/ignite/IgniteServices.java index fe369c1..e67f655 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteServices.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteServices.java @@ -83,9 +83,9 @@ import java.util.*; * resources can be injected: * <ul> * <li>{@link IgniteInstanceResource}</li> - * <li>{@link IgniteLoggerResource}</li> - * <li>{@link IgniteSpringApplicationContextResource}</li> - * <li>{@link IgniteSpringResource}</li> + * <li>{@link org.apache.ignite.resources.LoggerResource}</li> + * <li>{@link org.apache.ignite.resources.SpringApplicationContextResource}</li> + * <li>{@link org.apache.ignite.resources.SpringResource}</li> * </ul> * Refer to corresponding resource documentation for more information. * <h1 class="header">Service Example</h1> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/main/java/org/apache/ignite/cache/affinity/consistenthash/CacheConsistentHashAffinityFunction.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/affinity/consistenthash/CacheConsistentHashAffinityFunction.java b/modules/core/src/main/java/org/apache/ignite/cache/affinity/consistenthash/CacheConsistentHashAffinityFunction.java index 237f931..095f413 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/affinity/consistenthash/CacheConsistentHashAffinityFunction.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/affinity/consistenthash/CacheConsistentHashAffinityFunction.java @@ -105,11 +105,11 @@ public class CacheConsistentHashAffinityFunction implements CacheAffinityFunctio private Ignite ignite; /** Injected cache name. */ - @IgniteCacheNameResource + @CacheNameResource private String cacheName; /** Injected logger. */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** Initialization flag. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/main/java/org/apache/ignite/cache/store/CacheLoadOnlyStoreAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/store/CacheLoadOnlyStoreAdapter.java b/modules/core/src/main/java/org/apache/ignite/cache/store/CacheLoadOnlyStoreAdapter.java index 4779b83..9b6db74 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/store/CacheLoadOnlyStoreAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/store/CacheLoadOnlyStoreAdapter.java @@ -82,7 +82,7 @@ public abstract class CacheLoadOnlyStoreAdapter<K, V, I> extends CacheStore<K, V public static final int DFLT_THREADS_COUNT = Runtime.getRuntime().availableProcessors(); /** Auto-injected logger. */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** Batch size. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcBlobStore.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcBlobStore.java b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcBlobStore.java index be927e9..8b0709d 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcBlobStore.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcBlobStore.java @@ -143,7 +143,7 @@ public class CacheJdbcBlobStore<K, V> extends CacheStoreAdapter<K, V> { private boolean initSchema = true; /** Log. */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** Marshaller. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/JdbcCacheStore.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/JdbcCacheStore.java b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/JdbcCacheStore.java index a4392f1..9582afe 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/JdbcCacheStore.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/JdbcCacheStore.java @@ -92,7 +92,7 @@ public abstract class JdbcCacheStore<K, V> extends CacheStore<K, V> implements L protected static final Object[] EMPTY_COLUMN_VALUE = new Object[] { null }; /** Auto-injected logger instance. */ - @IgniteLoggerResource + @LoggerResource protected IgniteLogger log; /** Lock for metadata cache. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/main/java/org/apache/ignite/compute/ComputeJob.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/compute/ComputeJob.java b/modules/core/src/main/java/org/apache/ignite/compute/ComputeJob.java index b3b3d25..ccd8ac6 100644 --- a/modules/core/src/main/java/org/apache/ignite/compute/ComputeJob.java +++ b/modules/core/src/main/java/org/apache/ignite/compute/ComputeJob.java @@ -94,12 +94,12 @@ import java.util.*; * ignite resources. Both, field and method based injection are supported. * The following ignite resources can be injected: * <ul> - * <li>{@link org.apache.ignite.resources.IgniteTaskSessionResource}</li> - * <li>{@link org.apache.ignite.resources.IgniteJobContextResource}</li> + * <li>{@link org.apache.ignite.resources.TaskSessionResource}</li> + * <li>{@link org.apache.ignite.resources.JobContextResource}</li> * <li>{@link org.apache.ignite.resources.IgniteInstanceResource}</li> - * <li>{@link org.apache.ignite.resources.IgniteLoggerResource}</li> - * <li>{@link org.apache.ignite.resources.IgniteSpringApplicationContextResource}</li> - * <li>{@link org.apache.ignite.resources.IgniteSpringResource}</li> + * <li>{@link org.apache.ignite.resources.LoggerResource}</li> + * <li>{@link org.apache.ignite.resources.SpringApplicationContextResource}</li> + * <li>{@link org.apache.ignite.resources.SpringResource}</li> * </ul> * Refer to corresponding resource documentation for more information. * <p> @@ -117,7 +117,7 @@ import java.util.*; * of certain event or state change that occurred during job execution. * <p> * Distributed task session can be injected into {@link ComputeJob} implementation - * using {@link org.apache.ignite.resources.IgniteTaskSessionResource @IgniteTaskSessionResource} annotation. + * using {@link org.apache.ignite.resources.TaskSessionResource @IgniteTaskSessionResource} annotation. * Both, field and method based injections are supported. Refer to * {@link ComputeTaskSession} documentation for more information on session functionality. * <p> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobContext.java b/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobContext.java index 5ea90e7..a8cb10a 100644 --- a/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobContext.java +++ b/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobContext.java @@ -50,8 +50,8 @@ import java.util.concurrent.*; * ability to check context attributes from within grid task implementation for every job * returned from remote nodes. * <p> - * Job context can be injected into {@link ComputeJob} via {@link org.apache.ignite.resources.IgniteJobContextResource} - * annotation. Refer to the {@link org.apache.ignite.resources.IgniteJobContextResource} + * Job context can be injected into {@link ComputeJob} via {@link org.apache.ignite.resources.JobContextResource} + * annotation. Refer to the {@link org.apache.ignite.resources.JobContextResource} * documentation for coding examples on how to inject job context. * <p> * Attribute names that start with {@code "gridgain:"} are reserved for internal system use. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobContinuationAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobContinuationAdapter.java b/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobContinuationAdapter.java index 69ec79a..383d945 100644 --- a/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobContinuationAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobContinuationAdapter.java @@ -79,7 +79,7 @@ public abstract class ComputeJobContinuationAdapter extends ComputeJobAdapter im private static final long serialVersionUID = 0L; /** Job context. */ - @IgniteJobContextResource + @JobContextResource private transient ComputeJobContext jobCtx; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/main/java/org/apache/ignite/compute/ComputeTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/compute/ComputeTask.java b/modules/core/src/main/java/org/apache/ignite/compute/ComputeTask.java index b2c59fe..09f4314 100644 --- a/modules/core/src/main/java/org/apache/ignite/compute/ComputeTask.java +++ b/modules/core/src/main/java/org/apache/ignite/compute/ComputeTask.java @@ -132,11 +132,11 @@ import java.util.*; * ignite resources. Both, field and method based injection are supported. * The following ignite resources can be injected: * <ul> - * <li>{@link org.apache.ignite.resources.IgniteTaskSessionResource}</li> + * <li>{@link org.apache.ignite.resources.TaskSessionResource}</li> * <li>{@link org.apache.ignite.resources.IgniteInstanceResource}</li> - * <li>{@link org.apache.ignite.resources.IgniteLoggerResource}</li> - * <li>{@link org.apache.ignite.resources.IgniteSpringApplicationContextResource}</li> - * <li>{@link org.apache.ignite.resources.IgniteSpringResource}</li> + * <li>{@link org.apache.ignite.resources.LoggerResource}</li> + * <li>{@link org.apache.ignite.resources.SpringApplicationContextResource}</li> + * <li>{@link org.apache.ignite.resources.SpringResource}</li> * </ul> * Refer to corresponding resource documentation for more information. * <p> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskContinuousMapper.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskContinuousMapper.java b/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskContinuousMapper.java index c8cde40..ef924c4 100644 --- a/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskContinuousMapper.java +++ b/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskContinuousMapper.java @@ -41,7 +41,7 @@ import java.util.*; * has been sent prior to completing the {@link ComputeTask#map(List, Object)} method. * <p> * Task continuous mapper can be injected into a task using IoC (dependency - * injection) by attaching {@link org.apache.ignite.resources.IgniteTaskContinuousMapperResource} + * injection) by attaching {@link org.apache.ignite.resources.TaskContinuousMapperResource} * annotation to a field or a setter method inside of {@link ComputeTask} implementations * as follows: * <pre name="code" class="java"> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskSession.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskSession.java b/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskSession.java index c55ad1c..53da59e 100644 --- a/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskSession.java +++ b/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskSession.java @@ -76,7 +76,7 @@ import java.util.*; * <p> * <h1 class="header">Session Injection</h1> * Session can be injected into a task or a job using IoC (dependency - * injection) by attaching {@link org.apache.ignite.resources.IgniteTaskSessionResource @IgniteTaskSessionResource} + * injection) by attaching {@link org.apache.ignite.resources.TaskSessionResource @IgniteTaskSessionResource} * annotation to a field or a setter method inside of {@link ComputeTask} or * {@link ComputeJob} implementations as follows: * <pre name="code" class="java"> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskSplitAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskSplitAdapter.java b/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskSplitAdapter.java index 9239e5f..7b3b0d6 100644 --- a/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskSplitAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskSplitAdapter.java @@ -72,7 +72,7 @@ public abstract class ComputeTaskSplitAdapter<T, R> extends ComputeTaskAdapter<T private static final long serialVersionUID = 0L; /** Load balancer. */ - @IgniteLoadBalancerResource + @LoadBalancerResource private ComputeLoadBalancer balancer; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/main/java/org/apache/ignite/compute/gridify/aop/GridifyDefaultRangeTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/compute/gridify/aop/GridifyDefaultRangeTask.java b/modules/core/src/main/java/org/apache/ignite/compute/gridify/aop/GridifyDefaultRangeTask.java index a0b2c2c..a645246 100644 --- a/modules/core/src/main/java/org/apache/ignite/compute/gridify/aop/GridifyDefaultRangeTask.java +++ b/modules/core/src/main/java/org/apache/ignite/compute/gridify/aop/GridifyDefaultRangeTask.java @@ -51,20 +51,20 @@ public class GridifyDefaultRangeTask extends ComputeTaskAdapter<GridifyRangeArgu private Ignite ignite; /** Grid task session. */ - @IgniteTaskSessionResource + @TaskSessionResource private ComputeTaskSession ses; /** Grid logger. */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** Load balancer. */ - @IgniteLoadBalancerResource + @LoadBalancerResource private ComputeLoadBalancer balancer; /** */ @SuppressWarnings({"UnusedDeclaration"}) - @IgniteTaskContinuousMapperResource + @TaskContinuousMapperResource private ComputeTaskContinuousMapper mapper; /** */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/main/java/org/apache/ignite/compute/gridify/aop/GridifyDefaultTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/compute/gridify/aop/GridifyDefaultTask.java b/modules/core/src/main/java/org/apache/ignite/compute/gridify/aop/GridifyDefaultTask.java index 3071e54..d78de74 100644 --- a/modules/core/src/main/java/org/apache/ignite/compute/gridify/aop/GridifyDefaultTask.java +++ b/modules/core/src/main/java/org/apache/ignite/compute/gridify/aop/GridifyDefaultTask.java @@ -53,7 +53,7 @@ public class GridifyDefaultTask extends ComputeTaskAdapter<GridifyArgument, Obje private Ignite ignite; /** Load balancer. */ - @IgniteLoadBalancerResource + @LoadBalancerResource private ComputeLoadBalancer balancer; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java index 4b29d6c..7a24270 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java @@ -417,7 +417,7 @@ public class IgnitionEx { * @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. @@ -454,7 +454,7 @@ public class IgnitionEx { * @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. @@ -640,7 +640,7 @@ public class IgnitionEx { * @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 @@ -688,7 +688,7 @@ public class IgnitionEx { * @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 http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityUtils.java index 56b64f8..a5e8349 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityUtils.java @@ -128,7 +128,7 @@ class GridAffinityUtils { private Ignite ignite; /** */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDefaultAffinityKeyMapper.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDefaultAffinityKeyMapper.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDefaultAffinityKeyMapper.java index 5d2fa78..d89c9fc 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDefaultAffinityKeyMapper.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDefaultAffinityKeyMapper.java @@ -70,7 +70,7 @@ public class GridCacheDefaultAffinityKeyMapper implements CacheAffinityKeyMapper ); /** Logger. */ - @IgniteLoggerResource + @LoggerResource private transient IgniteLogger log; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java index d85a9d6..fee601b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java @@ -83,7 +83,7 @@ public class GridCacheQueryJdbcMetadataTask extends ComputeTaskAdapter<String, b private Ignite ignite; /** Logger. */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java index a8c0031..fc4015f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java @@ -157,7 +157,7 @@ public class GridCacheQueryJdbcTask extends ComputeTaskAdapter<byte[], byte[]> { private Ignite ignite; /** Logger. */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java index eb3aecc..d31d826 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java @@ -1114,7 +1114,7 @@ public class GridClosureProcessor extends GridProcessorAdapter { private static final long serialVersionUID = 0L; /** */ - @IgniteLoadBalancerResource + @LoadBalancerResource private ComputeLoadBalancer lb; /** */ @@ -1148,7 +1148,7 @@ public class GridClosureProcessor extends GridProcessorAdapter { private static final long serialVersionUID = 0L; /** */ - @IgniteLoadBalancerResource + @LoadBalancerResource private ComputeLoadBalancer lb; /** */ @@ -1179,7 +1179,7 @@ public class GridClosureProcessor extends GridProcessorAdapter { private static final long serialVersionUID = 0L; /** */ - @IgniteLoadBalancerResource + @LoadBalancerResource private ComputeLoadBalancer lb; /** */ @@ -1241,7 +1241,7 @@ public class GridClosureProcessor extends GridProcessorAdapter { private Runnable job; /** */ - @IgniteLoadBalancerResource + @LoadBalancerResource private ComputeLoadBalancer lb; /** @@ -1281,7 +1281,7 @@ public class GridClosureProcessor extends GridProcessorAdapter { private Callable<R> job; /** */ - @IgniteLoadBalancerResource + @LoadBalancerResource private ComputeLoadBalancer lb; /** @@ -1330,7 +1330,7 @@ public class GridClosureProcessor extends GridProcessorAdapter { private final Collection<? extends Callable<R>> jobs; /** */ - @IgniteLoadBalancerResource + @LoadBalancerResource private ComputeLoadBalancer lb; /** @@ -1370,7 +1370,7 @@ public class GridClosureProcessor extends GridProcessorAdapter { private IgniteBiTuple<GridClosureCallMode, Callable<R>> t; /** */ - @IgniteLoadBalancerResource + @LoadBalancerResource private ComputeLoadBalancer lb; /** @@ -1411,7 +1411,7 @@ public class GridClosureProcessor extends GridProcessorAdapter { private T arg; /** */ - @IgniteLoadBalancerResource + @LoadBalancerResource private ComputeLoadBalancer lb; /** @@ -1455,7 +1455,7 @@ public class GridClosureProcessor extends GridProcessorAdapter { private Collection<? extends T> args; /** */ - @IgniteLoadBalancerResource + @LoadBalancerResource private ComputeLoadBalancer lb; /** @@ -1511,7 +1511,7 @@ public class GridClosureProcessor extends GridProcessorAdapter { private IgniteReducer<R1, R2> rdc; /** */ - @IgniteLoadBalancerResource + @LoadBalancerResource private ComputeLoadBalancer lb; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsJobImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsJobImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsJobImpl.java index 348020d..0276457 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsJobImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsJobImpl.java @@ -56,7 +56,7 @@ public class GridGgfsJobImpl implements ComputeJob, GridInternalWrapper<IgniteFs private Ignite ignite; /** Injected logger. */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceLoggerInjector.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceLoggerInjector.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceLoggerInjector.java index bef8ee2..7a36067 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceLoggerInjector.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceLoggerInjector.java @@ -35,13 +35,13 @@ public class GridResourceLoggerInjector extends GridResourceBasicInjector<Ignite /** {@inheritDoc} */ @Override public void inject(GridResourceField field, Object target, Class<?> depCls, GridDeployment dep) throws IgniteCheckedException { - GridResourceUtils.inject(field.getField(), target, resource((IgniteLoggerResource)field.getAnnotation(), target)); + GridResourceUtils.inject(field.getField(), target, resource((LoggerResource)field.getAnnotation(), target)); } /** {@inheritDoc} */ @Override public void inject(GridResourceMethod mtd, Object target, Class<?> depCls, GridDeployment dep) throws IgniteCheckedException { - GridResourceUtils.inject(mtd.getMethod(), target, resource((IgniteLoggerResource)mtd.getAnnotation(), target)); + GridResourceUtils.inject(mtd.getMethod(), target, resource((LoggerResource)mtd.getAnnotation(), target)); } /** @@ -50,7 +50,7 @@ public class GridResourceLoggerInjector extends GridResourceBasicInjector<Ignite * @return Logger. */ @SuppressWarnings("IfMayBeConditional") - private IgniteLogger resource(IgniteLoggerResource ann, Object target) { + private IgniteLogger resource(LoggerResource ann, Object target) { Class<?> cls = ann.categoryClass(); String cat = ann.categoryName(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceProcessor.java index 8dc01c2..83ee983 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceProcessor.java @@ -40,24 +40,24 @@ import java.util.*; public class GridResourceProcessor extends GridProcessorAdapter { /** */ private static final Collection<Class<? extends Annotation>> JOB_INJECTIONS = Arrays.asList( - IgniteTaskSessionResource.class, - IgniteJobContextResource.class, + TaskSessionResource.class, + JobContextResource.class, IgniteInstanceResource.class, - IgniteSpringApplicationContextResource.class, - IgniteSpringResource.class, - IgniteLoggerResource.class, - IgniteServiceResource.class); + SpringApplicationContextResource.class, + SpringResource.class, + LoggerResource.class, + ServiceResource.class); /** */ private static final Collection<Class<? extends Annotation>> TASK_INJECTIONS = Arrays.asList( - IgniteTaskSessionResource.class, - IgniteLoadBalancerResource.class, - IgniteTaskContinuousMapperResource.class, + TaskSessionResource.class, + LoadBalancerResource.class, + TaskContinuousMapperResource.class, IgniteInstanceResource.class, - IgniteSpringApplicationContextResource.class, - IgniteSpringResource.class, - IgniteLoggerResource.class, - IgniteServiceResource.class); + SpringApplicationContextResource.class, + SpringResource.class, + LoggerResource.class, + ServiceResource.class); /** Grid instance injector. */ private GridResourceBasicInjector<IgniteEx> gridInjector; @@ -174,10 +174,10 @@ public class GridResourceProcessor extends GridProcessorAdapter { target = unwrapTarget(target); ioc.inject(target, IgniteInstanceResource.class, gridInjector, dep, depCls); - ioc.inject(target, IgniteSpringApplicationContextResource.class, springCtxInjector, dep, depCls); - ioc.inject(target, IgniteSpringResource.class, springBeanInjector, dep, depCls); - ioc.inject(target, IgniteLoggerResource.class, logInjector, dep, depCls); - ioc.inject(target, IgniteServiceResource.class, srvcInjector, dep, depCls); + ioc.inject(target, SpringApplicationContextResource.class, springCtxInjector, dep, depCls); + ioc.inject(target, SpringResource.class, springBeanInjector, dep, depCls); + ioc.inject(target, LoggerResource.class, logInjector, dep, depCls); + ioc.inject(target, ServiceResource.class, srvcInjector, dep, depCls); } /** @@ -196,7 +196,7 @@ public class GridResourceProcessor extends GridProcessorAdapter { // Unwrap Proxy object. obj = unwrapTarget(obj); - ioc.inject(obj, IgniteCacheNameResource.class, new GridResourceBasicInjector<>(cacheName), null, null); + ioc.inject(obj, CacheNameResource.class, new GridResourceBasicInjector<>(cacheName), null, null); } /** @@ -213,11 +213,11 @@ public class GridResourceProcessor extends GridProcessorAdapter { obj = unwrapTarget(obj); // No deployment for lifecycle beans. - ioc.inject(obj, IgniteSpringApplicationContextResource.class, springCtxInjector, null, null); - ioc.inject(obj, IgniteSpringResource.class, springBeanInjector, null, null); + ioc.inject(obj, SpringApplicationContextResource.class, springCtxInjector, null, null); + ioc.inject(obj, SpringResource.class, springBeanInjector, null, null); ioc.inject(obj, IgniteInstanceResource.class, gridInjector, null, null); - ioc.inject(obj, IgniteLoggerResource.class, logInjector, null, null); - ioc.inject(obj, IgniteServiceResource.class, srvcInjector, null, null); + ioc.inject(obj, LoggerResource.class, logInjector, null, null); + ioc.inject(obj, ServiceResource.class, srvcInjector, null, null); } /** @@ -233,10 +233,10 @@ public class GridResourceProcessor extends GridProcessorAdapter { obj = unwrapTarget(obj); // Caching key is null for the life-cycle beans. - ioc.inject(obj, IgniteLoggerResource.class, nullInjector, null, null); - ioc.inject(obj, IgniteServiceResource.class, nullInjector, null, null); - ioc.inject(obj, IgniteSpringApplicationContextResource.class, nullInjector, null, null); - ioc.inject(obj, IgniteSpringResource.class, nullInjector, null, null); + ioc.inject(obj, LoggerResource.class, nullInjector, null, null); + ioc.inject(obj, ServiceResource.class, nullInjector, null, null); + ioc.inject(obj, SpringApplicationContextResource.class, nullInjector, null, null); + ioc.inject(obj, SpringResource.class, nullInjector, null, null); ioc.inject(obj, IgniteInstanceResource.class, nullInjector, null, null); } } @@ -285,23 +285,23 @@ public class GridResourceProcessor extends GridProcessorAdapter { if (filtered.length > 0) { for (Class<? extends Annotation> annCls : filtered) { - if (annCls == IgniteTaskSessionResource.class) - injectBasicResource(job, IgniteTaskSessionResource.class, ses, dep, taskCls); - else if (annCls == IgniteJobContextResource.class) - ioc.inject(job, IgniteJobContextResource.class, new GridResourceJobContextInjector(jobCtx), + if (annCls == TaskSessionResource.class) + injectBasicResource(job, TaskSessionResource.class, ses, dep, taskCls); + else if (annCls == JobContextResource.class) + ioc.inject(job, JobContextResource.class, new GridResourceJobContextInjector(jobCtx), dep, taskCls); else if (annCls == IgniteInstanceResource.class) ioc.inject(job, IgniteInstanceResource.class, gridInjector, dep, taskCls); - else if (annCls == IgniteSpringApplicationContextResource.class) - ioc.inject(job, IgniteSpringApplicationContextResource.class, springCtxInjector, dep, taskCls); - else if (annCls == IgniteSpringResource.class) - ioc.inject(job, IgniteSpringResource.class, springBeanInjector, dep, taskCls); - else if (annCls == IgniteLoggerResource.class) - ioc.inject(job, IgniteLoggerResource.class, logInjector, dep, taskCls); + else if (annCls == SpringApplicationContextResource.class) + ioc.inject(job, SpringApplicationContextResource.class, springCtxInjector, dep, taskCls); + else if (annCls == SpringResource.class) + ioc.inject(job, SpringResource.class, springBeanInjector, dep, taskCls); + else if (annCls == LoggerResource.class) + ioc.inject(job, LoggerResource.class, logInjector, dep, taskCls); else { - assert annCls == IgniteServiceResource.class; + assert annCls == ServiceResource.class; - ioc.inject(job, IgniteServiceResource.class, srvcInjector, dep, taskCls); + ioc.inject(job, ServiceResource.class, srvcInjector, dep, taskCls); } } } @@ -346,24 +346,24 @@ public class GridResourceProcessor extends GridProcessorAdapter { Class<?> taskCls = obj.getClass(); for (Class<? extends Annotation> annCls : filtered) { - if (annCls == IgniteTaskSessionResource.class) - injectBasicResource(obj, IgniteTaskSessionResource.class, ses, dep, taskCls); - else if (annCls == IgniteLoadBalancerResource.class) - injectBasicResource(obj, IgniteLoadBalancerResource.class, balancer, dep, taskCls); - else if (annCls == IgniteTaskContinuousMapperResource.class) - injectBasicResource(obj, IgniteTaskContinuousMapperResource.class, mapper, dep, taskCls); + if (annCls == TaskSessionResource.class) + injectBasicResource(obj, TaskSessionResource.class, ses, dep, taskCls); + else if (annCls == LoadBalancerResource.class) + injectBasicResource(obj, LoadBalancerResource.class, balancer, dep, taskCls); + else if (annCls == TaskContinuousMapperResource.class) + injectBasicResource(obj, TaskContinuousMapperResource.class, mapper, dep, taskCls); else if (annCls == IgniteInstanceResource.class) ioc.inject(obj, IgniteInstanceResource.class, gridInjector, dep, taskCls); - else if (annCls == IgniteSpringApplicationContextResource.class) - ioc.inject(obj, IgniteSpringApplicationContextResource.class, springCtxInjector, dep, taskCls); - else if (annCls == IgniteSpringResource.class) - ioc.inject(obj, IgniteSpringResource.class, springBeanInjector, dep, taskCls); - else if (annCls == IgniteLoggerResource.class) - ioc.inject(obj, IgniteLoggerResource.class, logInjector, dep, taskCls); + else if (annCls == SpringApplicationContextResource.class) + ioc.inject(obj, SpringApplicationContextResource.class, springCtxInjector, dep, taskCls); + else if (annCls == SpringResource.class) + ioc.inject(obj, SpringResource.class, springBeanInjector, dep, taskCls); + else if (annCls == LoggerResource.class) + ioc.inject(obj, LoggerResource.class, logInjector, dep, taskCls); else { - assert annCls == IgniteServiceResource.class; + assert annCls == ServiceResource.class; - ioc.inject(obj, IgniteServiceResource.class, srvcInjector, dep, taskCls); + ioc.inject(obj, ServiceResource.class, srvcInjector, dep, taskCls); } } } @@ -394,10 +394,10 @@ public class GridResourceProcessor extends GridProcessorAdapter { Object obj = unwrapTarget(spi); // Caching key is null for the SPIs. - ioc.inject(obj, IgniteSpringApplicationContextResource.class, springCtxInjector, null, null); - ioc.inject(obj, IgniteSpringResource.class, springBeanInjector, null, null); - ioc.inject(obj, IgniteLoggerResource.class, logInjector, null, null); - ioc.inject(obj, IgniteServiceResource.class, srvcInjector, null, null); + ioc.inject(obj, SpringApplicationContextResource.class, springCtxInjector, null, null); + ioc.inject(obj, SpringResource.class, springBeanInjector, null, null); + ioc.inject(obj, LoggerResource.class, logInjector, null, null); + ioc.inject(obj, ServiceResource.class, srvcInjector, null, null); ioc.inject(obj, IgniteInstanceResource.class, gridInjector, null, null); } @@ -415,10 +415,10 @@ public class GridResourceProcessor extends GridProcessorAdapter { // Unwrap Proxy object. Object obj = unwrapTarget(spi); - ioc.inject(obj, IgniteLoggerResource.class, nullInjector, null, null); - ioc.inject(obj, IgniteServiceResource.class, nullInjector, null, null); - ioc.inject(obj, IgniteSpringApplicationContextResource.class, nullInjector, null, null); - ioc.inject(obj, IgniteSpringResource.class, nullInjector, null, null); + ioc.inject(obj, LoggerResource.class, nullInjector, null, null); + ioc.inject(obj, ServiceResource.class, nullInjector, null, null); + ioc.inject(obj, SpringApplicationContextResource.class, nullInjector, null, null); + ioc.inject(obj, SpringResource.class, nullInjector, null, null); ioc.inject(obj, IgniteInstanceResource.class, nullInjector, null, null); } @@ -436,11 +436,11 @@ public class GridResourceProcessor extends GridProcessorAdapter { Object obj = unwrapTarget(lifecycleBean); // No deployment for lifecycle beans. - ioc.inject(obj, IgniteSpringApplicationContextResource.class, springCtxInjector, null, null); - ioc.inject(obj, IgniteSpringResource.class, springBeanInjector, null, null); + ioc.inject(obj, SpringApplicationContextResource.class, springCtxInjector, null, null); + ioc.inject(obj, SpringResource.class, springBeanInjector, null, null); ioc.inject(obj, IgniteInstanceResource.class, gridInjector, null, null); - ioc.inject(obj, IgniteLoggerResource.class, logInjector, null, null); - ioc.inject(obj, IgniteServiceResource.class, srvcInjector, null, null); + ioc.inject(obj, LoggerResource.class, logInjector, null, null); + ioc.inject(obj, ServiceResource.class, srvcInjector, null, null); } /** @@ -458,10 +458,10 @@ public class GridResourceProcessor extends GridProcessorAdapter { Object obj = unwrapTarget(lifecycleBean); // Caching key is null for the life-cycle beans. - ioc.inject(obj, IgniteLoggerResource.class, nullInjector, null, null); - ioc.inject(obj, IgniteServiceResource.class, nullInjector, null, null); - ioc.inject(obj, IgniteSpringApplicationContextResource.class, nullInjector, null, null); - ioc.inject(obj, IgniteSpringResource.class, nullInjector, null, null); + ioc.inject(obj, LoggerResource.class, nullInjector, null, null); + ioc.inject(obj, ServiceResource.class, nullInjector, null, null); + ioc.inject(obj, SpringApplicationContextResource.class, nullInjector, null, null); + ioc.inject(obj, SpringResource.class, nullInjector, null, null); ioc.inject(obj, IgniteInstanceResource.class, nullInjector, null, null); } @@ -479,11 +479,11 @@ public class GridResourceProcessor extends GridProcessorAdapter { Object obj = unwrapTarget(svc); // No deployment for lifecycle beans. - ioc.inject(obj, IgniteSpringApplicationContextResource.class, springCtxInjector, null, null); - ioc.inject(obj, IgniteSpringResource.class, springBeanInjector, null, null); + ioc.inject(obj, SpringApplicationContextResource.class, springCtxInjector, null, null); + ioc.inject(obj, SpringResource.class, springBeanInjector, null, null); ioc.inject(obj, IgniteInstanceResource.class, gridInjector, null, null); - ioc.inject(obj, IgniteLoggerResource.class, logInjector, null, null); - ioc.inject(obj, IgniteServiceResource.class, srvcInjector, null, null); + ioc.inject(obj, LoggerResource.class, logInjector, null, null); + ioc.inject(obj, ServiceResource.class, srvcInjector, null, null); } /** @@ -501,10 +501,10 @@ public class GridResourceProcessor extends GridProcessorAdapter { Object obj = unwrapTarget(svc); // Caching key is null for the life-cycle beans. - ioc.inject(obj, IgniteLoggerResource.class, nullInjector, null, null); - ioc.inject(obj, IgniteServiceResource.class, nullInjector, null, null); - ioc.inject(obj, IgniteSpringApplicationContextResource.class, nullInjector, null, null); - ioc.inject(obj, IgniteSpringResource.class, nullInjector, null, null); + ioc.inject(obj, LoggerResource.class, nullInjector, null, null); + ioc.inject(obj, ServiceResource.class, nullInjector, null, null); + ioc.inject(obj, SpringApplicationContextResource.class, nullInjector, null, null); + ioc.inject(obj, SpringResource.class, nullInjector, null, null); ioc.inject(obj, IgniteInstanceResource.class, nullInjector, null, null); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceServiceInjector.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceServiceInjector.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceServiceInjector.java index d2f4293..f966a7d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceServiceInjector.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceServiceInjector.java @@ -43,7 +43,7 @@ public class GridResourceServiceInjector extends GridResourceBasicInjector<Colle /** {@inheritDoc} */ @Override public void inject(GridResourceField field, Object target, Class<?> depCls, GridDeployment dep) throws IgniteCheckedException { - IgniteServiceResource ann = (IgniteServiceResource)field.getAnnotation(); + ServiceResource ann = (ServiceResource)field.getAnnotation(); Class svcItf = ann.proxyInterface(); @@ -61,7 +61,7 @@ public class GridResourceServiceInjector extends GridResourceBasicInjector<Colle /** {@inheritDoc} */ @Override public void inject(GridResourceMethod mtd, Object target, Class<?> depCls, GridDeployment dep) throws IgniteCheckedException { - IgniteServiceResource ann = (IgniteServiceResource)mtd.getAnnotation(); + ServiceResource ann = (ServiceResource)mtd.getAnnotation(); Class svcItf = ann.proxyInterface(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java index ce0d760..0c45fe7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java @@ -401,7 +401,7 @@ class GridTaskWorker<T, R> extends GridWorker implements GridTimeoutObject { // Load balancer. ComputeLoadBalancer balancer = ctx.loadBalancing().getLoadBalancer(ses, shuffledNodes); - continuous = ctx.resource().isAnnotationPresent(dep, task, IgniteTaskContinuousMapperResource.class); + continuous = ctx.resource().isAnnotationPresent(dep, task, TaskContinuousMapperResource.class); if (log.isDebugEnabled()) log.debug("Injected task resources [continuous=" + continuous + ']'); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/loopback/IpcServerTcpEndpoint.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/loopback/IpcServerTcpEndpoint.java b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/loopback/IpcServerTcpEndpoint.java index fc22651..ccb6d02 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/loopback/IpcServerTcpEndpoint.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/loopback/IpcServerTcpEndpoint.java @@ -46,7 +46,7 @@ public class IpcServerTcpEndpoint implements IpcServerEndpoint { private boolean mgmt; /** Logger. */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryServerEndpoint.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryServerEndpoint.java b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryServerEndpoint.java index 5bae4e7..a9fa7d4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryServerEndpoint.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryServerEndpoint.java @@ -97,7 +97,7 @@ public class IpcSharedMemoryServerEndpoint implements IpcServerEndpoint { private File tokDir; /** Logger. */ - @IgniteLoggerResource + @LoggerResource private IgniteLogger log; /** Local node ID. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleBean.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleBean.java b/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleBean.java index 71a005c..9c321ab 100644 --- a/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleBean.java +++ b/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleBean.java @@ -55,9 +55,9 @@ import org.apache.ignite.*; * ignite resources. Both, field and method based injection are supported. * The following ignite resources can be injected: * <ul> - * <li>{@link org.apache.ignite.resources.IgniteLoggerResource}</li> - * <li>{@link org.apache.ignite.resources.IgniteSpringApplicationContextResource}</li> - * <li>{@link org.apache.ignite.resources.IgniteSpringResource}</li> + * <li>{@link org.apache.ignite.resources.LoggerResource}</li> + * <li>{@link org.apache.ignite.resources.SpringApplicationContextResource}</li> + * <li>{@link org.apache.ignite.resources.SpringResource}</li> * <li>{@link org.apache.ignite.resources.IgniteInstanceResource}</li> * </ul> * Refer to corresponding resource documentation for more information. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/main/java/org/apache/ignite/logger/java/JavaLogger.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/logger/java/JavaLogger.java b/modules/core/src/main/java/org/apache/ignite/logger/java/JavaLogger.java index 2c120a3..cb4c450 100644 --- a/modules/core/src/main/java/org/apache/ignite/logger/java/JavaLogger.java +++ b/modules/core/src/main/java/org/apache/ignite/logger/java/JavaLogger.java @@ -78,7 +78,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 JavaLogger implements IgniteLogger, LoggerNodeIdAware { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/main/java/org/apache/ignite/messaging/MessagingListenActor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/messaging/MessagingListenActor.java b/modules/core/src/main/java/org/apache/ignite/messaging/MessagingListenActor.java index db5cbb6..644a9fa 100644 --- a/modules/core/src/main/java/org/apache/ignite/messaging/MessagingListenActor.java +++ b/modules/core/src/main/java/org/apache/ignite/messaging/MessagingListenActor.java @@ -45,7 +45,7 @@ public abstract class MessagingListenActor<T> implements IgniteBiPredicate<UUID, private transient Ignite ignite; /** */ - @IgniteLoggerResource + @LoggerResource private transient IgniteLogger log; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/main/java/org/apache/ignite/resources/CacheNameResource.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/resources/CacheNameResource.java b/modules/core/src/main/java/org/apache/ignite/resources/CacheNameResource.java new file mode 100644 index 0000000..114ce18 --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/resources/CacheNameResource.java @@ -0,0 +1,59 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.resources; + +import java.lang.annotation.*; + +/** + * Annotates a field or a setter method for injection of grid cache name. + * Grid cache name is provided to cache via {@link org.apache.ignite.configuration.CacheConfiguration#getName()} method. + * <p> + * Cache name can be injected into components provided in the {@link org.apache.ignite.configuration.CacheConfiguration}, + * if {@link CacheNameResource} annotation is used in another classes it is no-op. + * <p> + * Here is how injection would typically happen: + * <pre name="code" class="java"> + * public class MyCacheStore implements GridCacheStore { + * ... + * @IgniteCacheNameResource + * private String cacheName; + * ... + * } + * </pre> + * or + * <pre name="code" class="java"> + * public class MyCacheStore implements GridCacheStore { + * ... + * private String cacheName; + * ... + * @IgniteCacheNameResource + * public void setCacheName(String cacheName) { + * this.cacheName = cacheName; + * } + * ... + * } + * </pre> + * <p> + * See {@link org.apache.ignite.configuration.CacheConfiguration#getName()} for cache configuration details. + */ +@Documented +@Retention(RetentionPolicy.RUNTIME) +@Target({ElementType.METHOD, ElementType.FIELD}) +public @interface CacheNameResource { + // No-op. +}
