Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Rename] modules/ingest-geoip #205

Merged
merged 1 commit into from
Mar 5, 2021
Merged

[Rename] modules/ingest-geoip #205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions modules/ingest-geoip/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion .../geoip/GeoIpProcessorNonIngestNodeIT.java → .../geoip/GeoIpProcessorNonIngestNodeIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...ngest/geoip/DatabaseReaderLazyLoader.java → ...ngest/geoip/DatabaseReaderLazyLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...icsearch/ingest/geoip/GeoIpProcessor.java → ...ensearch/ingest/geoip/GeoIpProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...earch/ingest/geoip/IngestGeoIpPlugin.java → ...earch/ingest/geoip/IngestGeoIpPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...est/geoip/GeoIpProcessorFactoryTests.java → ...est/geoip/GeoIpProcessorFactoryTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...rch/ingest/geoip/GeoIpProcessorTests.java → ...rch/ingest/geoip/GeoIpProcessorTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions .../ingest/geoip/IngestGeoIpPluginTests.java → .../ingest/geoip/IngestGeoIpPluginTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...oip/IngestGeoIpClientYamlTestSuiteIT.java → ...oip/IngestGeoIpClientYamlTestSuiteIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down