From 52fc502b7e45e45e3fb3af0607696ffb943c77b9 Mon Sep 17 00:00:00 2001 From: Jason Tedor Date: Mon, 22 Oct 2018 11:23:33 -0400 Subject: [PATCH] Fix the casing in the names of some CCR classes We should be consistent here. We were already using the casing "Ccr" and this is the preferred casing for Java class names. This commit adjusts the names of some classes that were using the casing "CCR" to be "Ccr". --- .../{CCRIntegTestCase.java => CcrIntegTestCase.java} | 2 +- ...SingleNodeTestCase.java => CcrSingleNodeTestCase.java} | 4 ++-- .../java/org/elasticsearch/xpack/ccr/AutoFollowIT.java | 4 ++-- .../java/org/elasticsearch/xpack/ccr/CcrLicenseIT.java | 4 ++-- .../org/elasticsearch/xpack/ccr/IndexFollowingIT.java | 4 ++-- .../elasticsearch/xpack/ccr/LocalIndexFollowingIT.java | 4 ++-- .../xpack/ccr/action/ShardFollowTaskReplicationTests.java | 8 ++++---- 7 files changed, 15 insertions(+), 15 deletions(-) rename x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/{CCRIntegTestCase.java => CcrIntegTestCase.java} (99%) rename x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/{CCRSingleNodeTestCase.java => CcrSingleNodeTestCase.java} (96%) diff --git a/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/CCRIntegTestCase.java b/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/CcrIntegTestCase.java similarity index 99% rename from x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/CCRIntegTestCase.java rename to x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/CcrIntegTestCase.java index 30cd8920ba8..b4229e1b268 100644 --- a/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/CCRIntegTestCase.java +++ b/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/CcrIntegTestCase.java @@ -67,7 +67,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcke import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures; import static org.hamcrest.Matchers.lessThanOrEqualTo; -public abstract class CCRIntegTestCase extends ESTestCase { +public abstract class CcrIntegTestCase extends ESTestCase { private static ClusterGroup clusterGroup; diff --git a/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/CCRSingleNodeTestCase.java b/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/CcrSingleNodeTestCase.java similarity index 96% rename from x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/CCRSingleNodeTestCase.java rename to x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/CcrSingleNodeTestCase.java index 0b59fabf095..3f5c340deed 100644 --- a/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/CCRSingleNodeTestCase.java +++ b/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/CcrSingleNodeTestCase.java @@ -24,9 +24,9 @@ import java.util.Collection; import java.util.Collections; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; -import static org.elasticsearch.xpack.CCRIntegTestCase.removeCCRRelatedMetadataFromClusterState; +import static org.elasticsearch.xpack.CcrIntegTestCase.removeCCRRelatedMetadataFromClusterState; -public abstract class CCRSingleNodeTestCase extends ESSingleNodeTestCase { +public abstract class CcrSingleNodeTestCase extends ESSingleNodeTestCase { @Override protected Settings nodeSettings() { diff --git a/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/AutoFollowIT.java b/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/AutoFollowIT.java index f7801c42787..5c181a99c29 100644 --- a/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/AutoFollowIT.java +++ b/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/AutoFollowIT.java @@ -15,7 +15,7 @@ import org.elasticsearch.common.unit.ByteSizeValue; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.persistent.PersistentTasksCustomMetaData; -import org.elasticsearch.xpack.CCRIntegTestCase; +import org.elasticsearch.xpack.CcrIntegTestCase; import org.elasticsearch.xpack.ccr.action.ShardFollowTask; import org.elasticsearch.xpack.core.ccr.AutoFollowStats; import org.elasticsearch.xpack.core.ccr.action.AutoFollowStatsAction; @@ -28,7 +28,7 @@ import java.util.Collections; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.notNullValue; -public class AutoFollowIT extends CCRIntegTestCase { +public class AutoFollowIT extends CcrIntegTestCase { @Override protected boolean reuseClusters() { diff --git a/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/CcrLicenseIT.java b/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/CcrLicenseIT.java index cf667be0d1c..26e29eeacec 100644 --- a/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/CcrLicenseIT.java +++ b/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/CcrLicenseIT.java @@ -20,7 +20,7 @@ import org.elasticsearch.common.logging.Loggers; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.plugins.Plugin; import org.elasticsearch.test.MockLogAppender; -import org.elasticsearch.xpack.CCRSingleNodeTestCase; +import org.elasticsearch.xpack.CcrSingleNodeTestCase; import org.elasticsearch.xpack.ccr.action.AutoFollowCoordinator; import org.elasticsearch.xpack.core.ccr.AutoFollowMetadata; import org.elasticsearch.xpack.core.ccr.AutoFollowMetadata.AutoFollowPattern; @@ -36,7 +36,7 @@ import java.util.concurrent.CountDownLatch; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.instanceOf; -public class CcrLicenseIT extends CCRSingleNodeTestCase { +public class CcrLicenseIT extends CcrSingleNodeTestCase { @Override protected Collection> getPlugins() { diff --git a/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/IndexFollowingIT.java b/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/IndexFollowingIT.java index e9d0534d458..ca6d2747c6c 100644 --- a/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/IndexFollowingIT.java +++ b/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/IndexFollowingIT.java @@ -52,7 +52,7 @@ import org.elasticsearch.persistent.PersistentTasksCustomMetaData; import org.elasticsearch.search.builder.SearchSourceBuilder; import org.elasticsearch.tasks.TaskInfo; import org.elasticsearch.test.InternalTestCluster; -import org.elasticsearch.xpack.CCRIntegTestCase; +import org.elasticsearch.xpack.CcrIntegTestCase; import org.elasticsearch.xpack.ccr.action.ShardFollowTask; import org.elasticsearch.xpack.ccr.index.engine.FollowingEngine; import org.elasticsearch.xpack.core.ccr.ShardFollowNodeTaskStatus; @@ -91,7 +91,7 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; -public class IndexFollowingIT extends CCRIntegTestCase { +public class IndexFollowingIT extends CcrIntegTestCase { public void testFollowIndex() throws Exception { final int numberOfPrimaryShards = randomIntBetween(1, 3); diff --git a/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/LocalIndexFollowingIT.java b/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/LocalIndexFollowingIT.java index d3612c614d4..5ff1c67f323 100644 --- a/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/LocalIndexFollowingIT.java +++ b/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/LocalIndexFollowingIT.java @@ -10,7 +10,7 @@ import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.xpack.CCRSingleNodeTestCase; +import org.elasticsearch.xpack.CcrSingleNodeTestCase; import org.elasticsearch.xpack.core.ccr.action.PauseFollowAction; import org.elasticsearch.xpack.core.ccr.action.PutFollowAction; import org.elasticsearch.xpack.core.ccr.action.ResumeFollowAction; @@ -23,7 +23,7 @@ import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; import static org.hamcrest.Matchers.equalTo; -public class LocalIndexFollowingIT extends CCRSingleNodeTestCase { +public class LocalIndexFollowingIT extends CcrSingleNodeTestCase { public void testFollowIndex() throws Exception { final String leaderIndexSettings = getIndexSettings(2, 0, diff --git a/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/action/ShardFollowTaskReplicationTests.java b/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/action/ShardFollowTaskReplicationTests.java index 42ba4f9ef34..d5594bcabb7 100644 --- a/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/action/ShardFollowTaskReplicationTests.java +++ b/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/action/ShardFollowTaskReplicationTests.java @@ -311,7 +311,7 @@ public class ShardFollowTaskReplicationTests extends ESIndexLevelReplicationTest operations.removeAll(bulkOps); BulkShardOperationsRequest bulkRequest = new BulkShardOperationsRequest(group.getPrimary().shardId(), group.getPrimary().getHistoryUUID(), bulkOps, -1); - new CCRAction(bulkRequest, new PlainActionFuture<>(), group).execute(); + new CcrAction(bulkRequest, new PlainActionFuture<>(), group).execute(); if (randomInt(100) < 10) { group.getPrimary().flush(new FlushRequest()); } @@ -409,7 +409,7 @@ public class ShardFollowTaskReplicationTests extends ESIndexLevelReplicationTest BulkShardOperationsRequest request = new BulkShardOperationsRequest(params.getFollowShardId(), followerHistoryUUID, operations, maxSeqNoOfUpdates); ActionListener listener = ActionListener.wrap(handler::accept, errorHandler); - new CCRAction(request, listener, followerGroup).execute(); + new CcrAction(request, listener, followerGroup).execute(); }; threadPool.executor(ThreadPool.Names.GENERIC).execute(task); } @@ -493,9 +493,9 @@ public class ShardFollowTaskReplicationTests extends ESIndexLevelReplicationTest } } - class CCRAction extends ReplicationAction { + class CcrAction extends ReplicationAction { - CCRAction(BulkShardOperationsRequest request, ActionListener listener, ReplicationGroup group) { + CcrAction(BulkShardOperationsRequest request, ActionListener listener, ReplicationGroup group) { super(request, listener, group, "ccr"); }