Test

Author: mashhurs

libs/logstash-bridge/src/main/java/org/elasticsearch/logstashbridge/geoip/IpDatabaseBridge.java

@@ -16,7 +16,7 @@
 /**
  * An external bridge for {@link IpDatabase}
  */
-public interface IpDatabaseBridge {
+public interface IpDatabaseBridge extends StableBridgeAPI<IpDatabase> {
 
     String getDatabaseType() throws IOException;
 

libs/logstash-bridge/src/main/java/org/elasticsearch/logstashbridge/geoip/IpDatabaseProviderBridge.java

@@ -9,7 +9,6 @@
 package org.elasticsearch.logstashbridge.geoip;
 
 import org.elasticsearch.cluster.metadata.ProjectId;
-import org.elasticsearch.core.FixForMultiProject;
 import org.elasticsearch.ingest.Processor;
 import org.elasticsearch.ingest.geoip.IpDatabase;
 import org.elasticsearch.ingest.geoip.IpDatabaseProvider;
@@ -20,15 +19,9 @@
  */
 public interface IpDatabaseProviderBridge extends StableBridgeAPI<IpDatabaseProvider> {
 
-    @FixForMultiProject(description = "What ProjectId should be resolved for multi-project case?")
-    default Boolean isValid(String name) {
-        return toInternal().isValid(ProjectId.DEFAULT, name);
-    }
+    Boolean isValid(String name);
 
-    @FixForMultiProject(description = "What ProjectId should be resolved for multi-project case?")
-    default IpDatabaseBridge.ProxyInternal getDatabase(String name) {
-        return new IpDatabaseBridge.ProxyInternal(toInternal().getDatabase(ProjectId.DEFAULT, name));
-    }
+    IpDatabaseBridge getDatabase(String name);
 
     static IpDatabaseProviderBridge fromInternal(final IpDatabaseProvider internalProvider) {
         if (internalProvider instanceof IpDatabaseProviderBridge.AbstractExternal.ProxyExternal externalProxy) {
@@ -78,5 +71,16 @@ class ProxyInternal extends StableBridgeAPI.ProxyInternal<IpDatabaseProvider> im
         public ProxyInternal(final IpDatabaseProvider delegate) {
             super(delegate);
         }
+
+        @Override
+        public Boolean isValid(String name) {
+            return toInternal().isValid(ProjectId.DEFAULT, name);
+        }
+
+        @Override
+        public IpDatabaseBridge getDatabase(String name) {
+            IpDatabase ipDatabase = toInternal().getDatabase(ProjectId.DEFAULT, name);
+            return new IpDatabaseBridge.ProxyInternal(ipDatabase);
+        }
     }
 }