Skip to content

Commit 4504661

Browse files
thecoopthecoop
committed
Rename Metadata.Custom to MetadataSection
1 parent 06d09fc commit 4504661

File tree

235 files changed

+1712
-1651
lines changed

Some content is hidden

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

235 files changed

+1712
-1651
lines changed

‎modules/ingest-geoip/src/internalClusterTest/java/org/elasticsearch/ingest/geoip/GeoIpDownloaderIT.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import org.elasticsearch.ingest.Processor;
3333
import org.elasticsearch.ingest.geoip.stats.GeoIpStatsAction;
3434
import org.elasticsearch.persistent.PersistentTaskParams;
35-
import org.elasticsearch.persistent.PersistentTasksCustomMetadata;
35+
import org.elasticsearch.persistent.PersistentTasksMetadataSection;
3636
import org.elasticsearch.plugins.IngestPlugin;
3737
import org.elasticsearch.plugins.Plugin;
3838
import org.elasticsearch.reindex.ReindexPlugin;
@@ -115,7 +115,7 @@ public void cleanUp() throws Exception {
115115
.putNull("ingest.geoip.database_validity")
116116
);
117117
assertBusy(() -> {
118-
PersistentTasksCustomMetadata.PersistentTask<PersistentTaskParams> task = getTask();
118+
PersistentTasksMetadataSection.PersistentTask<PersistentTaskParams> task = getTask();
119119
if (task != null) {
120120
GeoIpTaskState state = (GeoIpTaskState) task.getState();
121121
assertThat(state.getDatabases(), anEmptyMap());
@@ -294,7 +294,7 @@ public void testGeoIpDatabasesDownloadNoGeoipProcessors() throws Exception {
294294
putGeoIpPipeline(pipelineId);
295295
updateClusterSettings(Settings.builder().put(GeoIpDownloaderTaskExecutor.ENABLED_SETTING.getKey(), true));
296296
assertBusy(() -> {
297-
PersistentTasksCustomMetadata.PersistentTask<PersistentTaskParams> task = getTask();
297+
PersistentTasksMetadataSection.PersistentTask<PersistentTaskParams> task = getTask();
298298
assertNotNull(task);
299299
assertNotNull(task.getState());
300300
});
@@ -467,7 +467,7 @@ private void verifyUpdatedDatabase() throws Exception {
467467
}
468468

469469
private GeoIpTaskState getGeoIpTaskState() {
470-
PersistentTasksCustomMetadata.PersistentTask<PersistentTaskParams> task = getTask();
470+
PersistentTasksMetadataSection.PersistentTask<PersistentTaskParams> task = getTask();
471471
assertNotNull(task);
472472
GeoIpTaskState state = (GeoIpTaskState) task.getState();
473473
assertNotNull(state);
@@ -756,8 +756,8 @@ private void parseDatabase(Path tempFile) throws IOException {
756756
}
757757
}
758758

759-
private PersistentTasksCustomMetadata.PersistentTask<PersistentTaskParams> getTask() {
760-
return PersistentTasksCustomMetadata.getTaskWithId(clusterService().state(), GeoIpDownloader.GEOIP_DOWNLOADER);
759+
private PersistentTasksMetadataSection.PersistentTask<PersistentTaskParams> getTask() {
760+
return PersistentTasksMetadataSection.getTaskWithId(clusterService().state(), GeoIpDownloader.GEOIP_DOWNLOADER);
761761
}
762762

763763
private static class MultiByteArrayInputStream extends InputStream {

‎modules/ingest-geoip/src/internalClusterTest/java/org/elasticsearch/ingest/geoip/GeoIpDownloaderTaskIT.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import org.elasticsearch.action.admin.cluster.node.tasks.list.ListTasksResponse;
1313
import org.elasticsearch.common.settings.Settings;
1414
import org.elasticsearch.persistent.PersistentTaskParams;
15-
import org.elasticsearch.persistent.PersistentTasksCustomMetadata;
15+
import org.elasticsearch.persistent.PersistentTasksMetadataSection;
1616
import org.elasticsearch.plugins.Plugin;
1717
import org.elasticsearch.reindex.ReindexPlugin;
1818
import org.junit.After;
@@ -48,7 +48,7 @@ public void cleanUp() {
4848
public void testTaskRemovedAfterCancellation() throws Exception {
4949
updateClusterSettings(Settings.builder().put(GeoIpDownloaderTaskExecutor.ENABLED_SETTING.getKey(), true));
5050
assertBusy(() -> {
51-
PersistentTasksCustomMetadata.PersistentTask<PersistentTaskParams> task = getTask();
51+
PersistentTasksMetadataSection.PersistentTask<PersistentTaskParams> task = getTask();
5252
assertNotNull(task);
5353
assertTrue(task.isAssigned());
5454
});
@@ -63,7 +63,7 @@ public void testTaskRemovedAfterCancellation() throws Exception {
6363
});
6464
}
6565

66-
private PersistentTasksCustomMetadata.PersistentTask<PersistentTaskParams> getTask() {
67-
return PersistentTasksCustomMetadata.getTaskWithId(clusterService().state(), GeoIpDownloader.GEOIP_DOWNLOADER);
66+
private PersistentTasksMetadataSection.PersistentTask<PersistentTaskParams> getTask() {
67+
return PersistentTasksMetadataSection.getTaskWithId(clusterService().state(), GeoIpDownloader.GEOIP_DOWNLOADER);
6868
}
6969
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import org.elasticsearch.index.query.TermQueryBuilder;
3232
import org.elasticsearch.ingest.IngestService;
3333
import org.elasticsearch.ingest.geoip.stats.CacheStats;
34-
import org.elasticsearch.persistent.PersistentTasksCustomMetadata;
34+
import org.elasticsearch.persistent.PersistentTasksMetadataSection;
3535
import org.elasticsearch.search.SearchHit;
3636
import org.elasticsearch.watcher.ResourceWatcherService;
3737

@@ -251,7 +251,7 @@ void checkDatabases(ClusterState state) {
251251
return;
252252
}
253253

254-
PersistentTasksCustomMetadata persistentTasks = state.metadata().custom(PersistentTasksCustomMetadata.TYPE);
254+
PersistentTasksMetadataSection persistentTasks = state.metadata().custom(PersistentTasksMetadataSection.TYPE);
255255
if (persistentTasks == null) {
256256
logger.trace("Not checking databases because persistent tasks are null");
257257
return;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import org.elasticsearch.ingest.geoip.direct.DatabaseConfiguration;
3434
import org.elasticsearch.ingest.geoip.direct.DatabaseConfigurationMetadata;
3535
import org.elasticsearch.persistent.AllocatedPersistentTask;
36-
import org.elasticsearch.persistent.PersistentTasksCustomMetadata.PersistentTask;
36+
import org.elasticsearch.persistent.PersistentTasksMetadataSection.PersistentTask;
3737
import org.elasticsearch.tasks.TaskId;
3838
import org.elasticsearch.threadpool.Scheduler;
3939
import org.elasticsearch.threadpool.ThreadPool;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
import org.elasticsearch.ingest.IngestService;
2828
import org.elasticsearch.persistent.AllocatedPersistentTask;
2929
import org.elasticsearch.persistent.PersistentTaskState;
30-
import org.elasticsearch.persistent.PersistentTasksCustomMetadata;
3130
import org.elasticsearch.persistent.PersistentTasksExecutor;
31+
import org.elasticsearch.persistent.PersistentTasksMetadataSection;
3232
import org.elasticsearch.tasks.TaskId;
3333
import org.elasticsearch.threadpool.ThreadPool;
3434

@@ -126,7 +126,7 @@ protected EnterpriseGeoIpDownloader createTask(
126126
String type,
127127
String action,
128128
TaskId parentTaskId,
129-
PersistentTasksCustomMetadata.PersistentTask<EnterpriseGeoIpTaskParams> taskInProgress,
129+
PersistentTasksMetadataSection.PersistentTask<EnterpriseGeoIpTaskParams> taskInProgress,
130130
Map<String, String> headers
131131
) {
132132
return new EnterpriseGeoIpDownloader(

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import org.elasticsearch.ingest.EnterpriseGeoIpTask;
2020
import org.elasticsearch.ingest.geoip.GeoIpTaskState.Metadata;
2121
import org.elasticsearch.persistent.PersistentTaskState;
22-
import org.elasticsearch.persistent.PersistentTasksCustomMetadata;
22+
import org.elasticsearch.persistent.PersistentTasksMetadataSection;
2323
import org.elasticsearch.xcontent.ConstructingObjectParser;
2424
import org.elasticsearch.xcontent.ParseField;
2525
import org.elasticsearch.xcontent.XContentBuilder;
@@ -33,7 +33,7 @@
3333
import java.util.stream.Collectors;
3434

3535
import static org.elasticsearch.ingest.geoip.GeoIpDownloader.GEOIP_DOWNLOADER;
36-
import static org.elasticsearch.persistent.PersistentTasksCustomMetadata.getTaskWithId;
36+
import static org.elasticsearch.persistent.PersistentTasksMetadataSection.getTaskWithId;
3737
import static org.elasticsearch.xcontent.ConstructingObjectParser.constructorArg;
3838

3939
class EnterpriseGeoIpTaskState implements PersistentTaskState, VersionedNamedWriteable {
@@ -146,7 +146,7 @@ public void writeTo(StreamOutput out) throws IOException {
146146
*/
147147
@Nullable
148148
static EnterpriseGeoIpTaskState getEnterpriseGeoIpTaskState(ClusterState state) {
149-
PersistentTasksCustomMetadata.PersistentTask<?> task = getTaskWithId(state, EnterpriseGeoIpTask.ENTERPRISE_GEOIP_DOWNLOADER);
149+
PersistentTasksMetadataSection.PersistentTask<?> task = getTaskWithId(state, EnterpriseGeoIpTask.ENTERPRISE_GEOIP_DOWNLOADER);
150150
return (task == null) ? null : (EnterpriseGeoIpTaskState) task.getState();
151151
}
152152

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import org.elasticsearch.ingest.geoip.GeoIpTaskState.Metadata;
3434
import org.elasticsearch.ingest.geoip.stats.GeoIpDownloaderStats;
3535
import org.elasticsearch.persistent.AllocatedPersistentTask;
36-
import org.elasticsearch.persistent.PersistentTasksCustomMetadata.PersistentTask;
36+
import org.elasticsearch.persistent.PersistentTasksMetadataSection.PersistentTask;
3737
import org.elasticsearch.tasks.TaskId;
3838
import org.elasticsearch.threadpool.Scheduler;
3939
import org.elasticsearch.threadpool.ThreadPool;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
import org.elasticsearch.ingest.PipelineConfiguration;
3636
import org.elasticsearch.persistent.AllocatedPersistentTask;
3737
import org.elasticsearch.persistent.PersistentTaskState;
38-
import org.elasticsearch.persistent.PersistentTasksCustomMetadata;
3938
import org.elasticsearch.persistent.PersistentTasksExecutor;
39+
import org.elasticsearch.persistent.PersistentTasksMetadataSection;
4040
import org.elasticsearch.persistent.PersistentTasksService;
4141
import org.elasticsearch.tasks.TaskId;
4242
import org.elasticsearch.threadpool.ThreadPool;
@@ -169,7 +169,7 @@ protected GeoIpDownloader createTask(
169169
String type,
170170
String action,
171171
TaskId parentTaskId,
172-
PersistentTasksCustomMetadata.PersistentTask<GeoIpTaskParams> taskInProgress,
172+
PersistentTasksMetadataSection.PersistentTask<GeoIpTaskParams> taskInProgress,
173173
Map<String, String> headers
174174
) {
175175
return new GeoIpDownloader(
@@ -362,7 +362,7 @@ private void startTask(Runnable onFailure) {
362362
}
363363

364364
private void stopTask(Runnable onFailure) {
365-
ActionListener<PersistentTasksCustomMetadata.PersistentTask<?>> listener = ActionListener.wrap(
365+
ActionListener<PersistentTasksMetadataSection.PersistentTask<?>> listener = ActionListener.wrap(
366366
r -> logger.debug("Stopped geoip downloader task"),
367367
e -> {
368368
Throwable t = e instanceof RemoteTransportException ? ExceptionsHelper.unwrapCause(e) : e;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import org.elasticsearch.core.TimeValue;
2020
import org.elasticsearch.core.Tuple;
2121
import org.elasticsearch.persistent.PersistentTaskState;
22-
import org.elasticsearch.persistent.PersistentTasksCustomMetadata;
22+
import org.elasticsearch.persistent.PersistentTasksMetadataSection;
2323
import org.elasticsearch.xcontent.ConstructingObjectParser;
2424
import org.elasticsearch.xcontent.ParseField;
2525
import org.elasticsearch.xcontent.ToXContentObject;
@@ -36,7 +36,7 @@
3636
import java.util.stream.Collectors;
3737

3838
import static org.elasticsearch.ingest.geoip.GeoIpDownloader.GEOIP_DOWNLOADER;
39-
import static org.elasticsearch.persistent.PersistentTasksCustomMetadata.getTaskWithId;
39+
import static org.elasticsearch.persistent.PersistentTasksMetadataSection.getTaskWithId;
4040
import static org.elasticsearch.xcontent.ConstructingObjectParser.constructorArg;
4141
import static org.elasticsearch.xcontent.ConstructingObjectParser.optionalConstructorArg;
4242

@@ -241,7 +241,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
241241
*/
242242
@Nullable
243243
static GeoIpTaskState getGeoIpTaskState(ClusterState state) {
244-
PersistentTasksCustomMetadata.PersistentTask<?> task = getTaskWithId(state, GeoIpDownloader.GEOIP_DOWNLOADER);
244+
PersistentTasksMetadataSection.PersistentTask<?> task = getTaskWithId(state, GeoIpDownloader.GEOIP_DOWNLOADER);
245245
return (task == null) ? null : (GeoIpTaskState) task.getState();
246246
}
247247

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import org.elasticsearch.cluster.DiffableUtils;
1515
import org.elasticsearch.cluster.NamedDiff;
1616
import org.elasticsearch.cluster.metadata.Metadata;
17+
import org.elasticsearch.cluster.metadata.MetadataSection;
1718
import org.elasticsearch.common.collect.Iterators;
1819
import org.elasticsearch.common.io.stream.StreamInput;
1920
import org.elasticsearch.common.io.stream.StreamOutput;
@@ -36,7 +37,7 @@
3637
/**
3738
* Holds the ingest-geoip databases that are available in the cluster state.
3839
*/
39-
public final class IngestGeoIpMetadata implements Metadata.Custom {
40+
public final class IngestGeoIpMetadata implements MetadataSection {
4041

4142
public static final String TYPE = "ingest_geoip";
4243
private static final ParseField DATABASES_FIELD = new ParseField("databases");
@@ -100,11 +101,11 @@ public EnumSet<Metadata.XContentContext> context() {
100101
}
101102

102103
@Override
103-
public Diff<Metadata.Custom> diff(Metadata.Custom before) {
104+
public Diff<MetadataSection> diff(MetadataSection before) {
104105
return new GeoIpMetadataDiff((IngestGeoIpMetadata) before, this);
105106
}
106107

107-
static class GeoIpMetadataDiff implements NamedDiff<Metadata.Custom> {
108+
static class GeoIpMetadataDiff implements NamedDiff<MetadataSection> {
108109

109110
final Diff<Map<String, DatabaseConfigurationMetadata>> databases;
110111

@@ -122,7 +123,7 @@ static class GeoIpMetadataDiff implements NamedDiff<Metadata.Custom> {
122123
}
123124

124125
@Override
125-
public Metadata.Custom apply(Metadata.Custom part) {
126+
public MetadataSection apply(MetadataSection part) {
126127
return new IngestGeoIpMetadata(databases.apply(((IngestGeoIpMetadata) part).databases));
127128
}
128129

0 commit comments

Comments
 (0)