You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ze...@apache.org on 2021/10/07 20:54:11 UTC
[incubator-streampipes-extensions] branch STREAMPIPES-438 updated:
Update adapter descriptions
This is an automated email from the ASF dual-hosted git repository.
zehnder pushed a commit to branch STREAMPIPES-438
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes-extensions.git
The following commit(s) were added to refs/heads/STREAMPIPES-438 by this push:
new 75fb6ce Update adapter descriptions
75fb6ce is described below
commit 75fb6cee37923041d2197ae453892adf289bc692
Author: Philipp Zehnder <ze...@fzi.de>
AuthorDate: Thu Oct 7 22:53:57 2021 +0200
Update adapter descriptions
---
.../streampipes/connect/adapters/flic/FlicUtils.java | 1 -
.../connect/adapters/gdelt/GdeltAdapter.java | 1 -
.../streampipes/connect/adapters/netio/NetioUtils.java | 1 -
.../trafficcamera/NswTrafficCameraAdapter.java | 2 --
.../adapters/plc4x/modbus/Plc4xModbusAdapter.java | 1 -
.../adapters/plc4x/passive/Plc4xPassiveAdapter.java | 1 -
.../connect/adapters/plc4x/s7/Plc4xS7Adapter.java | 1 -
.../connect/adapters/ros/RosBridgeAdapter.java | 1 -
.../connect/adapters/sensemap/OpenSenseMapAdapter.java | 1 -
.../streampipes/connect/protocol/set/FileProtocol.java | 2 +-
.../streampipes/connect/protocol/set/HttpProtocol.java | 2 +-
.../connect/protocol/stream/BrokerProtocol.java | 2 +-
.../connect/protocol/stream/FileStreamProtocol.java | 2 +-
.../connect/protocol/stream/HDFSProtocol.java | 2 +-
.../connect/protocol/stream/HttpStreamProtocol.java | 17 ++++++++---------
15 files changed, 13 insertions(+), 24 deletions(-)
diff --git a/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/flic/FlicUtils.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/flic/FlicUtils.java
index 7b84a05..7b0b6b9 100644
--- a/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/flic/FlicUtils.java
+++ b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/flic/FlicUtils.java
@@ -58,7 +58,6 @@ public class FlicUtils {
eventSchema.setEventProperties(allProperties);
guessSchema.setEventSchema(eventSchema);
- guessSchema.setPropertyProbabilityList(new ArrayList<>());
return guessSchema;
}
diff --git a/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/gdelt/GdeltAdapter.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/gdelt/GdeltAdapter.java
index 2c88948..3daf6b1 100644
--- a/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/gdelt/GdeltAdapter.java
+++ b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/gdelt/GdeltAdapter.java
@@ -181,7 +181,6 @@ public class GdeltAdapter extends PullAdapter {
eventSchema.setEventProperties(allProperties);
guessSchema.setEventSchema(eventSchema);
- guessSchema.setPropertyProbabilityList(new ArrayList<>());
return guessSchema;
}
diff --git a/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/netio/NetioUtils.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/netio/NetioUtils.java
index 0ed5690..2a47cc1 100644
--- a/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/netio/NetioUtils.java
+++ b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/netio/NetioUtils.java
@@ -155,7 +155,6 @@ public class NetioUtils {
eventSchema.setEventProperties(allProperties);
guessSchema.setEventSchema(eventSchema);
- guessSchema.setPropertyProbabilityList(new ArrayList<>());
return guessSchema;
}
diff --git a/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/nswaustralia/trafficcamera/NswTrafficCameraAdapter.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/nswaustralia/trafficcamera/NswTrafficCameraAdapter.java
index 7cee65b..341b471 100644
--- a/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/nswaustralia/trafficcamera/NswTrafficCameraAdapter.java
+++ b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/nswaustralia/trafficcamera/NswTrafficCameraAdapter.java
@@ -38,7 +38,6 @@ import org.apache.streampipes.sdk.utils.Datatypes;
import java.io.IOException;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
@@ -141,7 +140,6 @@ public class NswTrafficCameraAdapter extends PullAdapter {
GuessSchema guessSchema = new GuessSchema();
guessSchema.setEventSchema(schema);
- guessSchema.setPropertyProbabilityList(Collections.emptyList());
return guessSchema;
}
diff --git a/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/plc4x/modbus/Plc4xModbusAdapter.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/plc4x/modbus/Plc4xModbusAdapter.java
index 42182ec..94cb39c 100644
--- a/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/plc4x/modbus/Plc4xModbusAdapter.java
+++ b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/plc4x/modbus/Plc4xModbusAdapter.java
@@ -215,7 +215,6 @@ public class Plc4xModbusAdapter extends PullAdapter{
eventSchema.setEventProperties(allProperties);
guessSchema.setEventSchema(eventSchema);
- guessSchema.setPropertyProbabilityList(new ArrayList<>());
return guessSchema;
}
diff --git a/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/plc4x/passive/Plc4xPassiveAdapter.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/plc4x/passive/Plc4xPassiveAdapter.java
index 8549a05..9d8b069 100644
--- a/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/plc4x/passive/Plc4xPassiveAdapter.java
+++ b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/plc4x/passive/Plc4xPassiveAdapter.java
@@ -91,7 +91,6 @@ public class Plc4xPassiveAdapter extends SpecificDataStreamAdapter {
eventSchema.setEventProperties(allProperties);
guessSchema.setEventSchema(eventSchema);
- guessSchema.setPropertyProbabilityList(new ArrayList<>());
return guessSchema;
}
diff --git a/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/plc4x/s7/Plc4xS7Adapter.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/plc4x/s7/Plc4xS7Adapter.java
index cafb7e9..9c631e7 100644
--- a/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/plc4x/s7/Plc4xS7Adapter.java
+++ b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/plc4x/s7/Plc4xS7Adapter.java
@@ -157,7 +157,6 @@ public class Plc4xS7Adapter extends PullAdapter {
eventSchema.setEventProperties(allProperties);
guessSchema.setEventSchema(eventSchema);
- guessSchema.setPropertyProbabilityList(new ArrayList<>());
return guessSchema;
}
diff --git a/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/ros/RosBridgeAdapter.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/ros/RosBridgeAdapter.java
index 2a99f1d..d6bcf4a 100644
--- a/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/ros/RosBridgeAdapter.java
+++ b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/ros/RosBridgeAdapter.java
@@ -202,7 +202,6 @@ public class RosBridgeAdapter extends SpecificDataStreamAdapter implements Resol
GuessSchema guessSchema = new GuessSchema();
guessSchema.setEventSchema(eventSchema);
- guessSchema.setPropertyProbabilityList(new ArrayList<>());
return guessSchema;
}
diff --git a/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/sensemap/OpenSenseMapAdapter.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/sensemap/OpenSenseMapAdapter.java
index 48bc058..3bf0e26 100644
--- a/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/sensemap/OpenSenseMapAdapter.java
+++ b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/sensemap/OpenSenseMapAdapter.java
@@ -207,7 +207,6 @@ public class OpenSenseMapAdapter extends PullRestAdapter {
eventSchema.setEventProperties(allProperties);
guessSchema.setEventSchema(eventSchema);
- guessSchema.setPropertyProbabilityList(new ArrayList<>());
return guessSchema;
}
diff --git a/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/set/FileProtocol.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/set/FileProtocol.java
index ef1edd3..c002e08 100644
--- a/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/set/FileProtocol.java
+++ b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/set/FileProtocol.java
@@ -125,7 +125,7 @@ public class FileProtocol extends Protocol {
EventSchema eventSchema = parser.getEventSchema(dataByte);
- GuessSchema result = SchemaGuesser.guessSchma(eventSchema, getNElements(20));
+ GuessSchema result = SchemaGuesser.guessSchma(eventSchema);
return result;
} catch (FileNotFoundException e) {
diff --git a/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/set/HttpProtocol.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/set/HttpProtocol.java
index 8693a6e..6e27c97 100644
--- a/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/set/HttpProtocol.java
+++ b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/set/HttpProtocol.java
@@ -116,7 +116,7 @@ public class HttpProtocol extends Protocol {
EventSchema eventSchema= parser.getEventSchema(dataByte);
- GuessSchema result = SchemaGuesser.guessSchma(eventSchema, getNElements(2));
+ GuessSchema result = SchemaGuesser.guessSchma(eventSchema);
return result;
}
diff --git a/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/stream/BrokerProtocol.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/stream/BrokerProtocol.java
index 058c0d4..2f31723 100644
--- a/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/stream/BrokerProtocol.java
+++ b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/stream/BrokerProtocol.java
@@ -50,7 +50,7 @@ public abstract class BrokerProtocol extends Protocol {
List<byte[]> eventByte = getNByteElements(1);
EventSchema eventSchema = parser.getEventSchema(eventByte);
- return SchemaGuesser.guessSchma(eventSchema, getNElements(1));
+ return SchemaGuesser.guessSchma(eventSchema);
}
@Override
diff --git a/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/stream/FileStreamProtocol.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/stream/FileStreamProtocol.java
index 579d01f..e50979b 100644
--- a/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/stream/FileStreamProtocol.java
+++ b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/stream/FileStreamProtocol.java
@@ -211,7 +211,7 @@ public class FileStreamProtocol extends Protocol {
EventSchema eventSchema = parser.getEventSchema(dataByte);
- GuessSchema result = SchemaGuesser.guessSchma(eventSchema, getNElements(2));
+ GuessSchema result = SchemaGuesser.guessSchma(eventSchema);
return result;
}
diff --git a/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/stream/HDFSProtocol.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/stream/HDFSProtocol.java
index 59999aa..2c9f6d4 100644
--- a/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/stream/HDFSProtocol.java
+++ b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/stream/HDFSProtocol.java
@@ -135,7 +135,7 @@ public class HDFSProtocol extends Protocol {
dataByte.addAll(dataByte);
}
EventSchema eventSchema = parser.getEventSchema(dataByte);
- result = SchemaGuesser.guessSchma(eventSchema, getNElements(n));
+ result = SchemaGuesser.guessSchma(eventSchema);
return result;
diff --git a/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/stream/HttpStreamProtocol.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/stream/HttpStreamProtocol.java
index a467b96..652d149 100644
--- a/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/stream/HttpStreamProtocol.java
+++ b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/stream/HttpStreamProtocol.java
@@ -19,17 +19,12 @@
package org.apache.streampipes.connect.protocol.stream;
import org.apache.http.client.fluent.Request;
-import org.apache.streampipes.connect.api.IParser;
-import org.apache.streampipes.sdk.helpers.Locales;
-import org.apache.streampipes.sdk.utils.Assets;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.apache.streampipes.connect.api.exception.ParseException;
import org.apache.streampipes.connect.adapter.guess.SchemaGuesser;
-import org.apache.streampipes.connect.api.IFormat;
-import org.apache.streampipes.connect.adapter.model.generic.Parser;
import org.apache.streampipes.connect.adapter.model.generic.Protocol;
import org.apache.streampipes.connect.adapter.sdk.ParameterExtractor;
+import org.apache.streampipes.connect.api.IFormat;
+import org.apache.streampipes.connect.api.IParser;
+import org.apache.streampipes.connect.api.exception.ParseException;
import org.apache.streampipes.model.AdapterType;
import org.apache.streampipes.model.connect.grounding.ProtocolDescription;
import org.apache.streampipes.model.connect.guess.GuessSchema;
@@ -37,6 +32,10 @@ import org.apache.streampipes.model.schema.EventSchema;
import org.apache.streampipes.sdk.builder.adapter.ProtocolDescriptionBuilder;
import org.apache.streampipes.sdk.helpers.AdapterSourceType;
import org.apache.streampipes.sdk.helpers.Labels;
+import org.apache.streampipes.sdk.helpers.Locales;
+import org.apache.streampipes.sdk.utils.Assets;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.InputStream;
import java.util.ArrayList;
@@ -113,7 +112,7 @@ public class HttpStreamProtocol extends PullProtocol {
dataByte.addAll(dataByte);
}
EventSchema eventSchema= parser.getEventSchema(dataByte);
- GuessSchema result = SchemaGuesser.guessSchma(eventSchema, getNElements(n));
+ GuessSchema result = SchemaGuesser.guessSchma(eventSchema);
return result;
}