Apply conteptually modification (internal, external and bridge processor) changes.

Author: mashhurs

build.gradle

@@ -211,7 +211,7 @@ task unzipDownloadedElasticsearchSourceZip(dependsOn: downloadElasticsearchSourc
     }
 }
 
-task buildElasticsearchLocalDistro(dependsOn: unzipDownloadedElasticsearchSourceZip, type: Exec) {
+task buildElasticsearchLocalDistro(type: Exec) {
     description "builds Elasticsearch localDistro"
 
     def logFile = project.file("${buildDir}/elasticsearch-build.log")
@@ -221,7 +221,7 @@ task buildElasticsearchLocalDistro(dependsOn: unzipDownloadedElasticsearchSource
         errorOutput = funneler.funnelInstance
     }
 
-    def esSource = "${buildDir}/elasticsearch-source/"
+    def esSource = "/Users/mashhur/Dev/elastic/elasticsearch/"
     def esBuildDir = "${esSource}/build"
 
     inputs.dir esSource
@@ -261,6 +261,7 @@ task buildElasticsearchLogstashBridge(type: Exec) {
     description "builds logstash-bridge lib module"
 
     dependsOn buildElasticsearchLocalDistro
+    mustRunAfter buildElasticsearchLocalDistro
 
     def logFile = project.file("${buildDir}/logstash-bridge-build.log")
     doFirst {
@@ -269,7 +270,7 @@ task buildElasticsearchLogstashBridge(type: Exec) {
         errorOutput = funneler.funnelInstance
     }
 
-    def esSource = "${buildDir}/elasticsearch-source/"
+    def esSource = "/Users/mashhur/Dev/elastic/elasticsearch/"
     def esBuildDir = "${esSource}/build"
 
     inputs.dir esSource
@@ -358,14 +359,14 @@ task shadeElasticsearchLogstashBridge(type: com.github.jengelman.gradle.plugins.
     description "Shades the Elasticsearch logstash-bridge jar"
 
     dependsOn buildElasticsearchLogstashBridge
-
-    from("${buildDir}/elasticsearch-source/libs/logstash-bridge/build/distributions") {
+    
+    from("/Users/mashhur/Dev/elastic/elasticsearch/libs/logstash-bridge/build/distributions") {
         include "elasticsearch-logstash-bridge-*.jar"
     }
-
+    
     archiveFileName = "elasticsearch-logstash-bridge-shaded.jar"
     destinationDirectory = file("${buildDir}/shaded")
-
+    
     exclude '**/module-info.class'
 }
 

src/main/java/co/elastic/logstash/filters/elasticintegration/geoip/GeoIpProcessorFactory.java

@@ -24,10 +24,10 @@ public ProcessorBridge create(Map<String, ProcessorBridge.Factory> processorFact
                             String tag,
                             String description,
                             Map<String, Object> config) throws Exception {
-        return ProcessorBridge.wrap(new GeoIpProcessor.Factory("geoip", this.ipDatabaseProvider)
+        return ProcessorBridge.fromInternal(new GeoIpProcessor.Factory("geoip", this.ipDatabaseProvider)
                 .create(processorFactories.entrySet()
                                 .stream()
-                                .collect(Collectors.toMap(Map.Entry::getKey,e -> e.getValue().unwrap())),
+                                .collect(Collectors.toMap(Map.Entry::getKey,e -> e.getValue().toInternal())),
                         tag,
                         description,
                         config,

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

@@ -17,7 +17,7 @@
 import java.util.Map;
 import java.util.function.BiConsumer;
 
-public class PipelineProcessor implements ProcessorBridge {
+public class PipelineProcessor extends ProcessorBridge.AbstractExternal {
     public static final String TYPE = "pipeline";
 
     private final String tag;

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

@@ -12,7 +12,7 @@
 import java.util.Map;
 import java.util.function.BiConsumer;
 
-public class SetSecurityUserProcessor implements ProcessorBridge {
+public class SetSecurityUserProcessor extends ProcessorBridge.AbstractExternal {
 
     public static final String TYPE = "set_security_user";
     private final String tag;