From 9927fd4cdd48789255fc760a7542acdf215d23ba Mon Sep 17 00:00:00 2001
From: kimchy <kimchy@gmail.com>
Date: Sat, 16 Apr 2011 03:15:43 +0300
Subject: [PATCH] fix none bloom cache to proper name

---
 .../benchmark/index/engine/SimpleEngineBenchmark.java       | 4 ++--
 .../bloom/none/{NonBloomCache.java => NoneBloomCache.java}  | 6 +++---
 .../index/engine/robin/SimpleRobinEngineTests.java          | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)
 rename modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/bloom/none/{NonBloomCache.java => NoneBloomCache.java} (90%)

diff --git a/modules/benchmark/micro/src/main/java/org/elasticsearch/benchmark/index/engine/SimpleEngineBenchmark.java b/modules/benchmark/micro/src/main/java/org/elasticsearch/benchmark/index/engine/SimpleEngineBenchmark.java
index 95195053246..28158eb6e9f 100644
--- a/modules/benchmark/micro/src/main/java/org/elasticsearch/benchmark/index/engine/SimpleEngineBenchmark.java
+++ b/modules/benchmark/micro/src/main/java/org/elasticsearch/benchmark/index/engine/SimpleEngineBenchmark.java
@@ -32,7 +32,7 @@ import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.index.Index;
 import org.elasticsearch.index.analysis.AnalysisService;
-import org.elasticsearch.index.cache.bloom.none.NonBloomCache;
+import org.elasticsearch.index.cache.bloom.none.NoneBloomCache;
 import org.elasticsearch.index.deletionpolicy.KeepOnlyLastDeletionPolicy;
 import org.elasticsearch.index.deletionpolicy.SnapshotDeletionPolicy;
 import org.elasticsearch.index.engine.Engine;
@@ -308,7 +308,7 @@ public class SimpleEngineBenchmark {
         ThreadPool threadPool = new ThreadPool();
         SnapshotDeletionPolicy deletionPolicy = new SnapshotDeletionPolicy(new KeepOnlyLastDeletionPolicy(shardId, settings));
         Engine engine = new RobinEngine(shardId, settings, new IndexSettingsService(shardId.index(), settings), store, deletionPolicy, new FsTranslog(shardId, EMPTY_SETTINGS, new File("work/fs-translog"), false), new LogByteSizeMergePolicyProvider(store, new IndexSettingsService(shardId.index(), EMPTY_SETTINGS)),
-                new ConcurrentMergeSchedulerProvider(shardId, settings), new AnalysisService(shardId.index()), new SimilarityService(shardId.index()), new NonBloomCache(shardId.index()));
+                new ConcurrentMergeSchedulerProvider(shardId, settings), new AnalysisService(shardId.index()), new SimilarityService(shardId.index()), new NoneBloomCache(shardId.index()));
         engine.start();
 
         SimpleEngineBenchmark benchmark = new SimpleEngineBenchmark(store, engine)
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/bloom/none/NonBloomCache.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/bloom/none/NoneBloomCache.java
similarity index 90%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/bloom/none/NonBloomCache.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/bloom/none/NoneBloomCache.java
index 8ef886113a8..2a39829eabc 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/bloom/none/NonBloomCache.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/bloom/none/NoneBloomCache.java
@@ -33,13 +33,13 @@ import org.elasticsearch.index.settings.IndexSettings;
 /**
  * @author kimchy (shay.banon)
  */
-public class NonBloomCache extends AbstractIndexComponent implements BloomCache {
+public class NoneBloomCache extends AbstractIndexComponent implements BloomCache {
 
-    public NonBloomCache(Index index) {
+    public NoneBloomCache(Index index) {
         super(index, ImmutableSettings.Builder.EMPTY_SETTINGS);
     }
 
-    @Inject public NonBloomCache(Index index, @IndexSettings Settings indexSettings) {
+    @Inject public NoneBloomCache(Index index, @IndexSettings Settings indexSettings) {
         super(index, indexSettings);
     }
 
diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/engine/robin/SimpleRobinEngineTests.java b/modules/elasticsearch/src/test/java/org/elasticsearch/index/engine/robin/SimpleRobinEngineTests.java
index e2b32641b84..de7745c1179 100644
--- a/modules/elasticsearch/src/test/java/org/elasticsearch/index/engine/robin/SimpleRobinEngineTests.java
+++ b/modules/elasticsearch/src/test/java/org/elasticsearch/index/engine/robin/SimpleRobinEngineTests.java
@@ -20,7 +20,7 @@
 package org.elasticsearch.index.engine.robin;
 
 import org.elasticsearch.index.analysis.AnalysisService;
-import org.elasticsearch.index.cache.bloom.none.NonBloomCache;
+import org.elasticsearch.index.cache.bloom.none.NoneBloomCache;
 import org.elasticsearch.index.engine.AbstractSimpleEngineTests;
 import org.elasticsearch.index.engine.Engine;
 import org.elasticsearch.index.settings.IndexSettingsService;
@@ -37,6 +37,6 @@ public class SimpleRobinEngineTests extends AbstractSimpleEngineTests {
 
     protected Engine createEngine(Store store, Translog translog) {
         return new RobinEngine(shardId, EMPTY_SETTINGS, new IndexSettingsService(shardId.index(), EMPTY_SETTINGS), store, createSnapshotDeletionPolicy(), translog, createMergePolicy(), createMergeScheduler(),
-                new AnalysisService(shardId.index()), new SimilarityService(shardId.index()), new NonBloomCache(shardId.index()));
+                new AnalysisService(shardId.index()), new SimilarityService(shardId.index()), new NoneBloomCache(shardId.index()));
     }
 }