Point to PR base ES upstream repo and branch, minor source simplifications.

Author: mashhurs

gradle.properties

@@ -1,3 +1,3 @@
 LOGSTASH_PATH=../../logstash
-ELASTICSEARCH_REPO=yaauie/elasticsearch
-ELASTICSEARCH_TREEISH=rye-bridge-refinement-moar
+ELASTICSEARCH_REPO=mashhurs/elasticsearch
+ELASTICSEARCH_TREEISH=logstash-bridge-geoip-interfaces

src/main/java/co/elastic/logstash/filters/elasticintegration/EventProcessor.java

@@ -92,11 +92,8 @@ public Collection<Event> processEvents(final Collection<Event> incomingEvents) t
         final CountDownLatch latch = new CountDownLatch(1);
         final IntegrationBatch batch = new IntegrationBatch(incomingEvents);
 
-        RefCountingRunnableBridge ref = RefCountingRunnableBridge.create(latch::countDown);
-        try {
+        try (RefCountingRunnableBridge ref = RefCountingRunnableBridge.create(latch::countDown)) {
             batch.eachRequest(ref::acquire, this::processRequest);
-        } finally {
-            ref.close();
         }
 
         // await on work that has gone async

src/main/java/co/elastic/logstash/filters/elasticintegration/ingest/PipelineProcessor.java

@@ -9,7 +9,12 @@
 import co.elastic.logstash.filters.elasticintegration.IngestPipeline;
 import co.elastic.logstash.filters.elasticintegration.IngestPipelineResolver;
 import org.elasticsearch.logstashbridge.common.ProjectIdBridge;
-import org.elasticsearch.logstashbridge.ingest.*;
+import org.elasticsearch.logstashbridge.ingest.AbstractExternalProcessorBridge;
+import org.elasticsearch.logstashbridge.ingest.AbstractExternalProcessorFactoryBridge;
+import org.elasticsearch.logstashbridge.ingest.ConfigurationUtilsBridge;
+import org.elasticsearch.logstashbridge.ingest.IngestDocumentBridge;
+import org.elasticsearch.logstashbridge.ingest.ProcessorBridge;
+import org.elasticsearch.logstashbridge.ingest.ProcessorFactoryBridge;
 import org.elasticsearch.logstashbridge.script.ScriptServiceBridge;
 import org.elasticsearch.logstashbridge.script.TemplateScriptFactoryBridge;
 

src/main/java/co/elastic/logstash/filters/elasticintegration/ingest/SetSecurityUserProcessor.java

@@ -7,7 +7,11 @@
 package co.elastic.logstash.filters.elasticintegration.ingest;
 
 import org.elasticsearch.logstashbridge.common.ProjectIdBridge;
-import org.elasticsearch.logstashbridge.ingest.*;
+import org.elasticsearch.logstashbridge.ingest.AbstractExternalProcessorBridge;
+import org.elasticsearch.logstashbridge.ingest.AbstractExternalProcessorFactoryBridge;
+import org.elasticsearch.logstashbridge.ingest.IngestDocumentBridge;
+import org.elasticsearch.logstashbridge.ingest.ProcessorBridge;
+import org.elasticsearch.logstashbridge.ingest.ProcessorFactoryBridge;
 
 import java.util.Map;
 import java.util.function.BiConsumer;