From 48a88c575cca0579b3eeca46bcdeb1242b12b3db Mon Sep 17 00:00:00 2001 From: Keith Massey Date: Wed, 10 Apr 2024 09:21:24 -0500 Subject: [PATCH] Renaming GeoIpDownloaderStatsAction (#107290) Renaming GeoIpDownloaderStatsAction to GeoIpStatsAction --- .../ingest/apis/geoip-stats-api.asciidoc | 8 ++--- .../ingest/geoip/GeoIpDownloaderIT.java | 25 +++++---------- .../ingest/geoip/GeoIpDownloaderStatsIT.java | 8 ++--- .../ingest/geoip/IngestGeoIpPlugin.java | 10 +++--- ...StatsAction.java => GeoIpStatsAction.java} | 32 +++++++++---------- ...on.java => GeoIpStatsTransportAction.java} | 18 +++++------ ...sAction.java => RestGeoIpStatsAction.java} | 8 ++--- ...tsActionNodeResponseSerializingTests.java} | 15 ++++----- ...=> GeoIpStatsActionNodeResponseTests.java} | 4 +-- ...pStatsActionResponseSerializingTests.java} | 17 +++++----- 10 files changed, 65 insertions(+), 80 deletions(-) rename modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/stats/{GeoIpDownloaderStatsAction.java => GeoIpStatsAction.java} (88%) rename modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/stats/{GeoIpDownloaderStatsTransportAction.java => GeoIpStatsTransportAction.java} (80%) rename modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/stats/{RestGeoIpDownloaderStatsAction.java => RestGeoIpStatsAction.java} (80%) rename modules/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/stats/{GeoIpDownloaderStatsActionNodeResponseSerializingTests.java => GeoIpStatsActionNodeResponseSerializingTests.java} (68%) rename modules/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/stats/{GeoIpDownloaderStatsActionNodeResponseTests.java => GeoIpStatsActionNodeResponseTests.java} (91%) rename modules/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/stats/{GeoIpDownloaderStatsActionResponseSerializingTests.java => GeoIpStatsActionResponseSerializingTests.java} (50%) diff --git a/docs/reference/ingest/apis/geoip-stats-api.asciidoc b/docs/reference/ingest/apis/geoip-stats-api.asciidoc index 6ef0db546342..84a2b00737e5 100644 --- a/docs/reference/ingest/apis/geoip-stats-api.asciidoc +++ b/docs/reference/ingest/apis/geoip-stats-api.asciidoc @@ -4,8 +4,8 @@ GeoIP stats ++++ -Gets download statistics for GeoIP2 databases used with the -<>. +Gets statistics about the <>, including +download statistics for GeoIP2 databases used with it. [source,console] ---- @@ -60,7 +60,7 @@ Total number of database updates skipped. `nodes`:: (object) -Downloaded GeoIP2 databases for each node. +Statistics for each node. + .Properties of `nodes` [%collapsible%open] @@ -90,4 +90,4 @@ Downloaded database files, including related license files. {es} stores these files in the node's <>: `$ES_TMPDIR/geoip-databases/`. ===== -==== \ No newline at end of file +==== diff --git a/modules/ingest-geoip/src/internalClusterTest/java/org/elasticsearch/ingest/geoip/GeoIpDownloaderIT.java b/modules/ingest-geoip/src/internalClusterTest/java/org/elasticsearch/ingest/geoip/GeoIpDownloaderIT.java index 54d465aecda5..9dcd8abc7bc5 100644 --- a/modules/ingest-geoip/src/internalClusterTest/java/org/elasticsearch/ingest/geoip/GeoIpDownloaderIT.java +++ b/modules/ingest-geoip/src/internalClusterTest/java/org/elasticsearch/ingest/geoip/GeoIpDownloaderIT.java @@ -30,7 +30,7 @@ import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.ingest.AbstractProcessor; import org.elasticsearch.ingest.IngestDocument; import org.elasticsearch.ingest.Processor; -import org.elasticsearch.ingest.geoip.stats.GeoIpDownloaderStatsAction; +import org.elasticsearch.ingest.geoip.stats.GeoIpStatsAction; import org.elasticsearch.persistent.PersistentTaskParams; import org.elasticsearch.persistent.PersistentTasksCustomMetadata; import org.elasticsearch.plugins.IngestPlugin; @@ -121,13 +121,10 @@ public class GeoIpDownloaderIT extends AbstractGeoIpIT { } }); assertBusy(() -> { - GeoIpDownloaderStatsAction.Response response = client().execute( - GeoIpDownloaderStatsAction.INSTANCE, - new GeoIpDownloaderStatsAction.Request() - ).actionGet(); - assertThat(response.getStats().getDatabasesCount(), equalTo(0)); + GeoIpStatsAction.Response response = client().execute(GeoIpStatsAction.INSTANCE, new GeoIpStatsAction.Request()).actionGet(); + assertThat(response.getDownloaderStats().getDatabasesCount(), equalTo(0)); assertThat(response.getNodes(), not(empty())); - for (GeoIpDownloaderStatsAction.NodeResponse nodeResponse : response.getNodes()) { + for (GeoIpStatsAction.NodeResponse nodeResponse : response.getNodes()) { assertThat(nodeResponse.getConfigDatabases(), empty()); assertThat(nodeResponse.getDatabases(), empty()); assertThat(nodeResponse.getFilesInTemp().stream().filter(s -> s.endsWith(".txt") == false).toList(), empty()); @@ -703,12 +700,9 @@ public class GeoIpDownloaderIT extends AbstractGeoIpIT { }); assertBusy(() -> { - GeoIpDownloaderStatsAction.Response response = client().execute( - GeoIpDownloaderStatsAction.INSTANCE, - new GeoIpDownloaderStatsAction.Request() - ).actionGet(); + GeoIpStatsAction.Response response = client().execute(GeoIpStatsAction.INSTANCE, new GeoIpStatsAction.Request()).actionGet(); assertThat(response.getNodes(), not(empty())); - for (GeoIpDownloaderStatsAction.NodeResponse nodeResponse : response.getNodes()) { + for (GeoIpStatsAction.NodeResponse nodeResponse : response.getNodes()) { assertThat( nodeResponse.getConfigDatabases(), containsInAnyOrder("GeoLite2-Country.mmdb", "GeoLite2-City.mmdb", "GeoLite2-ASN.mmdb") @@ -751,12 +745,9 @@ public class GeoIpDownloaderIT extends AbstractGeoIpIT { }); assertBusy(() -> { - GeoIpDownloaderStatsAction.Response response = client().execute( - GeoIpDownloaderStatsAction.INSTANCE, - new GeoIpDownloaderStatsAction.Request() - ).actionGet(); + GeoIpStatsAction.Response response = client().execute(GeoIpStatsAction.INSTANCE, new GeoIpStatsAction.Request()).actionGet(); assertThat(response.getNodes(), not(empty())); - for (GeoIpDownloaderStatsAction.NodeResponse nodeResponse : response.getNodes()) { + for (GeoIpStatsAction.NodeResponse nodeResponse : response.getNodes()) { assertThat(nodeResponse.getConfigDatabases(), empty()); } }); diff --git a/modules/ingest-geoip/src/internalClusterTest/java/org/elasticsearch/ingest/geoip/GeoIpDownloaderStatsIT.java b/modules/ingest-geoip/src/internalClusterTest/java/org/elasticsearch/ingest/geoip/GeoIpDownloaderStatsIT.java index 77b0faeeb6eb..ec54317e144d 100644 --- a/modules/ingest-geoip/src/internalClusterTest/java/org/elasticsearch/ingest/geoip/GeoIpDownloaderStatsIT.java +++ b/modules/ingest-geoip/src/internalClusterTest/java/org/elasticsearch/ingest/geoip/GeoIpDownloaderStatsIT.java @@ -11,7 +11,7 @@ package org.elasticsearch.ingest.geoip; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentHelper; -import org.elasticsearch.ingest.geoip.stats.GeoIpDownloaderStatsAction; +import org.elasticsearch.ingest.geoip.stats.GeoIpStatsAction; import org.elasticsearch.plugins.Plugin; import org.elasticsearch.reindex.ReindexPlugin; import org.elasticsearch.test.ESIntegTestCase; @@ -65,8 +65,8 @@ public class GeoIpDownloaderStatsIT extends AbstractGeoIpIT { * slowly to pass. */ assumeTrue("only test with fixture to have stable results", getEndpoint() != null); - GeoIpDownloaderStatsAction.Request req = new GeoIpDownloaderStatsAction.Request(); - GeoIpDownloaderStatsAction.Response response = client().execute(GeoIpDownloaderStatsAction.INSTANCE, req).actionGet(); + GeoIpStatsAction.Request req = new GeoIpStatsAction.Request(); + GeoIpStatsAction.Response response = client().execute(GeoIpStatsAction.INSTANCE, req).actionGet(); XContentTestUtils.JsonMapView jsonMapView = new XContentTestUtils.JsonMapView(convertToMap(response)); assertThat(jsonMapView.get("stats.successful_downloads"), equalTo(0)); assertThat(jsonMapView.get("stats.failed_downloads"), equalTo(0)); @@ -78,7 +78,7 @@ public class GeoIpDownloaderStatsIT extends AbstractGeoIpIT { updateClusterSettings(Settings.builder().put(GeoIpDownloaderTaskExecutor.ENABLED_SETTING.getKey(), true)); assertBusy(() -> { - GeoIpDownloaderStatsAction.Response res = client().execute(GeoIpDownloaderStatsAction.INSTANCE, req).actionGet(); + GeoIpStatsAction.Response res = client().execute(GeoIpStatsAction.INSTANCE, req).actionGet(); XContentTestUtils.JsonMapView view = new XContentTestUtils.JsonMapView(convertToMap(res)); assertThat(view.get("stats.successful_downloads"), equalTo(4)); assertThat(view.get("stats.failed_downloads"), equalTo(0)); diff --git a/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/IngestGeoIpPlugin.java b/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/IngestGeoIpPlugin.java index 2e0a84cfde23..e5756652a984 100644 --- a/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/IngestGeoIpPlugin.java +++ b/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/IngestGeoIpPlugin.java @@ -28,9 +28,9 @@ import org.elasticsearch.indices.SystemIndexDescriptor; import org.elasticsearch.ingest.IngestService; import org.elasticsearch.ingest.Processor; import org.elasticsearch.ingest.geoip.stats.GeoIpDownloaderStats; -import org.elasticsearch.ingest.geoip.stats.GeoIpDownloaderStatsAction; -import org.elasticsearch.ingest.geoip.stats.GeoIpDownloaderStatsTransportAction; -import org.elasticsearch.ingest.geoip.stats.RestGeoIpDownloaderStatsAction; +import org.elasticsearch.ingest.geoip.stats.GeoIpStatsAction; +import org.elasticsearch.ingest.geoip.stats.GeoIpStatsTransportAction; +import org.elasticsearch.ingest.geoip.stats.RestGeoIpStatsAction; import org.elasticsearch.persistent.PersistentTaskParams; import org.elasticsearch.persistent.PersistentTaskState; import org.elasticsearch.persistent.PersistentTasksExecutor; @@ -144,7 +144,7 @@ public class IngestGeoIpPlugin extends Plugin implements IngestPlugin, SystemInd @Override public List> getActions() { - return List.of(new ActionHandler<>(GeoIpDownloaderStatsAction.INSTANCE, GeoIpDownloaderStatsTransportAction.class)); + return List.of(new ActionHandler<>(GeoIpStatsAction.INSTANCE, GeoIpStatsTransportAction.class)); } @Override @@ -159,7 +159,7 @@ public class IngestGeoIpPlugin extends Plugin implements IngestPlugin, SystemInd Supplier nodesInCluster, Predicate clusterSupportsFeature ) { - return List.of(new RestGeoIpDownloaderStatsAction()); + return List.of(new RestGeoIpStatsAction()); } @Override diff --git a/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/stats/GeoIpDownloaderStatsAction.java b/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/stats/GeoIpStatsAction.java similarity index 88% rename from modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/stats/GeoIpDownloaderStatsAction.java rename to modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/stats/GeoIpStatsAction.java index f9b1d8c637f6..db1242888ca8 100644 --- a/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/stats/GeoIpDownloaderStatsAction.java +++ b/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/stats/GeoIpStatsAction.java @@ -30,11 +30,11 @@ import java.util.Map; import java.util.Objects; import java.util.Set; -public class GeoIpDownloaderStatsAction { +public class GeoIpStatsAction { public static final ActionType INSTANCE = new ActionType<>("cluster:monitor/ingest/geoip/stats"); - private GeoIpDownloaderStatsAction() {/* no instances */} + private GeoIpStatsAction() {/* no instances */} public static class Request extends BaseNodesRequest implements ToXContentObject { @@ -89,8 +89,8 @@ public class GeoIpDownloaderStatsAction { super(clusterName, nodes, failures); } - public GeoIpDownloaderStats getStats() { - return getNodes().stream().map(n -> n.stats).filter(Objects::nonNull).findFirst().orElse(GeoIpDownloaderStats.EMPTY); + public GeoIpDownloaderStats getDownloaderStats() { + return getNodes().stream().map(n -> n.downloaderStats).filter(Objects::nonNull).findFirst().orElse(GeoIpDownloaderStats.EMPTY); } @Override @@ -105,7 +105,7 @@ public class GeoIpDownloaderStatsAction { @Override public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException { - GeoIpDownloaderStats stats = getStats(); + GeoIpDownloaderStats stats = getDownloaderStats(); builder.startObject(); builder.field("stats", stats); builder.startObject("nodes"); @@ -153,14 +153,14 @@ public class GeoIpDownloaderStatsAction { public static class NodeResponse extends BaseNodeResponse { - private final GeoIpDownloaderStats stats; + private final GeoIpDownloaderStats downloaderStats; private final Set databases; private final Set filesInTemp; private final Set configDatabases; protected NodeResponse(StreamInput in) throws IOException { super(in); - stats = in.readBoolean() ? new GeoIpDownloaderStats(in) : null; + downloaderStats = in.readBoolean() ? new GeoIpDownloaderStats(in) : null; databases = in.readCollectionAsImmutableSet(StreamInput::readString); filesInTemp = in.readCollectionAsImmutableSet(StreamInput::readString); configDatabases = in.getTransportVersion().onOrAfter(TransportVersions.V_8_0_0) @@ -170,20 +170,20 @@ public class GeoIpDownloaderStatsAction { protected NodeResponse( DiscoveryNode node, - GeoIpDownloaderStats stats, + GeoIpDownloaderStats downloaderStats, Set databases, Set filesInTemp, Set configDatabases ) { super(node); - this.stats = stats; + this.downloaderStats = downloaderStats; this.databases = Set.copyOf(databases); this.filesInTemp = Set.copyOf(filesInTemp); this.configDatabases = Set.copyOf(configDatabases); } - public GeoIpDownloaderStats getStats() { - return stats; + public GeoIpDownloaderStats getDownloaderStats() { + return downloaderStats; } public Set getDatabases() { @@ -201,9 +201,9 @@ public class GeoIpDownloaderStatsAction { @Override public void writeTo(StreamOutput out) throws IOException { super.writeTo(out); - out.writeBoolean(stats != null); - if (stats != null) { - stats.writeTo(out); + out.writeBoolean(downloaderStats != null); + if (downloaderStats != null) { + downloaderStats.writeTo(out); } out.writeStringCollection(databases); out.writeStringCollection(filesInTemp); @@ -217,7 +217,7 @@ public class GeoIpDownloaderStatsAction { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; NodeResponse that = (NodeResponse) o; - return stats.equals(that.stats) + return downloaderStats.equals(that.downloaderStats) && databases.equals(that.databases) && filesInTemp.equals(that.filesInTemp) && Objects.equals(configDatabases, that.configDatabases); @@ -225,7 +225,7 @@ public class GeoIpDownloaderStatsAction { @Override public int hashCode() { - return Objects.hash(stats, databases, filesInTemp, configDatabases); + return Objects.hash(downloaderStats, databases, filesInTemp, configDatabases); } } } diff --git a/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/stats/GeoIpDownloaderStatsTransportAction.java b/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/stats/GeoIpStatsTransportAction.java similarity index 80% rename from modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/stats/GeoIpDownloaderStatsTransportAction.java rename to modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/stats/GeoIpStatsTransportAction.java index 0958002405fb..13f9544e1b9e 100644 --- a/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/stats/GeoIpDownloaderStatsTransportAction.java +++ b/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/stats/GeoIpStatsTransportAction.java @@ -18,10 +18,10 @@ import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.ingest.geoip.DatabaseNodeService; import org.elasticsearch.ingest.geoip.GeoIpDownloader; import org.elasticsearch.ingest.geoip.GeoIpDownloaderTaskExecutor; -import org.elasticsearch.ingest.geoip.stats.GeoIpDownloaderStatsAction.NodeRequest; -import org.elasticsearch.ingest.geoip.stats.GeoIpDownloaderStatsAction.NodeResponse; -import org.elasticsearch.ingest.geoip.stats.GeoIpDownloaderStatsAction.Request; -import org.elasticsearch.ingest.geoip.stats.GeoIpDownloaderStatsAction.Response; +import org.elasticsearch.ingest.geoip.stats.GeoIpStatsAction.NodeRequest; +import org.elasticsearch.ingest.geoip.stats.GeoIpStatsAction.NodeResponse; +import org.elasticsearch.ingest.geoip.stats.GeoIpStatsAction.Request; +import org.elasticsearch.ingest.geoip.stats.GeoIpStatsAction.Response; import org.elasticsearch.tasks.Task; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; @@ -29,14 +29,14 @@ import org.elasticsearch.transport.TransportService; import java.io.IOException; import java.util.List; -public class GeoIpDownloaderStatsTransportAction extends TransportNodesAction { +public class GeoIpStatsTransportAction extends TransportNodesAction { private final TransportService transportService; private final DatabaseNodeService registry; private final GeoIpDownloaderTaskExecutor geoIpDownloaderTaskExecutor; @Inject - public GeoIpDownloaderStatsTransportAction( + public GeoIpStatsTransportAction( TransportService transportService, ClusterService clusterService, ThreadPool threadPool, @@ -45,7 +45,7 @@ public class GeoIpDownloaderStatsTransportAction extends TransportNodesAction client.execute( - GeoIpDownloaderStatsAction.INSTANCE, - new GeoIpDownloaderStatsAction.Request(), - new RestToXContentListener<>(channel) - ); + return channel -> client.execute(GeoIpStatsAction.INSTANCE, new GeoIpStatsAction.Request(), new RestToXContentListener<>(channel)); } } diff --git a/modules/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/stats/GeoIpDownloaderStatsActionNodeResponseSerializingTests.java b/modules/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/stats/GeoIpStatsActionNodeResponseSerializingTests.java similarity index 68% rename from modules/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/stats/GeoIpDownloaderStatsActionNodeResponseSerializingTests.java rename to modules/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/stats/GeoIpStatsActionNodeResponseSerializingTests.java index 54193967ba85..1008dcf56c4f 100644 --- a/modules/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/stats/GeoIpDownloaderStatsActionNodeResponseSerializingTests.java +++ b/modules/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/stats/GeoIpStatsActionNodeResponseSerializingTests.java @@ -15,30 +15,29 @@ import org.elasticsearch.test.AbstractWireSerializingTestCase; import java.util.Set; -public class GeoIpDownloaderStatsActionNodeResponseSerializingTests extends AbstractWireSerializingTestCase< - GeoIpDownloaderStatsAction.NodeResponse> { +public class GeoIpStatsActionNodeResponseSerializingTests extends AbstractWireSerializingTestCase { @Override - protected Writeable.Reader instanceReader() { - return GeoIpDownloaderStatsAction.NodeResponse::new; + protected Writeable.Reader instanceReader() { + return GeoIpStatsAction.NodeResponse::new; } @Override - protected GeoIpDownloaderStatsAction.NodeResponse createTestInstance() { + protected GeoIpStatsAction.NodeResponse createTestInstance() { return createRandomInstance(); } @Override - protected GeoIpDownloaderStatsAction.NodeResponse mutateInstance(GeoIpDownloaderStatsAction.NodeResponse instance) { + protected GeoIpStatsAction.NodeResponse mutateInstance(GeoIpStatsAction.NodeResponse instance) { return null;// TODO implement https://github.com/elastic/elasticsearch/issues/25929 } - static GeoIpDownloaderStatsAction.NodeResponse createRandomInstance() { + static GeoIpStatsAction.NodeResponse createRandomInstance() { DiscoveryNode node = DiscoveryNodeUtils.create("id"); Set databases = Set.copyOf(randomList(10, () -> randomAlphaOfLengthBetween(5, 10))); Set files = Set.copyOf(randomList(10, () -> randomAlphaOfLengthBetween(5, 10))); Set configDatabases = Set.copyOf(randomList(10, () -> randomAlphaOfLengthBetween(5, 10))); - return new GeoIpDownloaderStatsAction.NodeResponse( + return new GeoIpStatsAction.NodeResponse( node, GeoIpDownloaderStatsSerializingTests.createRandomInstance(), databases, diff --git a/modules/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/stats/GeoIpDownloaderStatsActionNodeResponseTests.java b/modules/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/stats/GeoIpStatsActionNodeResponseTests.java similarity index 91% rename from modules/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/stats/GeoIpDownloaderStatsActionNodeResponseTests.java rename to modules/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/stats/GeoIpStatsActionNodeResponseTests.java index a0fd470ef046..27a332c3b42f 100644 --- a/modules/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/stats/GeoIpDownloaderStatsActionNodeResponseTests.java +++ b/modules/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/stats/GeoIpStatsActionNodeResponseTests.java @@ -18,14 +18,14 @@ import java.util.Set; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.not; -public class GeoIpDownloaderStatsActionNodeResponseTests extends ESTestCase { +public class GeoIpStatsActionNodeResponseTests extends ESTestCase { public void testInputsAreDefensivelyCopied() { DiscoveryNode node = DiscoveryNodeUtils.create("id"); Set databases = new HashSet<>(randomList(10, () -> randomAlphaOfLengthBetween(5, 10))); Set files = new HashSet<>(randomList(10, () -> randomAlphaOfLengthBetween(5, 10))); Set configDatabases = new HashSet<>(randomList(10, () -> randomAlphaOfLengthBetween(5, 10))); - GeoIpDownloaderStatsAction.NodeResponse nodeResponse = new GeoIpDownloaderStatsAction.NodeResponse( + GeoIpStatsAction.NodeResponse nodeResponse = new GeoIpStatsAction.NodeResponse( node, GeoIpDownloaderStatsSerializingTests.createRandomInstance(), databases, diff --git a/modules/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/stats/GeoIpDownloaderStatsActionResponseSerializingTests.java b/modules/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/stats/GeoIpStatsActionResponseSerializingTests.java similarity index 50% rename from modules/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/stats/GeoIpDownloaderStatsActionResponseSerializingTests.java rename to modules/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/stats/GeoIpStatsActionResponseSerializingTests.java index d566fa8838df..6e057843b977 100644 --- a/modules/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/stats/GeoIpDownloaderStatsActionResponseSerializingTests.java +++ b/modules/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/stats/GeoIpStatsActionResponseSerializingTests.java @@ -14,25 +14,24 @@ import org.elasticsearch.test.AbstractWireSerializingTestCase; import java.util.List; -public class GeoIpDownloaderStatsActionResponseSerializingTests extends AbstractWireSerializingTestCase< - GeoIpDownloaderStatsAction.Response> { +public class GeoIpStatsActionResponseSerializingTests extends AbstractWireSerializingTestCase { @Override - protected Writeable.Reader instanceReader() { - return GeoIpDownloaderStatsAction.Response::new; + protected Writeable.Reader instanceReader() { + return GeoIpStatsAction.Response::new; } @Override - protected GeoIpDownloaderStatsAction.Response createTestInstance() { - List nodeResponses = randomList( + protected GeoIpStatsAction.Response createTestInstance() { + List nodeResponses = randomList( 10, - GeoIpDownloaderStatsActionNodeResponseSerializingTests::createRandomInstance + GeoIpStatsActionNodeResponseSerializingTests::createRandomInstance ); - return new GeoIpDownloaderStatsAction.Response(ClusterName.DEFAULT, nodeResponses, List.of()); + return new GeoIpStatsAction.Response(ClusterName.DEFAULT, nodeResponses, List.of()); } @Override - protected GeoIpDownloaderStatsAction.Response mutateInstance(GeoIpDownloaderStatsAction.Response instance) { + protected GeoIpStatsAction.Response mutateInstance(GeoIpStatsAction.Response instance) { return null;// TODO implement https://github.com/elastic/elasticsearch/issues/25929 } }