This is an automated email from the ASF dual-hosted git repository. cdutz pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit 323f4f5b9df5168cdc2dcf2c6aa439fd890defb4 Author: Stefan Herrmann <[email protected]> AuthorDate: Fri Aug 16 17:16:01 2019 +0200 remove unneccessary source pojo --- .../java/org/apache/plc4x/logstash/Plc4xInput.java | 5 ++-- .../plc4x/logstash/configuration/Source.java | 27 ---------------------- .../org/apache/plc4x/logstash/Plc4xInputTest.java | 4 +--- 3 files changed, 3 insertions(+), 33 deletions(-) diff --git a/plc4j/integrations/logstash-plugin/src/main/java/org/apache/plc4x/logstash/Plc4xInput.java b/plc4j/integrations/logstash-plugin/src/main/java/org/apache/plc4x/logstash/Plc4xInput.java index 244ef9e..6be394a 100644 --- a/plc4j/integrations/logstash-plugin/src/main/java/org/apache/plc4x/logstash/Plc4xInput.java +++ b/plc4j/integrations/logstash-plugin/src/main/java/org/apache/plc4x/logstash/Plc4xInput.java @@ -30,7 +30,6 @@ import org.apache.plc4x.java.scraper.triggeredscraper.triggerhandler.collector.T import org.apache.plc4x.java.scraper.triggeredscraper.triggerhandler.collector.TriggerCollectorImpl; import org.apache.plc4x.java.utils.connectionpool.PooledPlcDriverManager; import org.apache.plc4x.logstash.configuration.Job; -import org.apache.plc4x.logstash.configuration.Source; import java.util.Arrays; import java.util.Collection; @@ -83,7 +82,7 @@ public class Plc4xInput implements Input { for (String sourceName : sources.keySet()) { //TODO: check ! - builder.addSource(sourceName, ((Source) sources.get(sourceName)).getConnectionUri()); + builder.addSource(sourceName, ((String) sources.get(sourceName))); } for (String jobName : jobs.keySet()) { @@ -97,7 +96,7 @@ public class Plc4xInput implements Input { String[] fieldSegments = query.split("="); if(fieldSegments.length != 2) { System.err.println(String.format("Error in job configuration '%s'. " + - "The field segment expects a format {field-alias}#{field-address}, but got '%s'", + "The field segment expects a format {field-alias}={field-address}, but got '%s'", jobName, query)); continue; } diff --git a/plc4j/integrations/logstash-plugin/src/main/java/org/apache/plc4x/logstash/configuration/Source.java b/plc4j/integrations/logstash-plugin/src/main/java/org/apache/plc4x/logstash/configuration/Source.java deleted file mode 100644 index b393b37..0000000 --- a/plc4j/integrations/logstash-plugin/src/main/java/org/apache/plc4x/logstash/configuration/Source.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.apache.plc4x.logstash.configuration; - -public class Source { - private final String connectionUri; - private final String sourceAlias; - - @Override - public String toString() { - return "Source{" + - "connectionUri='" + connectionUri + '\'' + - ", sourceAlias='" + sourceAlias + '\'' + - '}'; - } - - public String getConnectionUri() { - return connectionUri; - } - - public String getSourceAlias() { - return sourceAlias; - } - - public Source(String connectionUri, String sourceAlias) { - this.connectionUri = connectionUri; - this.sourceAlias = sourceAlias; - } -} diff --git a/plc4j/integrations/logstash-plugin/src/test/java/org/apache/plc4x/logstash/Plc4xInputTest.java b/plc4j/integrations/logstash-plugin/src/test/java/org/apache/plc4x/logstash/Plc4xInputTest.java index 4824e3c..16977f4 100644 --- a/plc4j/integrations/logstash-plugin/src/test/java/org/apache/plc4x/logstash/Plc4xInputTest.java +++ b/plc4j/integrations/logstash-plugin/src/test/java/org/apache/plc4x/logstash/Plc4xInputTest.java @@ -20,7 +20,6 @@ package org.apache.plc4x.logstash; import co.elastic.logstash.api.Configuration; import org.apache.plc4x.logstash.configuration.Job; -import org.apache.plc4x.logstash.configuration.Source; import org.assertj.core.util.Maps; import org.junit.jupiter.api.Test; import org.logstash.plugins.ConfigurationImpl; @@ -35,9 +34,8 @@ public class Plc4xInputTest { Map<String, Object> configValues = new HashMap<>(); Job job1 = new Job(300, Arrays.asList("testfield=RANDOM/foo:INTEGER"), Arrays.asList("TestConnection")); - Source testConnection = new Source("test:hurzpurzfurz", "TestConnection"); - configValues.put(Plc4xInput.SOURCE_CONFIG.name(), Maps.newHashMap(testConnection.getSourceAlias(), testConnection)); + configValues.put(Plc4xInput.SOURCE_CONFIG.name(), Maps.newHashMap("TestConnection", "test:hurzpurzfurz")); configValues.put(Plc4xInput.JOB_CONFIG.name(), Maps.newHashMap("job1", job1));
