Skip to content

Commit a99cea1

Browse files
committed
address review comments
1 parent 8dd8bb3 commit a99cea1

File tree

3 files changed

+3
-10
lines changed

3 files changed

+3
-10
lines changed

server/src/main/java/org/elasticsearch/action/admin/indices/template/get/TransportGetComponentTemplateAction.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ public class TransportGetComponentTemplateAction extends TransportLocalProjectMe
3838
GetComponentTemplateAction.Response> {
3939

4040
private final ClusterSettings clusterSettings;
41-
private final ProjectResolver projectResolver;
4241

4342
/**
4443
* NB prior to 9.0 this was a TransportMasterNodeReadAction so for BwC it must be registered with the TransportService until
@@ -62,7 +61,6 @@ public TransportGetComponentTemplateAction(
6261
projectResolver
6362
);
6463
clusterSettings = clusterService.getClusterSettings();
65-
this.projectResolver = projectResolver;
6664
transportService.registerRequestHandler(
6765
actionName,
6866
executor,
@@ -75,7 +73,7 @@ public TransportGetComponentTemplateAction(
7573

7674
@Override
7775
protected ClusterBlockException checkBlock(GetComponentTemplateAction.Request request, ProjectState state) {
78-
return state.blocks().globalBlockedException(projectResolver.getProjectId(), ClusterBlockLevel.METADATA_READ);
76+
return state.blocks().globalBlockedException(state.projectId(), ClusterBlockLevel.METADATA_READ);
7977
}
8078

8179
@Override

server/src/main/java/org/elasticsearch/action/ingest/GetPipelineTransportAction.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@
2626
import org.elasticsearch.transport.TransportService;
2727

2828
public class GetPipelineTransportAction extends TransportLocalProjectMetadataAction<GetPipelineRequest, GetPipelineResponse> {
29-
30-
private final ProjectResolver projectResolver;
31-
3229
/**
3330
* NB prior to 9.0 this was a TransportMasterNodeReadAction so for BwC it must be registered with the TransportService until
3431
* we no longer need to support calling this action remotely.
@@ -51,8 +48,6 @@ public GetPipelineTransportAction(
5148
projectResolver
5249
);
5350

54-
this.projectResolver = projectResolver;
55-
5651
transportService.registerRequestHandler(
5752
actionName,
5853
executor,
@@ -75,7 +70,7 @@ protected void localClusterStateOperation(
7570

7671
@Override
7772
protected ClusterBlockException checkBlock(GetPipelineRequest request, ProjectState state) {
78-
return state.blocks().globalBlockedException(projectResolver.getProjectId(), ClusterBlockLevel.METADATA_READ);
73+
return state.blocks().globalBlockedException(state.projectId(), ClusterBlockLevel.METADATA_READ);
7974
}
8075

8176
}

server/src/main/java/org/elasticsearch/persistent/UpdatePersistentTaskStatusAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ public TransportAction(
138138
@Override
139139
protected ClusterBlockException checkBlock(Request request, ClusterState state) {
140140
// Cluster is not affected but we look up repositories in metadata
141-
return state.blocks().globalBlockedException(projectResolver.getProjectId(), ClusterBlockLevel.METADATA_WRITE);
141+
return state.blocks().globalBlockedException(ClusterBlockLevel.METADATA_WRITE);
142142
}
143143

144144
@Override

0 commit comments

Comments
 (0)