add static GeoIpProcessorBridge#newFactory(IpDatabaseProviderBridge)

Author: yaauie

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

@@ -9,16 +9,25 @@
 package org.elasticsearch.logstashbridge.geoip;
 
 import org.elasticsearch.ingest.geoip.GeoIpProcessor;
+import org.elasticsearch.logstashbridge.StableBridgeAPI;
 import org.elasticsearch.logstashbridge.ingest.ProcessorBridge;
 
 /**
  * An external bridge for {@link GeoIpProcessor}
  */
-public interface GeoIpProcessorBridge {
+public interface GeoIpProcessorBridge extends StableBridgeAPI<GeoIpProcessor> {
 
+    static Factory newFactory(final IpDatabaseProviderBridge ipDatabaseProviderBridge) {
+        return new Factory(ipDatabaseProviderBridge);
+    }
+
+    /**
+     * A {@link ProcessorBridge.Factory} implementation for the {@link GeoIpProcessor}
+     */
     class Factory extends ProcessorBridge.Factory.ProxyInternal {
-        public Factory(final String type, final IpDatabaseProviderBridge ipDatabaseProviderBridge) {
-            super(new GeoIpProcessor.Factory(type, ipDatabaseProviderBridge.toInternal()));
+
+        Factory(final IpDatabaseProviderBridge ipDatabaseProviderBridge) {
+            super(new GeoIpProcessor.Factory("geoip", ipDatabaseProviderBridge.toInternal()));
         }
     }
 }

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

@@ -34,7 +34,7 @@ public interface IpDatabaseBridge extends StableBridgeAPI<IpDatabase> {
      * The {@code IpDatabaseBridge.AbstractExternal} is an abstract base class for implementing
      * the {@link IpDatabaseBridge} externally to the Elasticsearch code-base. It takes care of
      * the details of maintaining a singular internal-form implementation of {@link IpDatabase}
-     * that proxies calls through the external implementation.
+     * that proxies calls to the external implementation.
      */
     abstract class AbstractExternal implements IpDatabaseBridge {
         private ProxyExternal internalDatabase;

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

@@ -29,7 +29,7 @@ public interface IpDatabaseProviderBridge extends StableBridgeAPI<IpDatabaseProv
      * The {@code IpDatabaseProviderBridge.AbstractExternal} is an abstract base class for implementing
      * the {@link IpDatabaseProviderBridge} externally to the Elasticsearch code-base. It takes care of
      * the details of maintaining a singular internal-form implementation of {@link IpDatabaseProvider}
-     * that proxies calls through the external implementation.
+     * that proxies calls to the external implementation.
      */
     abstract class AbstractExternal implements IpDatabaseProviderBridge {
         private AbstractExternal.ProxyExternal internalProcessor;

libs/logstash-bridge/src/main/java/org/elasticsearch/logstashbridge/ingest/FailProcessorExceptionBridge.java

@@ -189,17 +189,6 @@ static Factory fromInternal(final Processor.Factory delegate) {
             return new ProxyInternal(delegate);
         }
 
-        @Override
-        default Processor.Factory toInternal() {
-            final Factory stableAPIFactory = this;
-            return (registry, tag, description, config, projectId) -> stableAPIFactory.create(
-                StableBridgeAPI.fromInternal(registry, Factory::fromInternal),
-                tag,
-                description,
-                config
-            ).toInternal();
-        }
-
         /**
          * An implementation of {@link ProcessorBridge.Factory} that proxies to an internal {@link Processor.Factory}
          */
@@ -216,9 +205,16 @@ public ProcessorBridge create(
                 final String description,
                 final Map<String, Object> config
             ) throws Exception {
-                return ProcessorBridge.fromInternal(
-                    this.internalDelegate.create(StableBridgeAPI.toInternal(registry), processorTag, description, config, ProjectId.DEFAULT)
+                final Map<String, Processor.Factory> internalRegistry = StableBridgeAPI.toInternal(registry);
+                final Processor.Factory internalFactory = toInternal();
+                final Processor internalProcessor = internalFactory.create(
+                    internalRegistry,
+                    processorTag,
+                    description,
+                    config,
+                    ProjectId.DEFAULT
                 );
+                return ProcessorBridge.fromInternal(internalProcessor);
             }
 
             @Override