# ignite-394: GridDataLoaderProcessor -> IgniteDataStreamerProcessor.…

…java + test
apache · Mar 3, 2015 · 36b7c8f · 36b7c8f
1 parent 9b33b65
commit 36b7c8f
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 12 deletions.
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteDataStreamer.java b/modules/core/src/main/java/org/apache/ignite/IgniteDataStreamer.java
@@ -41,7 +41,7 @@
  * data can be loaded from underlying data store on demand, whenever it is accessed -
  * for this no explicit data loading step is needed.
  * <p>
- * {@code IgniteDataLoader} supports the following configuration properties:
+ * {@code IgniteDataStreamer} supports the following configuration properties:
  * <ul>
  *  <li>
  *      {@link #perNodeBufferSize(int)} - when entries are added to data loader via

diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
@@ -247,7 +247,7 @@ public interface GridKernalContext extends Iterable<GridComponent> {
      *
      * @return Data loader processor.
      */
-    public <K, V> GridDataLoaderProcessor<K, V> dataLoad();
+    public <K, V> IgniteDataStreamerProcessor<K, V> dataLoad();
 
     /**
      * Gets file system processor.

diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
@@ -202,7 +202,7 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable
 
     /** */
     @GridToStringInclude
-    private GridDataLoaderProcessor dataLdrProc;
+    private IgniteDataStreamerProcessor dataLdrProc;
 
     /** */
     @GridToStringInclude
@@ -446,8 +446,8 @@ else if (comp instanceof GridAffinityProcessor)
             affProc = (GridAffinityProcessor)comp;
         else if (comp instanceof GridRestProcessor)
             restProc = (GridRestProcessor)comp;
-        else if (comp instanceof GridDataLoaderProcessor)
+        else if (comp instanceof IgniteDataStreamerProcessor)
-            dataLdrProc = (GridDataLoaderProcessor)comp;
+            dataLdrProc = (IgniteDataStreamerProcessor)comp;
         else if (comp instanceof IgfsProcessorAdapter)
             igfsProc = (IgfsProcessorAdapter)comp;
         else if (comp instanceof GridOffHeapProcessor)
@@ -660,8 +660,8 @@ public void addHelper(Object helper) {
 
     /** {@inheritDoc} */
     @SuppressWarnings("unchecked")
-    @Override public <K, V> GridDataLoaderProcessor<K, V> dataLoad() {
+    @Override public <K, V> IgniteDataStreamerProcessor<K, V> dataLoad() {
-        return (GridDataLoaderProcessor<K, V>)dataLdrProc;
+        return (IgniteDataStreamerProcessor<K, V>)dataLdrProc;
     }
 
     /** {@inheritDoc} */

diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -753,7 +753,7 @@ public void start(final IgniteConfiguration cfg,
             startProcessor(ctx, new GridTaskProcessor(ctx), attrs);
             startProcessor(ctx, (GridProcessor)SCHEDULE.createOptional(ctx), attrs);
             startProcessor(ctx, new GridRestProcessor(ctx), attrs);
-            startProcessor(ctx, new GridDataLoaderProcessor(ctx), attrs);
+            startProcessor(ctx, new IgniteDataStreamerProcessor(ctx), attrs);
             startProcessor(ctx, new GridStreamProcessor(ctx), attrs);
             startProcessor(ctx, (GridProcessor) IGFS.create(ctx, F.isEmpty(cfg.getIgfsConfiguration())), attrs);
             startProcessor(ctx, new GridContinuousProcessor(ctx), attrs);

diff --git a/...ors/dataload/GridDataLoaderProcessor.java → ...dataload/IgniteDataStreamerProcessor.java b/...ors/dataload/GridDataLoaderProcessor.java → ...dataload/IgniteDataStreamerProcessor.java
@@ -39,7 +39,7 @@
 /**
  *
  */
-public class GridDataLoaderProcessor<K, V> extends GridProcessorAdapter {
+public class IgniteDataStreamerProcessor<K, V> extends GridProcessorAdapter {
     /** Loaders map (access is not supposed to be highly concurrent). */
     private Collection<IgniteDataStreamerImpl> ldrs = new GridConcurrentHashSet<>();
 
@@ -58,7 +58,7 @@ public class GridDataLoaderProcessor<K, V> extends GridProcessorAdapter {
     /**
      * @param ctx Kernal context.
      */
-    public GridDataLoaderProcessor(GridKernalContext ctx) {
+    public IgniteDataStreamerProcessor(GridKernalContext ctx) {
         super(ctx);
 
         ctx.io().addMessageListener(TOPIC_DATALOAD, new GridMessageListener() {

diff --git a/...load/GridDataLoaderProcessorSelfTest.java → .../IgniteDataStreamerProcessorSelfTest.java b/...load/GridDataLoaderProcessorSelfTest.java → .../IgniteDataStreamerProcessorSelfTest.java
@@ -52,7 +52,7 @@
 /**
  *
  */
-public class GridDataLoaderProcessorSelfTest extends GridCommonAbstractTest {
+public class IgniteDataStreamerProcessorSelfTest extends GridCommonAbstractTest {
     /** */
     private static ConcurrentHashMap<Object, Object> storeMap;
 

diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
@@ -109,7 +109,7 @@ public static TestSuite suite() throws Exception {
         suite.addTestSuite(GridCacheBalancingStoreSelfTest.class);
         suite.addTestSuite(GridCacheAffinityApiSelfTest.class);
         suite.addTestSuite(GridCacheStoreValueBytesSelfTest.class);
-        suite.addTestSuite(GridDataLoaderProcessorSelfTest.class);
+        suite.addTestSuite(IgniteDataStreamerProcessorSelfTest.class);
         suite.addTestSuite(GridDataLoaderImplSelfTest.class);
         suite.addTestSuite(GridCacheEntryMemorySizeSelfTest.class);
         suite.addTestSuite(GridCacheClearAllSelfTest.class);