Skip to content

Commit a151ac3

Browse files
committed
Rename PutLifecycleMetadataService to LifecycleMetadataService
1 parent 851fd32 commit a151ac3

File tree

5 files changed

+18
-18
lines changed

5 files changed

+18
-18
lines changed

x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/ilm/IndexLifecycle.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,15 +141,15 @@ protected XPackLicenseState getLicenseState() {
141141
@Override
142142
public Collection<?> createComponents(PluginServices services) {
143143
final List<Object> components = new ArrayList<>();
144-
PutLifecycleMetadataService putLifecycleMetadataService = new PutLifecycleMetadataService(
144+
LifecycleMetadataService lifecycleMetadataService = new LifecycleMetadataService(
145145
services.clusterService(),
146146
services.xContentRegistry(),
147147
services.client(),
148148
getLicenseState(),
149149
services.threadPool(),
150150
services.projectResolver()
151151
);
152-
components.add(putLifecycleMetadataService);
152+
components.add(lifecycleMetadataService);
153153

154154
ILMHistoryTemplateRegistry ilmTemplateRegistry = new ILMHistoryTemplateRegistry(
155155
settings,

x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/ilm/PutLifecycleMetadataService.java renamed to x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/ilm/LifecycleMetadataService.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@
5252
import static org.elasticsearch.xpack.core.ilm.PhaseCacheManagement.updateIndicesForPolicy;
5353
import static org.elasticsearch.xpack.core.searchablesnapshots.SearchableSnapshotsConstants.SEARCHABLE_SNAPSHOT_FEATURE;
5454

55-
public class PutLifecycleMetadataService {
55+
public class LifecycleMetadataService {
5656

57-
private static final Logger logger = LogManager.getLogger(PutLifecycleMetadataService.class);
57+
private static final Logger logger = LogManager.getLogger(LifecycleMetadataService.class);
5858

5959
private final NamedXContentRegistry xContentRegistry;
6060
private final Client client;
@@ -63,7 +63,7 @@ public class PutLifecycleMetadataService {
6363
private final ProjectResolver projectResolver;
6464
private final MasterServiceTaskQueue<UpdateLifecyclePolicyTask> taskQueue;
6565

66-
public PutLifecycleMetadataService(
66+
public LifecycleMetadataService(
6767
ClusterService clusterService,
6868
NamedXContentRegistry xContentRegistry,
6969
Client client,

x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/ilm/action/ReservedLifecycleAction.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import org.elasticsearch.xpack.core.ilm.LifecyclePolicy;
2323
import org.elasticsearch.xpack.core.ilm.action.DeleteLifecycleAction;
2424
import org.elasticsearch.xpack.core.ilm.action.PutLifecycleRequest;
25-
import org.elasticsearch.xpack.ilm.PutLifecycleMetadataService;
25+
import org.elasticsearch.xpack.ilm.LifecycleMetadataService;
2626

2727
import java.io.IOException;
2828
import java.util.ArrayList;
@@ -87,7 +87,7 @@ public TransformState transform(ProjectId projectId, List<LifecyclePolicy> sourc
8787
ClusterState state = prevState.state();
8888

8989
for (var request : requests) {
90-
PutLifecycleMetadataService.UpdateLifecyclePolicyTask task = new PutLifecycleMetadataService.UpdateLifecyclePolicyTask(
90+
LifecycleMetadataService.UpdateLifecyclePolicyTask task = new LifecycleMetadataService.UpdateLifecyclePolicyTask(
9191
state.metadata().getProject(projectId).id(),
9292
request,
9393
licenseState,

x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/ilm/action/TransportPutLifecycleAction.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import org.elasticsearch.xpack.core.ilm.IndexLifecycleMetadata;
2424
import org.elasticsearch.xpack.core.ilm.action.ILMActions;
2525
import org.elasticsearch.xpack.core.ilm.action.PutLifecycleRequest;
26-
import org.elasticsearch.xpack.ilm.PutLifecycleMetadataService;
26+
import org.elasticsearch.xpack.ilm.LifecycleMetadataService;
2727

2828
import java.util.Optional;
2929
import java.util.Set;
@@ -34,15 +34,15 @@
3434
*/
3535
public class TransportPutLifecycleAction extends TransportMasterNodeAction<PutLifecycleRequest, AcknowledgedResponse> {
3636

37-
private final PutLifecycleMetadataService putLifecycleMetadataService;
37+
private final LifecycleMetadataService lifecycleMetadataService;
3838

3939
@Inject
4040
public TransportPutLifecycleAction(
4141
TransportService transportService,
4242
ClusterService clusterService,
4343
ThreadPool threadPool,
4444
ActionFilters actionFilters,
45-
PutLifecycleMetadataService putLifecycleMetadataService
45+
LifecycleMetadataService lifecycleMetadataService
4646
) {
4747
super(
4848
ILMActions.PUT.name(),
@@ -54,7 +54,7 @@ public TransportPutLifecycleAction(
5454
AcknowledgedResponse::readFrom,
5555
EsExecutors.DIRECT_EXECUTOR_SERVICE
5656
);
57-
this.putLifecycleMetadataService = putLifecycleMetadataService;
57+
this.lifecycleMetadataService = lifecycleMetadataService;
5858
}
5959

6060
@Override
@@ -64,7 +64,7 @@ protected void masterOperation(
6464
ClusterState state,
6565
ActionListener<AcknowledgedResponse> listener
6666
) {
67-
putLifecycleMetadataService.addLifecycle(request, state, listener);
67+
lifecycleMetadataService.addLifecycle(request, state, listener);
6868
}
6969

7070
@Override

x-pack/plugin/ilm/src/test/java/org/elasticsearch/xpack/ilm/action/TransportPutLifecycleActionTests.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import org.elasticsearch.xpack.core.ilm.LifecyclePolicyMetadata;
2121
import org.elasticsearch.xpack.core.ilm.action.PutLifecycleRequest;
2222
import org.elasticsearch.xpack.ilm.LifecyclePolicyTestsUtils;
23-
import org.elasticsearch.xpack.ilm.PutLifecycleMetadataService;
23+
import org.elasticsearch.xpack.ilm.LifecycleMetadataService;
2424

2525
import java.util.Map;
2626

@@ -37,10 +37,10 @@ public void testIsNoop() {
3737

3838
LifecyclePolicyMetadata existing = new LifecyclePolicyMetadata(policy1, headers1, randomNonNegativeLong(), randomNonNegativeLong());
3939

40-
assertTrue(PutLifecycleMetadataService.isNoopUpdate(existing, policy1, headers1));
41-
assertFalse(PutLifecycleMetadataService.isNoopUpdate(existing, policy2, headers1));
42-
assertFalse(PutLifecycleMetadataService.isNoopUpdate(existing, policy1, headers2));
43-
assertFalse(PutLifecycleMetadataService.isNoopUpdate(null, policy1, headers1));
40+
assertTrue(LifecycleMetadataService.isNoopUpdate(existing, policy1, headers1));
41+
assertFalse(LifecycleMetadataService.isNoopUpdate(existing, policy2, headers1));
42+
assertFalse(LifecycleMetadataService.isNoopUpdate(existing, policy1, headers2));
43+
assertFalse(LifecycleMetadataService.isNoopUpdate(null, policy1, headers1));
4444
}
4545

4646
public void testReservedStateHandler() throws Exception {
@@ -52,7 +52,7 @@ public void testReservedStateHandler() throws Exception {
5252
mockClusterService,
5353
threadPool,
5454
mock(ActionFilters.class),
55-
mock(PutLifecycleMetadataService.class)
55+
mock(LifecycleMetadataService.class)
5656
);
5757
assertEquals(ReservedLifecycleAction.NAME, putAction.reservedStateHandlerName().get());
5858

0 commit comments

Comments
 (0)