[incubator-streampipes] branch STREAMPIPES-79 updated (7889cd8 -> 53cdddf)

[ze...@apache.org]

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

zehnder pushed a change to branch STREAMPIPES-79
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git.


    from 7889cd8  Fix layout issue in labeling dialog of "timeseries labeling tool"
     add 030d999  [STREAMPIPES-133] Add CodeInputStaticProperty
     add 55c12a3  [STREAMPIPES-133]: Add feature to reset code template
     add 1370d91  Update badges in README
     add c5d8ecd  [STREAMPIPES-134]: Add initial version of UserDefinedOutputStrategy
     new 53cdddf  Merge branch 'dev' into STREAMPIPES-79

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 README.md                                          |  4 +-
 ...trategy.java => UserDefinedOutputStrategy.java} | 19 ++---
 ...cProperty.java => CodeInputStaticProperty.java} | 45 +++++++----
 .../model/staticproperty/StaticPropertyType.java   |  3 +-
 .../org/apache/streampipes/model/util/Cloner.java  | 35 ++-------
 .../matching/output/OutputSchemaFactory.java       | 11 +--
 ....java => UserDefinedOutputSchemaGenerator.java} | 25 +++---
 ...AbstractConfigurablePipelineElementBuilder.java | 33 ++++----
 .../sdk/extractor/AbstractParameterExtractor.java  | 22 ++----
 .../helpers/{Locales.java => CodeLanguage.java}    | 23 +++---
 .../streampipes/sdk/helpers/OutputStrategies.java  | 18 +++--
 .../jsonld/CustomAnnotationProvider.java           | 60 +++-----------
 .../apache/streampipes/vocabulary/StreamPipes.java |  6 ++
 ui/package.json                                    |  2 +
 .../components/code/code-editor.directive.ts       | 91 ++++++++++++++++++++++
 .../code.component.ts}                             | 14 ++--
 .../code.controller.ts}                            | 31 ++++----
 .../components/code/code.tmpl.html}                | 20 +++--
 .../customize/customize-dialog.tmpl.html           |  5 ++
 .../user-defined-output.component.ts}              |  8 +-
 .../user-defined-output.controller.ts              | 87 +++++++++++++++++++++
 .../user-defined-output.tmpl.html                  | 55 +++++++++++++
 .../customizeElementDialog.tmpl.html               | 12 ++-
 ui/src/app/editor/editor.module.ts                 |  6 ++
 ui/src/scss/main.scss                              |  6 ++
 ui/src/scss/sp/main.scss                           |  4 +
 26 files changed, 429 insertions(+), 216 deletions(-)
 copy streampipes-model/src/main/java/org/apache/streampipes/model/output/{CustomTransformOutputStrategy.java => UserDefinedOutputStrategy.java} (78%)
 copy streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/{SecretStaticProperty.java => CodeInputStaticProperty.java} (55%)
 copy streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/matching/output/{FixedOutputSchemaGenerator.java => UserDefinedOutputSchemaGenerator.java} (58%)
 copy streampipes-sdk/src/main/java/org/apache/streampipes/sdk/helpers/{Locales.java => CodeLanguage.java} (65%)
 create mode 100644 ui/src/app/editor/components/code/code-editor.directive.ts
 copy ui/src/app/editor/components/{alternative/alternative.component.ts => code/code.component.ts} (79%)
 copy ui/src/app/editor/components/{customize/customize-dialog.controller.ts => code/code.controller.ts} (70%)
 copy ui/src/app/{sensors/components/general/advanced-settings.tmpl.html => editor/components/code/code.tmpl.html} (55%)
 copy ui/src/app/editor/components/{customoutput/customoutput.component.ts => userdefinedoutput/user-defined-output.component.ts} (81%)
 create mode 100644 ui/src/app/editor/components/userdefinedoutput/user-defined-output.controller.ts
 create mode 100644 ui/src/app/editor/components/userdefinedoutput/user-defined-output.tmpl.html

[incubator-streampipes] 01/01: Merge branch 'dev' into STREAMPIPES-79

[ze...@apache.org]

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

zehnder pushed a commit to branch STREAMPIPES-79
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git

commit 53cdddf685b442d9c62e224f236dd6f2dcba7001
Merge: 7889cd8 c5d8ecd
Author: Philipp Zehnder <ze...@fzi.de>
AuthorDate: Fri May 22 22:36:07 2020 +0200

    Merge branch 'dev' into STREAMPIPES-79

 README.md                                          |  4 +-
 .../model/output/UserDefinedOutputStrategy.java    | 57 ++++++++++++++
 .../staticproperty/CodeInputStaticProperty.java    | 78 +++++++++++++++++++
 .../model/staticproperty/StaticPropertyType.java   |  3 +-
 .../org/apache/streampipes/model/util/Cloner.java  | 35 ++-------
 .../matching/output/OutputSchemaFactory.java       | 11 +--
 .../output/UserDefinedOutputSchemaGenerator.java   | 50 ++++++++++++
 ...AbstractConfigurablePipelineElementBuilder.java | 33 ++++----
 .../sdk/extractor/AbstractParameterExtractor.java  | 22 ++----
 .../streampipes/sdk/helpers/CodeLanguage.java      | 34 ++++----
 .../streampipes/sdk/helpers/OutputStrategies.java  | 18 +++--
 .../jsonld/CustomAnnotationProvider.java           | 60 +++-----------
 .../apache/streampipes/vocabulary/StreamPipes.java |  6 ++
 ui/package.json                                    |  2 +
 .../components/code/code-editor.directive.ts       | 91 ++++++++++++++++++++++
 .../app/editor/components/code/code.component.ts   | 32 ++++----
 .../app/editor/components/code/code.controller.ts  | 47 ++++++-----
 ui/src/app/editor/components/code/code.tmpl.html   | 33 ++++++++
 .../customize/customize-dialog.tmpl.html           |  5 ++
 .../user-defined-output.component.ts               | 32 ++++----
 .../user-defined-output.controller.ts              | 87 +++++++++++++++++++++
 .../user-defined-output.tmpl.html                  | 55 +++++++++++++
 .../customizeElementDialog.tmpl.html               | 12 ++-
 ui/src/app/editor/editor.module.ts                 |  6 ++
 ui/src/scss/main.scss                              |  6 ++
 ui/src/scss/sp/main.scss                           |  4 +
 26 files changed, 615 insertions(+), 208 deletions(-)

diff --cc streampipes-serializers/src/main/java/org/apache/streampipes/serializers/jsonld/CustomAnnotationProvider.java
index e4c5b32,91c8a62..c881353
--- a/streampipes-serializers/src/main/java/org/apache/streampipes/serializers/jsonld/CustomAnnotationProvider.java
+++ b/streampipes-serializers/src/main/java/org/apache/streampipes/serializers/jsonld/CustomAnnotationProvider.java
@@@ -53,70 -49,15 +49,30 @@@ import org.apache.streampipes.model.con
  import org.apache.streampipes.model.connect.worker.ConnectWorkerContainer;
  import org.apache.streampipes.model.dashboard.DashboardWidgetModel;
  import org.apache.streampipes.model.dashboard.VisualizablePipeline;
 +import org.apache.streampipes.model.datalake.DataExplorerWidgetModel;
 +import org.apache.streampipes.model.datalake.DataLakeMeasure;
 +import org.apache.streampipes.model.graph.DataProcessorDescription;
 +import org.apache.streampipes.model.graph.DataProcessorInvocation;
 +import org.apache.streampipes.model.graph.DataSinkDescription;
 +import org.apache.streampipes.model.graph.DataSinkInvocation;
 +import org.apache.streampipes.model.graph.DataSourceDescription;
 +import org.apache.streampipes.model.grounding.EventGrounding;
 +import org.apache.streampipes.model.grounding.JmsTransportProtocol;
 +import org.apache.streampipes.model.grounding.KafkaTransportProtocol;
 +import org.apache.streampipes.model.grounding.MqttTransportProtocol;
 +import org.apache.streampipes.model.grounding.SimpleTopicDefinition;
 +import org.apache.streampipes.model.grounding.TransportFormat;
 +import org.apache.streampipes.model.grounding.TransportProtocol;
 +import org.apache.streampipes.model.grounding.WildcardTopicDefinition;
+ import org.apache.streampipes.model.graph.*;
+ import org.apache.streampipes.model.grounding.*;
  import org.apache.streampipes.model.monitoring.ElementStatusInfoSettings;
- import org.apache.streampipes.model.output.AppendOutputStrategy;
- import org.apache.streampipes.model.output.CustomOutputStrategy;
- import org.apache.streampipes.model.output.CustomTransformOutputStrategy;
- import org.apache.streampipes.model.output.FixedOutputStrategy;
- import org.apache.streampipes.model.output.KeepOutputStrategy;
- import org.apache.streampipes.model.output.ListOutputStrategy;
- import org.apache.streampipes.model.output.PropertyRenameRule;
- import org.apache.streampipes.model.output.TransformOperation;
- import org.apache.streampipes.model.output.TransformOutputStrategy;
- import org.apache.streampipes.model.quality.Accuracy;
- import org.apache.streampipes.model.quality.EventPropertyQualityRequirement;
- import org.apache.streampipes.model.quality.EventStreamQualityRequirement;
- import org.apache.streampipes.model.quality.Frequency;
- import org.apache.streampipes.model.quality.Latency;
- import org.apache.streampipes.model.quality.MeasurementCapability;
- import org.apache.streampipes.model.quality.MeasurementObject;
- import org.apache.streampipes.model.quality.MeasurementProperty;
- import org.apache.streampipes.model.quality.MeasurementRange;
- import org.apache.streampipes.model.quality.Precision;
- import org.apache.streampipes.model.quality.Resolution;
+ import org.apache.streampipes.model.output.*;
+ import org.apache.streampipes.model.quality.*;
  import org.apache.streampipes.model.runtime.RuntimeOptionsRequest;
  import org.apache.streampipes.model.runtime.RuntimeOptionsResponse;
- import org.apache.streampipes.model.schema.Enumeration;
- import org.apache.streampipes.model.schema.EventPropertyList;
- import org.apache.streampipes.model.schema.EventPropertyNested;
- import org.apache.streampipes.model.schema.EventPropertyPrimitive;
- import org.apache.streampipes.model.schema.EventSchema;
- import org.apache.streampipes.model.schema.QuantitativeValue;
- import org.apache.streampipes.model.staticproperty.AnyStaticProperty;
- import org.apache.streampipes.model.staticproperty.CollectionStaticProperty;
- import org.apache.streampipes.model.staticproperty.ColorPickerStaticProperty;
- import org.apache.streampipes.model.staticproperty.DomainStaticProperty;
- import org.apache.streampipes.model.staticproperty.FileStaticProperty;
- import org.apache.streampipes.model.staticproperty.FreeTextStaticProperty;
- import org.apache.streampipes.model.staticproperty.MappingProperty;
- import org.apache.streampipes.model.staticproperty.MappingPropertyNary;
- import org.apache.streampipes.model.staticproperty.MappingPropertyUnary;
- import org.apache.streampipes.model.staticproperty.MatchingStaticProperty;
- import org.apache.streampipes.model.staticproperty.OneOfStaticProperty;
- import org.apache.streampipes.model.staticproperty.Option;
- import org.apache.streampipes.model.staticproperty.RemoteOneOfStaticProperty;
- import org.apache.streampipes.model.staticproperty.RuntimeResolvableAnyStaticProperty;
- import org.apache.streampipes.model.staticproperty.RuntimeResolvableOneOfStaticProperty;
- import org.apache.streampipes.model.staticproperty.SecretStaticProperty;
- import org.apache.streampipes.model.staticproperty.StaticPropertyAlternative;
- import org.apache.streampipes.model.staticproperty.StaticPropertyAlternatives;
- import org.apache.streampipes.model.staticproperty.StaticPropertyGroup;
- import org.apache.streampipes.model.staticproperty.SupportedProperty;
+ import org.apache.streampipes.model.schema.*;
+ import org.apache.streampipes.model.staticproperty.*;
  import org.apache.streampipes.model.template.BoundPipelineElement;
  import org.apache.streampipes.model.template.PipelineTemplateDescription;
  import org.apache.streampipes.model.template.PipelineTemplateDescriptionContainer;
@@@ -249,10 -191,10 +206,11 @@@ public class CustomAnnotationProvider i
              EventRateTransformationRuleDescription.class,
              SecretStaticProperty.class,
              DashboardWidgetModel.class,
+             UserDefinedOutputStrategy.class,
              VisualizablePipeline.class,
 -            StreamPipesJsonLdContainer.class
 -
 +            DataExplorerWidgetModel.class,
 +            StreamPipesJsonLdContainer.class,
 +            DataLakeMeasure.class
      );
    }
  }
diff --cc streampipes-vocabulary/src/main/java/org/apache/streampipes/vocabulary/StreamPipes.java
index 054ab0e,55e3ac0..69b07c2
--- a/streampipes-vocabulary/src/main/java/org/apache/streampipes/vocabulary/StreamPipes.java
+++ b/streampipes-vocabulary/src/main/java/org/apache/streampipes/vocabulary/StreamPipes.java
@@@ -379,14 -378,13 +379,20 @@@ public class StreamPipes 
    public static final String DASHBOARD_WIDGET_DATA_CONFIG = NS + "DashboardWidgetDataConfig" ;
    public static final String COLOR_PICKER_STATIC_PROPERTY = NS + "ColorPickerStaticProperty";
    public static final String SELECTED_COLOR = NS + "hasSelectedColor";
 +
 +  public static final String DATA_EXPLORER_WIDGET_MODEL = NS + "DataExplorerWidgetModel";
 +  public static final String DATA_LAKE_MEASURE = NS + "DataLakeMeasure";
 +  public static final String HAS_DATA_LAKE_MEASURE = NS + "hasDataLakeMeasure";
 +  public static final String HAS_MEASUREMENT_NAME = NS + "hasMeasurementName";
 +  public static final String HAS_EVENT_SCHEMA = NS + "hasEventSchema";
    public static final String HAS_WIDGET_ICON_NAME = NS + "hasWidgetIconName";
    public static final String HAS_WIDGET_DESCRIPTION = NS + "hasWidgetDescription";
 +  public static final String HAS_SELECTED_KEYS = NS + "hasSelectedKeys";
    public static final String CORRESPONDING_USER = NS + "hasCorrespondingUser";
+ 
+   public static final String CODE_INPUT_STATIC_PROPERTY = NS + "CodeInputStaticProperty";
+   public static final String HAS_LANGUAGE = NS + "hasLanguage";
+   public static final String HAS_CODE_INPUT = NS + "hasCodeInput";
+   public static final String HAS_CODE_TEMPLATE = NS + "hasCodeTemplate";
+   public static final String USER_DEFINED_OUTPUT_STRATEGY = NS + "UserDefinedOutputStrategy";
  }