From 9101d3c0ee8c2f451c23a85dd9a706bd9e630240 Mon Sep 17 00:00:00 2001 From: Rabi Panda Date: Thu, 4 Mar 2021 16:06:30 -0800 Subject: [PATCH] [Rename] modules/ingest-geoip (#205) Refactor ingest-geoip module as part of the Elasticsearch to OpenSearch renaming. Signed-off-by: Rabi Panda --- modules/ingest-geoip/build.gradle | 8 ++++---- .../ingest/geoip/GeoIpProcessorNonIngestNodeIT.java | 2 +- .../ingest/geoip/DatabaseReaderLazyLoader.java | 2 +- .../ingest/geoip/GeoIpProcessor.java | 4 ++-- .../ingest/geoip/IngestGeoIpPlugin.java | 2 +- .../ingest/geoip/GeoIpProcessorFactoryTests.java | 4 ++-- .../ingest/geoip/GeoIpProcessorTests.java | 4 ++-- .../ingest/geoip/IngestGeoIpPluginTests.java | 4 ++-- .../ingest/geoip/IngestGeoIpClientYamlTestSuiteIT.java | 2 +- 9 files changed, 16 insertions(+), 16 deletions(-) rename modules/ingest-geoip/src/internalClusterTest/java/org/{elasticsearch => opensearch}/ingest/geoip/GeoIpProcessorNonIngestNodeIT.java (99%) rename modules/ingest-geoip/src/main/java/org/{elasticsearch => opensearch}/ingest/geoip/DatabaseReaderLazyLoader.java (99%) rename modules/ingest-geoip/src/main/java/org/{elasticsearch => opensearch}/ingest/geoip/GeoIpProcessor.java (99%) rename modules/ingest-geoip/src/main/java/org/{elasticsearch => opensearch}/ingest/geoip/IngestGeoIpPlugin.java (99%) rename modules/ingest-geoip/src/test/java/org/{elasticsearch => opensearch}/ingest/geoip/GeoIpProcessorFactoryTests.java (99%) rename modules/ingest-geoip/src/test/java/org/{elasticsearch => opensearch}/ingest/geoip/GeoIpProcessorTests.java (99%) rename modules/ingest-geoip/src/test/java/org/{elasticsearch => opensearch}/ingest/geoip/IngestGeoIpPluginTests.java (96%) rename modules/ingest-geoip/src/yamlRestTest/java/org/{elasticsearch => opensearch}/ingest/geoip/IngestGeoIpClientYamlTestSuiteIT.java (97%) diff --git a/modules/ingest-geoip/build.gradle b/modules/ingest-geoip/build.gradle index d0ddd9bcba774..79eda9ff90c7f 100644 --- a/modules/ingest-geoip/build.gradle +++ b/modules/ingest-geoip/build.gradle @@ -19,12 +19,12 @@ import org.apache.tools.ant.taskdefs.condition.Os -apply plugin: 'elasticsearch.yaml-rest-test' -apply plugin: 'elasticsearch.internal-cluster-test' +apply plugin: 'opensearch.yaml-rest-test' +apply plugin: 'opensearch.internal-cluster-test' esplugin { description 'Ingest processor that uses looksup geo data based on ip adresses using the Maxmind geo database' - classname 'org.elasticsearch.ingest.geoip.IngestGeoIpPlugin' + classname 'org.opensearch.ingest.geoip.IngestGeoIpPlugin' } dependencies { @@ -34,7 +34,7 @@ dependencies { api("com.fasterxml.jackson.core:jackson-databind:${versions.jackson}") api('com.maxmind.db:maxmind-db:1.3.1') - testImplementation 'org.elasticsearch:geolite2-databases:20191119' + testImplementation 'org.opensearch:geolite2-databases:20191119' } restResources { diff --git a/modules/ingest-geoip/src/internalClusterTest/java/org/elasticsearch/ingest/geoip/GeoIpProcessorNonIngestNodeIT.java b/modules/ingest-geoip/src/internalClusterTest/java/org/opensearch/ingest/geoip/GeoIpProcessorNonIngestNodeIT.java similarity index 99% rename from modules/ingest-geoip/src/internalClusterTest/java/org/elasticsearch/ingest/geoip/GeoIpProcessorNonIngestNodeIT.java rename to modules/ingest-geoip/src/internalClusterTest/java/org/opensearch/ingest/geoip/GeoIpProcessorNonIngestNodeIT.java index 011ae5121bf0f..0a4437851a131 100644 --- a/modules/ingest-geoip/src/internalClusterTest/java/org/elasticsearch/ingest/geoip/GeoIpProcessorNonIngestNodeIT.java +++ b/modules/ingest-geoip/src/internalClusterTest/java/org/opensearch/ingest/geoip/GeoIpProcessorNonIngestNodeIT.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.ingest.geoip; +package org.opensearch.ingest.geoip; import org.apache.lucene.util.Constants; import org.elasticsearch.action.index.IndexRequest; diff --git a/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/DatabaseReaderLazyLoader.java b/modules/ingest-geoip/src/main/java/org/opensearch/ingest/geoip/DatabaseReaderLazyLoader.java similarity index 99% rename from modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/DatabaseReaderLazyLoader.java rename to modules/ingest-geoip/src/main/java/org/opensearch/ingest/geoip/DatabaseReaderLazyLoader.java index 34e3b456b3e17..0211979084392 100644 --- a/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/DatabaseReaderLazyLoader.java +++ b/modules/ingest-geoip/src/main/java/org/opensearch/ingest/geoip/DatabaseReaderLazyLoader.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.ingest.geoip; +package org.opensearch.ingest.geoip; import com.maxmind.geoip2.DatabaseReader; import org.apache.logging.log4j.LogManager; diff --git a/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/GeoIpProcessor.java b/modules/ingest-geoip/src/main/java/org/opensearch/ingest/geoip/GeoIpProcessor.java similarity index 99% rename from modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/GeoIpProcessor.java rename to modules/ingest-geoip/src/main/java/org/opensearch/ingest/geoip/GeoIpProcessor.java index 5b7865eba4217..9c4f0cd6c071f 100644 --- a/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/GeoIpProcessor.java +++ b/modules/ingest-geoip/src/main/java/org/opensearch/ingest/geoip/GeoIpProcessor.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.ingest.geoip; +package org.opensearch.ingest.geoip; import com.maxmind.db.Network; import com.maxmind.geoip2.exception.AddressNotFoundException; @@ -36,7 +36,7 @@ import org.elasticsearch.ingest.AbstractProcessor; import org.elasticsearch.ingest.IngestDocument; import org.elasticsearch.ingest.Processor; -import org.elasticsearch.ingest.geoip.IngestGeoIpPlugin.GeoIpCache; +import org.opensearch.ingest.geoip.IngestGeoIpPlugin.GeoIpCache; import java.io.IOException; import java.net.InetAddress; diff --git a/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/IngestGeoIpPlugin.java b/modules/ingest-geoip/src/main/java/org/opensearch/ingest/geoip/IngestGeoIpPlugin.java similarity index 99% rename from modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/IngestGeoIpPlugin.java rename to modules/ingest-geoip/src/main/java/org/opensearch/ingest/geoip/IngestGeoIpPlugin.java index a170b4417739b..97e4dac657fa2 100644 --- a/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/IngestGeoIpPlugin.java +++ b/modules/ingest-geoip/src/main/java/org/opensearch/ingest/geoip/IngestGeoIpPlugin.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.ingest.geoip; +package org.opensearch.ingest.geoip; import com.maxmind.db.NoCache; import com.maxmind.db.NodeCache; diff --git a/modules/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/GeoIpProcessorFactoryTests.java b/modules/ingest-geoip/src/test/java/org/opensearch/ingest/geoip/GeoIpProcessorFactoryTests.java similarity index 99% rename from modules/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/GeoIpProcessorFactoryTests.java rename to modules/ingest-geoip/src/test/java/org/opensearch/ingest/geoip/GeoIpProcessorFactoryTests.java index 00613b5582b6d..8edb1218c1c1b 100644 --- a/modules/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/GeoIpProcessorFactoryTests.java +++ b/modules/ingest-geoip/src/test/java/org/opensearch/ingest/geoip/GeoIpProcessorFactoryTests.java @@ -17,14 +17,14 @@ * under the License. */ -package org.elasticsearch.ingest.geoip; +package org.opensearch.ingest.geoip; import com.carrotsearch.randomizedtesting.generators.RandomPicks; import org.elasticsearch.OpenSearchParseException; import org.elasticsearch.common.Randomness; import org.elasticsearch.index.VersionType; import org.elasticsearch.ingest.IngestDocument; -import org.elasticsearch.ingest.geoip.IngestGeoIpPlugin.GeoIpCache; +import org.opensearch.ingest.geoip.IngestGeoIpPlugin.GeoIpCache; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.StreamsUtils; import org.junit.AfterClass; diff --git a/modules/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/GeoIpProcessorTests.java b/modules/ingest-geoip/src/test/java/org/opensearch/ingest/geoip/GeoIpProcessorTests.java similarity index 99% rename from modules/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/GeoIpProcessorTests.java rename to modules/ingest-geoip/src/test/java/org/opensearch/ingest/geoip/GeoIpProcessorTests.java index e580b1eb4f823..724cb5f30a0f6 100644 --- a/modules/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/GeoIpProcessorTests.java +++ b/modules/ingest-geoip/src/test/java/org/opensearch/ingest/geoip/GeoIpProcessorTests.java @@ -17,14 +17,14 @@ * under the License. */ -package org.elasticsearch.ingest.geoip; +package org.opensearch.ingest.geoip; import com.maxmind.geoip2.DatabaseReader; import org.elasticsearch.common.CheckedSupplier; import org.elasticsearch.common.io.PathUtils; import org.elasticsearch.ingest.IngestDocument; import org.elasticsearch.ingest.RandomDocumentPicks; -import org.elasticsearch.ingest.geoip.IngestGeoIpPlugin.GeoIpCache; +import org.opensearch.ingest.geoip.IngestGeoIpPlugin.GeoIpCache; import org.elasticsearch.test.ESTestCase; import java.io.IOException; diff --git a/modules/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/IngestGeoIpPluginTests.java b/modules/ingest-geoip/src/test/java/org/opensearch/ingest/geoip/IngestGeoIpPluginTests.java similarity index 96% rename from modules/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/IngestGeoIpPluginTests.java rename to modules/ingest-geoip/src/test/java/org/opensearch/ingest/geoip/IngestGeoIpPluginTests.java index 884056bb0be8b..be09ab835c91e 100644 --- a/modules/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/IngestGeoIpPluginTests.java +++ b/modules/ingest-geoip/src/test/java/org/opensearch/ingest/geoip/IngestGeoIpPluginTests.java @@ -17,11 +17,11 @@ * under the License. */ -package org.elasticsearch.ingest.geoip; +package org.opensearch.ingest.geoip; import com.maxmind.geoip2.model.AbstractResponse; import org.elasticsearch.common.network.InetAddresses; -import org.elasticsearch.ingest.geoip.IngestGeoIpPlugin.GeoIpCache; +import org.opensearch.ingest.geoip.IngestGeoIpPlugin.GeoIpCache; import org.elasticsearch.test.ESTestCase; import static org.mockito.Mockito.mock; diff --git a/modules/ingest-geoip/src/yamlRestTest/java/org/elasticsearch/ingest/geoip/IngestGeoIpClientYamlTestSuiteIT.java b/modules/ingest-geoip/src/yamlRestTest/java/org/opensearch/ingest/geoip/IngestGeoIpClientYamlTestSuiteIT.java similarity index 97% rename from modules/ingest-geoip/src/yamlRestTest/java/org/elasticsearch/ingest/geoip/IngestGeoIpClientYamlTestSuiteIT.java rename to modules/ingest-geoip/src/yamlRestTest/java/org/opensearch/ingest/geoip/IngestGeoIpClientYamlTestSuiteIT.java index c247011d5d0f7..305ea2b27ff3f 100644 --- a/modules/ingest-geoip/src/yamlRestTest/java/org/elasticsearch/ingest/geoip/IngestGeoIpClientYamlTestSuiteIT.java +++ b/modules/ingest-geoip/src/yamlRestTest/java/org/opensearch/ingest/geoip/IngestGeoIpClientYamlTestSuiteIT.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.ingest.geoip; +package org.opensearch.ingest.geoip; import com.carrotsearch.randomizedtesting.annotations.Name; import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;