[Rename] modules/ingest-geoip (#205)

Refactor ingest-geoip module as part of the Elasticsearch to OpenSearch renaming. Signed-off-by: Rabi Panda <adnapibar@gmail.com>
opensearch-project · Mar 5, 2021 · 9101d3c · 9101d3c
1 parent 5bbf684
commit 9101d3c
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 16 deletions.
diff --git 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/.../geoip/GeoIpProcessorNonIngestNodeIT.java → .../geoip/GeoIpProcessorNonIngestNodeIT.java b/.../geoip/GeoIpProcessorNonIngestNodeIT.java → .../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/...ngest/geoip/DatabaseReaderLazyLoader.java → ...ngest/geoip/DatabaseReaderLazyLoader.java b/...ngest/geoip/DatabaseReaderLazyLoader.java → ...ngest/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/...icsearch/ingest/geoip/GeoIpProcessor.java → ...ensearch/ingest/geoip/GeoIpProcessor.java b/...icsearch/ingest/geoip/GeoIpProcessor.java → ...ensearch/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/...earch/ingest/geoip/IngestGeoIpPlugin.java → ...earch/ingest/geoip/IngestGeoIpPlugin.java b/...earch/ingest/geoip/IngestGeoIpPlugin.java → ...earch/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/...est/geoip/GeoIpProcessorFactoryTests.java → ...est/geoip/GeoIpProcessorFactoryTests.java b/...est/geoip/GeoIpProcessorFactoryTests.java → ...est/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/...rch/ingest/geoip/GeoIpProcessorTests.java → ...rch/ingest/geoip/GeoIpProcessorTests.java b/...rch/ingest/geoip/GeoIpProcessorTests.java → ...rch/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/.../ingest/geoip/IngestGeoIpPluginTests.java → .../ingest/geoip/IngestGeoIpPluginTests.java b/.../ingest/geoip/IngestGeoIpPluginTests.java → .../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/...oip/IngestGeoIpClientYamlTestSuiteIT.java → ...oip/IngestGeoIpClientYamlTestSuiteIT.java b/...oip/IngestGeoIpClientYamlTestSuiteIT.java → ...oip/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;