Skip to content

Commit bde7d20

Browse files
rjernstrjernst
committed
Remove unnecessary generic params from action classes
Transport actions have associated request and response classes. However, the base type restrictions are not necessary to duplicate when creating a map of transport actions. Relatedly, the ActionHandler class doesn't actually need strongly typed action type and classes since they are lost when shoved into the node client map. This commit removes these type restrictions and generic parameters.
1 parent a53ae21 commit bde7d20

File tree

76 files changed

+107
-248
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+107
-248
lines changed

‎client/client-benchmark-noop-api-plugin/src/main/java/org/elasticsearch/plugin/noop/NoopPlugin.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
*/
99
package org.elasticsearch.plugin.noop;
1010

11-
import org.elasticsearch.action.ActionRequest;
12-
import org.elasticsearch.action.ActionResponse;
1311
import org.elasticsearch.action.ActionType;
1412
import org.elasticsearch.action.bulk.BulkResponse;
1513
import org.elasticsearch.action.search.SearchResponse;
@@ -41,7 +39,7 @@ public class NoopPlugin extends Plugin implements ActionPlugin {
4139
public static final ActionType<BulkResponse> NOOP_BULK_ACTION = new ActionType<>("mock:data/write/bulk");
4240

4341
@Override
44-
public List<ActionHandler<? extends ActionRequest, ? extends ActionResponse>> getActions() {
42+
public List<ActionHandler> getActions() {
4543
return Arrays.asList(
4644
new ActionHandler<>(NOOP_BULK_ACTION, TransportNoopBulkAction.class),
4745
new ActionHandler<>(NOOP_SEARCH_ACTION, TransportNoopSearchAction.class)

‎modules/data-streams/src/main/java/org/elasticsearch/datastreams/DataStreamsPlugin.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010

1111
import org.apache.lucene.util.SetOnce;
1212
import org.elasticsearch.ElasticsearchException;
13-
import org.elasticsearch.action.ActionRequest;
14-
import org.elasticsearch.action.ActionResponse;
1513
import org.elasticsearch.action.datastreams.CreateDataStreamAction;
1614
import org.elasticsearch.action.datastreams.DataStreamsStatsAction;
1715
import org.elasticsearch.action.datastreams.DeleteDataStreamAction;
@@ -225,8 +223,8 @@ public Collection<?> createComponents(PluginServices services) {
225223
}
226224

227225
@Override
228-
public List<ActionHandler<? extends ActionRequest, ? extends ActionResponse>> getActions() {
229-
List<ActionHandler<? extends ActionRequest, ? extends ActionResponse>> actions = new ArrayList<>();
226+
public List<ActionHandler> getActions() {
227+
List<ActionHandler> actions = new ArrayList<>();
230228
actions.add(new ActionHandler<>(CreateDataStreamAction.INSTANCE, CreateDataStreamTransportAction.class));
231229
actions.add(new ActionHandler<>(DeleteDataStreamAction.INSTANCE, DeleteDataStreamTransportAction.class));
232230
actions.add(new ActionHandler<>(GetDataStreamAction.INSTANCE, TransportGetDataStreamsAction.class));

‎modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/IngestCommonPlugin.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99

1010
package org.elasticsearch.ingest.common;
1111

12-
import org.elasticsearch.action.ActionRequest;
13-
import org.elasticsearch.action.ActionResponse;
1412
import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
1513
import org.elasticsearch.cluster.node.DiscoveryNodes;
1614
import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
@@ -81,7 +79,7 @@ public Map<String, Processor.Factory> getProcessors(Processor.Parameters paramet
8179
}
8280

8381
@Override
84-
public List<ActionHandler<? extends ActionRequest, ? extends ActionResponse>> getActions() {
82+
public List<ActionHandler> getActions() {
8583
return List.of(new ActionHandler<>(GrokProcessorGetAction.INSTANCE, GrokProcessorGetAction.TransportAction.class));
8684
}
8785

‎modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/IngestGeoIpPlugin.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
package org.elasticsearch.ingest.geoip;
1111

1212
import org.apache.lucene.util.SetOnce;
13-
import org.elasticsearch.action.ActionRequest;
14-
import org.elasticsearch.action.ActionResponse;
1513
import org.elasticsearch.client.internal.Client;
1614
import org.elasticsearch.cluster.NamedDiff;
1715
import org.elasticsearch.cluster.metadata.IndexMetadata;
@@ -182,7 +180,7 @@ public List<PersistentTasksExecutor<?>> getPersistentTasksExecutor(
182180
}
183181

184182
@Override
185-
public List<ActionHandler<? extends ActionRequest, ? extends ActionResponse>> getActions() {
183+
public List<ActionHandler> getActions() {
186184
return List.of(
187185
new ActionHandler<>(GeoIpStatsAction.INSTANCE, GeoIpStatsTransportAction.class),
188186
new ActionHandler<>(GetDatabaseConfigurationAction.INSTANCE, TransportGetDatabaseConfigurationAction.class),

‎modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/MustachePlugin.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99

1010
package org.elasticsearch.script.mustache;
1111

12-
import org.elasticsearch.action.ActionRequest;
13-
import org.elasticsearch.action.ActionResponse;
1412
import org.elasticsearch.action.ActionType;
1513
import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
1614
import org.elasticsearch.cluster.node.DiscoveryNodes;
@@ -49,7 +47,7 @@ public ScriptEngine getScriptEngine(Settings settings, Collection<ScriptContext<
4947
}
5048

5149
@Override
52-
public List<ActionHandler<? extends ActionRequest, ? extends ActionResponse>> getActions() {
50+
public List<ActionHandler> getActions() {
5351
return Arrays.asList(
5452
new ActionHandler<>(SEARCH_TEMPLATE_ACTION, TransportSearchTemplateAction.class),
5553
new ActionHandler<>(MULTI_SEARCH_TEMPLATE_ACTION, TransportMultiSearchTemplateAction.class)

‎modules/lang-painless/src/main/java/org/elasticsearch/painless/PainlessPlugin.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
package org.elasticsearch.painless;
1111

1212
import org.apache.lucene.util.SetOnce;
13-
import org.elasticsearch.action.ActionRequest;
14-
import org.elasticsearch.action.ActionResponse;
1513
import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
1614
import org.elasticsearch.cluster.node.DiscoveryNodes;
1715
import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
@@ -164,8 +162,8 @@ public List<ScriptContext<?>> getContexts() {
164162
}
165163

166164
@Override
167-
public List<ActionHandler<? extends ActionRequest, ? extends ActionResponse>> getActions() {
168-
List<ActionHandler<? extends ActionRequest, ? extends ActionResponse>> actions = new ArrayList<>();
165+
public List<ActionHandler> getActions() {
166+
List<ActionHandler> actions = new ArrayList<>();
169167
actions.add(new ActionHandler<>(PainlessExecuteAction.INSTANCE, PainlessExecuteAction.TransportAction.class));
170168
actions.add(new ActionHandler<>(PainlessContextAction.INSTANCE, PainlessContextAction.TransportAction.class));
171169
return actions;

‎modules/rank-eval/src/main/java/org/elasticsearch/index/rankeval/RankEvalPlugin.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99

1010
package org.elasticsearch.index.rankeval;
1111

12-
import org.elasticsearch.action.ActionRequest;
13-
import org.elasticsearch.action.ActionResponse;
1412
import org.elasticsearch.action.ActionType;
1513
import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
1614
import org.elasticsearch.cluster.node.DiscoveryNodes;
@@ -38,7 +36,7 @@ public class RankEvalPlugin extends Plugin implements ActionPlugin {
3836
public static final ActionType<RankEvalResponse> ACTION = new ActionType<>("indices:data/read/rank_eval");
3937

4038
@Override
41-
public List<ActionHandler<? extends ActionRequest, ? extends ActionResponse>> getActions() {
39+
public List<ActionHandler> getActions() {
4240
return Arrays.asList(new ActionHandler<>(ACTION, TransportRankEvalAction.class));
4341
}
4442

‎modules/reindex/src/main/java/org/elasticsearch/reindex/ReindexPlugin.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99

1010
package org.elasticsearch.reindex;
1111

12-
import org.elasticsearch.action.ActionRequest;
13-
import org.elasticsearch.action.ActionResponse;
1412
import org.elasticsearch.action.ActionType;
1513
import org.elasticsearch.action.admin.cluster.node.tasks.list.ListTasksResponse;
1614
import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
@@ -47,7 +45,7 @@ public class ReindexPlugin extends Plugin implements ActionPlugin {
4745
public static final ActionType<ListTasksResponse> RETHROTTLE_ACTION = new ActionType<>("cluster:admin/reindex/rethrottle");
4846

4947
@Override
50-
public List<ActionHandler<? extends ActionRequest, ? extends ActionResponse>> getActions() {
48+
public List<ActionHandler> getActions() {
5149
return Arrays.asList(
5250
new ActionHandler<>(ReindexAction.INSTANCE, TransportReindexAction.class),
5351
new ActionHandler<>(UpdateByQueryAction.INSTANCE, TransportUpdateByQueryAction.class),

‎modules/rest-root/src/main/java/org/elasticsearch/rest/root/MainRestPlugin.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99

1010
package org.elasticsearch.rest.root;
1111

12-
import org.elasticsearch.action.ActionRequest;
13-
import org.elasticsearch.action.ActionResponse;
1412
import org.elasticsearch.action.ActionType;
1513
import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
1614
import org.elasticsearch.cluster.node.DiscoveryNodes;
@@ -49,7 +47,7 @@ public List<RestHandler> getRestHandlers(
4947
}
5048

5149
@Override
52-
public List<ActionHandler<? extends ActionRequest, ? extends ActionResponse>> getActions() {
50+
public List<ActionHandler> getActions() {
5351
return List.of(new ActionHandler<>(MAIN_ACTION, TransportMainAction.class));
5452
}
5553
}

‎modules/transport-netty4/src/internalClusterTest/java/org/elasticsearch/http/netty4/Netty4ChunkedContinuationsIT.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ public static class YieldsContinuationsPlugin extends Plugin implements ActionPl
340340
private static final ActionType<YieldsContinuationsPlugin.Response> TYPE = new ActionType<>("test:yields_continuations");
341341

342342
@Override
343-
public Collection<ActionHandler<? extends ActionRequest, ? extends ActionResponse>> getActions() {
343+
public Collection<ActionHandler> getActions() {
344344
return List.of(new ActionHandler<>(TYPE, TransportYieldsContinuationsAction.class));
345345
}
346346

@@ -521,7 +521,7 @@ public static class InfiniteContinuationsPlugin extends Plugin implements Action
521521
private static final ActionType<Response> TYPE = new ActionType<>("test:infinite_continuations");
522522

523523
@Override
524-
public Collection<ActionHandler<? extends ActionRequest, ? extends ActionResponse>> getActions() {
524+
public Collection<ActionHandler> getActions() {
525525
return List.of(new ActionHandler<>(TYPE, TransportInfiniteContinuationsAction.class));
526526
}
527527

0 commit comments

Comments
 (0)