ignite-188 - resources cleanup.

apache · Feb 6, 2015 · 8a065d0 · 8a065d0
1 parent c9b1dfb
commit 8a065d0
Show file tree

Hide file tree

Showing 197 changed files with 430 additions and 435 deletions.
diff --git a/.../src/main/java/org/apache/ignite/examples/computegrid/ComputeContinuousMapperExample.java b/.../src/main/java/org/apache/ignite/examples/computegrid/ComputeContinuousMapperExample.java
@@ -77,7 +77,7 @@ public static void main(String[] args) throws IgniteException {
     @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. */

diff --git a/...main/java/org/apache/ignite/examples/computegrid/ComputeFibonacciContinuationExample.java b/...main/java/org/apache/ignite/examples/computegrid/ComputeFibonacciContinuationExample.java
@@ -92,7 +92,7 @@ private static class FibonacciClosure implements IgniteClosure<Long, BigInteger>
         private IgniteFuture<BigInteger> fut2;
 
         /** Auto-inject job context. */
-        @IgniteJobContextResource
+        @JobContextResource
         private ComputeJobContext jobCtx;
 
         /** Auto-inject ignite instance. */

diff --git a/...src/main/java/org/apache/ignite/examples/computegrid/failover/ComputeFailoverExample.java b/...src/main/java/org/apache/ignite/examples/computegrid/failover/ComputeFailoverExample.java
@@ -62,11 +62,11 @@ public static void main(String[] args) throws IgniteException{
     @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;
 
         /** */

diff --git a/.../src/main/java/org/apache/ignite/examples/datagrid/store/dummy/CacheDummyPersonStore.java b/.../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. */

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
@@ -132,7 +132,7 @@ private static void remoteListen() throws IgniteException {
         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() {

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
@@ -152,7 +152,7 @@ private static void serviceInjectionExample(Ignite ignite) throws Exception {
      */
     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} */

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
@@ -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 = {

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
@@ -28,7 +28,7 @@
  */
 public class TestGridifyJob extends ComputeJobAdapter {
     /** */
-    @IgniteLoggerResource
+    @LoggerResource
     private IgniteLogger log;
 
     /**

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
@@ -28,11 +28,11 @@
  */
 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} */

diff --git 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} */

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
@@ -103,7 +103,7 @@
 public class S3CheckpointSpi extends IgniteSpiAdapter implements CheckpointSpi, S3CheckpointSpiMBean {
     /** Logger. */
     @SuppressWarnings({"FieldAccessedSynchronizedAndUnsynchronized"})
-    @IgniteLoggerResource
+    @LoggerResource
     private IgniteLogger log;
 
     /** Ignite instance. */

diff --git a/...src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/TcpDiscoveryS3IpFinder.java b/...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. */

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
@@ -52,7 +52,7 @@ public class ClientStartNodeTask extends TaskSingleJobSplitAdapter<String, Integ
     }};
 
     /** */
-    @IgniteLoggerResource
+    @LoggerResource
     private transient IgniteLogger log;
 
     /** */

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
@@ -35,7 +35,7 @@
  */
 public class ClientStopNodeTask extends ComputeTaskSplitAdapter<String, Integer> {
     /** */
-    @IgniteLoggerResource
+    @LoggerResource
     private transient IgniteLogger log;
 
     /** */
@@ -82,7 +82,7 @@ private static class StopJob extends ComputeJobAdapter {
         private final String gridType;
 
         /** */
-        @IgniteLoggerResource
+        @LoggerResource
         private IgniteLogger log;
 
         /** */

diff --git 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 @@
  * 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:

diff --git 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 @@
  *      ...
  * </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}

diff --git 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 @@
  * 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>

diff --git a/.../org/apache/ignite/cache/affinity/consistenthash/CacheConsistentHashAffinityFunction.java b/.../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. */

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
@@ -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. */

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
@@ -143,7 +143,7 @@ public class CacheJdbcBlobStore<K, V> extends CacheStoreAdapter<K, V> {
     private boolean initSchema = true;
 
     /** Log. */
-    @IgniteLoggerResource
+    @LoggerResource
     private IgniteLogger log;
 
     /** Marshaller. */

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
@@ -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. */

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
@@ -94,12 +94,12 @@
  * 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 @@
  * 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>

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
@@ -50,8 +50,8 @@
  * 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.

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
@@ -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;
 
     /**

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
@@ -132,11 +132,11 @@
  * 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>

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
@@ -41,7 +41,7 @@
  * 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">

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
@@ -76,7 +76,7 @@
  * <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">

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
@@ -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;
 
     /**

diff --git a/...les/core/src/main/java/org/apache/ignite/compute/gridify/aop/GridifyDefaultRangeTask.java b/...les/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;
 
     /** */

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
@@ -53,7 +53,7 @@ public class GridifyDefaultTask extends ComputeTaskAdapter<GridifyArgument, Obje
     private Ignite ignite;
 
     /** Load balancer. */
-    @IgniteLoadBalancerResource
+    @LoadBalancerResource
     private ComputeLoadBalancer balancer;
 
     /**