Skip to content

Commit 1162ad6

Browse files
authored
Rename the DataStreamLifecycle isEnabled to isFeatureEnabled (elastic#97816)
1 parent 18329b0 commit 1162ad6

File tree

21 files changed

+32
-32
lines changed

21 files changed

+32
-32
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ public List<Setting<?>> getSettings() {
141141
pluginSettings.add(TIME_SERIES_POLL_INTERVAL);
142142
pluginSettings.add(LOOK_AHEAD_TIME);
143143

144-
if (DataStreamLifecycle.isEnabled()) {
144+
if (DataStreamLifecycle.isFeatureEnabled()) {
145145
pluginSettings.add(DataStreamLifecycleService.DATA_STREAM_LIFECYCLE_POLL_INTERVAL_SETTING);
146146
pluginSettings.add(DataStreamLifecycleService.DATA_STREAM_MERGE_POLICY_TARGET_FLOOR_SEGMENT_SETTING);
147147
pluginSettings.add(DataStreamLifecycleService.DATA_STREAM_MERGE_POLICY_TARGET_FACTOR_SETTING);
@@ -172,7 +172,7 @@ public Collection<Object> createComponents(
172172
this.updateTimeSeriesRangeService.set(updateTimeSeriesRangeService);
173173
components.add(this.updateTimeSeriesRangeService.get());
174174

175-
if (DataStreamLifecycle.isEnabled()) {
175+
if (DataStreamLifecycle.isFeatureEnabled()) {
176176
errorStoreInitialisationService.set(new DataStreamLifecycleErrorStore());
177177
dataLifecycleInitialisationService.set(
178178
new DataStreamLifecycleService(
@@ -203,7 +203,7 @@ public Collection<Object> createComponents(
203203
actions.add(new ActionHandler<>(PromoteDataStreamAction.INSTANCE, PromoteDataStreamTransportAction.class));
204204
actions.add(new ActionHandler<>(ModifyDataStreamsAction.INSTANCE, ModifyDataStreamsTransportAction.class));
205205

206-
if (DataStreamLifecycle.isEnabled()) {
206+
if (DataStreamLifecycle.isFeatureEnabled()) {
207207
actions.add(new ActionHandler<>(PutDataStreamLifecycleAction.INSTANCE, TransportPutDataStreamLifecycleAction.class));
208208
actions.add(new ActionHandler<>(GetDataStreamLifecycleAction.INSTANCE, TransportGetDataStreamLifecycleAction.class));
209209
actions.add(new ActionHandler<>(DeleteDataStreamLifecycleAction.INSTANCE, TransportDeleteDataStreamLifecycleAction.class));
@@ -235,7 +235,7 @@ public List<RestHandler> getRestHandlers(
235235
handlers.add(new RestPromoteDataStreamAction());
236236
handlers.add(new RestModifyDataStreamsAction());
237237

238-
if (DataStreamLifecycle.isEnabled()) {
238+
if (DataStreamLifecycle.isFeatureEnabled()) {
239239
handlers.add(new RestPutDataStreamLifecycleAction());
240240
handlers.add(new RestGetDataStreamLifecycleAction());
241241
handlers.add(new RestDeleteDataStreamLifecycleAction());

modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/GetDataStreamsTransportAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ static GetDataStreamAction.Response innerOperation(
180180
}
181181
return new GetDataStreamAction.Response(
182182
dataStreamInfos,
183-
request.includeDefaults() && DataStreamLifecycle.isEnabled()
183+
request.includeDefaults() && DataStreamLifecycle.isFeatureEnabled()
184184
? clusterSettings.get(DataStreamLifecycle.CLUSTER_LIFECYCLE_DEFAULT_ROLLOVER_SETTING)
185185
: null
186186
);

modules/data-streams/src/main/java/org/elasticsearch/datastreams/lifecycle/action/TransportExplainDataStreamLifecycleAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ protected void masterOperation(
111111
listener.onResponse(
112112
new ExplainDataStreamLifecycleAction.Response(
113113
explainIndices,
114-
request.includeDefaults() && DataStreamLifecycle.isEnabled()
114+
request.includeDefaults() && DataStreamLifecycle.isFeatureEnabled()
115115
? clusterSettings.get(DataStreamLifecycle.CLUSTER_LIFECYCLE_DEFAULT_ROLLOVER_SETTING)
116116
: null
117117
)

modules/data-streams/src/main/java/org/elasticsearch/datastreams/lifecycle/action/TransportGetDataStreamLifecycleAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ protected void masterOperation(
8888
)
8989
.sorted(Comparator.comparing(GetDataStreamLifecycleAction.Response.DataStreamLifecycle::dataStreamName))
9090
.toList(),
91-
request.includeDefaults() && DataStreamLifecycle.isEnabled()
91+
request.includeDefaults() && DataStreamLifecycle.isFeatureEnabled()
9292
? clusterSettings.get(DataStreamLifecycle.CLUSTER_LIFECYCLE_DEFAULT_ROLLOVER_SETTING)
9393
: null
9494
)

modules/data-streams/src/main/java/org/elasticsearch/datastreams/rest/RestGetDataStreamsAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ protected RestChannelConsumer prepareRequest(RestRequest request, NodeClient cli
4040
GetDataStreamAction.Request getDataStreamsRequest = new GetDataStreamAction.Request(
4141
Strings.splitStringByCommaToArray(request.param("name"))
4242
);
43-
if (DataStreamLifecycle.isEnabled()) {
43+
if (DataStreamLifecycle.isFeatureEnabled()) {
4444
getDataStreamsRequest.includeDefaults(request.paramAsBoolean("include_defaults", false));
4545
}
4646
getDataStreamsRequest.indicesOptions(IndicesOptions.fromRequest(request, getDataStreamsRequest.indicesOptions()));

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ protected void masterOperation(
9191

9292
}
9393
}
94-
if (request.includeDefaults() && DataStreamLifecycle.isEnabled()) {
94+
if (request.includeDefaults() && DataStreamLifecycle.isFeatureEnabled()) {
9595
listener.onResponse(
9696
new GetComponentTemplateAction.Response(
9797
results,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ protected void masterOperation(
8989
throw new ResourceNotFoundException("index template matching [" + request.name() + "] not found");
9090
}
9191
}
92-
if (request.includeDefaults() && DataStreamLifecycle.isEnabled()) {
92+
if (request.includeDefaults() && DataStreamLifecycle.isFeatureEnabled()) {
9393
listener.onResponse(
9494
new GetComposableIndexTemplateAction.Response(
9595
results,

server/src/main/java/org/elasticsearch/action/admin/indices/template/post/TransportSimulateIndexTemplateAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ protected void masterOperation(
155155
overlapping.putAll(findConflictingV1Templates(tempClusterState, matchingTemplate, templateV2.indexPatterns()));
156156
overlapping.putAll(findConflictingV2Templates(tempClusterState, matchingTemplate, templateV2.indexPatterns()));
157157

158-
if (request.includeDefaults() && DataStreamLifecycle.isEnabled()) {
158+
if (request.includeDefaults() && DataStreamLifecycle.isFeatureEnabled()) {
159159
listener.onResponse(
160160
new SimulateIndexTemplateResponse(
161161
template,

server/src/main/java/org/elasticsearch/action/admin/indices/template/post/TransportSimulateTemplateAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ protected void masterOperation(
166166
systemIndices,
167167
indexSettingProviders
168168
);
169-
if (request.includeDefaults() && DataStreamLifecycle.isEnabled()) {
169+
if (request.includeDefaults() && DataStreamLifecycle.isFeatureEnabled()) {
170170
listener.onResponse(
171171
new SimulateIndexTemplateResponse(
172172
template,

server/src/main/java/org/elasticsearch/cluster/metadata/DataStream.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ public DataStream(
152152
this.system = system;
153153
this.allowCustomRouting = allowCustomRouting;
154154
this.indexMode = indexMode;
155-
this.lifecycle = DataStreamLifecycle.isEnabled() ? lifecycle : null;
155+
this.lifecycle = DataStreamLifecycle.isFeatureEnabled() ? lifecycle : null;
156156
assert assertConsistent(this.indices);
157157
}
158158

@@ -809,7 +809,7 @@ public void writeTo(StreamOutput out) throws IOException {
809809
args[6] != null && (boolean) args[6],
810810
args[7] != null && (boolean) args[7],
811811
args[8] != null ? IndexMode.fromString((String) args[8]) : null,
812-
DataStreamLifecycle.isEnabled() ? (DataStreamLifecycle) args[9] : null
812+
DataStreamLifecycle.isFeatureEnabled() ? (DataStreamLifecycle) args[9] : null
813813
)
814814
);
815815

@@ -831,7 +831,7 @@ public void writeTo(StreamOutput out) throws IOException {
831831
PARSER.declareBoolean(ConstructingObjectParser.optionalConstructorArg(), SYSTEM_FIELD);
832832
PARSER.declareBoolean(ConstructingObjectParser.optionalConstructorArg(), ALLOW_CUSTOM_ROUTING);
833833
PARSER.declareString(ConstructingObjectParser.optionalConstructorArg(), INDEX_MODE);
834-
if (DataStreamLifecycle.isEnabled()) {
834+
if (DataStreamLifecycle.isFeatureEnabled()) {
835835
PARSER.declareObject(
836836
ConstructingObjectParser.optionalConstructorArg(),
837837
(p, c) -> DataStreamLifecycle.fromXContent(p),

0 commit comments

Comments
 (0)