Skip to content

Commit bdef04b

Browse files
yaauieyaauie
committed
catch up to upstream@e3ba1cba268
 - `new ${BRIDGE}(...)` -> `${BRIDGE}.create(...)`: use bridge-provided factory methods - `${INTERNAL}Bridge.${NESTED}` -> `${INTERNAL}${NESTED}Bridge`: extract nested bridges to top-level - `${BRIDGE}.AbstractExternal` -> `AbstractExternal${BRIDGE}`: extract nested "AbstractExternal" base implementations to top-level
1 parent fb94ed0 commit bdef04b

File tree

15 files changed

+53
-51
lines changed

15 files changed

+53
-51
lines changed

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
LOGSTASH_PATH=../../logstash
22
ELASTICSEARCH_REPO=yaauie/elasticsearch
3-
ELASTICSEARCH_TREEISH=rye-bridge-refinement-progress
3+
ELASTICSEARCH_TREEISH=rye-bridge-refinement-moar

‎lib/logstash/filters/elastic_integration.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -368,11 +368,11 @@ def _elasticsearch_rest_client(config, &builder_interceptor)
368368

369369
def initialize_event_processor!
370370
java_import('co.elastic.logstash.filters.elasticintegration.EventProcessorBuilder')
371-
java_import('org.elasticsearch.logstashbridge.geoip.GeoIpProcessorBridge')
371+
java_import('org.elasticsearch.logstashbridge.geoip.GeoIpProcessorFactoryBridge')
372372

373373
@event_processor = EventProcessorBuilder.fromElasticsearch(@elasticsearch_rest_client, extract_immutable_config)
374374
.setFilterMatchListener(method(:filter_matched_java).to_proc)
375-
.addProcessor("geoip") { GeoIpProcessorBridge::newFactory(@geoip_database_provider) }
375+
.addProcessor("geoip") { GeoIpProcessorFactoryBridge::create(@geoip_database_provider) }
376376
.build(@plugin_context)
377377
rescue => exception
378378
raise_config_error!("configuration did not produce an EventProcessor: #{exception}")

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public Collection<Event> processEvents(final Collection<Event> incomingEvents) t
9292
final CountDownLatch latch = new CountDownLatch(1);
9393
final IntegrationBatch batch = new IntegrationBatch(incomingEvents);
9494

95-
RefCountingRunnableBridge ref = new RefCountingRunnableBridge(latch::countDown);
95+
RefCountingRunnableBridge ref = RefCountingRunnableBridge.create(latch::countDown);
9696
try {
9797
batch.eachRequest(ref::acquire, this::processRequest);
9898
} finally {

‎src/main/java/co/elastic/logstash/filters/elasticintegration/EventProcessorBuilder.java‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222
import org.elasticsearch.logstashbridge.common.SettingsBridge;
2323
import org.elasticsearch.logstashbridge.core.IOUtilsBridge;
2424
import org.elasticsearch.logstashbridge.env.EnvironmentBridge;
25-
import org.elasticsearch.logstashbridge.ingest.ProcessorBridge;
25+
import org.elasticsearch.logstashbridge.ingest.ProcessorFactoryBridge;
26+
import org.elasticsearch.logstashbridge.ingest.ProcessorParametersBridge;
2627
import org.elasticsearch.logstashbridge.plugins.IngestCommonPluginBridge;
2728
import org.elasticsearch.logstashbridge.plugins.IngestPluginBridge;
2829
import org.elasticsearch.logstashbridge.plugins.IngestUserAgentPluginBridge;
@@ -196,7 +197,7 @@ private synchronized EventProcessorBuilder setFilterMatchListener(final FilterMa
196197
return this;
197198
}
198199

199-
public EventProcessorBuilder addProcessor(final String type, final Supplier<ProcessorBridge.Factory> processorFactorySupplier) {
200+
public EventProcessorBuilder addProcessor(final String type, final Supplier<ProcessorFactoryBridge> processorFactorySupplier) {
200201
return this.addProcessorsFromPlugin(SingleProcessorIngestPlugin.of(type, processorFactorySupplier));
201202
}
202203

@@ -226,22 +227,22 @@ public synchronized EventProcessor build(final PluginContext pluginContext) {
226227
try {
227228
final ArrayList<Service> services = new ArrayList<>();
228229

229-
final ThreadPoolBridge threadPool = new ThreadPoolBridge(settings);
230-
resourcesToClose.add(() -> ThreadPoolBridge.terminate(threadPool, 10, TimeUnit.SECONDS));
230+
final ThreadPoolBridge threadPool = ThreadPoolBridge.create(settings);
231+
resourcesToClose.add(() -> threadPool.terminate(10, TimeUnit.SECONDS));
231232

232-
final ScriptServiceBridge scriptService = new ScriptServiceBridge(settings, threadPool::absoluteTimeInMillis);
233+
final ScriptServiceBridge scriptService = ScriptServiceBridge.create(settings, threadPool::absoluteTimeInMillis);
233234
resourcesToClose.add(scriptService);
234235

235-
final EnvironmentBridge env = new EnvironmentBridge(settings, null);
236-
final ProcessorBridge.Parameters processorParameters = new ProcessorBridge.Parameters(env, scriptService, threadPool);
236+
final EnvironmentBridge env = EnvironmentBridge.create(settings, null);
237+
final ProcessorParametersBridge processorParameters = ProcessorParametersBridge.create(env, scriptService, threadPool);
237238

238239
IngestPipelineFactory ingestPipelineFactory = new IngestPipelineFactory(scriptService);
239240
for (Supplier<IngestPluginBridge> ingestPluginSupplier : ingestPlugins) {
240241
final IngestPluginBridge ingestPlugin = ingestPluginSupplier.get();
241242
if (ingestPlugin instanceof Closeable closeableIngestPlugin) {
242243
resourcesToClose.add(closeableIngestPlugin);
243244
}
244-
final Map<String, ProcessorBridge.Factory> processorFactories = ingestPlugin.getProcessors(processorParameters);
245+
final Map<String, ProcessorFactoryBridge> processorFactories = ingestPlugin.getProcessors(processorParameters);
245246
ingestPipelineFactory = ingestPipelineFactory.withProcessors(processorFactories);
246247
}
247248

‎src/main/java/co/elastic/logstash/filters/elasticintegration/IngestDuplexMarshaller.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ public IngestDocumentBridge toIngestDocument(final Event event) {
103103
final Timestamp eventTimestamp = safeTimestampFrom(event.getField(org.logstash.Event.TIMESTAMP));
104104
Map<String, Object> ingestMetadata = Map.of(INGEST_METADATA_TIMESTAMP_FIELD, Objects.requireNonNullElseGet(eventTimestamp, Timestamp::now).toString());
105105

106-
return new IngestDocumentBridge(sourceAndMetadata, ingestMetadata);
106+
return IngestDocumentBridge.create(sourceAndMetadata, ingestMetadata);
107107
}
108108

109109
/**

‎src/main/java/co/elastic/logstash/filters/elasticintegration/IngestPipelineFactory.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import org.elasticsearch.logstashbridge.ingest.PipelineBridge;
1313
import org.elasticsearch.logstashbridge.ingest.PipelineConfigurationBridge;
1414
import org.elasticsearch.logstashbridge.ingest.ProcessorBridge;
15+
import org.elasticsearch.logstashbridge.ingest.ProcessorFactoryBridge;
1516
import org.elasticsearch.logstashbridge.script.ScriptServiceBridge;
1617

1718
import java.util.HashMap;
@@ -24,7 +25,7 @@
2425
*/
2526
public class IngestPipelineFactory {
2627
private final ScriptServiceBridge scriptService;
27-
private final Map<String, ProcessorBridge.Factory> processorFactories;
28+
private final Map<String, ProcessorFactoryBridge> processorFactories;
2829

2930
private static final Logger LOGGER = LogManager.getLogger(IngestPipelineFactory.class);
3031

@@ -33,13 +34,13 @@ public IngestPipelineFactory(final ScriptServiceBridge scriptService) {
3334
}
3435

3536
private IngestPipelineFactory(final ScriptServiceBridge scriptService,
36-
final Map<String, ProcessorBridge.Factory> processorFactories) {
37+
final Map<String, ProcessorFactoryBridge> processorFactories) {
3738
this.scriptService = scriptService;
3839
this.processorFactories = Map.copyOf(processorFactories);
3940
}
4041

41-
public IngestPipelineFactory withProcessors(final Map<String, ProcessorBridge.Factory> processorFactories) {
42-
final Map<String, ProcessorBridge.Factory> intermediate = new HashMap<>(this.processorFactories);
42+
public IngestPipelineFactory withProcessors(final Map<String, ProcessorFactoryBridge> processorFactories) {
43+
final Map<String, ProcessorFactoryBridge> intermediate = new HashMap<>(this.processorFactories);
4344
intermediate.putAll(processorFactories);
4445
return new IngestPipelineFactory(scriptService, intermediate);
4546
}
@@ -63,7 +64,7 @@ public Optional<IngestPipeline> create(final PipelineConfigurationBridge pipelin
6364
* resolve pipelines through the provided {@link IngestPipelineResolver}.
6465
*/
6566
public IngestPipelineFactory withIngestPipelineResolver(final IngestPipelineResolver ingestPipelineResolver) {
66-
final Map<String, ProcessorBridge.Factory> modifiedProcessorFactories = new HashMap<>(this.processorFactories);
67+
final Map<String, ProcessorFactoryBridge> modifiedProcessorFactories = new HashMap<>(this.processorFactories);
6768
modifiedProcessorFactories.put(PipelineProcessor.TYPE, new PipelineProcessor.Factory(ingestPipelineResolver, this.scriptService));
6869
return new IngestPipelineFactory(scriptService, modifiedProcessorFactories);
6970
}

‎src/main/java/co/elastic/logstash/filters/elasticintegration/PipelineConfigurationFactory.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public PipelineConfigurationBridge parseNamedObject(final String json) throws Ex
4646
}
4747

4848
public PipelineConfigurationBridge parseConfigOnly(final String pipelineId, final String jsonEncodedConfig) {
49-
return new PipelineConfigurationBridge(pipelineId, jsonEncodedConfig);
49+
return PipelineConfigurationBridge.create(pipelineId, jsonEncodedConfig);
5050
}
5151

5252

@@ -66,7 +66,7 @@ public List<PipelineConfigurationBridge> get(){
6666
}
6767

6868
private static PipelineConfigurationBridge init(final String id, final String json) {
69-
return new PipelineConfigurationBridge(id, json);
69+
return PipelineConfigurationBridge.create(id, json);
7070
}
7171
}
7272
}

‎src/main/java/co/elastic/logstash/filters/elasticintegration/geoip/IpDatabaseAdapter.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import org.apache.logging.log4j.LogManager;
1010
import org.apache.logging.log4j.Logger;
1111
import org.elasticsearch.logstashbridge.core.CheckedBiFunctionBridge;
12+
import org.elasticsearch.logstashbridge.geoip.AbstractExternalIpDatabaseBridge;
1213
import org.elasticsearch.logstashbridge.geoip.IpDatabaseBridge;
1314
import org.elasticsearch.ingest.geoip.shaded.com.maxmind.db.CHMCache;
1415
import org.elasticsearch.ingest.geoip.shaded.com.maxmind.db.NoCache;
@@ -20,7 +21,7 @@
2021
import java.nio.file.Path;
2122
import java.util.Optional;
2223

23-
public class IpDatabaseAdapter extends IpDatabaseBridge.AbstractExternal {
24+
public class IpDatabaseAdapter extends AbstractExternalIpDatabaseBridge {
2425
private static final Logger LOGGER = LogManager.getLogger(IpDatabaseAdapter.class);
2526

2627
private final Reader databaseReader;

‎src/main/java/co/elastic/logstash/filters/elasticintegration/geoip/IpDatabaseProvider.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
import org.apache.logging.log4j.LogManager;
1010
import org.apache.logging.log4j.Logger;
1111
import org.elasticsearch.logstashbridge.core.IOUtilsBridge;
12+
import org.elasticsearch.logstashbridge.geoip.AbstractExternalIpDatabaseProviderBridge;
1213
import org.elasticsearch.logstashbridge.geoip.IpDatabaseBridge;
13-
import org.elasticsearch.logstashbridge.geoip.IpDatabaseProviderBridge;
1414

1515
import java.io.Closeable;
1616
import java.io.File;
@@ -23,7 +23,7 @@
2323
import java.util.Map;
2424
import java.util.Objects;
2525

26-
public class IpDatabaseProvider extends IpDatabaseProviderBridge.AbstractExternal implements Closeable {
26+
public class IpDatabaseProvider extends AbstractExternalIpDatabaseProviderBridge implements Closeable {
2727

2828
private static final Logger LOGGER = LogManager.getLogger(IpDatabaseProvider.class);
2929

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

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,29 +9,27 @@
99
import co.elastic.logstash.filters.elasticintegration.IngestPipeline;
1010
import co.elastic.logstash.filters.elasticintegration.IngestPipelineResolver;
1111
import org.elasticsearch.logstashbridge.common.ProjectIdBridge;
12-
import org.elasticsearch.logstashbridge.ingest.ConfigurationUtilsBridge;
13-
import org.elasticsearch.logstashbridge.ingest.IngestDocumentBridge;
14-
import org.elasticsearch.logstashbridge.ingest.ProcessorBridge;
12+
import org.elasticsearch.logstashbridge.ingest.*;
1513
import org.elasticsearch.logstashbridge.script.ScriptServiceBridge;
16-
import org.elasticsearch.logstashbridge.script.TemplateScriptBridge;
14+
import org.elasticsearch.logstashbridge.script.TemplateScriptFactoryBridge;
1715

1816
import java.util.Map;
1917
import java.util.function.BiConsumer;
2018

21-
public class PipelineProcessor extends ProcessorBridge.AbstractExternal {
19+
public class PipelineProcessor extends AbstractExternalProcessorBridge {
2220
public static final String TYPE = "pipeline";
2321

2422
private final String tag;
2523
private final String description;
2624
private final String pipelineName;
2725

28-
private final TemplateScriptBridge.Factory pipelineTemplate;
26+
private final TemplateScriptFactoryBridge pipelineTemplate;
2927
private final IngestPipelineResolver pipelineProvider;
3028
private final boolean ignoreMissingPipeline;
3129

3230
private PipelineProcessor(String tag,
3331
String description,
34-
TemplateScriptBridge.Factory pipelineTemplate,
32+
TemplateScriptFactoryBridge pipelineTemplate,
3533
String pipelineName,
3634
boolean ignoreMissingPipeline,
3735
IngestPipelineResolver pipelineProvider) {
@@ -87,7 +85,7 @@ public void execute(IngestDocumentBridge ingestDocument, BiConsumer<IngestDocume
8785
}
8886

8987

90-
public static class Factory extends ProcessorBridge.Factory.AbstractExternal {
88+
public static class Factory extends AbstractExternalProcessorFactoryBridge {
9189

9290
private final IngestPipelineResolver pipelineProvider;
9391
private final ScriptServiceBridge scriptService;
@@ -98,13 +96,13 @@ public Factory(IngestPipelineResolver pipelineProvider, ScriptServiceBridge scri
9896
}
9997

10098
@Override
101-
public ProcessorBridge create(Map<String, ProcessorBridge.Factory> registry,
99+
public ProcessorBridge create(Map<String, ProcessorFactoryBridge> registry,
102100
String processorTag,
103101
String description,
104102
Map<String, Object> config,
105103
ProjectIdBridge projectIdBridge) throws Exception {
106104
String pipeline = ConfigurationUtilsBridge.readStringProperty(TYPE, processorTag, config, "name");
107-
TemplateScriptBridge.Factory pipelineTemplate = ConfigurationUtilsBridge.compileTemplate(TYPE, processorTag, "name", pipeline, scriptService);
105+
TemplateScriptFactoryBridge pipelineTemplate = ConfigurationUtilsBridge.compileTemplate(TYPE, processorTag, "name", pipeline, scriptService);
108106
boolean ignoreMissingPipeline = ConfigurationUtilsBridge.readBooleanProperty(TYPE, processorTag, config, "ignore_missing_pipeline", false);
109107
return new PipelineProcessor(processorTag, description, pipelineTemplate, pipeline, ignoreMissingPipeline, pipelineProvider);
110108
}

0 commit comments

Comments
 (0)