From 37db69da1f2da5e2cf006e534aa9228fe650f035 Mon Sep 17 00:00:00 2001 From: Alpar Torok Date: Thu, 4 Oct 2018 14:25:56 +0300 Subject: [PATCH] Rename clsuterformation -> testclusters --- .../ElasticsearchConfiguration.java | 2 +- .../ElasticsearchNode.java | 2 +- .../TestClustersPlugin.java} | 6 +++--- .../elasticsearch.clusterformation.properties | 1 - .../elasticsearch.testclusters.properties | 1 + .../TestClustersPluginIT.java} | 18 +++++++++--------- .../build.gradle | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) rename buildSrc/src/main/java/org/elasticsearch/gradle/{clusterformation => testclusters}/ElasticsearchConfiguration.java (96%) rename buildSrc/src/main/java/org/elasticsearch/gradle/{clusterformation => testclusters}/ElasticsearchNode.java (98%) rename buildSrc/src/main/java/org/elasticsearch/gradle/{clusterformation/ClusterformationPlugin.java => testclusters/TestClustersPlugin.java} (95%) delete mode 100644 buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.clusterformation.properties create mode 100644 buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.testclusters.properties rename buildSrc/src/test/java/org/elasticsearch/gradle/{clusterformation/ClusterformationPluginIT.java => testclusters/TestClustersPluginIT.java} (89%) rename buildSrc/src/testKit/{clusterformation => testclusters}/build.gradle (94%) diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/clusterformation/ElasticsearchConfiguration.java b/buildSrc/src/main/java/org/elasticsearch/gradle/testclusters/ElasticsearchConfiguration.java similarity index 96% rename from buildSrc/src/main/java/org/elasticsearch/gradle/clusterformation/ElasticsearchConfiguration.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/testclusters/ElasticsearchConfiguration.java index 913d88e9fa11b..a200c75880e6c 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/clusterformation/ElasticsearchConfiguration.java +++ b/buildSrc/src/main/java/org/elasticsearch/gradle/testclusters/ElasticsearchConfiguration.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.gradle.clusterformation; +package org.elasticsearch.gradle.testclusters; import org.elasticsearch.gradle.Distribution; import org.elasticsearch.gradle.Version; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/clusterformation/ElasticsearchNode.java b/buildSrc/src/main/java/org/elasticsearch/gradle/testclusters/ElasticsearchNode.java similarity index 98% rename from buildSrc/src/main/java/org/elasticsearch/gradle/clusterformation/ElasticsearchNode.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/testclusters/ElasticsearchNode.java index 8b78fc2b627cb..a196cb09e97e3 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/clusterformation/ElasticsearchNode.java +++ b/buildSrc/src/main/java/org/elasticsearch/gradle/testclusters/ElasticsearchNode.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.gradle.clusterformation; +package org.elasticsearch.gradle.testclusters; import org.elasticsearch.GradleServicesAdapter; import org.elasticsearch.gradle.Distribution; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/clusterformation/ClusterformationPlugin.java b/buildSrc/src/main/java/org/elasticsearch/gradle/testclusters/TestClustersPlugin.java similarity index 95% rename from buildSrc/src/main/java/org/elasticsearch/gradle/clusterformation/ClusterformationPlugin.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/testclusters/TestClustersPlugin.java index 779e7b61ed9ce..3a137906bec86 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/clusterformation/ClusterformationPlugin.java +++ b/buildSrc/src/main/java/org/elasticsearch/gradle/testclusters/TestClustersPlugin.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.gradle.clusterformation; +package org.elasticsearch.gradle.testclusters; import groovy.lang.Closure; import org.elasticsearch.GradleServicesAdapter; @@ -37,12 +37,12 @@ import java.util.List; import java.util.Map; -public class ClusterformationPlugin implements Plugin { +public class TestClustersPlugin implements Plugin { public static final String LIST_TASK_NAME = "listElasticSearchClusters"; public static final String EXTENSION_NAME = "elasticSearchClusters"; - private final Logger logger = Logging.getLogger(ClusterformationPlugin.class); + private final Logger logger = Logging.getLogger(TestClustersPlugin.class); @Override public void apply(Project project) { diff --git a/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.clusterformation.properties b/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.clusterformation.properties deleted file mode 100644 index dfd6cd9956a58..0000000000000 --- a/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.clusterformation.properties +++ /dev/null @@ -1 +0,0 @@ -implementation-class=org.elasticsearch.gradle.clusterformation.ClusterformationPlugin diff --git a/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.testclusters.properties b/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.testclusters.properties new file mode 100644 index 0000000000000..8d81f05fc69f5 --- /dev/null +++ b/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.testclusters.properties @@ -0,0 +1 @@ +implementation-class=org.elasticsearch.gradle.testclusters.TestClustersPlugin diff --git a/buildSrc/src/test/java/org/elasticsearch/gradle/clusterformation/ClusterformationPluginIT.java b/buildSrc/src/test/java/org/elasticsearch/gradle/testclusters/TestClustersPluginIT.java similarity index 89% rename from buildSrc/src/test/java/org/elasticsearch/gradle/clusterformation/ClusterformationPluginIT.java rename to buildSrc/src/test/java/org/elasticsearch/gradle/testclusters/TestClustersPluginIT.java index c690557537dfb..021bd9bb15169 100644 --- a/buildSrc/src/test/java/org/elasticsearch/gradle/clusterformation/ClusterformationPluginIT.java +++ b/buildSrc/src/test/java/org/elasticsearch/gradle/testclusters/TestClustersPluginIT.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.gradle.clusterformation; +package org.elasticsearch.gradle.testclusters; import org.elasticsearch.gradle.test.GradleIntegrationTestCase; import org.gradle.testkit.runner.BuildResult; @@ -26,11 +26,11 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; -public class ClusterformationPluginIT extends GradleIntegrationTestCase { +public class TestClustersPluginIT extends GradleIntegrationTestCase { public void testListClusters() { BuildResult result = GradleRunner.create() - .withProjectDir(getProjectDir("clusterformation")) + .withProjectDir(getProjectDir("testclusters")) .withArguments("listElasticSearchClusters", "-s") .withPluginClasspath() .build(); @@ -45,7 +45,7 @@ public void testListClusters() { public void testUseClusterByOne() { BuildResult result = GradleRunner.create() - .withProjectDir(getProjectDir("clusterformation")) + .withProjectDir(getProjectDir("testclusters")) .withArguments("user1", "-s") .withPluginClasspath() .build(); @@ -60,7 +60,7 @@ public void testUseClusterByOne() { public void testUseClusterByOneWithDryRun() { BuildResult result = GradleRunner.create() - .withProjectDir(getProjectDir("clusterformation")) + .withProjectDir(getProjectDir("testclusters")) .withArguments("user1", "-s", "--dry-run") .withPluginClasspath() .build(); @@ -75,7 +75,7 @@ public void testUseClusterByOneWithDryRun() { public void testUseClusterByTwo() { BuildResult result = GradleRunner.create() - .withProjectDir(getProjectDir("clusterformation")) + .withProjectDir(getProjectDir("testclusters")) .withArguments("user1", "user2", "-s") .withPluginClasspath() .build(); @@ -92,7 +92,7 @@ public void testUseClusterByTwo() { public void testUseClusterByUpToDateTask() { BuildResult result = GradleRunner.create() - .withProjectDir(getProjectDir("clusterformation")) + .withProjectDir(getProjectDir("testclusters")) .withArguments("upToDate1", "upToDate2", "-s") .withPluginClasspath() .build(); @@ -109,7 +109,7 @@ public void testUseClusterByUpToDateTask() { public void testUseClusterBySkippedTask() { BuildResult result = GradleRunner.create() - .withProjectDir(getProjectDir("clusterformation")) + .withProjectDir(getProjectDir("testclusters")) .withArguments("skipped1", "skipped2", "-s") .withPluginClasspath() .build(); @@ -126,7 +126,7 @@ public void testUseClusterBySkippedTask() { public void tetUseClusterBySkippedAndWorkingTask() { BuildResult result = GradleRunner.create() - .withProjectDir(getProjectDir("clusterformation")) + .withProjectDir(getProjectDir("testclusters")) .withArguments("skipped1", "user1", "-s") .withPluginClasspath() .build(); diff --git a/buildSrc/src/testKit/clusterformation/build.gradle b/buildSrc/src/testKit/testclusters/build.gradle similarity index 94% rename from buildSrc/src/testKit/clusterformation/build.gradle rename to buildSrc/src/testKit/testclusters/build.gradle index ae9dd8a2c335c..083ce97b963bb 100644 --- a/buildSrc/src/testKit/clusterformation/build.gradle +++ b/buildSrc/src/testKit/testclusters/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'elasticsearch.clusterformation' + id 'elasticsearch.testclusters' } elasticSearchClusters {