streampipes-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t..@apache.org
Subject [incubator-streampipes] 01/02: Merge branch 'feature_CollectionProperty' into dev
Date Thu, 09 Jan 2020 17:36:12 GMT
This is an automated email from the ASF dual-hosted git repository.

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

commit 4b0925c4655d148cc4c3eb7fab89e44f11a59855
Merge: eda23a8 f007524
Author: tex <tex@fzi.de>
AuthorDate: Wed Jan 8 20:56:58 2020 +0100

    Merge branch 'feature_CollectionProperty' into dev
    
    # Conflicts:
    #	ui/src/app/connect/data-marketplace/data-marketplace.service.ts

 .../connect/adapter/sdk/ParameterExtractor.java    |  83 ++++-
 .../model/staticproperty/AnyStaticProperty.java    |  10 +-
 .../staticproperty/CollectionStaticProperty.java   |   5 +
 .../model/staticproperty/OneOfStaticProperty.java  |   9 +
 .../RuntimeResolvableAnyStaticProperty.java        |   5 +
 .../RuntimeResolvableOneOfStaticProperty.java      |   4 +
 .../staticproperty/SelectionStaticProperty.java    |  20 ++
 .../model/staticproperty/StaticPropertyGroup.java  |  25 ++
 .../rest/shared/util/JsonLdUtilsTest.java          |  29 +-
 .../apache/streampipes/sdk/StaticProperties.java   |  38 +++
 ...AbstractConfigurablePipelineElementBuilder.java |  13 +
 .../apache/streampipes/vocabulary/StreamPipes.java |   4 +
 ui/src/app/connect/connect.module.ts               | 378 +++++++++++----------
 .../data-marketplace/data-marketplace.service.ts   |   7 +-
 .../app/connect/model/CollectionStaticProperty.ts  |  40 +++
 ui/src/app/connect/model/GroupStaticProperty.ts    |   3 +
 .../app/connect/model/SelectionStaticProperty.ts   |  86 ++---
 .../static-alternatives.component.css              |   2 +-
 .../static-alternatives.component.html             |  12 +-
 .../static-any-input.component.html                |  66 ++--
 .../static-collection.component.css                |   0
 .../static-collection.component.html               |  68 ++++
 .../static-collection.component.ts                 |  78 +++++
 .../static-file-input.component.html               |  10 +-
 .../static-free-input.component.html               |   5 +-
 .../static-group/static-group.component.css        |   4 +
 .../static-group/static-group.component.html       |  18 +-
 .../static-mapping-nary.component.css              |   4 +
 .../static-mapping-nary.component.html             |  12 +-
 .../static-mapping-unary.component.html            |  10 +-
 .../static-number-input.component.html             |   1 -
 .../static-one-of-input.component.css              |   3 +
 .../static-one-of-input.component.html             |  46 ++-
 .../static-property-util.service.ts                | 126 ++++++-
 .../static-property.component.html                 |   5 +
 .../static-properties/static-property.component.ts |   5 +
 ...atic-runtime-resolvable-any-input.component.css |   3 +
 ...tic-runtime-resolvable-any-input.component.html |  29 +-
 ...ic-runtime-resolvable-oneof-input.component.css |  16 +
 ...c-runtime-resolvable-oneof-input.component.html |  56 ++-
 .../static-secret-input.component.css              |   5 -
 .../static-secret-input.component.html             |  15 +-
 .../static-text-input.component.css                |   5 -
 .../static-text-input.component.html               |   1 -
 .../static-url-input.component.css                 |   6 -
 .../static-url-input.component.html                |   1 -
 .../platform-services/tsonld-serializer.service.ts |   2 +
 ui/src/app/platform-services/tsonld/tsonld.ts      |   8 +-
 48 files changed, 1020 insertions(+), 361 deletions(-)



Mime
View raw message