Do a horrible thing as an experimental workaround for the logstash issue

Author: PeteGillinElastic

modules/ingest-geoip/src/internalClusterTest/java/org/elasticsearch/ingest/geoip/DatabaseNodeServiceIT.java

@@ -93,7 +93,7 @@ private void assertValidDatabase(DatabaseNodeService databaseNodeService, String
         IpDatabase database = databaseNodeService.getDatabase(databaseFileName);
         assertNotNull(database);
         assertThat(database.getDatabaseType(), equalTo(databaseType));
-        GeoIpTestUtils.SimpleCountry countryResponse = database.getResponse("89.160.20.128", GeoIpTestUtils::getCountry);
+        GeoIpTestUtils.SimpleCountry countryResponse = database.getTypedResponse("89.160.20.128", GeoIpTestUtils::getCountry);
         assertNotNull(countryResponse);
         assertThat(countryResponse.countryName(), equalTo("Sweden"));
     }

modules/ingest-geoip/src/internalClusterTest/java/org/elasticsearch/ingest/geoip/ReloadingDatabasesWhilePerformingGeoLookupsIT.java

@@ -213,10 +213,10 @@ private static DatabaseNodeService createRegistry(Path geoIpConfigDir, Path geoI
     private static void lazyLoadReaders(DatabaseNodeService databaseNodeService) throws IOException {
         if (databaseNodeService.get("GeoLite2-City.mmdb") != null) {
             databaseNodeService.get("GeoLite2-City.mmdb").getDatabaseType();
-            databaseNodeService.get("GeoLite2-City.mmdb").getResponse("2.125.160.216", GeoIpTestUtils::getCity);
+            databaseNodeService.get("GeoLite2-City.mmdb").getTypedResponse("2.125.160.216", GeoIpTestUtils::getCity);
         }
         databaseNodeService.get("GeoLite2-City-Test.mmdb").getDatabaseType();
-        databaseNodeService.get("GeoLite2-City-Test.mmdb").getResponse("2.125.160.216", GeoIpTestUtils::getCity);
+        databaseNodeService.get("GeoLite2-City-Test.mmdb").getTypedResponse("2.125.160.216", GeoIpTestUtils::getCity);
     }
 
 }

modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/DatabaseReaderLazyLoader.java

@@ -105,10 +105,9 @@ int current() {
         return currentUsages.get();
     }
 
-    @Override
     @Nullable
     @FixForMultiProject // do not use ProjectId.DEFAULT
-    public <RESPONSE extends Response> RESPONSE getResponse(
+    public <RESPONSE extends Response> RESPONSE getTypedResponse(
         String ipAddress,
         CheckedBiFunction<Reader, String, RESPONSE, Exception> responseProvider
     ) {

modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/IpDatabase.java

@@ -35,10 +35,38 @@ public interface IpDatabase extends AutoCloseable {
      * @return a possibly-null response
      */
     @Nullable
-    <RESPONSE extends Response> RESPONSE getResponse(
+    @Deprecated // use getTypedResponse instead
+    default <RESPONSE> RESPONSE getResponse(String ipAddress, CheckedBiFunction<Reader, String, RESPONSE, Exception> responseProvider) {
+        // TODO(pete): Decide what to do here
+        // TODO(pete): This is one option, which makes this method work so long as it is invoked with a type which satisfies the constraint,
+        // but fails nastily if it doesn't.
+        // @SuppressWarnings("unchecked") // TODO(pete): Put some words of wisdom here
+        // RESPONSE typedResponse = (RESPONSE) getTypedResponse(
+        // ipAddress,
+        // (CheckedBiFunction<Reader, String, ? extends Response, Exception>) responseProvider
+        // );
+        // return typedResponse;
+        // TODO(pete): This is the other option, which fails fast. Which is okay as nothing calls this method.
+        // TODO(pete): If we do this, add a message to the exception.
+        throw new UnsupportedOperationException();
+    }
+
+    // TODO(pete): If we end up doing this, pick a better name for getTypedResponse() and document why we do this weird thing.
+
+    /**
+     * Returns a response from this database's reader for the given IP address.
+     *
+     * @param ipAddress the address to lookup
+     * @param responseProvider a method for extracting a response from a {@link Reader}, usually this will be a method reference
+     * @return a possibly-null response
+     */
+    @Nullable
+    default <RESPONSE extends Response> RESPONSE getTypedResponse(
         String ipAddress,
         CheckedBiFunction<Reader, String, RESPONSE, Exception> responseProvider
-    );
+    ) {
+        return getResponse(ipAddress, responseProvider);
+    }
 
     /**
      * Releases the current database object. Called after processing a single document. Databases should be closed or returned to a

modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/IpinfoIpDataLookups.java

@@ -479,7 +479,7 @@ public Set<Database.Property> getProperties() {
 
         @Override
         public final Map<String, Object> getData(final IpDatabase ipDatabase, final String ipAddress) {
-            final Result<RESPONSE> response = ipDatabase.getResponse(ipAddress, this::lookup);
+            final Result<RESPONSE> response = ipDatabase.getTypedResponse(ipAddress, this::lookup);
             return (response == null || response.result() == null) ? Map.of() : transform(response);
         }
 

modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/MaxmindIpDataLookups.java

@@ -938,7 +938,7 @@ public Set<Database.Property> getProperties() {
 
         @Override
         public final Map<String, Object> getData(final IpDatabase ipDatabase, final String ipAddress) {
-            final RECORD response = ipDatabase.getResponse(ipAddress, this::lookup);
+            final RECORD response = ipDatabase.getTypedResponse(ipAddress, this::lookup);
             return (response == null) ? Map.of() : transform(response);
         }
 

modules/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/ConfigDatabasesTests.java

@@ -124,7 +124,7 @@ public void testDatabasesUpdateExistingConfDatabase() throws Exception {
 
             DatabaseReaderLazyLoader loader = configDatabases.getDatabase("GeoLite2-City.mmdb");
             assertThat(loader.getDatabaseType(), equalTo("GeoLite2-City"));
-            GeoIpTestUtils.SimpleCity cityResponse = loader.getResponse("89.160.20.128", GeoIpTestUtils::getCity);
+            GeoIpTestUtils.SimpleCity cityResponse = loader.getTypedResponse("89.160.20.128", GeoIpTestUtils::getCity);
             assertThat(cityResponse.cityName(), equalTo("Tumba"));
             assertThat(cache.count(), equalTo(1));
         }
@@ -136,7 +136,7 @@ public void testDatabasesUpdateExistingConfDatabase() throws Exception {
 
             DatabaseReaderLazyLoader loader = configDatabases.getDatabase("GeoLite2-City.mmdb");
             assertThat(loader.getDatabaseType(), equalTo("GeoLite2-City"));
-            GeoIpTestUtils.SimpleCity cityResponse = loader.getResponse("89.160.20.128", GeoIpTestUtils::getCity);
+            GeoIpTestUtils.SimpleCity cityResponse = loader.getTypedResponse("89.160.20.128", GeoIpTestUtils::getCity);
             assertThat(cityResponse.cityName(), equalTo("Linköping"));
             assertThat(cache.count(), equalTo(1));
         });

modules/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/GeoIpTestUtils.java

@@ -70,7 +70,7 @@ static void copyDefaultDatabases(final Path directory, ConfigDatabases configDat
     public record SimpleCity(String cityName) implements IpDatabase.Response {}
 
     /**
-     * A static city-specific responseProvider for use with {@link IpDatabase#getResponse(String, CheckedBiFunction)} in
+     * A static city-specific responseProvider for use with {@link IpDatabase#getTypedResponse(String, CheckedBiFunction)} in
      * tests.
      * <p>
      * Like this: {@code SimpleCity city = loader.getResponse("some.ip.address", GeoIpTestUtils::getCity);}
@@ -84,7 +84,7 @@ public static SimpleCity getCity(Reader reader, String ip) throws IOException {
     public record SimpleCountry(String countryName) implements IpDatabase.Response {}
 
     /**
-     * A static country-specific responseProvider for use with {@link IpDatabase#getResponse(String, CheckedBiFunction)} in
+     * A static country-specific responseProvider for use with {@link IpDatabase#getTypedResponse(String, CheckedBiFunction)} in
      * tests.
      * <p>
      * Like this: {@code SimpleCountry country = loader.getResponse("some.ip.address", GeoIpTestUtils::getCountry);}