This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/streampipes.git
The following commit(s) were added to refs/heads/dev by this push:
new 297c3b7df feat: AdapterParameterExtractor now uses
IStaticPropertyExtractor (#2367)
297c3b7df is described below
commit 297c3b7dfed98484c85314ba125169a69bd65c11
Author: Philipp Zehnder <[email protected]>
AuthorDate: Mon Dec 25 23:51:50 2023 +0100
feat: AdapterParameterExtractor now uses IStaticPropertyExtractor (#2367)
---
.../management/connect/adapter/parser/CsvParser.java | 2 +-
.../management/connect/adapter/parser/xml/XmlParser.java | 2 +-
.../streampipes/sdk/extractor/AdapterParameterExtractor.java | 10 ++++++----
.../streampipes/sdk/extractor/StaticPropertyExtractor.java | 2 +-
4 files changed, 9 insertions(+), 7 deletions(-)
diff --git
a/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/connect/adapter/parser/CsvParser.java
b/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/connect/adapter/parser/CsvParser.java
index 1601c5181..bfa0cc299 100644
---
a/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/connect/adapter/parser/CsvParser.java
+++
b/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/connect/adapter/parser/CsvParser.java
@@ -79,7 +79,7 @@ public class CsvParser implements IParser {
@Override
public IParser fromDescription(List<StaticProperty> config) {
- StaticPropertyExtractor extractor = StaticPropertyExtractor.from(config);
+ var extractor = StaticPropertyExtractor.from(config);
char delimiter = extractor.singleValueParameter(DELIMITER,
String.class).charAt(0);
diff --git
a/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/connect/adapter/parser/xml/XmlParser.java
b/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/connect/adapter/parser/xml/XmlParser.java
index 9013d6be7..253844d8e 100644
---
a/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/connect/adapter/parser/xml/XmlParser.java
+++
b/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/connect/adapter/parser/xml/XmlParser.java
@@ -72,7 +72,7 @@ public class XmlParser implements IParser {
@Override
public IParser fromDescription(List<StaticProperty> configuration) {
- StaticPropertyExtractor extractor =
StaticPropertyExtractor.from(configuration);
+ var extractor = StaticPropertyExtractor.from(configuration);
var configuredTag = extractor.singleValueParameter(TAG, String.class);
diff --git
a/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/extractor/AdapterParameterExtractor.java
b/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/extractor/AdapterParameterExtractor.java
index 6874dea72..57011c18d 100644
---
a/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/extractor/AdapterParameterExtractor.java
+++
b/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/extractor/AdapterParameterExtractor.java
@@ -21,6 +21,7 @@ package org.apache.streampipes.sdk.extractor;
import org.apache.streampipes.commons.exceptions.connect.AdapterException;
import org.apache.streampipes.extensions.api.connect.IParser;
import
org.apache.streampipes.extensions.api.extractor.IAdapterParameterExtractor;
+import
org.apache.streampipes.extensions.api.extractor.IStaticPropertyExtractor;
import org.apache.streampipes.model.connect.adapter.AdapterDescription;
import org.apache.streampipes.model.staticproperty.StaticPropertyAlternative;
import org.apache.streampipes.model.staticproperty.StaticPropertyAlternatives;
@@ -32,12 +33,13 @@ public class AdapterParameterExtractor implements
IAdapterParameterExtractor {
private List<IParser> parsers;
- private final StaticPropertyExtractor staticPropertyExtractor;
+ private final IStaticPropertyExtractor staticPropertyExtractor;
private final AdapterDescription adapterDescription;
- public AdapterParameterExtractor(StaticPropertyExtractor extractor,
- AdapterDescription adapterDescription) {
+ public AdapterParameterExtractor(
+ IStaticPropertyExtractor extractor,
+ AdapterDescription adapterDescription) {
super();
this.staticPropertyExtractor = extractor;
this.adapterDescription = adapterDescription;
@@ -79,7 +81,7 @@ public class AdapterParameterExtractor implements
IAdapterParameterExtractor {
}
@Override
- public StaticPropertyExtractor getStaticPropertyExtractor() {
+ public IStaticPropertyExtractor getStaticPropertyExtractor() {
return staticPropertyExtractor;
}
diff --git
a/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/extractor/StaticPropertyExtractor.java
b/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/extractor/StaticPropertyExtractor.java
index 5603960e1..bdeb664e8 100644
---
a/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/extractor/StaticPropertyExtractor.java
+++
b/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/extractor/StaticPropertyExtractor.java
@@ -45,7 +45,7 @@ public class StaticPropertyExtractor extends
AbstractParameterExtractor<DataSink
return new StaticPropertyExtractor(dataSinkInvocation);
}
- public static StaticPropertyExtractor from(List<StaticProperty>
staticProperties) {
+ public static IStaticPropertyExtractor from(List<StaticProperty>
staticProperties) {
return from(staticProperties, new ArrayList<>());
}