Fix split packages in external test modules (#78136) (#78144)

The external test modules are plugins which provide extra test functionality in snapshot builds. These are independent Elasticsearch plugins added as modules. They currently share package names with server. This commit moves them each into their own java package name.
elastic · Sep 21, 2021 · 5f94b03 · 5f94b03
1 parent 3877282
commit 5f94b03
Show file tree

Hide file tree

Showing 12 changed files with 19 additions and 31 deletions.
diff --git a/test/external-modules/delayed-aggs/build.gradle b/test/external-modules/delayed-aggs/build.gradle
@@ -8,17 +8,11 @@
 
 esplugin {
   description 'A test module that allows to delay aggregations on shards with a configurable time'
-  classname 'org.elasticsearch.search.aggregations.DelayedShardAggregationPlugin'
+  classname 'org.elasticsearch.test.delayedshard.DelayedShardAggregationPlugin'
 }
 
 restResources {
   restApi {
     include '_common', 'indices', 'index', 'cluster', 'search'
   }
 }
-
-tasks.named('splitPackagesAudit').configure {
-  // aggs is owned by server, these should be moved to delayedaggs
-  ignoreClasses 'org.elasticsearch.search.aggregations.DelayedShardAggregationBuilder',
-    'org.elasticsearch.search.aggregations.DelayedShardAggregationPlugin'
-}
diff --git a/...tions/DelayedShardAggregationBuilder.java → ...shard/DelayedShardAggregationBuilder.java b/...tions/DelayedShardAggregationBuilder.java → ...shard/DelayedShardAggregationBuilder.java
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-package org.elasticsearch.search.aggregations;
+package org.elasticsearch.test.delayedshard;
 
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -15,6 +15,12 @@
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.core.TimeValue;
 import org.elasticsearch.index.query.QueryBuilders;
+import org.elasticsearch.search.aggregations.AbstractAggregationBuilder;
+import org.elasticsearch.search.aggregations.AggregationBuilder;
+import org.elasticsearch.search.aggregations.Aggregator;
+import org.elasticsearch.search.aggregations.AggregatorFactories;
+import org.elasticsearch.search.aggregations.AggregatorFactory;
+import org.elasticsearch.search.aggregations.CardinalityUpperBound;
 import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
 import org.elasticsearch.search.aggregations.support.AggregationContext;
 

diff --git a/...ations/DelayedShardAggregationPlugin.java → ...dshard/DelayedShardAggregationPlugin.java b/...ations/DelayedShardAggregationPlugin.java → ...dshard/DelayedShardAggregationPlugin.java
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-package org.elasticsearch.search.aggregations;
+package org.elasticsearch.test.delayedshard;
 
 import org.elasticsearch.plugins.Plugin;
 import org.elasticsearch.plugins.SearchPlugin;

diff --git a/.../DelayedShardAggregationBuilderTests.java → .../DelayedShardAggregationBuilderTests.java b/.../DelayedShardAggregationBuilderTests.java → .../DelayedShardAggregationBuilderTests.java
@@ -5,10 +5,11 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-package org.elasticsearch.search.aggregations;
+package org.elasticsearch.test.delayedshard;
 
 import org.elasticsearch.core.TimeValue;
 import org.elasticsearch.plugins.Plugin;
+import org.elasticsearch.search.aggregations.BaseAggregationTestCase;
 import org.elasticsearch.test.TestGeoShapeFieldMapperPlugin;
 
 import java.util.Arrays;

diff --git a/test/external-modules/die-with-dignity/build.gradle b/test/external-modules/die-with-dignity/build.gradle
@@ -6,7 +6,7 @@ apply plugin: 'elasticsearch.internal-es-plugin'
 
 esplugin {
   description 'Die with dignity plugin'
-  classname 'org.elasticsearch.DieWithDignityPlugin'
+  classname 'org.elasticsearch.test.diewithdignity.DieWithDignityPlugin'
 }
 
 // let the javaRestTest see the classpath of main
@@ -31,9 +31,3 @@ tasks.named("test").configure {
 tasks.named("yamlRestTest").configure {
   enabled = false
 }
-
-tasks.named('splitPackagesAudit').configure {
-  // these should be moved to an actual package, not the root package
-  ignoreClasses 'org.elasticsearch.DieWithDignityPlugin',
-    'org.elasticsearch.RestDieWithDignityAction'
-}
diff --git a/...g/elasticsearch/DieWithDignityPlugin.java → .../diewithdignity/DieWithDignityPlugin.java b/...g/elasticsearch/DieWithDignityPlugin.java → .../diewithdignity/DieWithDignityPlugin.java
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-package org.elasticsearch;
+package org.elasticsearch.test.diewithdignity;
 
 import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
 import org.elasticsearch.cluster.node.DiscoveryNodes;

diff --git a/...asticsearch/RestDieWithDignityAction.java → ...withdignity/RestDieWithDignityAction.java b/...asticsearch/RestDieWithDignityAction.java → ...withdignity/RestDieWithDignityAction.java
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-package org.elasticsearch;
+package org.elasticsearch.test.diewithdignity;
 
 import org.elasticsearch.client.node.NodeClient;
 import org.elasticsearch.common.Randomness;

diff --git a/test/external-modules/error-query/build.gradle b/test/external-modules/error-query/build.gradle
@@ -8,18 +8,11 @@
 
 esplugin {
   description 'A test module that exposes a way to simulate search shard failures and warnings'
-  classname 'org.elasticsearch.search.query.ErrorQueryPlugin'
+  classname 'org.elasticsearch.test.errorquery.ErrorQueryPlugin'
 }
 
 restResources {
   restApi {
     include '_common', 'indices', 'index', 'cluster', 'search'
   }
 }
-
-tasks.named('splitPackagesAudit').configure {
-  // search.query is owned by server, these should be moved to errorquery
-  ignoreClasses 'org.elasticsearch.search.query.ErrorQueryBuilder',
-    'org.elasticsearch.search.query.ErrorQueryPlugin',
-    'org.elasticsearch.search.query.IndexError'
-}
diff --git a/...earch/search/query/ErrorQueryBuilder.java → ...ch/test/errorquery/ErrorQueryBuilder.java b/...earch/search/query/ErrorQueryBuilder.java → ...ch/test/errorquery/ErrorQueryBuilder.java
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-package org.elasticsearch.search.query;
+package org.elasticsearch.test.errorquery;
 
 import org.apache.lucene.search.MatchAllDocsQuery;
 import org.apache.lucene.search.Query;

diff --git a/...search/search/query/ErrorQueryPlugin.java → ...rch/test/errorquery/ErrorQueryPlugin.java b/...search/search/query/ErrorQueryPlugin.java → ...rch/test/errorquery/ErrorQueryPlugin.java
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-package org.elasticsearch.search.query;
+package org.elasticsearch.test.errorquery;
 
 import org.elasticsearch.plugins.Plugin;
 import org.elasticsearch.plugins.SearchPlugin;

diff --git a/...lasticsearch/search/query/IndexError.java → ...ticsearch/test/errorquery/IndexError.java b/...lasticsearch/search/query/IndexError.java → ...ticsearch/test/errorquery/IndexError.java
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-package org.elasticsearch.search.query;
+package org.elasticsearch.test.errorquery;
 
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;

diff --git a/.../search/query/ErrorQueryBuilderTests.java → ...st/errorquery/ErrorQueryBuilderTests.java b/.../search/query/ErrorQueryBuilderTests.java → ...st/errorquery/ErrorQueryBuilderTests.java
@@ -5,7 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-package org.elasticsearch.search.query;
+package org.elasticsearch.test.errorquery;
 
 import org.apache.lucene.search.MatchAllDocsQuery;
 import org.apache.lucene.search.Query;