Organizes the GeoIP processor Java packages. Use plugins.geoip as the…

… root package and then move processor-specific classes into plugins.geoip.processor. (opensearch-project#4240) Signed-off-by: David Venable <[email protected]>
kkondaka · Mar 6, 2024 · 5d1edb6 · 5d1edb6
1 parent 8c5bb54
commit 5d1edb6
Show file tree

Hide file tree

Showing 71 changed files with 282 additions and 283 deletions.
diff --git a/...pper/plugins/processor/GeoIPDatabase.java → ...aprepper/plugins/geoip/GeoIPDatabase.java b/...pper/plugins/processor/GeoIPDatabase.java → ...aprepper/plugins/geoip/GeoIPDatabase.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.dataprepper.plugins.processor;
+package org.opensearch.dataprepper.plugins.geoip;
 
 public enum GeoIPDatabase {
     CITY,

diff --git a/...prepper/plugins/processor/GeoIPField.java → ...dataprepper/plugins/geoip/GeoIPField.java b/...prepper/plugins/processor/GeoIPField.java → ...dataprepper/plugins/geoip/GeoIPField.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.dataprepper.plugins.processor;
+package org.opensearch.dataprepper.plugins.geoip;
 
 import java.util.Arrays;
 import java.util.HashSet;

diff --git a/...aseenrich/AutoCountingDatabaseReader.java → ...aseenrich/AutoCountingDatabaseReader.java b/...aseenrich/AutoCountingDatabaseReader.java → ...aseenrich/AutoCountingDatabaseReader.java
@@ -3,10 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.dataprepper.plugins.processor.databaseenrich;
+package org.opensearch.dataprepper.plugins.geoip.databaseenrich;
 
-import org.opensearch.dataprepper.plugins.processor.GeoIPDatabase;
-import org.opensearch.dataprepper.plugins.processor.GeoIPField;
+import org.opensearch.dataprepper.plugins.geoip.GeoIPDatabase;
+import org.opensearch.dataprepper.plugins.geoip.GeoIPField;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/.../databaseenrich/GeoIP2DatabaseReader.java → .../databaseenrich/GeoIP2DatabaseReader.java b/.../databaseenrich/GeoIP2DatabaseReader.java → .../databaseenrich/GeoIP2DatabaseReader.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.dataprepper.plugins.processor.databaseenrich;
+package org.opensearch.dataprepper.plugins.geoip.databaseenrich;
 
 import com.maxmind.geoip2.DatabaseReader;
 import com.maxmind.geoip2.exception.GeoIp2Exception;
@@ -16,13 +16,13 @@
 import com.maxmind.geoip2.record.Postal;
 import com.maxmind.geoip2.record.RepresentedCountry;
 import com.maxmind.geoip2.record.Subdivision;
-import org.opensearch.dataprepper.plugins.processor.GeoIPDatabase;
-import org.opensearch.dataprepper.plugins.processor.GeoIPField;
-import org.opensearch.dataprepper.plugins.processor.exception.DatabaseReaderInitializationException;
-import org.opensearch.dataprepper.plugins.processor.exception.EnrichFailedException;
-import org.opensearch.dataprepper.plugins.processor.exception.NoValidDatabaseFoundException;
-import org.opensearch.dataprepper.plugins.processor.extension.databasedownload.GeoIPFileManager;
-import org.opensearch.dataprepper.plugins.processor.extension.databasedownload.DatabaseReaderBuilder;
+import org.opensearch.dataprepper.plugins.geoip.GeoIPDatabase;
+import org.opensearch.dataprepper.plugins.geoip.GeoIPField;
+import org.opensearch.dataprepper.plugins.geoip.exception.DatabaseReaderInitializationException;
+import org.opensearch.dataprepper.plugins.geoip.exception.EnrichFailedException;
+import org.opensearch.dataprepper.plugins.geoip.exception.NoValidDatabaseFoundException;
+import org.opensearch.dataprepper.plugins.geoip.extension.databasedownload.DatabaseReaderBuilder;
+import org.opensearch.dataprepper.plugins.geoip.extension.databasedownload.GeoIPFileManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -39,7 +39,7 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import static org.opensearch.dataprepper.plugins.processor.extension.MaxMindDatabaseConfig.GEOIP2_ENTERPRISE;
+import static org.opensearch.dataprepper.plugins.geoip.extension.MaxMindDatabaseConfig.GEOIP2_ENTERPRISE;
 
 public class GeoIP2DatabaseReader implements GeoIPDatabaseReader, AutoCloseable {
     private static final Logger LOG = LoggerFactory.getLogger(GeoIP2DatabaseReader.class);

diff --git a/...r/databaseenrich/GeoIPDatabaseReader.java → ...p/databaseenrich/GeoIPDatabaseReader.java b/...r/databaseenrich/GeoIPDatabaseReader.java → ...p/databaseenrich/GeoIPDatabaseReader.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.dataprepper.plugins.processor.databaseenrich;
+package org.opensearch.dataprepper.plugins.geoip.databaseenrich;
 
 import com.maxmind.geoip2.model.AsnResponse;
 import com.maxmind.geoip2.record.City;
@@ -13,8 +13,8 @@
 import com.maxmind.geoip2.record.Postal;
 import com.maxmind.geoip2.record.RepresentedCountry;
 import com.maxmind.geoip2.record.Subdivision;
-import org.opensearch.dataprepper.plugins.processor.GeoIPDatabase;
-import org.opensearch.dataprepper.plugins.processor.GeoIPField;
+import org.opensearch.dataprepper.plugins.geoip.GeoIPDatabase;
+import org.opensearch.dataprepper.plugins.geoip.GeoIPField;
 
 import java.io.File;
 import java.net.InetAddress;

diff --git a/...atabaseenrich/GeoLite2DatabaseReader.java → ...atabaseenrich/GeoLite2DatabaseReader.java b/...atabaseenrich/GeoLite2DatabaseReader.java → ...atabaseenrich/GeoLite2DatabaseReader.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.dataprepper.plugins.processor.databaseenrich;
+package org.opensearch.dataprepper.plugins.geoip.databaseenrich;
 
 import com.maxmind.geoip2.DatabaseReader;
 import com.maxmind.geoip2.exception.GeoIp2Exception;
@@ -17,14 +17,14 @@
 import com.maxmind.geoip2.record.Postal;
 import com.maxmind.geoip2.record.RepresentedCountry;
 import com.maxmind.geoip2.record.Subdivision;
-import org.opensearch.dataprepper.plugins.processor.GeoIPDatabase;
-import org.opensearch.dataprepper.plugins.processor.GeoIPField;
-import org.opensearch.dataprepper.plugins.processor.exception.DatabaseReaderInitializationException;
-import org.opensearch.dataprepper.plugins.processor.exception.EngineFailureException;
-import org.opensearch.dataprepper.plugins.processor.exception.EnrichFailedException;
-import org.opensearch.dataprepper.plugins.processor.exception.NoValidDatabaseFoundException;
-import org.opensearch.dataprepper.plugins.processor.extension.databasedownload.GeoIPFileManager;
-import org.opensearch.dataprepper.plugins.processor.extension.databasedownload.DatabaseReaderBuilder;
+import org.opensearch.dataprepper.plugins.geoip.GeoIPDatabase;
+import org.opensearch.dataprepper.plugins.geoip.GeoIPField;
+import org.opensearch.dataprepper.plugins.geoip.exception.DatabaseReaderInitializationException;
+import org.opensearch.dataprepper.plugins.geoip.exception.EngineFailureException;
+import org.opensearch.dataprepper.plugins.geoip.exception.EnrichFailedException;
+import org.opensearch.dataprepper.plugins.geoip.exception.NoValidDatabaseFoundException;
+import org.opensearch.dataprepper.plugins.geoip.extension.databasedownload.DatabaseReaderBuilder;
+import org.opensearch.dataprepper.plugins.geoip.extension.databasedownload.GeoIPFileManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -40,9 +40,9 @@
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import static org.opensearch.dataprepper.plugins.processor.extension.MaxMindDatabaseConfig.GEOLITE2_ASN;
-import static org.opensearch.dataprepper.plugins.processor.extension.MaxMindDatabaseConfig.GEOLITE2_CITY;
-import static org.opensearch.dataprepper.plugins.processor.extension.MaxMindDatabaseConfig.GEOLITE2_COUNTRY;
+import static org.opensearch.dataprepper.plugins.geoip.extension.MaxMindDatabaseConfig.GEOLITE2_ASN;
+import static org.opensearch.dataprepper.plugins.geoip.extension.MaxMindDatabaseConfig.GEOLITE2_CITY;
+import static org.opensearch.dataprepper.plugins.geoip.extension.MaxMindDatabaseConfig.GEOLITE2_COUNTRY;
 
 public class GeoLite2DatabaseReader implements GeoIPDatabaseReader, AutoCloseable {
     private static final Logger LOG = LoggerFactory.getLogger(GeoLite2DatabaseReader.class);

diff --git a/...atabaseReaderInitializationException.java → ...atabaseReaderInitializationException.java b/...atabaseReaderInitializationException.java → ...atabaseReaderInitializationException.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.dataprepper.plugins.processor.exception;
+package org.opensearch.dataprepper.plugins.geoip.exception;
 
 public class DatabaseReaderInitializationException extends EngineFailureException {
     public DatabaseReaderInitializationException(final String exceptionMsg) {

diff --git a/...or/exception/DownloadFailedException.java → ...ip/exception/DownloadFailedException.java b/...or/exception/DownloadFailedException.java → ...ip/exception/DownloadFailedException.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.dataprepper.plugins.processor.exception;
+package org.opensearch.dataprepper.plugins.geoip.exception;
 
 /**
  * Implementation class for DownloadFailedException Custom exception

diff --git a/...sor/exception/EngineFailureException.java → ...oip/exception/EngineFailureException.java b/...sor/exception/EngineFailureException.java → ...oip/exception/EngineFailureException.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.dataprepper.plugins.processor.exception;
+package org.opensearch.dataprepper.plugins.geoip.exception;
 
 public class EngineFailureException extends RuntimeException {
     public EngineFailureException(final String exceptionMsg) {

diff --git a/...ssor/exception/EnrichFailedException.java → ...eoip/exception/EnrichFailedException.java b/...ssor/exception/EnrichFailedException.java → ...eoip/exception/EnrichFailedException.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.dataprepper.plugins.processor.exception;
+package org.opensearch.dataprepper.plugins.geoip.exception;
 
 /**
  * Implementation class for EnrichFailedException Custom exception

diff --git a/.../exception/InvalidIPAddressException.java → .../exception/InvalidIPAddressException.java b/.../exception/InvalidIPAddressException.java → .../exception/InvalidIPAddressException.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.dataprepper.plugins.processor.exception;
+package org.opensearch.dataprepper.plugins.geoip.exception;
 
 public class InvalidIPAddressException extends EnrichFailedException {
     public InvalidIPAddressException(final String exceptionMsg) {

diff --git a/...eption/NoValidDatabaseFoundException.java → ...eption/NoValidDatabaseFoundException.java b/...eption/NoValidDatabaseFoundException.java → ...eption/NoValidDatabaseFoundException.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.dataprepper.plugins.processor.exception;
+package org.opensearch.dataprepper.plugins.geoip.exception;
 
 public class NoValidDatabaseFoundException extends EngineFailureException {
     public NoValidDatabaseFoundException(final String exceptionMsg) {

diff --git a/...nsion/AwsAuthenticationOptionsConfig.java → ...nsion/AwsAuthenticationOptionsConfig.java b/...nsion/AwsAuthenticationOptionsConfig.java → ...nsion/AwsAuthenticationOptionsConfig.java
@@ -3,10 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.dataprepper.plugins.processor.extension;
+package org.opensearch.dataprepper.plugins.geoip.extension;
 
-import java.util.Map;
-import java.util.UUID;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import jakarta.validation.constraints.Size;
 import software.amazon.awssdk.arns.Arn;
@@ -17,6 +15,9 @@
 import software.amazon.awssdk.services.sts.auth.StsAssumeRoleCredentialsProvider;
 import software.amazon.awssdk.services.sts.model.AssumeRoleRequest;
 
+import java.util.Map;
+import java.util.UUID;
+
 /**
  * An implementation class AWS Authentication configuration
  */

diff --git a/...extension/DefaultGeoIpConfigSupplier.java → ...extension/DefaultGeoIpConfigSupplier.java b/...extension/DefaultGeoIpConfigSupplier.java → ...extension/DefaultGeoIpConfigSupplier.java
@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.dataprepper.plugins.processor.extension;
+package org.opensearch.dataprepper.plugins.geoip.extension;
 
-import org.opensearch.dataprepper.plugins.processor.extension.databasedownload.GeoIPDatabaseManager;
+import org.opensearch.dataprepper.plugins.geoip.extension.databasedownload.GeoIPDatabaseManager;
 
 import java.util.Optional;
 import java.util.concurrent.locks.ReentrantReadWriteLock;

diff --git a/...ssor/extension/GeoIPProcessorService.java → ...eoip/extension/GeoIPProcessorService.java b/...ssor/extension/GeoIPProcessorService.java → ...eoip/extension/GeoIPProcessorService.java
@@ -3,10 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.dataprepper.plugins.processor.extension;
+package org.opensearch.dataprepper.plugins.geoip.extension;
 
-import org.opensearch.dataprepper.plugins.processor.databaseenrich.GeoIPDatabaseReader;
-import org.opensearch.dataprepper.plugins.processor.extension.databasedownload.GeoIPDatabaseManager;
+import org.opensearch.dataprepper.plugins.geoip.databaseenrich.GeoIPDatabaseReader;
+import org.opensearch.dataprepper.plugins.geoip.extension.databasedownload.GeoIPDatabaseManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/...essor/extension/GeoIpConfigExtension.java → ...geoip/extension/GeoIpConfigExtension.java b/...essor/extension/GeoIpConfigExtension.java → ...geoip/extension/GeoIpConfigExtension.java
@@ -3,16 +3,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.dataprepper.plugins.processor.extension;
+package org.opensearch.dataprepper.plugins.geoip.extension;
 
 import org.opensearch.dataprepper.model.annotations.DataPrepperExtensionPlugin;
 import org.opensearch.dataprepper.model.annotations.DataPrepperPluginConstructor;
 import org.opensearch.dataprepper.model.plugin.ExtensionPlugin;
 import org.opensearch.dataprepper.model.plugin.ExtensionPoints;
-import org.opensearch.dataprepper.plugins.processor.extension.databasedownload.GeoIPFileManager;
-import org.opensearch.dataprepper.plugins.processor.extension.databasedownload.DatabaseReaderBuilder;
-import org.opensearch.dataprepper.plugins.processor.extension.databasedownload.GeoIPDatabaseManager;
-import org.opensearch.dataprepper.plugins.processor.utils.LicenseTypeCheck;
+import org.opensearch.dataprepper.plugins.geoip.extension.databasedownload.DatabaseReaderBuilder;
+import org.opensearch.dataprepper.plugins.geoip.extension.databasedownload.GeoIPDatabaseManager;
+import org.opensearch.dataprepper.plugins.geoip.extension.databasedownload.GeoIPFileManager;
+import org.opensearch.dataprepper.plugins.geoip.utils.LicenseTypeCheck;
 
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 

diff --git a/...cessor/extension/GeoIpConfigProvider.java → .../geoip/extension/GeoIpConfigProvider.java b/...cessor/extension/GeoIpConfigProvider.java → .../geoip/extension/GeoIpConfigProvider.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.dataprepper.plugins.processor.extension;
+package org.opensearch.dataprepper.plugins.geoip.extension;
 
 import org.opensearch.dataprepper.model.plugin.ExtensionProvider;
 

diff --git a/...cessor/extension/GeoIpConfigSupplier.java → .../geoip/extension/GeoIpConfigSupplier.java b/...cessor/extension/GeoIpConfigSupplier.java → .../geoip/extension/GeoIpConfigSupplier.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.dataprepper.plugins.processor.extension;
+package org.opensearch.dataprepper.plugins.geoip.extension;
 
 import java.util.Optional;
 

diff --git a/...ocessor/extension/GeoIpServiceConfig.java → ...s/geoip/extension/GeoIpServiceConfig.java b/...ocessor/extension/GeoIpServiceConfig.java → ...s/geoip/extension/GeoIpServiceConfig.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.dataprepper.plugins.processor.extension;
+package org.opensearch.dataprepper.plugins.geoip.extension;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import jakarta.validation.Valid;

diff --git a/...ns/processor/extension/MaxMindConfig.java → ...lugins/geoip/extension/MaxMindConfig.java b/...ns/processor/extension/MaxMindConfig.java → ...lugins/geoip/extension/MaxMindConfig.java
@@ -3,15 +3,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.dataprepper.plugins.processor.extension;
+package org.opensearch.dataprepper.plugins.geoip.extension;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.AssertTrue;
 import jakarta.validation.constraints.Min;
 import org.hibernate.validator.constraints.time.DurationMax;
 import org.hibernate.validator.constraints.time.DurationMin;
-import org.opensearch.dataprepper.plugins.processor.utils.DatabaseSourceIdentification;
+import org.opensearch.dataprepper.plugins.geoip.utils.DatabaseSourceIdentification;
 
 import java.io.File;
 import java.net.URI;

diff --git a/...ssor/extension/MaxMindDatabaseConfig.java → ...eoip/extension/MaxMindDatabaseConfig.java b/...ssor/extension/MaxMindDatabaseConfig.java → ...eoip/extension/MaxMindDatabaseConfig.java
@@ -3,12 +3,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.dataprepper.plugins.processor.extension;
+package org.opensearch.dataprepper.plugins.geoip.extension;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import jakarta.validation.constraints.AssertTrue;
-import org.opensearch.dataprepper.plugins.processor.extension.databasedownload.DBSourceOptions;
-import org.opensearch.dataprepper.plugins.processor.utils.DatabaseSourceIdentification;
+import org.opensearch.dataprepper.plugins.geoip.extension.databasedownload.DBSourceOptions;
+import org.opensearch.dataprepper.plugins.geoip.utils.DatabaseSourceIdentification;
 
 import java.util.ArrayList;
 import java.util.HashMap;

diff --git a/.../extension/databasedownload/DBSource.java → .../extension/databasedownload/DBSource.java b/.../extension/databasedownload/DBSource.java → .../extension/databasedownload/DBSource.java
@@ -3,14 +3,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.dataprepper.plugins.processor.extension.databasedownload;
+package org.opensearch.dataprepper.plugins.geoip.extension.databasedownload;
 
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.X509TrustManager;
+import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLSession;
-import javax.net.ssl.HostnameVerifier;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
 import java.security.KeyManagementException;
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;

diff --git a/...ion/databasedownload/DBSourceOptions.java → ...ion/databasedownload/DBSourceOptions.java b/...ion/databasedownload/DBSourceOptions.java → ...ion/databasedownload/DBSourceOptions.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.dataprepper.plugins.processor.extension.databasedownload;
+package org.opensearch.dataprepper.plugins.geoip.extension.databasedownload;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 

diff --git a/...tabasedownload/DatabaseReaderBuilder.java → ...tabasedownload/DatabaseReaderBuilder.java b/...tabasedownload/DatabaseReaderBuilder.java → ...tabasedownload/DatabaseReaderBuilder.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.dataprepper.plugins.processor.extension.databasedownload;
+package org.opensearch.dataprepper.plugins.geoip.extension.databasedownload;
 
 import com.maxmind.db.CHMCache;
 import com.maxmind.db.Reader;

diff --git a/...atabasedownload/GeoIPDatabaseManager.java → ...atabasedownload/GeoIPDatabaseManager.java b/...atabasedownload/GeoIPDatabaseManager.java → ...atabasedownload/GeoIPDatabaseManager.java
@@ -3,19 +3,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.dataprepper.plugins.processor.extension.databasedownload;
+package org.opensearch.dataprepper.plugins.geoip.extension.databasedownload;
 
 import com.linecorp.armeria.client.retry.Backoff;
-import org.opensearch.dataprepper.plugins.processor.databaseenrich.AutoCountingDatabaseReader;
-import org.opensearch.dataprepper.plugins.processor.databaseenrich.GeoIP2DatabaseReader;
-import org.opensearch.dataprepper.plugins.processor.databaseenrich.GeoIPDatabaseReader;
-import org.opensearch.dataprepper.plugins.processor.databaseenrich.GeoLite2DatabaseReader;
-import org.opensearch.dataprepper.plugins.processor.exception.DownloadFailedException;
-import org.opensearch.dataprepper.plugins.processor.exception.NoValidDatabaseFoundException;
-import org.opensearch.dataprepper.plugins.processor.extension.MaxMindConfig;
-import org.opensearch.dataprepper.plugins.processor.extension.MaxMindDatabaseConfig;
-import org.opensearch.dataprepper.plugins.processor.utils.DatabaseSourceIdentification;
-import org.opensearch.dataprepper.plugins.processor.utils.LicenseTypeCheck;
+import org.opensearch.dataprepper.plugins.geoip.databaseenrich.AutoCountingDatabaseReader;
+import org.opensearch.dataprepper.plugins.geoip.databaseenrich.GeoIP2DatabaseReader;
+import org.opensearch.dataprepper.plugins.geoip.databaseenrich.GeoIPDatabaseReader;
+import org.opensearch.dataprepper.plugins.geoip.databaseenrich.GeoLite2DatabaseReader;
+import org.opensearch.dataprepper.plugins.geoip.exception.DownloadFailedException;
+import org.opensearch.dataprepper.plugins.geoip.exception.NoValidDatabaseFoundException;
+import org.opensearch.dataprepper.plugins.geoip.extension.MaxMindConfig;
+import org.opensearch.dataprepper.plugins.geoip.extension.MaxMindDatabaseConfig;
+import org.opensearch.dataprepper.plugins.geoip.utils.DatabaseSourceIdentification;
+import org.opensearch.dataprepper.plugins.geoip.utils.LicenseTypeCheck;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/...on/databasedownload/GeoIPFileManager.java → ...on/databasedownload/GeoIPFileManager.java b/...on/databasedownload/GeoIPFileManager.java → ...on/databasedownload/GeoIPFileManager.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.dataprepper.plugins.processor.extension.databasedownload;
+package org.opensearch.dataprepper.plugins.geoip.extension.databasedownload;
 
 import java.io.File;