You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ri...@apache.org on 2020/09/15 18:44:17 UTC

[incubator-streampipes] 01/02: [STREAMPIPES-217] Add additional file extensions to SDK

This is an automated email from the ASF dual-hosted git repository.

riemer pushed a commit to branch rel/0.67.0
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git

commit 05c788b539254663fdc8f489b7e9efaf4156e9bd
Author: Dominik Riemer <ri...@fzi.de>
AuthorDate: Tue Sep 15 20:43:32 2020 +0200

    [STREAMPIPES-217] Add additional file extensions to SDK
---
 .../org/apache/streampipes/sdk/StaticProperties.java     | 16 ++++++++++++++++
 .../org/apache/streampipes/sdk/helpers/Filetypes.java    |  6 ++++--
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/StaticProperties.java b/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/StaticProperties.java
index c3779b1..e074de2 100644
--- a/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/StaticProperties.java
+++ b/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/StaticProperties.java
@@ -20,11 +20,13 @@ package org.apache.streampipes.sdk;
 
 import org.apache.streampipes.model.schema.PropertyScope;
 import org.apache.streampipes.model.staticproperty.*;
+import org.apache.streampipes.sdk.helpers.Filetypes;
 import org.apache.streampipes.sdk.helpers.Label;
 import org.apache.streampipes.sdk.helpers.RequirementsSelector;
 import org.apache.streampipes.sdk.utils.Datatypes;
 
 import java.net.URI;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -68,6 +70,20 @@ public class StaticProperties {
     return fp;
   }
 
+  public static FileStaticProperty fileProperty(Label label, Filetypes... requiredFiletypes) {
+    FileStaticProperty fp = fileProperty(label);
+    List<String> collectedFiletypes = new ArrayList<>();
+    Arrays.stream(requiredFiletypes).forEach(rf -> collectedFiletypes.addAll(rf.getFileExtensions()));
+    fp.setRequiredFiletypes(collectedFiletypes);
+    return fp;
+  }
+
+  public static FileStaticProperty fileProperty(Label label, String... requiredFiletypes) {
+    FileStaticProperty fp = fileProperty(label);
+    fp.setRequiredFiletypes(Arrays.asList(requiredFiletypes.clone()));
+    return fp;
+  }
+
   public static RuntimeResolvableOneOfStaticProperty singleValueSelectionFromContainer(Label label) {
     return new RuntimeResolvableOneOfStaticProperty(label.getInternalId(), label
             .getLabel(), label.getDescription());
diff --git a/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/helpers/Filetypes.java b/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/helpers/Filetypes.java
index 8ac43d2..2ac00e6 100644
--- a/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/helpers/Filetypes.java
+++ b/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/helpers/Filetypes.java
@@ -23,10 +23,12 @@ import java.util.List;
 public enum Filetypes {
 
   CSV("csv"),
+  JPG("jpg", "jpeg"),
   JSON("json"),
+  XLS("xls"),
+  XLSX("xlsx"),
   XML("xml"),
-  ZIP("zip"),
-  JPG("jpg", "jpeg");
+  ZIP("zip");
 
   private List<String> fileExtensions;