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/08/24 10:22:50 UTC

[incubator-streampipes] branch dev updated (c495a1b -> 6a9f58a)

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

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


    from c495a1b  [STREAMPIPES-206] Remove tson-ld serializer and service
     new 486c80c  [STREAMPIPES-206] Cleanup imports in Connect UI module
     new 6a9f58a  [STREAMPIPES-206] Remove deprecated UI models

The 2 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:
 ui/src/app/connect/connect.component.ts            |   1 -
 ui/src/app/connect/connect.module.ts               | 136 +++++++-------
 ui/src/app/connect/connect.service.ts              |   2 +-
 .../data-marketplace/data-marketplace.component.ts |  14 +-
 .../edit-data-type/edit-data-type.component.ts     |   4 +-
 .../edit-event-property-list.component.ts          |   2 +-
 .../edit-event-property-primitive.component.ts     |   4 +-
 .../edit-timestamp-property.component.ts           |   2 +-
 .../edit-unit-transformation.component.ts          |  14 +-
 .../edit-event-property.component.ts               |  18 +-
 ui/src/app/connect/filter/timestamp.pipe.ts        |   1 -
 .../connect/format-form/format-form.component.ts   |   6 +-
 .../format-list-component/format-list.component.ts |   4 +-
 .../app/connect/model/AlternativeStaticProperty.ts |  37 ----
 .../connect/model/AlternativesStaticProperty.ts    |  35 ----
 ui/src/app/connect/model/AnyStaticProperty.ts      |  23 ---
 ui/src/app/connect/model/ApplicationLink.ts        |  51 ------
 ui/src/app/connect/model/BoundPipelineElement.ts   |  40 ----
 .../app/connect/model/CodeInputStaticProperty.ts   |  39 ----
 .../app/connect/model/CollectionStaticProperty.ts  |  41 -----
 .../app/connect/model/ColorPickerStaticProperty.ts |  33 ----
 .../model/{message => }/ConfigurationInfo.ts       |   0
 .../app/connect/model/DataProcessorInvocation.ts   |  45 -----
 ui/src/app/connect/model/DataSetDescription.ts     |  46 -----
 ui/src/app/connect/model/DataSinkInvocation.ts     |  34 ----
 ui/src/app/connect/model/DataSourceDescription.ts  |  34 ----
 ui/src/app/connect/model/DataStreamContainer.ts    |  37 ----
 ui/src/app/connect/model/DataStreamDescription.ts  |  41 -----
 ui/src/app/connect/model/FileStaticProperty.ts     |  56 ------
 ui/src/app/connect/model/FreeTextStaticProperty.ts |  43 -----
 ui/src/app/connect/model/GroupStaticProperty.ts    |  40 ----
 .../connect/model/InvocableStreamPipesEntity.ts    |  57 ------
 ui/src/app/connect/model/MappingPropertyNary.ts    |  42 -----
 ui/src/app/connect/model/MappingPropertyUnary.ts   |  43 -----
 ui/src/app/connect/model/NamedStreamPipesEntity.ts |  48 -----
 ui/src/app/connect/model/OneOfStaticProperty.ts    |  23 ---
 ui/src/app/connect/model/Option.ts                 |  44 -----
 .../connect/model/PipelineTemplateDescription.ts   |  51 ------
 .../model/PipelineTemplateDescriptionContainer.ts  |  37 ----
 .../connect/model/PipelineTemplateInvocation.ts    |  46 -----
 .../model/RuntimeResolvableAnyStaticProperty.ts    |  32 ----
 .../model/RuntimeResolvableOneOfStaticProperty.ts  |  34 ----
 ui/src/app/connect/model/SecretStaticProperty.ts   |  41 -----
 .../app/connect/model/SelectionStaticProperty.ts   |  43 -----
 ui/src/app/connect/model/StaticProperty.ts         |  60 ------
 .../rules => }/TimestampTransformationRuleMode.ts  |   0
 ui/src/app/connect/model/URI.ts                    |  38 ----
 .../app/connect/model/UnnamedStreamPipesEntity.ts  |  41 -----
 .../connect/model/connect/AdapterDescription.ts    |  88 ---------
 .../model/connect/AdapterDescriptionList.ts        |  38 ----
 .../connect/model/connect/AdapterSetDescription.ts |  38 ----
 .../model/connect/AdapterStreamDescription.ts      |  38 ----
 .../model/connect/GenericAdapterSetDescription.ts  |  39 ----
 .../connect/GenericAdapterStreamDescription.ts     |  39 ----
 .../model/connect/SpecificAdapterSetDescription.ts |  30 ---
 .../connect/SpecificAdapterStreamDescription.ts    |  29 ---
 .../model/connect/grounding/FormatDescription.ts   |  51 ------
 .../connect/grounding/FormatDescriptionList.ts     |  38 ----
 .../model/connect/grounding/ProtocolDescription.ts |  73 --------
 .../connect/grounding/ProtocolDescriptionList.ts   |  38 ----
 .../connect/grounding/ProtocolSetDescription.ts    |  29 ---
 .../connect/grounding/ProtocolStreamDescription.ts |  29 ---
 .../connect/rules/AddNestedRuleDescription.ts      |  39 ----
 .../connect/rules/AddTimestampRuleDescription.ts   |  39 ----
 .../rules/AddValueTransformationRuleDescription.ts |  43 -----
 .../model/connect/rules/DeleteRuleDescription.ts   |  39 ----
 .../EventRateTransformationRuleDescription.ts      |  43 -----
 .../model/connect/rules/MoveRuleDesctiption.ts     |  44 -----
 .../rules/RemoveDuplicatesRuleDescription.ts       |  39 ----
 .../model/connect/rules/RenameRuleDescription.ts   |  44 -----
 .../TimestampTransformationRuleDescription.ts      |  53 ------
 .../connect/rules/TransformationRuleDescription.ts |  24 ---
 .../connect/rules/UnitTransformRuleDescription.ts  |  49 -----
 .../model/connect/runtime/RuntimeOptionsRequest.ts |  41 -----
 .../connect/runtime/RuntimeOptionsResponse.ts      |  41 -----
 .../app/connect/model/grounding/EventGrounding.ts  |  33 ----
 .../model/grounding/JmsTransportProtocol.ts        |  17 --
 .../model/grounding/KafkaTransportProtocol.ts      |  17 --
 .../app/connect/model/grounding/TopicDefinition.ts |  29 ---
 .../app/connect/model/grounding/TransportFormat.ts |  29 ---
 .../connect/model/grounding/TransportProtocol.ts   |  32 ----
 ui/src/app/connect/model/message/ErrorMessage.ts   |  31 ----
 ui/src/app/connect/model/message/MessageLd.ts      |  42 -----
 ui/src/app/connect/model/message/Notification.ts   |  28 ---
 ui/src/app/connect/model/message/NotificationLd.ts |  41 -----
 ui/src/app/connect/model/message/StatusMessage.ts  |  28 ---
 ui/src/app/connect/model/message/SuccessMessage.ts |  31 ----
 .../connect/model/output/AppendOutputStrategy.ts   |  34 ----
 .../connect/model/output/CustomOutputStrategy.ts   |  38 ----
 .../model/output/CustomTransformOutputStrategy.ts  |  34 ----
 .../connect/model/output/FixedOutputStrategy.ts    |  34 ----
 .../app/connect/model/output/KeepOutputStrategy.ts |  36 ----
 .../app/connect/model/output/ListOutputStrategy.ts |  33 ----
 ui/src/app/connect/model/output/OutputStrategy.ts  |  40 ----
 .../app/connect/model/output/PropertyRenameRule.ts |  40 ----
 .../app/connect/model/output/TransformOperation.ts |  43 -----
 .../connect/model/output/TransformOperationType.ts |  19 --
 .../model/output/TransformOutputStrategy.ts        |  37 ----
 .../model/output/UserDefinedOutputStrategy.ts      |  33 ----
 .../component/adapter-started-dialog.component.ts  |  55 +++---
 .../connect/new-adapter/new-adapter.component.ts   |  64 +++----
 ui/src/app/connect/rest.service.ts                 |  10 +-
 .../app/connect/schema-editor/data-type.service.ts |   2 +-
 .../event-property-row.component.ts                |  17 +-
 .../event-schema-preview.component.ts              |   2 +-
 .../model/DomainPropertyProbability.ts             |  40 ----
 .../model/DomainPropertyProbabilityList.ts         |  39 ----
 .../app/connect/schema-editor/model/Enumeration.ts |  58 ------
 .../connect/schema-editor/model/EventProperty.ts   | 101 -----------
 .../schema-editor/model/EventPropertyList.ts       |  48 -----
 .../schema-editor/model/EventPropertyNested.ts     |  50 -----
 .../schema-editor/model/EventPropertyPrimitive.ts  |  91 ----------
 .../app/connect/schema-editor/model/EventSchema.ts |  53 ------
 .../app/connect/schema-editor/model/ExampleNode.ts |  32 ----
 .../app/connect/schema-editor/model/GuessSchema.ts |  39 ----
 .../schema-editor/model/QuantitativeValue.ts       |  44 -----
 .../connect/schema-editor/unit-provider.service.ts |   2 +-
 .../base/abstract-static-property.ts               |   2 +-
 .../static-collection.component.ts                 |   2 +-
 .../static-color-picker.component.ts               |   2 +-
 .../static-free-input.component.ts                 |   2 +-
 .../static-property-util.service.ts                |   5 -
 .../static-properties/static-property.component.ts |   2 +-
 .../base-runtime-resolvable-input.ts               |   2 +-
 .../static-secret-input.component.ts               |   2 +-
 .../connect/transformation-rule.service.spec.ts    | 103 ++++++-----
 ui/src/app/connect/transformation-rule.service.ts  |  11 +-
 ui/src/app/core-model/dashboard/DashboardWidget.ts |  48 -----
 .../dashboard/DashboardWidgetSettings.ts           |  49 -----
 .../core-model/dashboard/VisualizablePipeline.ts   |  54 ------
 ui/src/app/core-model/datalake/DateRange.ts        |   7 -
 .../shared/shared-dashboard.service.ts             |   9 +-
 .../sdk/matching/mapping-property-generator.ts     |   1 -
 ui/src/app/dashboard/services/dashboard.service.ts |  30 +--
 .../group-configuration.component.ts               |   4 +-
 .../app/data-explorer/data-explorer.component.ts   |   3 +-
 .../registry/data-explorer-widget-registry.ts      |   3 -
 .../registry/widget-config-builder.ts              |   9 +-
 .../sdk/collected-schema-requirements.ts           |  11 +-
 ui/src/app/data-explorer/sdk/ep-requirements.ts    |  22 +--
 .../sdk/extractor/static-property-extractor.ts     |  16 +-
 .../sdk/matching/domain-property-match.ts          |  10 +-
 .../sdk/matching/mapping-property-generator.ts     |   4 +-
 .../sdk/matching/primitive-property-match.ts       |   4 +-
 .../data-explorer/sdk/matching/property-match.ts   |   8 +-
 .../sdk/schema-requirements-builder.ts             |  23 +--
 .../services/data-view-data-explorer.service.ts    |   4 +-
 .../editor/dialog/customize/customize.component.ts |   2 +-
 ui/src/app/editor/services/editor.service.ts       |   6 +-
 .../notifications/service/notifications.service.ts |   9 +-
 .../apis/pipeline-element.service.ts               |  14 +-
 .../apis/pipeline-template.service.ts              | 201 ++++++++++-----------
 ui/src/app/platform-services/platform.module.ts    |   3 +-
 ui/src/app/platform-services/tsonld/Float.ts       |  20 --
 ui/src/app/platform-services/tsonld/RdfId.js       |  25 ---
 ui/src/app/platform-services/tsonld/RdfId.ts       |  22 ---
 ui/src/app/platform-services/tsonld/RdfsClass.js   |  26 ---
 ui/src/app/platform-services/tsonld/RdfsClass.ts   |  23 ---
 .../app/platform-services/tsonld/RdfsProperty.js   |  27 ---
 .../app/platform-services/tsonld/RdfsProperty.ts   |  24 ---
 160 files changed, 451 insertions(+), 4627 deletions(-)
 delete mode 100644 ui/src/app/connect/model/AlternativeStaticProperty.ts
 delete mode 100644 ui/src/app/connect/model/AlternativesStaticProperty.ts
 delete mode 100644 ui/src/app/connect/model/AnyStaticProperty.ts
 delete mode 100644 ui/src/app/connect/model/ApplicationLink.ts
 delete mode 100644 ui/src/app/connect/model/BoundPipelineElement.ts
 delete mode 100644 ui/src/app/connect/model/CodeInputStaticProperty.ts
 delete mode 100644 ui/src/app/connect/model/CollectionStaticProperty.ts
 delete mode 100644 ui/src/app/connect/model/ColorPickerStaticProperty.ts
 rename ui/src/app/connect/model/{message => }/ConfigurationInfo.ts (100%)
 delete mode 100644 ui/src/app/connect/model/DataProcessorInvocation.ts
 delete mode 100644 ui/src/app/connect/model/DataSetDescription.ts
 delete mode 100644 ui/src/app/connect/model/DataSinkInvocation.ts
 delete mode 100644 ui/src/app/connect/model/DataSourceDescription.ts
 delete mode 100644 ui/src/app/connect/model/DataStreamContainer.ts
 delete mode 100644 ui/src/app/connect/model/DataStreamDescription.ts
 delete mode 100644 ui/src/app/connect/model/FileStaticProperty.ts
 delete mode 100644 ui/src/app/connect/model/FreeTextStaticProperty.ts
 delete mode 100644 ui/src/app/connect/model/GroupStaticProperty.ts
 delete mode 100644 ui/src/app/connect/model/InvocableStreamPipesEntity.ts
 delete mode 100644 ui/src/app/connect/model/MappingPropertyNary.ts
 delete mode 100644 ui/src/app/connect/model/MappingPropertyUnary.ts
 delete mode 100644 ui/src/app/connect/model/NamedStreamPipesEntity.ts
 delete mode 100644 ui/src/app/connect/model/OneOfStaticProperty.ts
 delete mode 100644 ui/src/app/connect/model/Option.ts
 delete mode 100644 ui/src/app/connect/model/PipelineTemplateDescription.ts
 delete mode 100644 ui/src/app/connect/model/PipelineTemplateDescriptionContainer.ts
 delete mode 100644 ui/src/app/connect/model/PipelineTemplateInvocation.ts
 delete mode 100644 ui/src/app/connect/model/RuntimeResolvableAnyStaticProperty.ts
 delete mode 100644 ui/src/app/connect/model/RuntimeResolvableOneOfStaticProperty.ts
 delete mode 100644 ui/src/app/connect/model/SecretStaticProperty.ts
 delete mode 100644 ui/src/app/connect/model/SelectionStaticProperty.ts
 delete mode 100644 ui/src/app/connect/model/StaticProperty.ts
 rename ui/src/app/connect/model/{connect/rules => }/TimestampTransformationRuleMode.ts (100%)
 delete mode 100644 ui/src/app/connect/model/URI.ts
 delete mode 100644 ui/src/app/connect/model/UnnamedStreamPipesEntity.ts
 delete mode 100644 ui/src/app/connect/model/connect/AdapterDescription.ts
 delete mode 100644 ui/src/app/connect/model/connect/AdapterDescriptionList.ts
 delete mode 100644 ui/src/app/connect/model/connect/AdapterSetDescription.ts
 delete mode 100644 ui/src/app/connect/model/connect/AdapterStreamDescription.ts
 delete mode 100644 ui/src/app/connect/model/connect/GenericAdapterSetDescription.ts
 delete mode 100644 ui/src/app/connect/model/connect/GenericAdapterStreamDescription.ts
 delete mode 100644 ui/src/app/connect/model/connect/SpecificAdapterSetDescription.ts
 delete mode 100644 ui/src/app/connect/model/connect/SpecificAdapterStreamDescription.ts
 delete mode 100644 ui/src/app/connect/model/connect/grounding/FormatDescription.ts
 delete mode 100644 ui/src/app/connect/model/connect/grounding/FormatDescriptionList.ts
 delete mode 100644 ui/src/app/connect/model/connect/grounding/ProtocolDescription.ts
 delete mode 100644 ui/src/app/connect/model/connect/grounding/ProtocolDescriptionList.ts
 delete mode 100644 ui/src/app/connect/model/connect/grounding/ProtocolSetDescription.ts
 delete mode 100644 ui/src/app/connect/model/connect/grounding/ProtocolStreamDescription.ts
 delete mode 100644 ui/src/app/connect/model/connect/rules/AddNestedRuleDescription.ts
 delete mode 100644 ui/src/app/connect/model/connect/rules/AddTimestampRuleDescription.ts
 delete mode 100644 ui/src/app/connect/model/connect/rules/AddValueTransformationRuleDescription.ts
 delete mode 100644 ui/src/app/connect/model/connect/rules/DeleteRuleDescription.ts
 delete mode 100644 ui/src/app/connect/model/connect/rules/EventRateTransformationRuleDescription.ts
 delete mode 100644 ui/src/app/connect/model/connect/rules/MoveRuleDesctiption.ts
 delete mode 100644 ui/src/app/connect/model/connect/rules/RemoveDuplicatesRuleDescription.ts
 delete mode 100644 ui/src/app/connect/model/connect/rules/RenameRuleDescription.ts
 delete mode 100644 ui/src/app/connect/model/connect/rules/TimestampTransformationRuleDescription.ts
 delete mode 100644 ui/src/app/connect/model/connect/rules/TransformationRuleDescription.ts
 delete mode 100644 ui/src/app/connect/model/connect/rules/UnitTransformRuleDescription.ts
 delete mode 100644 ui/src/app/connect/model/connect/runtime/RuntimeOptionsRequest.ts
 delete mode 100644 ui/src/app/connect/model/connect/runtime/RuntimeOptionsResponse.ts
 delete mode 100644 ui/src/app/connect/model/grounding/EventGrounding.ts
 delete mode 100644 ui/src/app/connect/model/grounding/JmsTransportProtocol.ts
 delete mode 100644 ui/src/app/connect/model/grounding/KafkaTransportProtocol.ts
 delete mode 100644 ui/src/app/connect/model/grounding/TopicDefinition.ts
 delete mode 100644 ui/src/app/connect/model/grounding/TransportFormat.ts
 delete mode 100644 ui/src/app/connect/model/grounding/TransportProtocol.ts
 delete mode 100644 ui/src/app/connect/model/message/ErrorMessage.ts
 delete mode 100644 ui/src/app/connect/model/message/MessageLd.ts
 delete mode 100644 ui/src/app/connect/model/message/Notification.ts
 delete mode 100644 ui/src/app/connect/model/message/NotificationLd.ts
 delete mode 100644 ui/src/app/connect/model/message/StatusMessage.ts
 delete mode 100644 ui/src/app/connect/model/message/SuccessMessage.ts
 delete mode 100644 ui/src/app/connect/model/output/AppendOutputStrategy.ts
 delete mode 100644 ui/src/app/connect/model/output/CustomOutputStrategy.ts
 delete mode 100644 ui/src/app/connect/model/output/CustomTransformOutputStrategy.ts
 delete mode 100644 ui/src/app/connect/model/output/FixedOutputStrategy.ts
 delete mode 100644 ui/src/app/connect/model/output/KeepOutputStrategy.ts
 delete mode 100644 ui/src/app/connect/model/output/ListOutputStrategy.ts
 delete mode 100644 ui/src/app/connect/model/output/OutputStrategy.ts
 delete mode 100644 ui/src/app/connect/model/output/PropertyRenameRule.ts
 delete mode 100644 ui/src/app/connect/model/output/TransformOperation.ts
 delete mode 100644 ui/src/app/connect/model/output/TransformOperationType.ts
 delete mode 100644 ui/src/app/connect/model/output/TransformOutputStrategy.ts
 delete mode 100644 ui/src/app/connect/model/output/UserDefinedOutputStrategy.ts
 delete mode 100644 ui/src/app/connect/schema-editor/model/DomainPropertyProbability.ts
 delete mode 100644 ui/src/app/connect/schema-editor/model/DomainPropertyProbabilityList.ts
 delete mode 100644 ui/src/app/connect/schema-editor/model/Enumeration.ts
 delete mode 100644 ui/src/app/connect/schema-editor/model/EventProperty.ts
 delete mode 100644 ui/src/app/connect/schema-editor/model/EventPropertyList.ts
 delete mode 100644 ui/src/app/connect/schema-editor/model/EventPropertyNested.ts
 delete mode 100644 ui/src/app/connect/schema-editor/model/EventPropertyPrimitive.ts
 delete mode 100644 ui/src/app/connect/schema-editor/model/EventSchema.ts
 delete mode 100644 ui/src/app/connect/schema-editor/model/ExampleNode.ts
 delete mode 100644 ui/src/app/connect/schema-editor/model/GuessSchema.ts
 delete mode 100644 ui/src/app/connect/schema-editor/model/QuantitativeValue.ts
 delete mode 100644 ui/src/app/core-model/dashboard/DashboardWidget.ts
 delete mode 100644 ui/src/app/core-model/dashboard/DashboardWidgetSettings.ts
 delete mode 100644 ui/src/app/core-model/dashboard/VisualizablePipeline.ts
 delete mode 100644 ui/src/app/platform-services/tsonld/Float.ts
 delete mode 100644 ui/src/app/platform-services/tsonld/RdfId.js
 delete mode 100644 ui/src/app/platform-services/tsonld/RdfId.ts
 delete mode 100644 ui/src/app/platform-services/tsonld/RdfsClass.js
 delete mode 100644 ui/src/app/platform-services/tsonld/RdfsClass.ts
 delete mode 100644 ui/src/app/platform-services/tsonld/RdfsProperty.js
 delete mode 100644 ui/src/app/platform-services/tsonld/RdfsProperty.ts


[incubator-streampipes] 01/02: [STREAMPIPES-206] Cleanup imports in Connect UI module

Posted by ri...@apache.org.
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/incubator-streampipes.git

commit 486c80c504d9efc23f409f5537ce7a165e087a61
Author: Dominik Riemer <ri...@fzi.de>
AuthorDate: Sun Aug 23 23:37:15 2020 +0200

    [STREAMPIPES-206] Cleanup imports in Connect UI module
---
 ui/src/app/connect/connect.component.ts            |   1 -
 ui/src/app/connect/connect.module.ts               | 136 ++++++++++-----------
 ui/src/app/connect/connect.service.ts              |   2 +-
 .../data-marketplace/data-marketplace.component.ts |  14 +--
 .../edit-data-type/edit-data-type.component.ts     |   4 +-
 .../edit-event-property-list.component.ts          |   2 +-
 .../edit-event-property-primitive.component.ts     |   4 +-
 .../edit-timestamp-property.component.ts           |   2 +-
 .../edit-unit-transformation.component.ts          |  14 +--
 .../edit-event-property.component.ts               |  18 +--
 ui/src/app/connect/filter/timestamp.pipe.ts        |   1 -
 ui/src/app/connect/model/DataSinkInvocation.ts     |   1 -
 .../app/connect/model/UnnamedStreamPipesEntity.ts  |   4 +-
 .../app/connect/model/grounding/EventGrounding.ts  |   1 -
 .../app/connect/model/grounding/TransportFormat.ts |   2 -
 .../component/adapter-started-dialog.component.ts  |  12 +-
 .../connect/new-adapter/new-adapter.component.ts   |  64 +++++-----
 ui/src/app/connect/rest.service.ts                 |  10 +-
 .../app/connect/schema-editor/data-type.service.ts |   2 +-
 .../event-property-row.component.ts                |  14 +--
 .../connect/schema-editor/unit-provider.service.ts |   2 +-
 ui/src/app/connect/transformation-rule.service.ts  |  11 +-
 22 files changed, 157 insertions(+), 164 deletions(-)

diff --git a/ui/src/app/connect/connect.component.ts b/ui/src/app/connect/connect.component.ts
index e74712e..38fce8e 100644
--- a/ui/src/app/connect/connect.component.ts
+++ b/ui/src/app/connect/connect.component.ts
@@ -17,7 +17,6 @@
  */
 
 import {Component} from '@angular/core';
-import {AdapterDescription} from './model/connect/AdapterDescription';
 import {AdapterDescriptionUnion} from "../core-model/gen/streampipes-model";
 
 @Component({
diff --git a/ui/src/app/connect/connect.module.ts b/ui/src/app/connect/connect.module.ts
index 9be2929..cb32efc 100644
--- a/ui/src/app/connect/connect.module.ts
+++ b/ui/src/app/connect/connect.module.ts
@@ -16,86 +16,84 @@
  *
  */
 
-import { CommonModule } from '@angular/common';
-import { NgModule } from '@angular/core';
-import { FlexLayoutModule } from '@angular/flex-layout';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { MatFormFieldModule } from '@angular/material/form-field';
-import { MatGridListModule } from '@angular/material/grid-list';
-import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
-import { BrowserModule } from '@angular/platform-browser';
+import {CommonModule} from '@angular/common';
+import {NgModule} from '@angular/core';
+import {FlexLayoutModule} from '@angular/flex-layout';
+import {FormsModule, ReactiveFormsModule} from '@angular/forms';
+import {MatFormFieldModule} from '@angular/material/form-field';
+import {MatGridListModule} from '@angular/material/grid-list';
+import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';
+import {BrowserModule} from '@angular/platform-browser';
 
-import { ConnectComponent } from './connect.component';
-import { NewAdapterComponent } from './new-adapter/new-adapter.component';
+import {ConnectComponent} from './connect.component';
+import {NewAdapterComponent} from './new-adapter/new-adapter.component';
 
-import { FormatFormComponent } from './format-form/format-form.component';
+import {FormatFormComponent} from './format-form/format-form.component';
 
-import { EditEventPropertyPrimitiveComponent } from './dialog/edit-event-property/components/edit-event-property-primitive/edit-event-property-primitive.component';
-import { EventSchemaComponent } from './schema-editor/event-schema/event-schema.component';
+import {EditEventPropertyPrimitiveComponent} from './dialog/edit-event-property/components/edit-event-property-primitive/edit-event-property-primitive.component';
+import {EventSchemaComponent} from './schema-editor/event-schema/event-schema.component';
 
-import { StaticPropertyComponent } from './static-properties/static-property.component';
+import {StaticPropertyComponent} from './static-properties/static-property.component';
 
-import { CustomMaterialModule } from '../CustomMaterial/custom-material.module';
+import {CustomMaterialModule} from '../CustomMaterial/custom-material.module';
 
-import { RestService } from './rest.service';
+import {RestService} from './rest.service';
 
-import { MatInputModule } from '@angular/material/input';
-import { DragulaModule } from 'ng2-dragula';
-import { AdapterStartedDialog } from './new-adapter/component/adapter-started-dialog.component';
-import { DataTypesService } from './schema-editor/data-type.service';
-import { StaticFreeInputComponent } from './static-properties/static-free-input/static-free-input.component';
-import { StaticPropertyUtilService } from './static-properties/static-property-util.service';
-import { StaticSecretInputComponent } from './static-properties/static-secret-input/static-secret-input.component';
-import { TransformationRuleService } from './transformation-rule.service';
+import {MatInputModule} from '@angular/material/input';
+import {DragulaModule} from 'ng2-dragula';
+import {AdapterStartedDialog} from './new-adapter/component/adapter-started-dialog.component';
+import {DataTypesService} from './schema-editor/data-type.service';
+import {StaticFreeInputComponent} from './static-properties/static-free-input/static-free-input.component';
+import {StaticPropertyUtilService} from './static-properties/static-property-util.service';
+import {StaticSecretInputComponent} from './static-properties/static-secret-input/static-secret-input.component';
+import {TransformationRuleService} from './transformation-rule.service';
+import {ConnectService} from './connect.service';
+import {AdapterDescriptionComponent} from './data-marketplace/adapter-description/adapter-description.component';
+import {DataMarketplaceComponent} from './data-marketplace/data-marketplace.component';
+import {DataMarketplaceService} from './data-marketplace/data-marketplace.service';
+import {FileManagementComponent} from './file-management/file-management.component';
+import {FileRestService} from './file-management/service/filerest.service';
+import {FormatComponent} from './format-component/format.component';
+import {FormatListComponent} from './format-list-component/format-list.component';
+import {IconService} from './new-adapter/icon.service';
+import {UnitProviderService} from './schema-editor/unit-provider.service';
+import {StaticAlternativesComponent} from './static-properties/static-alternatives/static-alternatives.component';
+import {StaticAnyInput} from './static-properties/static-any-input/static-any-input.component';
+import {StaticCollectionComponent} from './static-properties/static-collection/static-collection.component';
+import {StaticFileInputComponent} from './static-properties/static-file-input/static-file-input.component';
+import {StaticFileRestService} from './static-properties/static-file-input/static-file-rest.service';
+import {StaticGroupComponent} from './static-properties/static-group/static-group.component';
+import {StaticOneOfInputComponent} from './static-properties/static-one-of-input/static-one-of-input.component';
+import {StaticRuntimeResolvableAnyInputComponent} from './static-properties/static-runtime-resolvable-any-input/static-runtime-resolvable-any-input.component';
+import {StaticRuntimeResolvableOneOfInputComponent} from './static-properties/static-runtime-resolvable-oneof-input/static-runtime-resolvable-oneof-input.component';
 
-import { ShepherdService } from '../services/tour/shepherd.service';
-import { ConnectService } from './connect.service';
-import { AdapterDescriptionComponent } from './data-marketplace/adapter-description/adapter-description.component';
-import { DataMarketplaceComponent } from './data-marketplace/data-marketplace.component';
-import { DataMarketplaceService } from './data-marketplace/data-marketplace.service';
-import { FileManagementComponent } from './file-management/file-management.component';
-import { FileRestService } from './file-management/service/filerest.service';
-import { FormatComponent } from './format-component/format.component';
-import { FormatListComponent } from './format-list-component/format-list.component';
-import { IconService } from './new-adapter/icon.service';
-import { UnitProviderService } from './schema-editor/unit-provider.service';
-import { StaticAlternativesComponent } from './static-properties/static-alternatives/static-alternatives.component';
-import { StaticAnyInput } from './static-properties/static-any-input/static-any-input.component';
-import { StaticCollectionComponent } from './static-properties/static-collection/static-collection.component';
-import { StaticFileInputComponent } from './static-properties/static-file-input/static-file-input.component';
-import { StaticFileRestService } from './static-properties/static-file-input/static-file-rest.service';
-import { StaticGroupComponent } from './static-properties/static-group/static-group.component';
-import { StaticOneOfInputComponent } from './static-properties/static-one-of-input/static-one-of-input.component';
-import { StaticRuntimeResolvableAnyInputComponent } from './static-properties/static-runtime-resolvable-any-input/static-runtime-resolvable-any-input.component';
-import { StaticRuntimeResolvableOneOfInputComponent } from './static-properties/static-runtime-resolvable-oneof-input/static-runtime-resolvable-oneof-input.component';
 
-
-import { FilterPipe } from '../connect/data-marketplace/filter.pipe';
-import { PlatformServicesModule } from '../platform-services/platform.module';
-import { AdapterExportDialog } from './data-marketplace/adapter-export/adapter-export-dialog.component';
-import { AdapterUploadDialog } from './data-marketplace/adapter-upload/adapter-upload-dialog.component';
-import { EditEventPropertyListComponent } from './dialog/edit-event-property/components/edit-event-property-list/edit-event-property-list.component';
-import { TimestampPipe } from './filter/timestamp.pipe';
-import { StaticMappingNaryComponent } from './static-properties/static-mapping-nary/static-mapping-nary.component';
-import { StaticMappingUnaryComponent } from './static-properties/static-mapping-unary/static-mapping-unary.component';
+import {FilterPipe} from '../connect/data-marketplace/filter.pipe';
+import {PlatformServicesModule} from '../platform-services/platform.module';
+import {AdapterExportDialog} from './data-marketplace/adapter-export/adapter-export-dialog.component';
+import {AdapterUploadDialog} from './data-marketplace/adapter-upload/adapter-upload-dialog.component';
+import {EditEventPropertyListComponent} from './dialog/edit-event-property/components/edit-event-property-list/edit-event-property-list.component';
+import {TimestampPipe} from './filter/timestamp.pipe';
+import {StaticMappingNaryComponent} from './static-properties/static-mapping-nary/static-mapping-nary.component';
+import {StaticMappingUnaryComponent} from './static-properties/static-mapping-unary/static-mapping-unary.component';
 
 import {StaticCodeInputComponent} from "./static-properties/static-code-input/static-code-input.component";
-import { CodemirrorModule } from '@ctrl/ngx-codemirror';
-import { MatChipsModule } from '@angular/material/chips';
-import { MatSliderModule } from '@angular/material/slider';
-import { TreeModule } from 'angular-tree-component';
-import { ColorPickerModule } from 'ngx-color-picker';
-import { QuillModule } from 'ngx-quill';
-import { xsService } from '../NS/XS.service';
-import { PropertySelectorService } from '../services/property-selector.service';
-import { EditDataTypeComponent } from './dialog/edit-event-property/components/edit-data-type/edit-data-type.component';
-import { EditTimestampPropertyComponent } from './dialog/edit-event-property/components/edit-timestamp-property/edit-timestamp-property.component';
-import { EditUnitTransformationComponent } from './dialog/edit-event-property/components/edit-unit-transformation/edit-unit-transformation.component';
-import { EditEventPropertyComponent } from './dialog/edit-event-property/edit-event-property.component';
-import { PipelineElementRuntimeInfoComponent } from './new-adapter/component/runtime-info/pipeline-element-runtime-info.component';
-import { EventPropertyRowComponent } from './schema-editor/event-property-row/event-property-row.component';
-import { EventSchemaPreviewComponent } from './schema-editor/event-schema-preview/event-schema-preview.component';
-import { StaticColorPickerComponent } from './static-properties/static-color-picker/static-color-picker.component';
+import {CodemirrorModule} from '@ctrl/ngx-codemirror';
+import {MatChipsModule} from '@angular/material/chips';
+import {MatSliderModule} from '@angular/material/slider';
+import {TreeModule} from 'angular-tree-component';
+import {ColorPickerModule} from 'ngx-color-picker';
+import {QuillModule} from 'ngx-quill';
+import {xsService} from '../NS/XS.service';
+import {PropertySelectorService} from '../services/property-selector.service';
+import {EditDataTypeComponent} from './dialog/edit-event-property/components/edit-data-type/edit-data-type.component';
+import {EditTimestampPropertyComponent} from './dialog/edit-event-property/components/edit-timestamp-property/edit-timestamp-property.component';
+import {EditUnitTransformationComponent} from './dialog/edit-event-property/components/edit-unit-transformation/edit-unit-transformation.component';
+import {EditEventPropertyComponent} from './dialog/edit-event-property/edit-event-property.component';
+import {PipelineElementRuntimeInfoComponent} from './new-adapter/component/runtime-info/pipeline-element-runtime-info.component';
+import {EventPropertyRowComponent} from './schema-editor/event-property-row/event-property-row.component';
+import {EventSchemaPreviewComponent} from './schema-editor/event-schema-preview/event-schema-preview.component';
+import {StaticColorPickerComponent} from './static-properties/static-color-picker/static-color-picker.component';
 import {DisplayRecommendedPipe} from "./static-properties/filter/display-recommended.pipe";
 import {TourProviderService} from "../services/tour/tour-provider.service";
 import {RuntimeResolvableService} from "./static-properties/static-runtime-resolvable-input/runtime-resolvable.service";
diff --git a/ui/src/app/connect/connect.service.ts b/ui/src/app/connect/connect.service.ts
index 9f3d03e..6ec7c99 100644
--- a/ui/src/app/connect/connect.service.ts
+++ b/ui/src/app/connect/connect.service.ts
@@ -16,7 +16,7 @@
  *
  */
 
-import { Injectable } from '@angular/core';
+import {Injectable} from '@angular/core';
 import {
   AdapterDescription,
   GenericAdapterSetDescription,
diff --git a/ui/src/app/connect/data-marketplace/data-marketplace.component.ts b/ui/src/app/connect/data-marketplace/data-marketplace.component.ts
index fe03695..8f506da 100644
--- a/ui/src/app/connect/data-marketplace/data-marketplace.component.ts
+++ b/ui/src/app/connect/data-marketplace/data-marketplace.component.ts
@@ -23,13 +23,13 @@ import {ConnectService} from '../connect.service';
 import {FilterPipe} from './filter.pipe';
 import {AdapterUploadDialog} from './adapter-upload/adapter-upload-dialog.component';
 import {
-    AdapterDescription,
-    AdapterDescriptionUnion,
-    AdapterSetDescription,
-    AdapterStreamDescription,
-    EventSchema,
-    SpDataSet,
-    SpDataStream
+  AdapterDescription,
+  AdapterDescriptionUnion,
+  AdapterSetDescription,
+  AdapterStreamDescription,
+  EventSchema,
+  SpDataSet,
+  SpDataStream
 } from "../../core-model/gen/streampipes-model";
 import {PanelType} from "../../core-ui/dialog/base-dialog/base-dialog.model";
 import {DialogService} from "../../core-ui/dialog/base-dialog/base-dialog.service";
diff --git a/ui/src/app/connect/dialog/edit-event-property/components/edit-data-type/edit-data-type.component.ts b/ui/src/app/connect/dialog/edit-event-property/components/edit-data-type/edit-data-type.component.ts
index e53e56f..9520cac 100644
--- a/ui/src/app/connect/dialog/edit-event-property/components/edit-data-type/edit-data-type.component.ts
+++ b/ui/src/app/connect/dialog/edit-event-property/components/edit-data-type/edit-data-type.component.ts
@@ -16,8 +16,8 @@
  *
  */
 
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
-import { DataTypesService } from '../../../../schema-editor/data-type.service';
+import {Component, EventEmitter, Input, OnInit, Output} from '@angular/core';
+import {DataTypesService} from '../../../../schema-editor/data-type.service';
 
 @Component({
   selector: 'sp-edit-data-type',
diff --git a/ui/src/app/connect/dialog/edit-event-property/components/edit-event-property-list/edit-event-property-list.component.ts b/ui/src/app/connect/dialog/edit-event-property/components/edit-event-property-list/edit-event-property-list.component.ts
index 75b7e7a..3941ed4 100644
--- a/ui/src/app/connect/dialog/edit-event-property/components/edit-event-property-list/edit-event-property-list.component.ts
+++ b/ui/src/app/connect/dialog/edit-event-property/components/edit-event-property-list/edit-event-property-list.component.ts
@@ -16,7 +16,7 @@
  *
  */
 
-import { Component, Input } from '@angular/core';
+import {Component, Input} from '@angular/core';
 
 @Component({
   selector: 'sp-edit-event-property-list',
diff --git a/ui/src/app/connect/dialog/edit-event-property/components/edit-event-property-primitive/edit-event-property-primitive.component.ts b/ui/src/app/connect/dialog/edit-event-property/components/edit-event-property-primitive/edit-event-property-primitive.component.ts
index e974016..ba10210 100644
--- a/ui/src/app/connect/dialog/edit-event-property/components/edit-event-property-primitive/edit-event-property-primitive.component.ts
+++ b/ui/src/app/connect/dialog/edit-event-property/components/edit-event-property-primitive/edit-event-property-primitive.component.ts
@@ -16,8 +16,8 @@
  *
  */
 
-import { Component, Input, OnInit } from '@angular/core';
-import { DataTypesService } from '../../../../schema-editor/data-type.service';
+import {Component, Input, OnInit} from '@angular/core';
+import {DataTypesService} from '../../../../schema-editor/data-type.service';
 
 @Component({
   selector: 'sp-edit-event-property-primitive',
diff --git a/ui/src/app/connect/dialog/edit-event-property/components/edit-timestamp-property/edit-timestamp-property.component.ts b/ui/src/app/connect/dialog/edit-event-property/components/edit-timestamp-property/edit-timestamp-property.component.ts
index 6d6d5a7..c79060a 100644
--- a/ui/src/app/connect/dialog/edit-event-property/components/edit-timestamp-property/edit-timestamp-property.component.ts
+++ b/ui/src/app/connect/dialog/edit-event-property/components/edit-timestamp-property/edit-timestamp-property.component.ts
@@ -16,7 +16,7 @@
  *
  */
 
-import { Component, Input } from '@angular/core';
+import {Component, Input} from '@angular/core';
 
 @Component({
   selector: 'sp-edit-timestamp-property',
diff --git a/ui/src/app/connect/dialog/edit-event-property/components/edit-unit-transformation/edit-unit-transformation.component.ts b/ui/src/app/connect/dialog/edit-event-property/components/edit-unit-transformation/edit-unit-transformation.component.ts
index 36cfe90..640bf15 100644
--- a/ui/src/app/connect/dialog/edit-event-property/components/edit-unit-transformation/edit-unit-transformation.component.ts
+++ b/ui/src/app/connect/dialog/edit-event-property/components/edit-unit-transformation/edit-unit-transformation.component.ts
@@ -16,13 +16,13 @@
  *
  */
 
-import { Component, Input, OnInit } from '@angular/core';
-import { FormBuilder, FormControl } from '@angular/forms';
-import { Observable } from 'rxjs';
-import { map, startWith } from 'rxjs/operators';
-import { UnitDescription } from '../../../../model/UnitDescription';
-import { RestService } from '../../../../rest.service';
-import { UnitProviderService } from '../../../../schema-editor/unit-provider.service';
+import {Component, Input, OnInit} from '@angular/core';
+import {FormBuilder, FormControl} from '@angular/forms';
+import {Observable} from 'rxjs';
+import {map, startWith} from 'rxjs/operators';
+import {UnitDescription} from '../../../../model/UnitDescription';
+import {RestService} from '../../../../rest.service';
+import {UnitProviderService} from '../../../../schema-editor/unit-provider.service';
 
 @Component({
   selector: 'sp-edit-unit-transformation',
diff --git a/ui/src/app/connect/dialog/edit-event-property/edit-event-property.component.ts b/ui/src/app/connect/dialog/edit-event-property/edit-event-property.component.ts
index 45e6aef..e6f9a54 100644
--- a/ui/src/app/connect/dialog/edit-event-property/edit-event-property.component.ts
+++ b/ui/src/app/connect/dialog/edit-event-property/edit-event-property.component.ts
@@ -16,17 +16,17 @@
  *
  */
 
-import { Component, EventEmitter, Inject, OnInit, Output } from '@angular/core';
-import { FormBuilder, FormGroup, Validators } from '@angular/forms';
-import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
+import {Component, EventEmitter, Inject, OnInit, Output} from '@angular/core';
+import {FormBuilder, FormGroup, Validators} from '@angular/forms';
+import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog';
 import {
-    EventPropertyList,
-    EventPropertyNested,
-    EventPropertyPrimitive,
-    EventPropertyUnion
+  EventPropertyList,
+  EventPropertyNested,
+  EventPropertyPrimitive,
+  EventPropertyUnion
 } from '../../../core-model/gen/streampipes-model';
-import { SemanticTypeUtilsService } from '../../../core-services/semantic-type/semantic-type-utils.service';
-import { DataTypesService } from '../../schema-editor/data-type.service';
+import {SemanticTypeUtilsService} from '../../../core-services/semantic-type/semantic-type-utils.service';
+import {DataTypesService} from '../../schema-editor/data-type.service';
 
 
 @Component({
diff --git a/ui/src/app/connect/filter/timestamp.pipe.ts b/ui/src/app/connect/filter/timestamp.pipe.ts
index 4ad2342..0e29569 100644
--- a/ui/src/app/connect/filter/timestamp.pipe.ts
+++ b/ui/src/app/connect/filter/timestamp.pipe.ts
@@ -17,7 +17,6 @@
  */
 
 import {Pipe, PipeTransform} from '@angular/core';
-import {EventProperty} from '../schema-editor/model/EventProperty';
 import {EventPropertyUnion} from "../../core-model/gen/streampipes-model";
 
 @Pipe({
diff --git a/ui/src/app/connect/model/DataSinkInvocation.ts b/ui/src/app/connect/model/DataSinkInvocation.ts
index a91ddfc..5d43bcd 100644
--- a/ui/src/app/connect/model/DataSinkInvocation.ts
+++ b/ui/src/app/connect/model/DataSinkInvocation.ts
@@ -17,7 +17,6 @@
  */
 
 import {RdfId} from '../../platform-services/tsonld/RdfId';
-import {RdfProperty} from '../../platform-services/tsonld/RdfsProperty';
 import {RdfsClass} from '../../platform-services/tsonld/RdfsClass';
 import {InvocableStreamPipesEntity} from "./InvocableStreamPipesEntity";
 
diff --git a/ui/src/app/connect/model/UnnamedStreamPipesEntity.ts b/ui/src/app/connect/model/UnnamedStreamPipesEntity.ts
index 9864e0a..f3428f7 100644
--- a/ui/src/app/connect/model/UnnamedStreamPipesEntity.ts
+++ b/ui/src/app/connect/model/UnnamedStreamPipesEntity.ts
@@ -16,8 +16,8 @@
  *
  */
 
-import { RdfId } from '../../platform-services/tsonld/RdfId';
-import { RdfsClass } from '../../platform-services/tsonld/RdfsClass';
+import {RdfId} from '../../platform-services/tsonld/RdfId';
+import {RdfsClass} from '../../platform-services/tsonld/RdfsClass';
 
 @RdfsClass('sp:UnnamedStreamPipesEntity')
 export class UnnamedStreamPipesEntity {
diff --git a/ui/src/app/connect/model/grounding/EventGrounding.ts b/ui/src/app/connect/model/grounding/EventGrounding.ts
index b66b85c..f2471f3 100644
--- a/ui/src/app/connect/model/grounding/EventGrounding.ts
+++ b/ui/src/app/connect/model/grounding/EventGrounding.ts
@@ -20,7 +20,6 @@ import {RdfsClass} from "../../../platform-services/tsonld/RdfsClass";
 import {UnnamedStreamPipesEntity} from "../UnnamedStreamPipesEntity";
 import {TransportProtocol} from "./TransportProtocol";
 import {RdfProperty} from "../../../platform-services/tsonld/RdfsProperty";
-import {TransportFormat} from "./TransportFormat";
 
 @RdfsClass('sp:DataStreamGrounding')
 export class EventGrounding extends UnnamedStreamPipesEntity {
diff --git a/ui/src/app/connect/model/grounding/TransportFormat.ts b/ui/src/app/connect/model/grounding/TransportFormat.ts
index 1663c8f..a6a12a9 100644
--- a/ui/src/app/connect/model/grounding/TransportFormat.ts
+++ b/ui/src/app/connect/model/grounding/TransportFormat.ts
@@ -18,8 +18,6 @@
 
 import {RdfsClass} from "../../../platform-services/tsonld/RdfsClass";
 import {UnnamedStreamPipesEntity} from "../UnnamedStreamPipesEntity";
-import {RdfProperty} from "../../../platform-services/tsonld/RdfsProperty";
-import {URI} from "../URI";
 
 @RdfsClass('sp:TransportFormat')
 export class TransportFormat extends UnnamedStreamPipesEntity {
diff --git a/ui/src/app/connect/new-adapter/component/adapter-started-dialog.component.ts b/ui/src/app/connect/new-adapter/component/adapter-started-dialog.component.ts
index a25f0cf..2d73d82 100644
--- a/ui/src/app/connect/new-adapter/component/adapter-started-dialog.component.ts
+++ b/ui/src/app/connect/new-adapter/component/adapter-started-dialog.component.ts
@@ -22,12 +22,12 @@ import {ShepherdService} from '../../../services/tour/shepherd.service';
 import {RestService} from "../../rest.service";
 import {PipelineTemplateService} from '../../../platform-services/apis/pipeline-template.service';
 import {
-    FreeTextStaticProperty,
-    GenericAdapterSetDescription,
-    MappingPropertyUnary,
-    Message,
-    SpDataStream,
-    SpecificAdapterSetDescription
+  FreeTextStaticProperty,
+  GenericAdapterSetDescription,
+  MappingPropertyUnary,
+  Message,
+  SpDataStream,
+  SpecificAdapterSetDescription
 } from "../../../core-model/gen/streampipes-model";
 
 @Component({
diff --git a/ui/src/app/connect/new-adapter/new-adapter.component.ts b/ui/src/app/connect/new-adapter/new-adapter.component.ts
index c8fba28..90e1c60 100644
--- a/ui/src/app/connect/new-adapter/new-adapter.component.ts
+++ b/ui/src/app/connect/new-adapter/new-adapter.component.ts
@@ -17,40 +17,42 @@
  */
 
 import {
-    AfterViewInit, ChangeDetectorRef,
-    Component,
-    EventEmitter,
-    Input,
-    OnInit,
-    Output,
-    ViewChild
+  AfterViewInit,
+  ChangeDetectorRef,
+  Component,
+  EventEmitter,
+  Input,
+  OnInit,
+  Output,
+  ViewChild
 } from '@angular/core';
-import { FormBuilder, FormGroup, Validators } from '@angular/forms';
-import { MatDialog } from '@angular/material/dialog';
-import { MatStepper } from '@angular/material/stepper';
+import {FormBuilder, FormGroup, Validators} from '@angular/forms';
+import {MatDialog} from '@angular/material/dialog';
+import {MatStepper} from '@angular/material/stepper';
 import {
-    AdapterDescription, AdapterDescriptionUnion,
-    EventProperty,
-    EventRateTransformationRuleDescription,
-    EventSchema,
-    FormatDescription,
-    GenericAdapterSetDescription,
-    GenericAdapterStreamDescription,
-    RemoveDuplicatesTransformationRuleDescription,
-    SpecificAdapterSetDescription,
-    SpecificAdapterStreamDescription,
-    TransformationRuleDescriptionUnion
+  AdapterDescription,
+  AdapterDescriptionUnion,
+  EventProperty,
+  EventRateTransformationRuleDescription,
+  EventSchema,
+  FormatDescription,
+  GenericAdapterSetDescription,
+  GenericAdapterStreamDescription,
+  RemoveDuplicatesTransformationRuleDescription,
+  SpecificAdapterSetDescription,
+  SpecificAdapterStreamDescription,
+  TransformationRuleDescriptionUnion
 } from '../../core-model/gen/streampipes-model';
-import { ShepherdService } from '../../services/tour/shepherd.service';
-import { Logger } from '../../shared/logger/default-log.service';
-import { ConnectService } from '../connect.service';
-import { TimestampPipe } from '../filter/timestamp.pipe';
-import { ConfigurationInfo } from '../model/message/ConfigurationInfo';
-import { RestService } from '../rest.service';
-import { EventSchemaComponent } from '../schema-editor/event-schema/event-schema.component';
-import { TransformationRuleService } from '../transformation-rule.service';
-import { AdapterStartedDialog } from './component/adapter-started-dialog.component';
-import { IconService } from './icon.service';
+import {ShepherdService} from '../../services/tour/shepherd.service';
+import {Logger} from '../../shared/logger/default-log.service';
+import {ConnectService} from '../connect.service';
+import {TimestampPipe} from '../filter/timestamp.pipe';
+import {ConfigurationInfo} from '../model/message/ConfigurationInfo';
+import {RestService} from '../rest.service';
+import {EventSchemaComponent} from '../schema-editor/event-schema/event-schema.component';
+import {TransformationRuleService} from '../transformation-rule.service';
+import {AdapterStartedDialog} from './component/adapter-started-dialog.component';
+import {IconService} from './icon.service';
 
 @Component({
     selector: 'sp-new-adapter',
diff --git a/ui/src/app/connect/rest.service.ts b/ui/src/app/connect/rest.service.ts
index 0cf436d..0c3c08a 100644
--- a/ui/src/app/connect/rest.service.ts
+++ b/ui/src/app/connect/rest.service.ts
@@ -18,7 +18,7 @@
 
 import {Injectable} from '@angular/core';
 
-import {HttpClient, HttpHeaders} from '@angular/common/http';
+import {HttpClient} from '@angular/common/http';
 
 import {from, Observable} from 'rxjs';
 import {map} from 'rxjs/operators';
@@ -27,15 +27,13 @@ import {map} from 'rxjs/operators';
 import {AuthStatusService} from '../services/auth-status.service';
 import {UnitDescription} from './model/UnitDescription';
 import {
-    AdapterDescription, DataSourceDescription,
-    ErrorMessage,
+    AdapterDescription,
+    DataSourceDescription,
     FormatDescriptionList,
     GuessSchema,
     Message,
-    ProtocolDescriptionList,
-    RuntimeOptionsResponse
+    ProtocolDescriptionList
 } from "../core-model/gen/streampipes-model";
-import {StatusMessage} from "./model/message/StatusMessage";
 
 @Injectable()
 export class RestService {
diff --git a/ui/src/app/connect/schema-editor/data-type.service.ts b/ui/src/app/connect/schema-editor/data-type.service.ts
index 7dd2f2c..bb05d78 100644
--- a/ui/src/app/connect/schema-editor/data-type.service.ts
+++ b/ui/src/app/connect/schema-editor/data-type.service.ts
@@ -16,7 +16,7 @@
  *
  */
 
-import { Injectable } from '@angular/core';
+import {Injectable} from '@angular/core';
 
 @Injectable()
 export class DataTypesService {
diff --git a/ui/src/app/connect/schema-editor/event-property-row/event-property-row.component.ts b/ui/src/app/connect/schema-editor/event-property-row/event-property-row.component.ts
index 04afd00..1bee6ae 100644
--- a/ui/src/app/connect/schema-editor/event-property-row/event-property-row.component.ts
+++ b/ui/src/app/connect/schema-editor/event-property-row/event-property-row.component.ts
@@ -22,14 +22,14 @@ import {DomainPropertyProbabilityList} from "../model/DomainPropertyProbabilityL
 import {TreeNode} from "angular-tree-component";
 import {MatDialog} from "@angular/material/dialog";
 import {
-    EventProperty,
-    EventPropertyList,
-    EventPropertyNested,
-    EventPropertyPrimitive,
-    EventPropertyUnion,
-    EventSchema
+  EventProperty,
+  EventPropertyList,
+  EventPropertyNested,
+  EventPropertyPrimitive,
+  EventPropertyUnion,
+  EventSchema
 } from "../../../core-model/gen/streampipes-model";
-import { EditEventPropertyComponent } from '../../dialog/edit-event-property/edit-event-property.component';
+import {EditEventPropertyComponent} from '../../dialog/edit-event-property/edit-event-property.component';
 
 @Component({
     selector: 'event-property-row',
diff --git a/ui/src/app/connect/schema-editor/unit-provider.service.ts b/ui/src/app/connect/schema-editor/unit-provider.service.ts
index 3b7d8f5..85a8559 100644
--- a/ui/src/app/connect/schema-editor/unit-provider.service.ts
+++ b/ui/src/app/connect/schema-editor/unit-provider.service.ts
@@ -17,7 +17,7 @@
  */
 
 import {UnitDescription} from '../model/UnitDescription';
-import { Injectable } from "@angular/core";
+import {Injectable} from "@angular/core";
 
 @Injectable()
 export class UnitProviderService {
diff --git a/ui/src/app/connect/transformation-rule.service.ts b/ui/src/app/connect/transformation-rule.service.ts
index 0070e93..ee7294e 100644
--- a/ui/src/app/connect/transformation-rule.service.ts
+++ b/ui/src/app/connect/transformation-rule.service.ts
@@ -16,10 +16,11 @@
  *
  */
 
-import { Injectable } from '@angular/core';
+import {Injectable} from '@angular/core';
 import {
     AddTimestampRuleDescription,
-    AddValueTransformationRuleDescription, CreateNestedRuleDescription,
+    AddValueTransformationRuleDescription,
+    CreateNestedRuleDescription,
     DeleteRuleDescription,
     EventProperty,
     EventPropertyNested,
@@ -29,11 +30,11 @@ import {
     MoveRuleDescription,
     RenameRuleDescription,
     TimestampTranfsformationRuleDescription,
-     TransformationRuleDescriptionUnion,
+    TransformationRuleDescriptionUnion,
     UnitTransformRuleDescription
 } from '../core-model/gen/streampipes-model';
-import { Logger } from '../shared/logger/default-log.service';
-import { TimestampTransformationRuleMode } from './model/connect/rules/TimestampTransformationRuleMode';
+import {Logger} from '../shared/logger/default-log.service';
+import {TimestampTransformationRuleMode} from './model/connect/rules/TimestampTransformationRuleMode';
 
 @Injectable()
 export class TransformationRuleService {


[incubator-streampipes] 02/02: [STREAMPIPES-206] Remove deprecated UI models

Posted by ri...@apache.org.
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/incubator-streampipes.git

commit 6a9f58ab634fd4a236dac64568b30c15a3d5a4b9
Author: Dominik Riemer <ri...@fzi.de>
AuthorDate: Mon Aug 24 12:22:27 2020 +0200

    [STREAMPIPES-206] Remove deprecated UI models
---
 .../connect/format-form/format-form.component.ts   |   6 +-
 .../format-list-component/format-list.component.ts |   4 +-
 .../app/connect/model/AlternativeStaticProperty.ts |  37 ----
 .../connect/model/AlternativesStaticProperty.ts    |  35 ----
 ui/src/app/connect/model/AnyStaticProperty.ts      |  23 ---
 ui/src/app/connect/model/ApplicationLink.ts        |  51 ------
 ui/src/app/connect/model/BoundPipelineElement.ts   |  40 ----
 .../app/connect/model/CodeInputStaticProperty.ts   |  39 ----
 .../app/connect/model/CollectionStaticProperty.ts  |  41 -----
 .../app/connect/model/ColorPickerStaticProperty.ts |  33 ----
 .../model/{message => }/ConfigurationInfo.ts       |   0
 .../app/connect/model/DataProcessorInvocation.ts   |  45 -----
 ui/src/app/connect/model/DataSetDescription.ts     |  46 -----
 ui/src/app/connect/model/DataSinkInvocation.ts     |  33 ----
 ui/src/app/connect/model/DataSourceDescription.ts  |  34 ----
 ui/src/app/connect/model/DataStreamContainer.ts    |  37 ----
 ui/src/app/connect/model/DataStreamDescription.ts  |  41 -----
 ui/src/app/connect/model/FileStaticProperty.ts     |  56 ------
 ui/src/app/connect/model/FreeTextStaticProperty.ts |  43 -----
 ui/src/app/connect/model/GroupStaticProperty.ts    |  40 ----
 .../connect/model/InvocableStreamPipesEntity.ts    |  57 ------
 ui/src/app/connect/model/MappingPropertyNary.ts    |  42 -----
 ui/src/app/connect/model/MappingPropertyUnary.ts   |  43 -----
 ui/src/app/connect/model/NamedStreamPipesEntity.ts |  48 -----
 ui/src/app/connect/model/OneOfStaticProperty.ts    |  23 ---
 ui/src/app/connect/model/Option.ts                 |  44 -----
 .../connect/model/PipelineTemplateDescription.ts   |  51 ------
 .../model/PipelineTemplateDescriptionContainer.ts  |  37 ----
 .../connect/model/PipelineTemplateInvocation.ts    |  46 -----
 .../model/RuntimeResolvableAnyStaticProperty.ts    |  32 ----
 .../model/RuntimeResolvableOneOfStaticProperty.ts  |  34 ----
 ui/src/app/connect/model/SecretStaticProperty.ts   |  41 -----
 .../app/connect/model/SelectionStaticProperty.ts   |  43 -----
 ui/src/app/connect/model/StaticProperty.ts         |  60 ------
 .../rules => }/TimestampTransformationRuleMode.ts  |   0
 ui/src/app/connect/model/URI.ts                    |  38 ----
 .../app/connect/model/UnnamedStreamPipesEntity.ts  |  41 -----
 .../connect/model/connect/AdapterDescription.ts    |  88 ---------
 .../model/connect/AdapterDescriptionList.ts        |  38 ----
 .../connect/model/connect/AdapterSetDescription.ts |  38 ----
 .../model/connect/AdapterStreamDescription.ts      |  38 ----
 .../model/connect/GenericAdapterSetDescription.ts  |  39 ----
 .../connect/GenericAdapterStreamDescription.ts     |  39 ----
 .../model/connect/SpecificAdapterSetDescription.ts |  30 ---
 .../connect/SpecificAdapterStreamDescription.ts    |  29 ---
 .../model/connect/grounding/FormatDescription.ts   |  51 ------
 .../connect/grounding/FormatDescriptionList.ts     |  38 ----
 .../model/connect/grounding/ProtocolDescription.ts |  73 --------
 .../connect/grounding/ProtocolDescriptionList.ts   |  38 ----
 .../connect/grounding/ProtocolSetDescription.ts    |  29 ---
 .../connect/grounding/ProtocolStreamDescription.ts |  29 ---
 .../connect/rules/AddNestedRuleDescription.ts      |  39 ----
 .../connect/rules/AddTimestampRuleDescription.ts   |  39 ----
 .../rules/AddValueTransformationRuleDescription.ts |  43 -----
 .../model/connect/rules/DeleteRuleDescription.ts   |  39 ----
 .../EventRateTransformationRuleDescription.ts      |  43 -----
 .../model/connect/rules/MoveRuleDesctiption.ts     |  44 -----
 .../rules/RemoveDuplicatesRuleDescription.ts       |  39 ----
 .../model/connect/rules/RenameRuleDescription.ts   |  44 -----
 .../TimestampTransformationRuleDescription.ts      |  53 ------
 .../connect/rules/TransformationRuleDescription.ts |  24 ---
 .../connect/rules/UnitTransformRuleDescription.ts  |  49 -----
 .../model/connect/runtime/RuntimeOptionsRequest.ts |  41 -----
 .../connect/runtime/RuntimeOptionsResponse.ts      |  41 -----
 .../app/connect/model/grounding/EventGrounding.ts  |  32 ----
 .../model/grounding/JmsTransportProtocol.ts        |  17 --
 .../model/grounding/KafkaTransportProtocol.ts      |  17 --
 .../app/connect/model/grounding/TopicDefinition.ts |  29 ---
 .../app/connect/model/grounding/TransportFormat.ts |  27 ---
 .../connect/model/grounding/TransportProtocol.ts   |  32 ----
 ui/src/app/connect/model/message/ErrorMessage.ts   |  31 ----
 ui/src/app/connect/model/message/MessageLd.ts      |  42 -----
 ui/src/app/connect/model/message/Notification.ts   |  28 ---
 ui/src/app/connect/model/message/NotificationLd.ts |  41 -----
 ui/src/app/connect/model/message/StatusMessage.ts  |  28 ---
 ui/src/app/connect/model/message/SuccessMessage.ts |  31 ----
 .../connect/model/output/AppendOutputStrategy.ts   |  34 ----
 .../connect/model/output/CustomOutputStrategy.ts   |  38 ----
 .../model/output/CustomTransformOutputStrategy.ts  |  34 ----
 .../connect/model/output/FixedOutputStrategy.ts    |  34 ----
 .../app/connect/model/output/KeepOutputStrategy.ts |  36 ----
 .../app/connect/model/output/ListOutputStrategy.ts |  33 ----
 ui/src/app/connect/model/output/OutputStrategy.ts  |  40 ----
 .../app/connect/model/output/PropertyRenameRule.ts |  40 ----
 .../app/connect/model/output/TransformOperation.ts |  43 -----
 .../connect/model/output/TransformOperationType.ts |  19 --
 .../model/output/TransformOutputStrategy.ts        |  37 ----
 .../model/output/UserDefinedOutputStrategy.ts      |  33 ----
 .../component/adapter-started-dialog.component.ts  |  43 +++--
 .../connect/new-adapter/new-adapter.component.ts   |   2 +-
 .../event-property-row.component.ts                |   3 -
 .../event-schema-preview.component.ts              |   2 +-
 .../model/DomainPropertyProbability.ts             |  40 ----
 .../model/DomainPropertyProbabilityList.ts         |  39 ----
 .../app/connect/schema-editor/model/Enumeration.ts |  58 ------
 .../connect/schema-editor/model/EventProperty.ts   | 101 -----------
 .../schema-editor/model/EventPropertyList.ts       |  48 -----
 .../schema-editor/model/EventPropertyNested.ts     |  50 -----
 .../schema-editor/model/EventPropertyPrimitive.ts  |  91 ----------
 .../app/connect/schema-editor/model/EventSchema.ts |  53 ------
 .../app/connect/schema-editor/model/ExampleNode.ts |  32 ----
 .../app/connect/schema-editor/model/GuessSchema.ts |  39 ----
 .../schema-editor/model/QuantitativeValue.ts       |  44 -----
 .../base/abstract-static-property.ts               |   2 +-
 .../static-collection.component.ts                 |   2 +-
 .../static-color-picker.component.ts               |   2 +-
 .../static-free-input.component.ts                 |   2 +-
 .../static-property-util.service.ts                |   5 -
 .../static-properties/static-property.component.ts |   2 +-
 .../base-runtime-resolvable-input.ts               |   2 +-
 .../static-secret-input.component.ts               |   2 +-
 .../connect/transformation-rule.service.spec.ts    | 103 ++++++-----
 ui/src/app/connect/transformation-rule.service.ts  |   2 +-
 ui/src/app/core-model/dashboard/DashboardWidget.ts |  48 -----
 .../dashboard/DashboardWidgetSettings.ts           |  49 -----
 .../core-model/dashboard/VisualizablePipeline.ts   |  54 ------
 ui/src/app/core-model/datalake/DateRange.ts        |   7 -
 .../shared/shared-dashboard.service.ts             |   9 +-
 .../sdk/matching/mapping-property-generator.ts     |   1 -
 ui/src/app/dashboard/services/dashboard.service.ts |  30 +--
 .../group-configuration.component.ts               |   4 +-
 .../app/data-explorer/data-explorer.component.ts   |   3 +-
 .../registry/data-explorer-widget-registry.ts      |   3 -
 .../registry/widget-config-builder.ts              |   9 +-
 .../sdk/collected-schema-requirements.ts           |  11 +-
 ui/src/app/data-explorer/sdk/ep-requirements.ts    |  22 +--
 .../sdk/extractor/static-property-extractor.ts     |  16 +-
 .../sdk/matching/domain-property-match.ts          |  10 +-
 .../sdk/matching/mapping-property-generator.ts     |   4 +-
 .../sdk/matching/primitive-property-match.ts       |   4 +-
 .../data-explorer/sdk/matching/property-match.ts   |   8 +-
 .../sdk/schema-requirements-builder.ts             |  23 +--
 .../services/data-view-data-explorer.service.ts    |   4 +-
 .../editor/dialog/customize/customize.component.ts |   2 +-
 ui/src/app/editor/services/editor.service.ts       |   6 +-
 .../notifications/service/notifications.service.ts |   9 +-
 .../apis/pipeline-element.service.ts               |  14 +-
 .../apis/pipeline-template.service.ts              | 201 ++++++++++-----------
 ui/src/app/platform-services/platform.module.ts    |   3 +-
 ui/src/app/platform-services/tsonld/Float.ts       |  20 --
 ui/src/app/platform-services/tsonld/RdfId.js       |  25 ---
 ui/src/app/platform-services/tsonld/RdfId.ts       |  22 ---
 ui/src/app/platform-services/tsonld/RdfsClass.js   |  26 ---
 ui/src/app/platform-services/tsonld/RdfsClass.ts   |  23 ---
 .../app/platform-services/tsonld/RdfsProperty.js   |  27 ---
 .../app/platform-services/tsonld/RdfsProperty.ts   |  24 ---
 146 files changed, 298 insertions(+), 4467 deletions(-)

diff --git a/ui/src/app/connect/format-form/format-form.component.ts b/ui/src/app/connect/format-form/format-form.component.ts
index 0297e4a..f55137c 100644
--- a/ui/src/app/connect/format-form/format-form.component.ts
+++ b/ui/src/app/connect/format-form/format-form.component.ts
@@ -17,8 +17,8 @@
  */
 
 import {Component, EventEmitter, Input, OnInit, Output} from '@angular/core';
-import {FormatDescription} from '../model/connect/grounding/FormatDescription';
 import {isUndefined} from 'util';
+import {FormatDescription} from "../../core-model/gen/streampipes-model";
 
 @Component({
     selector: 'app-format-form',
@@ -45,7 +45,7 @@ export class FormatFormComponent implements OnInit {
             return false;
         } else {
             this.selectedFormatChange.emit(this.selectedFormat);
-            return f.label === this.selectedFormat.label;
+            return f.name === this.selectedFormat.name;
         }
     }
 
@@ -55,7 +55,7 @@ export class FormatFormComponent implements OnInit {
 
         setTimeout(() => {
             for (var i = 0; i < this.allFormats.length ; i++) {
-                if (selectedFormat && this.allFormats[i].label == selectedFormat.label) {
+                if (selectedFormat && this.allFormats[i].name == selectedFormat.name) {
                     this.showStaticProperty.push(true);
                     this.hasInput.push(true);
                 } else {
diff --git a/ui/src/app/connect/format-list-component/format-list.component.ts b/ui/src/app/connect/format-list-component/format-list.component.ts
index 3804a7b..b48bf96 100644
--- a/ui/src/app/connect/format-list-component/format-list.component.ts
+++ b/ui/src/app/connect/format-list-component/format-list.component.ts
@@ -17,7 +17,7 @@
  */
 
 import {Component, EventEmitter, Input, Output} from '@angular/core';
-import {FormatDescription} from '../model/connect/grounding/FormatDescription';
+import {FormatDescription} from "../../core-model/gen/streampipes-model";
 
 @Component({
     selector: 'app-format-list',
@@ -38,7 +38,7 @@ export class FormatListComponent {
 
       this.allFormats.forEach(format => {
         if(format!=selectedFormat){
-          format.edit = false;
+          (format as any).edit = false;
         }
       });
 
diff --git a/ui/src/app/connect/model/AlternativeStaticProperty.ts b/ui/src/app/connect/model/AlternativeStaticProperty.ts
deleted file mode 100644
index fb6aff1..0000000
--- a/ui/src/app/connect/model/AlternativeStaticProperty.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfsClass} from '../../platform-services/tsonld/RdfsClass';
-import {StaticProperty} from './StaticProperty';
-import {RdfProperty} from '../../platform-services/tsonld/RdfsProperty';
-
-@RdfsClass('sp:StaticPropertyAlternative')
-export class AlternativeStaticProperty extends StaticProperty {
-
-    @RdfProperty('sp:isSelected')
-    public selected: boolean;
-
-    @RdfProperty('sp:hasStaticProperty')
-    public staticProperty: StaticProperty;
-
-    constructor(id: string) {
-        super();
-        this.id = id;
-    }
-
-}
\ No newline at end of file
diff --git a/ui/src/app/connect/model/AlternativesStaticProperty.ts b/ui/src/app/connect/model/AlternativesStaticProperty.ts
deleted file mode 100644
index 55f6c6b..0000000
--- a/ui/src/app/connect/model/AlternativesStaticProperty.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfsClass} from '../../platform-services/tsonld/RdfsClass';
-import {StaticProperty} from './StaticProperty';
-import {RdfProperty} from '../../platform-services/tsonld/RdfsProperty';
-import {AlternativeStaticProperty} from './AlternativeStaticProperty';
-
-@RdfsClass('sp:StaticPropertyAlternatives')
-export class AlternativesStaticProperty extends StaticProperty {
-
-    @RdfProperty('sp:hasStaticPropertyAlternative')
-    public alternatives: AlternativeStaticProperty[] = [];
-
-
-    constructor(id: string) {
-        super();
-        this.id = id;
-    }
-}
\ No newline at end of file
diff --git a/ui/src/app/connect/model/AnyStaticProperty.ts b/ui/src/app/connect/model/AnyStaticProperty.ts
deleted file mode 100644
index 0814a92..0000000
--- a/ui/src/app/connect/model/AnyStaticProperty.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfsClass} from '../../platform-services/tsonld/RdfsClass';
-import {SelectionStaticProperty} from './SelectionStaticProperty';
-
-@RdfsClass('sp:AnyStaticProperty')
-export class AnyStaticProperty extends SelectionStaticProperty {}
diff --git a/ui/src/app/connect/model/ApplicationLink.ts b/ui/src/app/connect/model/ApplicationLink.ts
deleted file mode 100644
index cb27ef2..0000000
--- a/ui/src/app/connect/model/ApplicationLink.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfId} from '../../platform-services/tsonld/RdfId';
-import {RdfProperty} from '../../platform-services/tsonld/RdfsProperty';
-import {RdfsClass} from '../../platform-services/tsonld/RdfsClass';
-
-@RdfsClass('sp:ApplicationLink')
-export class ApplicationLink {
-
-    @RdfId
-    public id: string;
-
-    @RdfProperty('http://www.w3.org/2000/01/rdf-schema#label')
-    public name: string;
-
-    @RdfProperty('http://www.w3.org/2000/01/rdf-schema#description')
-    public description: string;
-
-    @RdfProperty('sp:applicationUrl')
-    public applicationUrl: string;
-
-    @RdfProperty('sp:applicationDescription')
-    public applicationDescription: string;
-
-    @RdfProperty('sp:iconUrl')
-    public iconUrl: string;
-
-    @RdfProperty('sp:applicationLinkType')
-    public applicationLinkType: string;
-
-
-    constructor(id: string) {
-        this.id = id;
-    }
-}
diff --git a/ui/src/app/connect/model/BoundPipelineElement.ts b/ui/src/app/connect/model/BoundPipelineElement.ts
deleted file mode 100644
index 00600c9..0000000
--- a/ui/src/app/connect/model/BoundPipelineElement.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfId} from '../../platform-services/tsonld/RdfId';
-import {RdfProperty} from '../../platform-services/tsonld/RdfsProperty';
-import {RdfsClass} from '../../platform-services/tsonld/RdfsClass';
-import {InvocableStreamPipesEntity} from "./InvocableStreamPipesEntity";
-
-@RdfsClass('sp:BoundPipelineElement')
-export class BoundPipelineElement {
-
-    @RdfId
-    public id: string;
-
-    @RdfProperty('sp:hasPipelineElementTemplate')
-    private template: InvocableStreamPipesEntity;
-
-    @RdfProperty('sp:isConnectedTo')
-    public connectedTo: BoundPipelineElement[] = [];
-
-    constructor(id: string) {
-        this.id = id;
-    }
-
-}
\ No newline at end of file
diff --git a/ui/src/app/connect/model/CodeInputStaticProperty.ts b/ui/src/app/connect/model/CodeInputStaticProperty.ts
deleted file mode 100644
index 20fd079..0000000
--- a/ui/src/app/connect/model/CodeInputStaticProperty.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfsClass} from "../../platform-services/tsonld/RdfsClass";
-import {StaticProperty} from "./StaticProperty";
-import {RdfProperty} from "../../platform-services/tsonld/RdfsProperty";
-
-@RdfsClass('sp:CodeInputStaticProperty')
-export class CodeInputStaticProperty extends StaticProperty {
-
-    @RdfProperty('sp:hasLanguage')
-    public language: string;
-
-    @RdfProperty('sp:hasCodeTemplate')
-    public codeTemplate: string;
-
-    @RdfProperty('hasCodeInput')
-    public value: string;
-
-    constructor() {
-        super();
-    }
-
-}
\ No newline at end of file
diff --git a/ui/src/app/connect/model/CollectionStaticProperty.ts b/ui/src/app/connect/model/CollectionStaticProperty.ts
deleted file mode 100644
index a820eb6..0000000
--- a/ui/src/app/connect/model/CollectionStaticProperty.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-
-import {RdfsClass} from '../../platform-services/tsonld/RdfsClass';
-import {RdfProperty} from '../../platform-services/tsonld/RdfsProperty';
-import {StaticProperty} from './StaticProperty';
-
-@RdfsClass('sp:CollectionStaticProperty')
-export class CollectionStaticProperty extends StaticProperty {
-
-    @RdfProperty('sp:hasStaticProperty')
-    public staticPropertyTemplate: StaticProperty;
-
-    @RdfProperty('sp:member')
-    public members: StaticProperty [];
-
-    @RdfProperty('sp:memberType')
-    public memberType: String;
-
-    constructor(id: string) {
-        super();
-        this.id = id;
-    }
-
-}
\ No newline at end of file
diff --git a/ui/src/app/connect/model/ColorPickerStaticProperty.ts b/ui/src/app/connect/model/ColorPickerStaticProperty.ts
deleted file mode 100644
index 5124893..0000000
--- a/ui/src/app/connect/model/ColorPickerStaticProperty.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfsClass} from "../../platform-services/tsonld/RdfsClass";
-import {StaticProperty} from "./StaticProperty";
-import {RdfProperty} from "../../platform-services/tsonld/RdfsProperty";
-
-@RdfsClass('sp:ColorPickerStaticProperty')
-export class ColorPickerStaticProperty extends StaticProperty {
-
-    @RdfProperty('sp:hasSelectedColor')
-    public selectedColor: string;
-
-    constructor() {
-        super();
-    }
-
-}
\ No newline at end of file
diff --git a/ui/src/app/connect/model/message/ConfigurationInfo.ts b/ui/src/app/connect/model/ConfigurationInfo.ts
similarity index 100%
rename from ui/src/app/connect/model/message/ConfigurationInfo.ts
rename to ui/src/app/connect/model/ConfigurationInfo.ts
diff --git a/ui/src/app/connect/model/DataProcessorInvocation.ts b/ui/src/app/connect/model/DataProcessorInvocation.ts
deleted file mode 100644
index 2060db8..0000000
--- a/ui/src/app/connect/model/DataProcessorInvocation.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfId} from '../../platform-services/tsonld/RdfId';
-import {RdfProperty} from '../../platform-services/tsonld/RdfsProperty';
-import {RdfsClass} from '../../platform-services/tsonld/RdfsClass';
-import {DataStreamDescription} from './DataStreamDescription';
-import {OutputStrategy} from './output/OutputStrategy';
-import {InvocableStreamPipesEntity} from "./InvocableStreamPipesEntity";
-
-@RdfsClass('sp:DataProcessorInvocation')
-export class DataProcessorInvocation extends InvocableStreamPipesEntity {
-
-    @RdfId
-    public id: string;
-
-    @RdfProperty('sp:produces')
-    public outputStream: DataStreamDescription;
-
-    @RdfProperty('sp:hasOutputStrategy')
-    public outputStrategies: OutputStrategy[];
-
-    @RdfProperty('sp:hasEpaType')
-    public category: string[];
-
-    constructor(id: string) {
-        super(id);
-    }
-
-}
\ No newline at end of file
diff --git a/ui/src/app/connect/model/DataSetDescription.ts b/ui/src/app/connect/model/DataSetDescription.ts
deleted file mode 100644
index 2e5bd51..0000000
--- a/ui/src/app/connect/model/DataSetDescription.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfId} from '../../platform-services/tsonld/RdfId';
-import {RdfProperty} from '../../platform-services/tsonld/RdfsProperty';
-import {RdfsClass} from '../../platform-services/tsonld/RdfsClass';
-import {EventSchema} from '../schema-editor/model/EventSchema';
-
-@RdfsClass('sp:DataSet')
-export class DataSetDescription {
-
-  @RdfId
-  public id: string;
-
-  @RdfProperty('http://www.w3.org/2000/01/rdf-schema#label')
-  public label: string;
-
-  @RdfProperty('http://www.w3.org/2000/01/rdf-schema#description')
-  public description: string;
-
-  @RdfProperty('sp:hasUri')
-  public uri: string;
-
-  @RdfProperty('sp:hasSchema')
-  public eventSchema: EventSchema;
-
-  constructor(id: string) {
-    this.id = id;
-  }
-
-}
\ No newline at end of file
diff --git a/ui/src/app/connect/model/DataSinkInvocation.ts b/ui/src/app/connect/model/DataSinkInvocation.ts
deleted file mode 100644
index 5d43bcd..0000000
--- a/ui/src/app/connect/model/DataSinkInvocation.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfId} from '../../platform-services/tsonld/RdfId';
-import {RdfsClass} from '../../platform-services/tsonld/RdfsClass';
-import {InvocableStreamPipesEntity} from "./InvocableStreamPipesEntity";
-
-@RdfsClass('sp:DataSinkInvocation')
-export class DataSinkInvocation extends InvocableStreamPipesEntity {
-
-    @RdfId
-    public id: string;
-
-    constructor(id: string) {
-        super(id);
-    }
-
-}
diff --git a/ui/src/app/connect/model/DataSourceDescription.ts b/ui/src/app/connect/model/DataSourceDescription.ts
deleted file mode 100644
index b25a8af..0000000
--- a/ui/src/app/connect/model/DataSourceDescription.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfProperty} from '../../platform-services/tsonld/RdfsProperty';
-import {RdfsClass} from '../../platform-services/tsonld/RdfsClass';
-import {NamedStreamPipesEntity} from "./NamedStreamPipesEntity";
-import {DataStreamDescription} from "./DataStreamDescription";
-
-@RdfsClass('sp:DataSourceDescription')
-export class DataSourceDescription extends NamedStreamPipesEntity {
-
-    @RdfProperty('sp:produces')
-    public spDataStreams: DataStreamDescription[];
-
-    constructor(id: string) {
-        super(id);
-    }
-
-}
\ No newline at end of file
diff --git a/ui/src/app/connect/model/DataStreamContainer.ts b/ui/src/app/connect/model/DataStreamContainer.ts
deleted file mode 100644
index 0a7ee09..0000000
--- a/ui/src/app/connect/model/DataStreamContainer.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfId} from '../../platform-services/tsonld/RdfId';
-import {RdfProperty} from '../../platform-services/tsonld/RdfsProperty';
-import {RdfsClass} from '../../platform-services/tsonld/RdfsClass';
-import {DataSetDescription} from './DataSetDescription';
-
-@RdfsClass('sp:DataStreamContainer')
-export class DataStreamContainer {
-
-    @RdfId
-    public id: string;
-
-    @RdfProperty('sp:list')
-    public list: DataSetDescription[] = [];
-
-    constructor(id: string) {
-        this.id = id;
-    }
-
-}
\ No newline at end of file
diff --git a/ui/src/app/connect/model/DataStreamDescription.ts b/ui/src/app/connect/model/DataStreamDescription.ts
deleted file mode 100644
index f18acb3..0000000
--- a/ui/src/app/connect/model/DataStreamDescription.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfId} from '../../platform-services/tsonld/RdfId';
-import {RdfProperty} from '../../platform-services/tsonld/RdfsProperty';
-import {RdfsClass} from '../../platform-services/tsonld/RdfsClass';
-import {EventSchema} from '../schema-editor/model/EventSchema';
-import {NamedStreamPipesEntity} from "./NamedStreamPipesEntity";
-
-@RdfsClass('sp:DataStream')
-export class DataStreamDescription extends NamedStreamPipesEntity {
-
-    @RdfId
-    public id: string;
-
-    @RdfProperty('sp:hasUri')
-    public uri: string;
-
-    @RdfProperty('sp:hasSchema')
-    public eventSchema: EventSchema;
-
-    constructor(id: string) {
-        super(id);
-    }
-
-}
diff --git a/ui/src/app/connect/model/FileStaticProperty.ts b/ui/src/app/connect/model/FileStaticProperty.ts
deleted file mode 100644
index 9e492ae..0000000
--- a/ui/src/app/connect/model/FileStaticProperty.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfId} from '../../platform-services/tsonld/RdfId';
-import {RdfProperty} from '../../platform-services/tsonld/RdfsProperty';
-import {RdfsClass} from '../../platform-services/tsonld/RdfsClass';
-import {StaticProperty} from './StaticProperty';
-
-@RdfsClass('sp:FileStaticProperty')
-export class FileStaticProperty extends StaticProperty {
-
-    @RdfId
-    public id: string;
-
-    @RdfProperty('sp:elementName')
-    public elementName: string;
-
-    @RdfProperty('sp:hasValue')
-    public value: string ;
-
-    @RdfProperty('http://www.w3.org/2000/01/rdf-schema#label')
-    public label: string;
-
-    @RdfProperty('http://www.w3.org/2000/01/rdf-schema#description')
-    public description: string;
-
-    @RdfProperty('sp:internalName')
-    public internalName: string;
-
-    @RdfProperty('sp:endpointUrl')
-    public endpointUrl: string;
-
-    @RdfProperty('sp:locationPath')
-    public locationPath: string ;
-
-    constructor(id: string) {
-        super();
-        this.id = id;
-    }
-
-}
\ No newline at end of file
diff --git a/ui/src/app/connect/model/FreeTextStaticProperty.ts b/ui/src/app/connect/model/FreeTextStaticProperty.ts
deleted file mode 100644
index f1b4653..0000000
--- a/ui/src/app/connect/model/FreeTextStaticProperty.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfProperty} from '../../platform-services/tsonld/RdfsProperty';
-import {RdfsClass} from '../../platform-services/tsonld/RdfsClass';
-import {StaticProperty} from './StaticProperty';
-
-@RdfsClass('sp:FreeTextStaticProperty')
-export class FreeTextStaticProperty extends StaticProperty {
-
-  @RdfProperty('sp:hasValue')
-  public value: string;
-
-  @RdfProperty('sp:requiredDomainProperty')
-  public requiredDomainProperty: string;
-
-  @RdfProperty('sp:requiresDatatype')
-  public requiredDatatype: string;
-
-  //TODO find better solution
-  public render: boolean;
-
-  constructor() {
-    super();
-    this.render = true;
-  }
-
-}
diff --git a/ui/src/app/connect/model/GroupStaticProperty.ts b/ui/src/app/connect/model/GroupStaticProperty.ts
deleted file mode 100644
index f457508..0000000
--- a/ui/src/app/connect/model/GroupStaticProperty.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfsClass} from '../../platform-services/tsonld/RdfsClass';
-import {StaticProperty} from './StaticProperty';
-import {RdfProperty} from '../../platform-services/tsonld/RdfsProperty';
-
-@RdfsClass('sp:StaticPropertyGroup')
-export class GroupStaticProperty extends StaticProperty {
-
-    @RdfProperty('sp:hasStaticProperty')
-    public staticProperties: StaticProperty[];
-
-    @RdfProperty('sp:showLabel')
-    public showLabel: boolean;
-
-    @RdfProperty('sp:isHorizontalRendering')
-    public horizontalRendering: boolean;
-
-    constructor(id: string) {
-        super();
-        this.id = id;
-    }
-
-}
\ No newline at end of file
diff --git a/ui/src/app/connect/model/InvocableStreamPipesEntity.ts b/ui/src/app/connect/model/InvocableStreamPipesEntity.ts
deleted file mode 100644
index 3d081ae..0000000
--- a/ui/src/app/connect/model/InvocableStreamPipesEntity.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfProperty} from '../../platform-services/tsonld/RdfsProperty';
-import {RdfsClass} from '../../platform-services/tsonld/RdfsClass';
-import {NamedStreamPipesEntity} from "./NamedStreamPipesEntity";
-import {StaticProperty} from "./StaticProperty";
-import {DataStreamDescription} from "./DataStreamDescription";
-import {EventGrounding} from "./grounding/EventGrounding";
-
-@RdfsClass('sp:InvocableStreamPipesEntity')
-export class InvocableStreamPipesEntity extends NamedStreamPipesEntity {
-
-    @RdfProperty('sp:receivesStream')
-    public inputStreams: DataStreamDescription[];
-
-    @RdfProperty('sp:hasStaticProperty')
-    public staticProperties: Array<StaticProperty>;
-
-    @RdfProperty('sp:belongsTo')
-    public belongsTo: string;
-
-    @RdfProperty('sp:supportedGrounding')
-    public supportedGrounding: EventGrounding;
-
-    @RdfProperty('sp:correspondingPipeline')
-    public correspondingPipeline: string;
-
-    @RdfProperty('sp:hasCorrespondingUser')
-    public correspondingUser: string;
-
-    @RdfProperty('sp:requiresStream')
-    public streamRequirements: DataStreamDescription[];
-
-    @RdfProperty('sp:isPeConfigured')
-    public configured: boolean;
-
-    constructor(id: string) {
-        super(id);
-    }
-
-}
diff --git a/ui/src/app/connect/model/MappingPropertyNary.ts b/ui/src/app/connect/model/MappingPropertyNary.ts
deleted file mode 100644
index 48ee0ea..0000000
--- a/ui/src/app/connect/model/MappingPropertyNary.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfProperty} from '../../platform-services/tsonld/RdfsProperty';
-import {RdfsClass} from '../../platform-services/tsonld/RdfsClass';
-import {StaticProperty} from './StaticProperty';
-
-@RdfsClass('sp:MappingPropertyNary')
-export class MappingPropertyNary extends StaticProperty {
-
-  @RdfProperty('sp:mapsFrom')
-  public requirementSelector: string;
-
-  @RdfProperty('sp:hasMapsFromOptions')
-  public mapsFromOptions: string[];
-
-  @RdfProperty('sp:hasPropertyScope')
-  public propertyScope: string;
-
-  @RdfProperty('sp:mapsTo')
-  public selectedProperties: string[];
-
-  constructor() {
-      super();
-  }
-
-}
diff --git a/ui/src/app/connect/model/MappingPropertyUnary.ts b/ui/src/app/connect/model/MappingPropertyUnary.ts
deleted file mode 100644
index 0d3efec..0000000
--- a/ui/src/app/connect/model/MappingPropertyUnary.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfProperty} from '../../platform-services/tsonld/RdfsProperty';
-import {RdfsClass} from '../../platform-services/tsonld/RdfsClass';
-import {StaticProperty} from './StaticProperty';
-
-@RdfsClass('sp:MappingPropertyUnary')
-export class MappingPropertyUnary extends StaticProperty {
-
-    @RdfProperty('sp:mapsFrom')
-    public requirementSelector: string;
-
-    @RdfProperty('sp:hasMapsFromOptions')
-    public mapsFromOptions: string[];
-
-    @RdfProperty('sp:hasPropertyScope')
-    public propertyScope: string;
-
-    @RdfProperty('sp:mapsTo')
-    public selectedProperty: string;
-
-
-    constructor() {
-        super();
-    }
-
-}
diff --git a/ui/src/app/connect/model/NamedStreamPipesEntity.ts b/ui/src/app/connect/model/NamedStreamPipesEntity.ts
deleted file mode 100644
index 80cab38..0000000
--- a/ui/src/app/connect/model/NamedStreamPipesEntity.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfId} from '../../platform-services/tsonld/RdfId';
-import {RdfProperty} from '../../platform-services/tsonld/RdfsProperty';
-import {RdfsClass} from '../../platform-services/tsonld/RdfsClass';
-import {ApplicationLink} from "./ApplicationLink";
-
-@RdfsClass('sp:StaticProperty')
-export class NamedStreamPipesEntity {
-
-    @RdfId
-    @RdfProperty('sp:hasUri')
-    public uri: string;
-
-    @RdfProperty('http://www.w3.org/2000/01/rdf-schema#label')
-    public name: string;
-
-    @RdfProperty('http://www.w3.org/2000/01/rdf-schema#description')
-    public description: string;
-
-    @RdfProperty('sp:iconUrl')
-    public iconUrl: string;
-
-    @RdfProperty('sp:hasApplicationLink')
-    public applicationLinks: Array<ApplicationLink>;
-
-    public type: string;
-
-    constructor(uri: string) {
-      this.uri = uri;
-    }
-}
diff --git a/ui/src/app/connect/model/OneOfStaticProperty.ts b/ui/src/app/connect/model/OneOfStaticProperty.ts
deleted file mode 100644
index a03e786..0000000
--- a/ui/src/app/connect/model/OneOfStaticProperty.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfsClass} from '../../platform-services/tsonld/RdfsClass';
-import {SelectionStaticProperty} from './SelectionStaticProperty';
-
-@RdfsClass('sp:OneOfStaticProperty')
-export class OneOfStaticProperty extends SelectionStaticProperty {}
\ No newline at end of file
diff --git a/ui/src/app/connect/model/Option.ts b/ui/src/app/connect/model/Option.ts
deleted file mode 100644
index 5042495..0000000
--- a/ui/src/app/connect/model/Option.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfId} from '../../platform-services/tsonld/RdfId';
-import {RdfProperty} from '../../platform-services/tsonld/RdfsProperty';
-import {RdfsClass} from '../../platform-services/tsonld/RdfsClass';
-import {UnnamedStreamPipesEntity} from "./UnnamedStreamPipesEntity";
-
-@RdfsClass('sp:Option')
-export class Option extends UnnamedStreamPipesEntity {
-  @RdfId
-  public id: string;
-
-  @RdfProperty('sp:elementName')
-  public elementName: string;
-
-  @RdfProperty('sp:hasName')
-  public name: string;
-
-  @RdfProperty('sp:internalName')
-  public internalName: string;
-
-  @RdfProperty('sp:isSelected')
-  public selected: boolean;
-
-  constructor() {
-    super();
-  }
-}
diff --git a/ui/src/app/connect/model/PipelineTemplateDescription.ts b/ui/src/app/connect/model/PipelineTemplateDescription.ts
deleted file mode 100644
index 57b8d04..0000000
--- a/ui/src/app/connect/model/PipelineTemplateDescription.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfId} from '../../platform-services/tsonld/RdfId';
-import {RdfProperty} from '../../platform-services/tsonld/RdfsProperty';
-import {RdfsClass} from '../../platform-services/tsonld/RdfsClass';
-import {BoundPipelineElement} from "./BoundPipelineElement";
-
-
-@RdfsClass('sp:PipelineTemplateDescription')
-export class PipelineTemplateDescription {
-
-    @RdfId
-    public id: string;
-
-    @RdfProperty('http://www.w3.org/2000/01/rdf-schema#description')
-    public description: string;
-
-    @RdfProperty('http://www.w3.org/2000/01/rdf-schema#label')
-    public label: string;
-
-    @RdfProperty('sp:internalName')
-    public internalName: string;
-
-    @RdfProperty('sp:hasAppId')
-    public appId: string;
-
-    @RdfProperty('sp:isConnectedTo')
-    public connectedTo: BoundPipelineElement[] = [];
-
-
-    constructor(id: string) {
-        this.id = id;
-    }
-
-}
\ No newline at end of file
diff --git a/ui/src/app/connect/model/PipelineTemplateDescriptionContainer.ts b/ui/src/app/connect/model/PipelineTemplateDescriptionContainer.ts
deleted file mode 100644
index 5343e1e..0000000
--- a/ui/src/app/connect/model/PipelineTemplateDescriptionContainer.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfId} from '../../platform-services/tsonld/RdfId';
-import {RdfProperty} from '../../platform-services/tsonld/RdfsProperty';
-import {RdfsClass} from '../../platform-services/tsonld/RdfsClass';
-import {PipelineTemplateDescription} from './PipelineTemplateDescription';
-
-@RdfsClass('sp:PipelineTemplateDescriptionContainer')
-export class PipelineTemplateDescriptionContainer {
-
-    @RdfId
-    public id: string;
-
-    @RdfProperty('sp:list')
-    public list: PipelineTemplateDescription[] = [];
-
-    constructor(id: string) {
-        this.id = id;
-    }
-
-}
\ No newline at end of file
diff --git a/ui/src/app/connect/model/PipelineTemplateInvocation.ts b/ui/src/app/connect/model/PipelineTemplateInvocation.ts
deleted file mode 100644
index 54caa94..0000000
--- a/ui/src/app/connect/model/PipelineTemplateInvocation.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfId} from '../../platform-services/tsonld/RdfId';
-import {RdfsClass} from '../../platform-services/tsonld/RdfsClass';
-import {RdfProperty} from '../../platform-services/tsonld/RdfsProperty';
-import {StaticProperty} from './StaticProperty';
-
-@RdfsClass('sp:PipelineTemplateInvocation')
-export class PipelineTemplateInvocation {
-
-    @RdfId
-    public id: string;
-
-    @RdfProperty('sp:hasName')
-    public name: string;
-
-    @RdfProperty('sp:hasDataSetId')
-    public dataSetId: string;
-
-    @RdfProperty('sp:internalName')
-    public pipelineTemplateId: string;
-
-    @RdfProperty('sp:hasStaticProperty')
-    public list: StaticProperty[] = [];
-
-    constructor(id: string) {
-        this.id = id;
-    }
-
-}
\ No newline at end of file
diff --git a/ui/src/app/connect/model/RuntimeResolvableAnyStaticProperty.ts b/ui/src/app/connect/model/RuntimeResolvableAnyStaticProperty.ts
deleted file mode 100644
index 88b27b5..0000000
--- a/ui/src/app/connect/model/RuntimeResolvableAnyStaticProperty.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfsClass} from "../../platform-services/tsonld/RdfsClass";
-import {AnyStaticProperty} from "./AnyStaticProperty";
-import {RdfProperty} from "../../platform-services/tsonld/RdfsProperty";
-
-@RdfsClass('sp:RuntimeResolvableAnyStaticProperty')
-export class RuntimeResolvableAnyStaticProperty extends AnyStaticProperty {
-
-    @RdfProperty('sp:dependsOnStaticProperty')
-    public dependsOn: string[] = [];
-
-    constructor() {
-        super();
-    }
-}
\ No newline at end of file
diff --git a/ui/src/app/connect/model/RuntimeResolvableOneOfStaticProperty.ts b/ui/src/app/connect/model/RuntimeResolvableOneOfStaticProperty.ts
deleted file mode 100644
index 3dbd6b1..0000000
--- a/ui/src/app/connect/model/RuntimeResolvableOneOfStaticProperty.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfsClass} from "../../platform-services/tsonld/RdfsClass";
-import {OneOfStaticProperty} from "./OneOfStaticProperty";
-import {RdfProperty} from "../../platform-services/tsonld/RdfsProperty";
-
-@RdfsClass('sp:RuntimeResolvableOneOfStaticProperty')
-export class RuntimeResolvableOneOfStaticProperty extends OneOfStaticProperty {
-
-    @RdfProperty('sp:dependsOnStaticProperty')
-    public dependsOn: string[] = [];
-
-    constructor() {
-        super();
-    }
-
-
-}
\ No newline at end of file
diff --git a/ui/src/app/connect/model/SecretStaticProperty.ts b/ui/src/app/connect/model/SecretStaticProperty.ts
deleted file mode 100644
index be477b1..0000000
--- a/ui/src/app/connect/model/SecretStaticProperty.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfProperty} from '../../platform-services/tsonld/RdfsProperty';
-import {RdfsClass} from '../../platform-services/tsonld/RdfsClass';
-import {StaticProperty} from './StaticProperty';
-
-@RdfsClass('sp:SecretStaticProperty')
-export class SecretStaticProperty extends StaticProperty {
-
-    @RdfProperty('sp:hasValue')
-    public value: string;
-
-    @RdfProperty('sp:isEncrypted')
-    public isEncrypted: boolean;
-
-    //TODO find better solution
-    public render: boolean;
-
-    constructor(id: string) {
-        super();
-        this.id = id;
-        this.render = true;
-    }
-
-}
diff --git a/ui/src/app/connect/model/SelectionStaticProperty.ts b/ui/src/app/connect/model/SelectionStaticProperty.ts
deleted file mode 100644
index 8745836..0000000
--- a/ui/src/app/connect/model/SelectionStaticProperty.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfProperty} from '../../platform-services/tsonld/RdfsProperty';
-import {RdfsClass} from '../../platform-services/tsonld/RdfsClass';
-import {StaticProperty} from './StaticProperty';
-import {Option} from './Option';
-
-@RdfsClass('sp:SelectionStaticProperty')
-export class SelectionStaticProperty extends StaticProperty {
-
-  @RdfProperty('sp:hasValue')
-  public value: string;
-
-  @RdfProperty('sp:requiredDomainProperty')
-  public requiredDomainProperty: string;
-
-  @RdfProperty('sp:hasOption')
-  public options: Option[] = [];
-
-  //TODO - remove if deserialize works correct
-  @RdfProperty('sp:isHorizontalRendering')
-  public horizontalRendering: boolean = true;
-
-  constructor() {
-    super();
-  }
-}
diff --git a/ui/src/app/connect/model/StaticProperty.ts b/ui/src/app/connect/model/StaticProperty.ts
deleted file mode 100644
index 726d5cc..0000000
--- a/ui/src/app/connect/model/StaticProperty.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfProperty} from '../../platform-services/tsonld/RdfsProperty';
-import {RdfsClass} from '../../platform-services/tsonld/RdfsClass';
-import {UnnamedStreamPipesEntity} from "./UnnamedStreamPipesEntity";
-
-@RdfsClass('sp:StaticProperty')
-export class StaticProperty extends UnnamedStreamPipesEntity {
-  public isValid = false;
-
-  @RdfProperty('sp:elementName')
-  public elementName: string;
-
-  @RdfProperty('http://www.w3.org/2000/01/rdf-schema#label')
-  public label: string;
-
-  @RdfProperty('http://www.w3.org/2000/01/rdf-schema#description')
-  public description: string;
-
-  @RdfProperty('sp:internalName')
-  public internalName: string;
-
-  @RdfProperty('sp:hasIndex')
-  public index: number;
-
-  // @RdfId
-  // public id: string;
-  //
-  // @RdfProperty('sp:elementName')
-  // public elementName: string;
-  //
-  // @RdfProperty('http://www.w3.org/2000/01/rdf-schema#label')
-  // public label: string;
-  //
-  // @RdfProperty('http://www.w3.org/2000/01/rdf-schema#description')
-  // public description: string;
-  //
-  // @RdfProperty('sp:internalName')
-  // public internalName: string;
-
-  // constructor(id: string) {
-  //   this.id = id;
-  // }
-}
diff --git a/ui/src/app/connect/model/connect/rules/TimestampTransformationRuleMode.ts b/ui/src/app/connect/model/TimestampTransformationRuleMode.ts
similarity index 100%
rename from ui/src/app/connect/model/connect/rules/TimestampTransformationRuleMode.ts
rename to ui/src/app/connect/model/TimestampTransformationRuleMode.ts
diff --git a/ui/src/app/connect/model/URI.ts b/ui/src/app/connect/model/URI.ts
deleted file mode 100644
index 0a1ee52..0000000
--- a/ui/src/app/connect/model/URI.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfId} from '../../platform-services/tsonld/RdfId';
-import {RdfsClass} from '../../platform-services/tsonld/RdfsClass';
-import {StaticProperty} from './StaticProperty';
-import {RdfProperty} from '../../platform-services/tsonld/RdfsProperty';
-
-@RdfsClass('sp:URI')
-export class URI extends StaticProperty {
-
-    @RdfId
-    public id: string;
-
-    @RdfProperty('sp:tmp')
-    public tmp: string;
-
-    constructor(id: string) {
-        super();
-        this.id = id;
-        this.tmp = "ff";
-    }
-}
\ No newline at end of file
diff --git a/ui/src/app/connect/model/UnnamedStreamPipesEntity.ts b/ui/src/app/connect/model/UnnamedStreamPipesEntity.ts
deleted file mode 100644
index f3428f7..0000000
--- a/ui/src/app/connect/model/UnnamedStreamPipesEntity.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfId} from '../../platform-services/tsonld/RdfId';
-import {RdfsClass} from '../../platform-services/tsonld/RdfsClass';
-
-@RdfsClass('sp:UnnamedStreamPipesEntity')
-export class UnnamedStreamPipesEntity {
-
-    @RdfId
-    public id: string;
-
-    constructor() {
-        this.id = 'urn:streampipes.org:spi:' + this.randomString(6);
-    }
-
-    randomString(length) {
-        const chars = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
-        let result = '';
-        for (let i = length; i > 0; --i) {
-            result += chars[Math.floor(Math.random() * chars.length)];
-        }
-        return result;
-    }
-
-}
diff --git a/ui/src/app/connect/model/connect/AdapterDescription.ts b/ui/src/app/connect/model/connect/AdapterDescription.ts
deleted file mode 100644
index 882124d..0000000
--- a/ui/src/app/connect/model/connect/AdapterDescription.ts
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfId} from '../../../platform-services/tsonld/RdfId';
-import {RdfProperty} from '../../../platform-services/tsonld/RdfsProperty';
-import {RdfsClass} from '../../../platform-services/tsonld/RdfsClass';
-import {TransformationRuleDescription} from './rules/TransformationRuleDescription';
-import {StaticProperty} from '../StaticProperty';
-
-@RdfsClass('sp:AdapterDescription')
-export class AdapterDescription {
-
-  @RdfId
-  public id: string;
-
-  @RdfProperty('http://www.w3.org/2000/01/rdf-schema#label')
-  public label: string;
-
-  @RdfProperty('http://www.w3.org/2000/01/rdf-schema#description')
-  public description: string;
-
-  @RdfProperty('sp:hasAppId')
-  public appId: string;
-
-  @RdfProperty('sp:couchDBId')
-  public couchDbId: string;
-
-  @RdfProperty('sp:userName')
-  public userName: string;
-
-  @RdfProperty('sp:hasUri')
-  public uri: string;
-
-  @RdfProperty('sp:iconUrl')
-  public iconUrl: string;
-
-  @RdfProperty('sp:icon')
-  public icon: string;
-
-  @RdfProperty('sp:hasAdapterType')
-  public category: string[] = [];
-
-  @RdfProperty('sp:adapterType')
-  public adapterType: string;
-
-  @RdfProperty('sp:rules')
-  public rules: TransformationRuleDescription[];
-
-  @RdfProperty('sp:config')
-  public config: StaticProperty[] = [];
-
-  @RdfProperty('sp:includesAssets')
-  public includesAssets: Boolean;
-
-  @RdfProperty('sp:includesLocales')
-  public includesLocales: Boolean;
-
-  @RdfProperty('sp:includedAssets')
-  public includedAssets: string[] = [];
-
-  @RdfProperty('sp:includedLocales')
-  public includedLocales: string[] = [];
-
-
-  public templateTitle: String;
-
-  public isTemplate: boolean;
-
-  constructor(id: string) {
-    this.id = id;
-  }
-
-}
diff --git a/ui/src/app/connect/model/connect/AdapterDescriptionList.ts b/ui/src/app/connect/model/connect/AdapterDescriptionList.ts
deleted file mode 100644
index 6207377..0000000
--- a/ui/src/app/connect/model/connect/AdapterDescriptionList.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfId} from '../../../platform-services/tsonld/RdfId';
-import {RdfProperty} from '../../../platform-services/tsonld/RdfsProperty';
-import {RdfsClass} from '../../../platform-services/tsonld/RdfsClass';
-import {AdapterDescription} from './AdapterDescription';
-
-@RdfsClass('sp:AdapterDescriptionList')
-export class AdapterDescriptionList {
-
-    @RdfId
-    public id: string;
-
-    @RdfProperty('sp:list')
-    public list: AdapterDescription[] = [];
-
-
-    constructor(id: string) {
-        this.id = id;
-    }
-
-}
\ No newline at end of file
diff --git a/ui/src/app/connect/model/connect/AdapterSetDescription.ts b/ui/src/app/connect/model/connect/AdapterSetDescription.ts
deleted file mode 100644
index ae51f2d..0000000
--- a/ui/src/app/connect/model/connect/AdapterSetDescription.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfProperty} from '../../../platform-services/tsonld/RdfsProperty';
-import {RdfsClass} from '../../../platform-services/tsonld/RdfsClass';
-import {DataSetDescription} from '../DataSetDescription';
-import {AdapterDescription} from './AdapterDescription';
-import {UUID} from 'angular2-uuid';
-
-@RdfsClass('sp:AdapterSetDescription')
-export class AdapterSetDescription extends AdapterDescription {
-
-    @RdfProperty("sp:hasDataSet")
-    public dataSet: DataSetDescription;
-
-    @RdfProperty("sp:stopPipeline")
-    public stopPipeline: Boolean = false;
-
-    constructor(id: string) {
-        super(id)
-        this.dataSet = new DataSetDescription('http://streampipes.org/dataset/' + UUID.UUID().toString());
-    }
-}
\ No newline at end of file
diff --git a/ui/src/app/connect/model/connect/AdapterStreamDescription.ts b/ui/src/app/connect/model/connect/AdapterStreamDescription.ts
deleted file mode 100644
index f0c8c31..0000000
--- a/ui/src/app/connect/model/connect/AdapterStreamDescription.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfProperty} from '../../../platform-services/tsonld/RdfsProperty';
-import {RdfsClass} from '../../../platform-services/tsonld/RdfsClass';
-import {AdapterDescription} from './AdapterDescription';
-import {DataStreamDescription} from '../DataStreamDescription';
-import {UUID} from 'angular2-uuid';
-
-@RdfsClass('sp:AdapterStreamDescription')
-export class AdapterStreamDescription extends AdapterDescription {
-
-    @RdfProperty("sp:hasDataStream")
-    public dataStream: DataStreamDescription;
-
-    @RdfProperty('sp:iconUrl')
-    public iconUrl: string;
-
-    constructor(id: string) {
-        super(id)
-        this.dataStream = new DataStreamDescription('http://streampipes.org/dataset/' + UUID.UUID().toString());
-    }
-}
\ No newline at end of file
diff --git a/ui/src/app/connect/model/connect/GenericAdapterSetDescription.ts b/ui/src/app/connect/model/connect/GenericAdapterSetDescription.ts
deleted file mode 100644
index 951e888..0000000
--- a/ui/src/app/connect/model/connect/GenericAdapterSetDescription.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfProperty} from '../../../platform-services/tsonld/RdfsProperty';
-import {RdfsClass} from '../../../platform-services/tsonld/RdfsClass';
-import {AdapterSetDescription} from './AdapterSetDescription';
-import {FormatDescription} from './grounding/FormatDescription';
-import {ProtocolDescription} from './grounding/ProtocolDescription';
-
-@RdfsClass('sp:GenericAdapterSetDescription')
-export class GenericAdapterSetDescription extends AdapterSetDescription {
-
-    @RdfProperty('sp:hasProtocol')
-    public protocol: ProtocolDescription;
-  
-    @RdfProperty('sp:hasFormat')
-    public format: FormatDescription;
-
-    constructor(id: string) {
-        super(id);
-        this.appId = id;
-    }
-
-}
\ No newline at end of file
diff --git a/ui/src/app/connect/model/connect/GenericAdapterStreamDescription.ts b/ui/src/app/connect/model/connect/GenericAdapterStreamDescription.ts
deleted file mode 100644
index e45be9e..0000000
--- a/ui/src/app/connect/model/connect/GenericAdapterStreamDescription.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {AdapterStreamDescription} from "./AdapterStreamDescription";
-import {RdfsClass} from '../../../platform-services/tsonld/RdfsClass';
-import {RdfProperty} from '../../../platform-services/tsonld/RdfsProperty';
-import {ProtocolDescription} from './grounding/ProtocolDescription';
-import {FormatDescription} from './grounding/FormatDescription';
-
-@RdfsClass('sp:GenericAdapterStreamDescription')
-export class GenericAdapterStreamDescription extends AdapterStreamDescription {
-
-    @RdfProperty('sp:hasProtocol')
-    public protocol: ProtocolDescription;
-  
-    @RdfProperty('sp:hasFormat')
-    public format: FormatDescription;
-
-    constructor(id: string) {
-        super(id);
-        this.appId = id;
-    }
-
-}
\ No newline at end of file
diff --git a/ui/src/app/connect/model/connect/SpecificAdapterSetDescription.ts b/ui/src/app/connect/model/connect/SpecificAdapterSetDescription.ts
deleted file mode 100644
index cfb360e..0000000
--- a/ui/src/app/connect/model/connect/SpecificAdapterSetDescription.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfsClass} from '../../../platform-services/tsonld/RdfsClass';
-import {AdapterSetDescription} from './AdapterSetDescription';
-
-@RdfsClass('sp:SpecificAdapterSetDescription')
-export class SpecificAdapterSetDescription extends AdapterSetDescription {
-
-    constructor(id: string) {
-        super(id)
-        this.appId = id;
-    }
-
-}
\ No newline at end of file
diff --git a/ui/src/app/connect/model/connect/SpecificAdapterStreamDescription.ts b/ui/src/app/connect/model/connect/SpecificAdapterStreamDescription.ts
deleted file mode 100644
index a2fc28a..0000000
--- a/ui/src/app/connect/model/connect/SpecificAdapterStreamDescription.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfsClass} from '../../../platform-services/tsonld/RdfsClass';
-import {AdapterStreamDescription} from './AdapterStreamDescription';
-
-@RdfsClass('sp:SpecificAdapterStreamDescription')
-export class SpecificAdapterStreamDescription extends AdapterStreamDescription {
-
-    constructor(id: string) {
-        super(id)
-    }
-
-}
\ No newline at end of file
diff --git a/ui/src/app/connect/model/connect/grounding/FormatDescription.ts b/ui/src/app/connect/model/connect/grounding/FormatDescription.ts
deleted file mode 100644
index 1b55b92..0000000
--- a/ui/src/app/connect/model/connect/grounding/FormatDescription.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfId} from '../../../../platform-services/tsonld/RdfId';
-import {RdfProperty} from '../../../../platform-services/tsonld/RdfsProperty';
-import {RdfsClass} from '../../../../platform-services/tsonld/RdfsClass';
-import {StaticProperty} from '../../StaticProperty';
-
-@RdfsClass('sp:FormatDescription')
-export class FormatDescription {
-
-  public edit: boolean;
-
-  @RdfId
-  public id: string;
-
-  @RdfProperty('http://www.w3.org/2000/01/rdf-schema#label')
-  public label: string;
-
-  @RdfProperty('sp:hasAppId')
-  public appId: string;
-
-  @RdfProperty('http://www.w3.org/2000/01/rdf-schema#description')
-  public description: string;
-
-  @RdfProperty('sp:hasUri')
-  public uri: string;
-
-  @RdfProperty('sp:config')
-  public config: StaticProperty[] = [];
-
-  constructor(id: string) {
-    this.id = id;
-    this.edit = false;
-  }
-}
diff --git a/ui/src/app/connect/model/connect/grounding/FormatDescriptionList.ts b/ui/src/app/connect/model/connect/grounding/FormatDescriptionList.ts
deleted file mode 100644
index 3ee6df6..0000000
--- a/ui/src/app/connect/model/connect/grounding/FormatDescriptionList.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfId} from '../../../../platform-services/tsonld/RdfId';
-import {RdfProperty} from '../../../../platform-services/tsonld/RdfsProperty';
-import {RdfsClass} from '../../../../platform-services/tsonld/RdfsClass';
-import {FormatDescription} from './FormatDescription';
-
-@RdfsClass('sp:FormatDescriptionList')
-export class FormatDescriptionList {
-
-  @RdfId
-  public id: string;
-
-  @RdfProperty('sp:list')
-  public list: FormatDescription[];
-
-
-  constructor(id: string) {
-    this.id = id;
-  }
-
-}
diff --git a/ui/src/app/connect/model/connect/grounding/ProtocolDescription.ts b/ui/src/app/connect/model/connect/grounding/ProtocolDescription.ts
deleted file mode 100644
index 1dc091f..0000000
--- a/ui/src/app/connect/model/connect/grounding/ProtocolDescription.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfId} from '../../../../platform-services/tsonld/RdfId';
-import {RdfProperty} from '../../../../platform-services/tsonld/RdfsProperty';
-import {RdfsClass} from '../../../../platform-services/tsonld/RdfsClass';
-import {StaticProperty} from '../../StaticProperty';
-
-@RdfsClass('sp:ProtocolDescription')
-export class ProtocolDescription {
-
-  @RdfId
-  public id: string;
-
-  public edit: boolean;
-
-  @RdfProperty('http://www.w3.org/2000/01/rdf-schema#label')
-  public label: string;
-
-  @RdfProperty('http://www.w3.org/2000/01/rdf-schema#description')
-  public description: string;
-
-  @RdfProperty('sp:hasAppId')
-  public appId: string;
-
-  @RdfProperty('sp:iconUrl')
-  public iconUrl: string;
-
-  @RdfProperty('sp:hasUri')
-  public uri: string;
-
-  @RdfProperty('sp:sourceType')
-  public sourceType: string;
-
-  @RdfProperty('sp:config')
-  public config: StaticProperty[] = [];
-
-  @RdfProperty('sp:hasAdapterType')
-  public category: string[] = [];
-
-  @RdfProperty('sp:includesAssets')
-  public includesAssets: Boolean;
-
-  @RdfProperty('sp:includesLocales')
-  public includesLocales: Boolean;
-
-  @RdfProperty('sp:includedAssets')
-  public includedAssets: string[] = [];
-
-  @RdfProperty('sp:includedLocales')
-  public includedLocales: string[] = [];
-
-  constructor(id: string) {
-    this.id = id;
-    this.edit = false;
-  }
-
-}
diff --git a/ui/src/app/connect/model/connect/grounding/ProtocolDescriptionList.ts b/ui/src/app/connect/model/connect/grounding/ProtocolDescriptionList.ts
deleted file mode 100644
index 2a0dd09..0000000
--- a/ui/src/app/connect/model/connect/grounding/ProtocolDescriptionList.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfId} from '../../../../platform-services/tsonld/RdfId';
-import {RdfProperty} from '../../../../platform-services/tsonld/RdfsProperty';
-import {RdfsClass} from '../../../../platform-services/tsonld/RdfsClass';
-import {ProtocolDescription} from './ProtocolDescription';
-
-@RdfsClass('sp:ProtocolDescriptionList')
-export class ProtocolDescriptionList {
-
-  @RdfId
-  public id: string;
-
-  @RdfProperty('sp:list')
-  public list: ProtocolDescription[];
-
-
-  constructor(id: string) {
-    this.id = id;
-  }
-
-}
diff --git a/ui/src/app/connect/model/connect/grounding/ProtocolSetDescription.ts b/ui/src/app/connect/model/connect/grounding/ProtocolSetDescription.ts
deleted file mode 100644
index 374d49f..0000000
--- a/ui/src/app/connect/model/connect/grounding/ProtocolSetDescription.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfsClass} from '../../../../platform-services/tsonld/RdfsClass';
-import {ProtocolDescription} from './ProtocolDescription';
-
-@RdfsClass('sp:ProtocolSetDescription')
-export class ProtocolSetDescription extends ProtocolDescription {
-
-    constructor(id: string) {
-        super(id);
-    }
-
-}
\ No newline at end of file
diff --git a/ui/src/app/connect/model/connect/grounding/ProtocolStreamDescription.ts b/ui/src/app/connect/model/connect/grounding/ProtocolStreamDescription.ts
deleted file mode 100644
index a5bbf30..0000000
--- a/ui/src/app/connect/model/connect/grounding/ProtocolStreamDescription.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfsClass} from '../../../../platform-services/tsonld/RdfsClass';
-import {ProtocolDescription} from './ProtocolDescription';
-
-@RdfsClass('sp:ProtocolStreamDescription')
-export class ProtocolStreamDescription extends ProtocolDescription {
-
-    constructor(id: string) {
-        super(id);
-    }
-
-}
diff --git a/ui/src/app/connect/model/connect/rules/AddNestedRuleDescription.ts b/ui/src/app/connect/model/connect/rules/AddNestedRuleDescription.ts
deleted file mode 100644
index 6882aa0..0000000
--- a/ui/src/app/connect/model/connect/rules/AddNestedRuleDescription.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfsClass} from '../../../../platform-services/tsonld/RdfsClass';
-import {RdfId} from '../../../../platform-services/tsonld/RdfId';
-import {RdfProperty} from '../../../../platform-services/tsonld/RdfsProperty';
-import {TransformationRuleDescription} from './TransformationRuleDescription';
-
-@RdfsClass('sp:CreateNestedRuleDescription')
-export class AddNestedRuleDescription extends TransformationRuleDescription {
-
-  @RdfId
-  public id: string;
-
-  @RdfProperty('sp:runtimeKey')
-  public runtimeKey: string;
-
-  constructor(runtimeKey: string) {
-    super();
-    this.id = "http://streampipes.org/transformation_rule/" + Math.floor(Math.random() * 10000000) + 1;
-    this.runtimeKey = runtimeKey;
-  }
-
-}
diff --git a/ui/src/app/connect/model/connect/rules/AddTimestampRuleDescription.ts b/ui/src/app/connect/model/connect/rules/AddTimestampRuleDescription.ts
deleted file mode 100644
index 847aea7..0000000
--- a/ui/src/app/connect/model/connect/rules/AddTimestampRuleDescription.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfsClass} from '../../../../platform-services/tsonld/RdfsClass';
-import {RdfId} from '../../../../platform-services/tsonld/RdfId';
-import {RdfProperty} from '../../../../platform-services/tsonld/RdfsProperty';
-import {TransformationRuleDescription} from './TransformationRuleDescription';
-
-@RdfsClass('sp:AddTimestampRuleDescription')
-export class AddTimestampRuleDescription extends TransformationRuleDescription {
-
-    @RdfId
-    public id: string;
-
-    @RdfProperty('sp:runtimeKey')
-    public runtimeKey: string;
-
-    constructor(runtimeKey) {
-        super();
-        this.id = "http://streampipes.org/transformation_rule/" + Math.floor(Math.random() * 10000000) + 1;
-        this.runtimeKey = runtimeKey;
-    }
-
-}
\ No newline at end of file
diff --git a/ui/src/app/connect/model/connect/rules/AddValueTransformationRuleDescription.ts b/ui/src/app/connect/model/connect/rules/AddValueTransformationRuleDescription.ts
deleted file mode 100644
index 293e9c8..0000000
--- a/ui/src/app/connect/model/connect/rules/AddValueTransformationRuleDescription.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfsClass} from '../../../../platform-services/tsonld/RdfsClass';
-import {RdfId} from '../../../../platform-services/tsonld/RdfId';
-import {RdfProperty} from '../../../../platform-services/tsonld/RdfsProperty';
-import {TransformationRuleDescription} from './TransformationRuleDescription';
-
-@RdfsClass('sp:AddValueTransformationRuleDescription')
-export class AddValueTransformationRuleDescription extends TransformationRuleDescription {
-
-    @RdfId
-    public id: string;
-
-    @RdfProperty('sp:runtimeKey')
-    public runtimeKey: string;
-
-    @RdfProperty('sp:staticValue')
-    public staticValue: string;
-
-    constructor(runtimeKey, staticValue) {
-        super();
-        this.id = "http://streampipes.org/transformation_rule/" + Math.floor(Math.random() * 10000000) + 1;
-        this.runtimeKey = runtimeKey;
-        this.staticValue = staticValue;
-    }
-
-}
\ No newline at end of file
diff --git a/ui/src/app/connect/model/connect/rules/DeleteRuleDescription.ts b/ui/src/app/connect/model/connect/rules/DeleteRuleDescription.ts
deleted file mode 100644
index 424947f..0000000
--- a/ui/src/app/connect/model/connect/rules/DeleteRuleDescription.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfsClass} from '../../../../platform-services/tsonld/RdfsClass';
-import {RdfId} from '../../../../platform-services/tsonld/RdfId';
-import {RdfProperty} from '../../../../platform-services/tsonld/RdfsProperty';
-import {TransformationRuleDescription} from './TransformationRuleDescription';
-
-@RdfsClass('sp:DeleteRuleDescription')
-export class DeleteRuleDescription extends TransformationRuleDescription {
-
-  @RdfId
-  public id: string;
-
-  @RdfProperty('sp:runtimeKey')
-  public runtimeKey: string;
-
-  constructor(runtimeKey: string) {
-    super();
-    this.id = "http://streampipes.org/transformation_rule/" + Math.floor(Math.random() * 10000000) + 1;
-    this.runtimeKey = runtimeKey;
-  }
-
-}
diff --git a/ui/src/app/connect/model/connect/rules/EventRateTransformationRuleDescription.ts b/ui/src/app/connect/model/connect/rules/EventRateTransformationRuleDescription.ts
deleted file mode 100644
index f222d7a..0000000
--- a/ui/src/app/connect/model/connect/rules/EventRateTransformationRuleDescription.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfsClass} from '../../../../platform-services/tsonld/RdfsClass';
-import {RdfId} from '../../../../platform-services/tsonld/RdfId';
-import {RdfProperty} from '../../../../platform-services/tsonld/RdfsProperty';
-import {TransformationRuleDescription} from './TransformationRuleDescription';
-
-@RdfsClass('sp:EventRateRuleDescription')
-export class EventRateTransformationRuleDescription extends TransformationRuleDescription {
-
-    @RdfId
-    public id: string;
-
-    @RdfProperty('sp:aggregationTimeWindow')
-    public aggregationTimeWindow: number;
-
-    @RdfProperty('sp:aggregationType')
-    public aggregationType: string;
-
-
-    constructor(aggregationTimeWindow: number, aggregationType: string) {
-        super();
-        this.id = "http://streampipes.org/transformation_rule/" + Math.floor(Math.random() * 10000000) + 1;
-        this.aggregationTimeWindow = aggregationTimeWindow;
-        this.aggregationType = aggregationType;
-    }
-}
\ No newline at end of file
diff --git a/ui/src/app/connect/model/connect/rules/MoveRuleDesctiption.ts b/ui/src/app/connect/model/connect/rules/MoveRuleDesctiption.ts
deleted file mode 100644
index f01c10d..0000000
--- a/ui/src/app/connect/model/connect/rules/MoveRuleDesctiption.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfsClass} from '../../../../platform-services/tsonld/RdfsClass';
-import {RdfId} from '../../../../platform-services/tsonld/RdfId';
-import {RdfProperty} from '../../../../platform-services/tsonld/RdfsProperty';
-import {TransformationRuleDescription} from './TransformationRuleDescription';
-
-@RdfsClass('sp:MoveRuleDescription')
-export class MoveRuleDescription extends TransformationRuleDescription {
-
-  @RdfId
-  public id: string;
-
-  @RdfProperty('sp:oldRuntimeKey')
-  public oldRuntimeKey: string;
-
-  @RdfProperty('sp:newRuntimeKey')
-  public newRuntimeKey: string;
-
-
-  constructor(oldRuntimeKey: string, newRuntimeKey) {
-    super();
-    this.id = "http://streampipes.org/transformation_rule/" + Math.floor(Math.random() * 10000000) + 1;
-    this.oldRuntimeKey = oldRuntimeKey;
-    this.newRuntimeKey = newRuntimeKey;
-  }
-
-}
diff --git a/ui/src/app/connect/model/connect/rules/RemoveDuplicatesRuleDescription.ts b/ui/src/app/connect/model/connect/rules/RemoveDuplicatesRuleDescription.ts
deleted file mode 100644
index 6c06eb1..0000000
--- a/ui/src/app/connect/model/connect/rules/RemoveDuplicatesRuleDescription.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfsClass} from '../../../../platform-services/tsonld/RdfsClass';
-import {RdfId} from '../../../../platform-services/tsonld/RdfId';
-import {RdfProperty} from '../../../../platform-services/tsonld/RdfsProperty';
-import {TransformationRuleDescription} from './TransformationRuleDescription';
-
-@RdfsClass('sp:RemoveDuplicatesRuleDescription')
-export class RemoveDuplicatesRuleDescription extends TransformationRuleDescription {
-
-    @RdfId
-    public id: string;
-
-    @RdfProperty('sp:filterTimeWindow')
-    public filterTimeWindow: number;
-
-    constructor(filterTimeWindow) {
-        super();
-        this.id = "http://streampipes.org/transformation_rule/" + Math.floor(Math.random() * 10000000) + 1;
-        this.filterTimeWindow = filterTimeWindow;
-    }
-
-}
\ No newline at end of file
diff --git a/ui/src/app/connect/model/connect/rules/RenameRuleDescription.ts b/ui/src/app/connect/model/connect/rules/RenameRuleDescription.ts
deleted file mode 100644
index e07980c..0000000
--- a/ui/src/app/connect/model/connect/rules/RenameRuleDescription.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfsClass} from '../../../../platform-services/tsonld/RdfsClass';
-import {RdfId} from '../../../../platform-services/tsonld/RdfId';
-import {RdfProperty} from '../../../../platform-services/tsonld/RdfsProperty';
-import {TransformationRuleDescription} from './TransformationRuleDescription';
-
-@RdfsClass('sp:RenameRuleDescription')
-export class RenameRuleDescription extends TransformationRuleDescription {
-
-  @RdfId
-  public id: string;
-
-  @RdfProperty('sp:oldRuntimeKey')
-  public oldRuntimeKey: string;
-
-  @RdfProperty('sp:newRuntimeKey')
-  public newRuntimeKey: string;
-
-
-  constructor(oldRuntimeKey: string, newRuntimeKey) {
-    super();
-    this.id = "http://streampipes.org/transformation_rule/" + Math.floor(Math.random() * 10000000) + 1;
-    this.oldRuntimeKey = oldRuntimeKey;
-    this.newRuntimeKey = newRuntimeKey;
-  }
-
-}
diff --git a/ui/src/app/connect/model/connect/rules/TimestampTransformationRuleDescription.ts b/ui/src/app/connect/model/connect/rules/TimestampTransformationRuleDescription.ts
deleted file mode 100644
index 6bbb44b..0000000
--- a/ui/src/app/connect/model/connect/rules/TimestampTransformationRuleDescription.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfsClass} from '../../../../platform-services/tsonld/RdfsClass';
-import {RdfId} from '../../../../platform-services/tsonld/RdfId';
-import {RdfProperty} from '../../../../platform-services/tsonld/RdfsProperty';
-import {TransformationRuleDescription} from './TransformationRuleDescription';
-
-@RdfsClass('sp:TimestampTransformationRuleDescription')
-export class TimestampTransformationRuleDescription extends TransformationRuleDescription {
-
-    @RdfId
-    public id: string;
-
-    @RdfProperty('sp:runtimeKey')
-    public runtimeKey: string;
-
-    @RdfProperty('sp:mode')
-    public mode: string;
-
-    @RdfProperty('sp:formatString')
-    public formatString: string;
-
-    @RdfProperty('sp:multiplier')
-    public multiplier: number;
-
-    constructor(runtimeKey: string, mode: string, formatString: string, multiplier: number) {
-        super();
-        this.id = "http://streampipes.org/transformation_rule/" + Math.floor(Math.random() * 10000000) + 1;
-        this.runtimeKey = runtimeKey;
-        this.mode = mode;
-        this.formatString = formatString;
-        this.multiplier = multiplier;
-    }
-
-
-
-}
\ No newline at end of file
diff --git a/ui/src/app/connect/model/connect/rules/TransformationRuleDescription.ts b/ui/src/app/connect/model/connect/rules/TransformationRuleDescription.ts
deleted file mode 100644
index 479c549..0000000
--- a/ui/src/app/connect/model/connect/rules/TransformationRuleDescription.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfsClass} from '../../../../platform-services/tsonld/RdfsClass';
-
-@RdfsClass('sp:TransformationRuleDescription')
-export class TransformationRuleDescription {
-
-}
diff --git a/ui/src/app/connect/model/connect/rules/UnitTransformRuleDescription.ts b/ui/src/app/connect/model/connect/rules/UnitTransformRuleDescription.ts
deleted file mode 100644
index a6b6757..0000000
--- a/ui/src/app/connect/model/connect/rules/UnitTransformRuleDescription.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfsClass} from '../../../../platform-services/tsonld/RdfsClass';
-import {RdfId} from '../../../../platform-services/tsonld/RdfId';
-import {RdfProperty} from '../../../../platform-services/tsonld/RdfsProperty';
-import {TransformationRuleDescription} from './TransformationRuleDescription';
-
-@RdfsClass('sp:UnitTransformRuleDescription')
-export class UnitTransformRuleDescription extends TransformationRuleDescription {
-
-    @RdfId
-    public id: string;
-
-    @RdfProperty('sp:runtimeKey')
-    public runtimeKey: string;
-
-    @RdfProperty('sp:fromUnit')
-    public fromUnitRessourceURL: string;
-
-    @RdfProperty('sp:toUnit')
-    public toUnitRessourceURL: string;
-
-
-
-    constructor(runtimeKey: string, fromUnitRessourceURL: string, toUnitRessourceURL: string) {
-        super();
-        this.id = "http://streampipes.org/transformation_rule/" + Math.floor(Math.random() * 10000000) + 1;
-        this.runtimeKey = runtimeKey;
-        this.fromUnitRessourceURL = fromUnitRessourceURL;
-        this.toUnitRessourceURL = toUnitRessourceURL;
-    }
-
-}
\ No newline at end of file
diff --git a/ui/src/app/connect/model/connect/runtime/RuntimeOptionsRequest.ts b/ui/src/app/connect/model/connect/runtime/RuntimeOptionsRequest.ts
deleted file mode 100644
index 41d96a1..0000000
--- a/ui/src/app/connect/model/connect/runtime/RuntimeOptionsRequest.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfsClass} from '../../../../platform-services/tsonld/RdfsClass';
-import {RdfId} from '../../../../platform-services/tsonld/RdfId';
-import {RdfProperty} from '../../../../platform-services/tsonld/RdfsProperty';
-import {StaticProperty} from "../../StaticProperty";
-
-@RdfsClass('sp:RuntimeOptionsRequest')
-export class RuntimeOptionsRequest  {
-
-    @RdfId
-    public id: string;
-
-    @RdfProperty('sp:hasRequestId')
-    public requestId: string;
-
-    @RdfProperty('sp:hasStaticProperty')
-    public staticProperties: StaticProperty[] = [];
-
-    constructor() {
-        this.id = "http://streampipes.org/runtimeOptionsRequest/" + Math.floor(Math.random() * 10000000) + 1;
-        //this.runtimeKey = runtimeKey;
-    }
-
-}
diff --git a/ui/src/app/connect/model/connect/runtime/RuntimeOptionsResponse.ts b/ui/src/app/connect/model/connect/runtime/RuntimeOptionsResponse.ts
deleted file mode 100644
index c591976..0000000
--- a/ui/src/app/connect/model/connect/runtime/RuntimeOptionsResponse.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfsClass} from '../../../../platform-services/tsonld/RdfsClass';
-import {RdfProperty} from '../../../../platform-services/tsonld/RdfsProperty';
-import {RuntimeOptionsRequest} from "./RuntimeOptionsRequest";
-import {Option} from "../../Option";
-
-@RdfsClass('sp:RuntimeOptionsResponse')
-export class RuntimeOptionsResponse extends RuntimeOptionsRequest {
-
-
-    @RdfProperty('sp:hasRequestId')
-    public requestId: string;
-
-    @RdfProperty('sp:hasOption')
-    public options: Option[] = [];
-
-
-    constructor() {
-        super();
-        //this.id = "http://streampipes.org/transformation_rule/" + Math.floor(Math.random() * 10000000) + 1;
-        //this.runtimeKey = runtimeKey;
-    }
-
-}
diff --git a/ui/src/app/connect/model/grounding/EventGrounding.ts b/ui/src/app/connect/model/grounding/EventGrounding.ts
deleted file mode 100644
index f2471f3..0000000
--- a/ui/src/app/connect/model/grounding/EventGrounding.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfsClass} from "../../../platform-services/tsonld/RdfsClass";
-import {UnnamedStreamPipesEntity} from "../UnnamedStreamPipesEntity";
-import {TransportProtocol} from "./TransportProtocol";
-import {RdfProperty} from "../../../platform-services/tsonld/RdfsProperty";
-
-@RdfsClass('sp:DataStreamGrounding')
-export class EventGrounding extends UnnamedStreamPipesEntity {
-
-    @RdfProperty('sp:hasTransportProtocol')
-    public transportProtocols: TransportProtocol[];
-
-    //@RdfProperty('sp:hasTransportFormat')
-    //public transportFormats: TransportFormat[];
-}
diff --git a/ui/src/app/connect/model/grounding/JmsTransportProtocol.ts b/ui/src/app/connect/model/grounding/JmsTransportProtocol.ts
deleted file mode 100644
index 41ecef0..0000000
--- a/ui/src/app/connect/model/grounding/JmsTransportProtocol.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
\ No newline at end of file
diff --git a/ui/src/app/connect/model/grounding/KafkaTransportProtocol.ts b/ui/src/app/connect/model/grounding/KafkaTransportProtocol.ts
deleted file mode 100644
index 41ecef0..0000000
--- a/ui/src/app/connect/model/grounding/KafkaTransportProtocol.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
\ No newline at end of file
diff --git a/ui/src/app/connect/model/grounding/TopicDefinition.ts b/ui/src/app/connect/model/grounding/TopicDefinition.ts
deleted file mode 100644
index 0be2c63..0000000
--- a/ui/src/app/connect/model/grounding/TopicDefinition.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfsClass} from "../../../platform-services/tsonld/RdfsClass";
-import {UnnamedStreamPipesEntity} from "../UnnamedStreamPipesEntity";
-import {RdfProperty} from "../../../platform-services/tsonld/RdfsProperty";
-
-@RdfsClass('sp:TopicDefinition')
-export class TopicDefinition extends UnnamedStreamPipesEntity {
-
-    @RdfProperty('sp:hasActualTopicName')
-    public actualTopicName: String;
-
-}
diff --git a/ui/src/app/connect/model/grounding/TransportFormat.ts b/ui/src/app/connect/model/grounding/TransportFormat.ts
deleted file mode 100644
index a6a12a9..0000000
--- a/ui/src/app/connect/model/grounding/TransportFormat.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfsClass} from "../../../platform-services/tsonld/RdfsClass";
-import {UnnamedStreamPipesEntity} from "../UnnamedStreamPipesEntity";
-
-@RdfsClass('sp:TransportFormat')
-export class TransportFormat extends UnnamedStreamPipesEntity {
-
-    //@RdfProperty('http://www.w3.org/1999/02/22-rdf-syntax-ns#type')
-    //public rdfType: URI[];
-}
diff --git a/ui/src/app/connect/model/grounding/TransportProtocol.ts b/ui/src/app/connect/model/grounding/TransportProtocol.ts
deleted file mode 100644
index 1208465..0000000
--- a/ui/src/app/connect/model/grounding/TransportProtocol.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfsClass} from "../../../platform-services/tsonld/RdfsClass";
-import {UnnamedStreamPipesEntity} from "../UnnamedStreamPipesEntity";
-import {RdfProperty} from "../../../platform-services/tsonld/RdfsProperty";
-import {TopicDefinition} from "./TopicDefinition";
-
-@RdfsClass('sp:TransportProtocol')
-export class TransportProtocol extends UnnamedStreamPipesEntity {
-
-    @RdfProperty('sp:brokerHostname')
-    public brokerHostname: String;
-
-    @RdfProperty('sp:topic')
-    public topicDefinition: TopicDefinition;
-}
diff --git a/ui/src/app/connect/model/message/ErrorMessage.ts b/ui/src/app/connect/model/message/ErrorMessage.ts
deleted file mode 100644
index 2336bc9..0000000
--- a/ui/src/app/connect/model/message/ErrorMessage.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfsClass} from '../../../platform-services/tsonld/RdfsClass';
-import {MessageLd} from './MessageLd';
-
-@RdfsClass("sp:ErrorMessage")
-export class ErrorMessageLd extends MessageLd {
-
-
-    constructor(id: string) {
-        super(id);
-        this.success = false;
-    }
-
-}
\ No newline at end of file
diff --git a/ui/src/app/connect/model/message/MessageLd.ts b/ui/src/app/connect/model/message/MessageLd.ts
deleted file mode 100644
index 720de29..0000000
--- a/ui/src/app/connect/model/message/MessageLd.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfsClass} from '../../../platform-services/tsonld/RdfsClass';
-import {RdfId} from '../../../platform-services/tsonld/RdfId';
-import {RdfProperty} from '../../../platform-services/tsonld/RdfsProperty';
-import {NotificationLd} from './NotificationLd';
-
-@RdfsClass("sp:Message")
-export class MessageLd {
-
-    @RdfId
-    public id: string;
-
-    @RdfProperty('sp:messsageSuccess')
-    public success:boolean;
-
-    @RdfProperty('sp:messageElementName')
-    public elementName: string;
-
-    @RdfProperty('sp:notifications')
-    public notifications: NotificationLd[] = [];
-
-    constructor(id: string) {
-        this.id = id;
-    }
-}
\ No newline at end of file
diff --git a/ui/src/app/connect/model/message/Notification.ts b/ui/src/app/connect/model/message/Notification.ts
deleted file mode 100644
index 7bd7243..0000000
--- a/ui/src/app/connect/model/message/Notification.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-export class Notification {
-
-    public title: string;
-    public description: string;
-
-    constructor(title: string, description: string) {
-        this.title = title;
-        this.description = description;
-    }
-}
\ No newline at end of file
diff --git a/ui/src/app/connect/model/message/NotificationLd.ts b/ui/src/app/connect/model/message/NotificationLd.ts
deleted file mode 100644
index 553f06c..0000000
--- a/ui/src/app/connect/model/message/NotificationLd.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfsClass} from '../../../platform-services/tsonld/RdfsClass';
-import {RdfId} from '../../../platform-services/tsonld/RdfId';
-import {RdfProperty} from '../../../platform-services/tsonld/RdfsProperty';
-
-@RdfsClass("sp:Notification")
-export class NotificationLd {
-
-    @RdfId
-    public id: string;
-
-    @RdfProperty('sp:notificationTitle')
-    public title: string;
-
-    @RdfProperty('sp:notificationDescription')
-    public description: string;
-
-    @RdfProperty('sp:notificationAdditionalInformation')
-    public additionalInformation: string;
-
-    constructor(id: string) {
-        this.id = id;
-    }
-}
\ No newline at end of file
diff --git a/ui/src/app/connect/model/message/StatusMessage.ts b/ui/src/app/connect/model/message/StatusMessage.ts
deleted file mode 100644
index ef3dede..0000000
--- a/ui/src/app/connect/model/message/StatusMessage.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-export class StatusMessage {
-
-    public success: boolean;
-    public notifications: Array<Notification>;
-
-    constructor(success: boolean, notifications: Array<Notification>) {
-        this.success = success;
-        this.notifications = notifications;
-    }
-}
diff --git a/ui/src/app/connect/model/message/SuccessMessage.ts b/ui/src/app/connect/model/message/SuccessMessage.ts
deleted file mode 100644
index 674b38d..0000000
--- a/ui/src/app/connect/model/message/SuccessMessage.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfsClass} from '../../../platform-services/tsonld/RdfsClass';
-import {MessageLd} from './MessageLd';
-
-@RdfsClass("sp:SuccessMessage")
-export class SuccessMessageLd extends MessageLd {
-
-
-    constructor(id: string) {
-        super(id);
-        this.success = true;
-    }
-
-}
\ No newline at end of file
diff --git a/ui/src/app/connect/model/output/AppendOutputStrategy.ts b/ui/src/app/connect/model/output/AppendOutputStrategy.ts
deleted file mode 100644
index ccec675..0000000
--- a/ui/src/app/connect/model/output/AppendOutputStrategy.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfProperty} from '../../../platform-services/tsonld/RdfsProperty';
-import {RdfsClass} from '../../../platform-services/tsonld/RdfsClass';
-import {EventProperty} from '../../schema-editor/model/EventProperty';
-import {OutputStrategy} from './OutputStrategy';
-
-@RdfsClass('sp:AppendOutputStrategy')
-export class AppendOutputStrategy extends OutputStrategy {
-
-    @RdfProperty('sp:appendsProperty') //StreamPipes.APPENDS_PROPERTY in Java Klasse
-    public eventProperties: EventProperty [];
-
-    constructor(id: string) {
-        super(id);
-      }
-
-}
diff --git a/ui/src/app/connect/model/output/CustomOutputStrategy.ts b/ui/src/app/connect/model/output/CustomOutputStrategy.ts
deleted file mode 100644
index efabe3b..0000000
--- a/ui/src/app/connect/model/output/CustomOutputStrategy.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfProperty} from '../../../platform-services/tsonld/RdfsProperty';
-import {RdfsClass} from '../../../platform-services/tsonld/RdfsClass';
-import {OutputStrategy} from './OutputStrategy';
-
-@RdfsClass('sp:CustomOutputStrategy')
-export class CustomOutputStrategy extends OutputStrategy{
-
-    public availablePropertyKeys: String [];
-
-    @RdfProperty('sp:producesProperty') //StreamPipes.PRODUCES_PROPERTY in Java Klasse (https://streampipes.org/vocabulary/v1/producesProperty)
-    public selectedPropertyKeys: String [];
-
-    @RdfProperty('sp:outputRight')
-    public outputRight: boolean;
-   
-    constructor(id: string) {
-        super(id);
-      }
-
-}
diff --git a/ui/src/app/connect/model/output/CustomTransformOutputStrategy.ts b/ui/src/app/connect/model/output/CustomTransformOutputStrategy.ts
deleted file mode 100644
index e9bd2d0..0000000
--- a/ui/src/app/connect/model/output/CustomTransformOutputStrategy.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfProperty} from '../../../platform-services/tsonld/RdfsProperty';
-import {RdfsClass} from '../../../platform-services/tsonld/RdfsClass';
-import {EventProperty} from '../../schema-editor/model/EventProperty';
-import {OutputStrategy} from './OutputStrategy';
-
-@RdfsClass('sp:CustomTransformOutputStrategy')
-export class CustomTransformOutputStrategy extends OutputStrategy{
-
-    @RdfProperty('sp:producesProperty')
-    public eventProperties: EventProperty [];
-
-    constructor(id: string) {
-        super(id);
-    }
-
-}
diff --git a/ui/src/app/connect/model/output/FixedOutputStrategy.ts b/ui/src/app/connect/model/output/FixedOutputStrategy.ts
deleted file mode 100644
index 0323be1..0000000
--- a/ui/src/app/connect/model/output/FixedOutputStrategy.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfProperty} from '../../../platform-services/tsonld/RdfsProperty';
-import {RdfsClass} from '../../../platform-services/tsonld/RdfsClass';
-import {EventProperty} from '../../schema-editor/model/EventProperty';
-import {OutputStrategy} from './OutputStrategy';
-
-@RdfsClass('sp:FixedOutputStrategy')
-export class FixedOutputStrategy extends OutputStrategy{
-
-    @RdfProperty('sp:producesProperty')
-    public eventProperties: EventProperty [];
-   
-    constructor(id: string) {
-        super(id);
-      }
-
-}
diff --git a/ui/src/app/connect/model/output/KeepOutputStrategy.ts b/ui/src/app/connect/model/output/KeepOutputStrategy.ts
deleted file mode 100644
index c95feb7..0000000
--- a/ui/src/app/connect/model/output/KeepOutputStrategy.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfProperty} from '../../../platform-services/tsonld/RdfsProperty';
-import {RdfsClass} from '../../../platform-services/tsonld/RdfsClass';
-import {OutputStrategy} from './OutputStrategy';
-
-@RdfsClass('sp:KeepOutputStrategy')
-export class KeepOutputStrategy extends OutputStrategy {
-
-    @RdfProperty('sp:eventName')
-    public eventName: String;
-
-    @RdfProperty('sp:keepBoth')
-    public keepBoth: boolean;
-
-    constructor(id: string) {
-        super(id);
-      }
-
-}
diff --git a/ui/src/app/connect/model/output/ListOutputStrategy.ts b/ui/src/app/connect/model/output/ListOutputStrategy.ts
deleted file mode 100644
index ef33710..0000000
--- a/ui/src/app/connect/model/output/ListOutputStrategy.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfProperty} from '../../../platform-services/tsonld/RdfsProperty';
-import {RdfsClass} from '../../../platform-services/tsonld/RdfsClass';
-import {OutputStrategy} from './OutputStrategy';
-
-@RdfsClass('sp:ListOutputStrategy')
-export class ListOutputStrategy extends OutputStrategy{
-
-    @RdfProperty('sp:propertyName')
-    public eventName: String;
-
-    constructor(id: string) {
-        super(id);
-      }
-
-}
diff --git a/ui/src/app/connect/model/output/OutputStrategy.ts b/ui/src/app/connect/model/output/OutputStrategy.ts
deleted file mode 100644
index 47b2e3e..0000000
--- a/ui/src/app/connect/model/output/OutputStrategy.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfId} from '../../../platform-services/tsonld/RdfId';
-import {RdfProperty} from '../../../platform-services/tsonld/RdfsProperty';
-import {RdfsClass} from '../../../platform-services/tsonld/RdfsClass';
-import {PropertyRenameRule} from './PropertyRenameRule';
-
-@RdfsClass('sp:OutputStrategy')
-export class OutputStrategy {
-
-    @RdfId
-    public id: string;
-
-    @RdfProperty('sp:hasName')
-    public name: String
-
-    @RdfProperty('sp:hasRenameRule')
-    public renameRules: PropertyRenameRule [];
-
-    constructor(id: string) {
-        this.id = id;
-      }
-
-}
diff --git a/ui/src/app/connect/model/output/PropertyRenameRule.ts b/ui/src/app/connect/model/output/PropertyRenameRule.ts
deleted file mode 100644
index 65c7de3..0000000
--- a/ui/src/app/connect/model/output/PropertyRenameRule.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfId} from '../../../platform-services/tsonld/RdfId';
-import {RdfProperty} from '../../../platform-services/tsonld/RdfsProperty';
-import {RdfsClass} from '../../../platform-services/tsonld/RdfsClass';
-
-@RdfsClass('sp:PropertyRenameRule')
-export class PropertyRenameRule {
-
-    @RdfId
-    public id: string;
-
-    @RdfProperty('sp:hasRuntimeID')
-    public runtimeID: String;
-
-    @RdfProperty('sp:hasNewRuntimeName')
-    public newRuntimeName: String;
-
-    constructor(id: string) {
-        this.id = id;
-      }
-
-
-}
\ No newline at end of file
diff --git a/ui/src/app/connect/model/output/TransformOperation.ts b/ui/src/app/connect/model/output/TransformOperation.ts
deleted file mode 100644
index fb03253..0000000
--- a/ui/src/app/connect/model/output/TransformOperation.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfId} from '../../../platform-services/tsonld/RdfId';
-import {RdfProperty} from '../../../platform-services/tsonld/RdfsProperty';
-import {RdfsClass} from '../../../platform-services/tsonld/RdfsClass';
-
-@RdfsClass('sp:TransformOperation')
-export class TransformOperation {
-
-    @RdfId
-    public id: string;
-
-   @RdfProperty('hasLinkedMappingPropertyID')
-    public mappingPropertyInternalName: String;
-
-    @RdfProperty('hasSourcePropertyInternalName')
-    public sourceStaticProperty: String;
-
-    @RdfProperty('hasTransformationScope')
-    public transformationScope: String;
-
-    constructor(id: string) {
-        this.id = id;
-      }
-
-
-}
\ No newline at end of file
diff --git a/ui/src/app/connect/model/output/TransformOperationType.ts b/ui/src/app/connect/model/output/TransformOperationType.ts
deleted file mode 100644
index c5a27ba..0000000
--- a/ui/src/app/connect/model/output/TransformOperationType.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-//java enum
\ No newline at end of file
diff --git a/ui/src/app/connect/model/output/TransformOutputStrategy.ts b/ui/src/app/connect/model/output/TransformOutputStrategy.ts
deleted file mode 100644
index 3df02fb..0000000
--- a/ui/src/app/connect/model/output/TransformOutputStrategy.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfId} from '../../../platform-services/tsonld/RdfId';
-import {RdfProperty} from '../../../platform-services/tsonld/RdfsProperty';
-import {RdfsClass} from '../../../platform-services/tsonld/RdfsClass';
-
-@RdfsClass('sp:TransformOutputStrategy')
-export class TransformOutputStrategy {
-
-    @RdfId
-    public id: string;
-
-   @RdfProperty('hasTransformOperation')
-    public transformOutputStrategy: TransformOutputStrategy [];
-    
-    constructor(id: string) {
-        this.id = id;
-      }
-
-
-}
\ No newline at end of file
diff --git a/ui/src/app/connect/model/output/UserDefinedOutputStrategy.ts b/ui/src/app/connect/model/output/UserDefinedOutputStrategy.ts
deleted file mode 100644
index 5234d82..0000000
--- a/ui/src/app/connect/model/output/UserDefinedOutputStrategy.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfsClass} from "../../../platform-services/tsonld/RdfsClass";
-import {OutputStrategy} from "./OutputStrategy";
-import {RdfProperty} from "../../../platform-services/tsonld/RdfsProperty";
-import {EventProperty} from "../../schema-editor/model/EventProperty";
-
-@RdfsClass('sp:UserDefinedOutputStrategy')
-export class UserDefinedOutputStrategy extends OutputStrategy {
-
-    @RdfProperty('sp:producesProperty')
-    public eventProperties: EventProperty [];
-
-    constructor(id: string) {
-        super(id);
-    }
-}
\ No newline at end of file
diff --git a/ui/src/app/connect/new-adapter/component/adapter-started-dialog.component.ts b/ui/src/app/connect/new-adapter/component/adapter-started-dialog.component.ts
index 2d73d82..985f0b5 100644
--- a/ui/src/app/connect/new-adapter/component/adapter-started-dialog.component.ts
+++ b/ui/src/app/connect/new-adapter/component/adapter-started-dialog.component.ts
@@ -20,7 +20,6 @@ import {Component, Inject} from '@angular/core';
 import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog';
 import {ShepherdService} from '../../../services/tour/shepherd.service';
 import {RestService} from "../../rest.service";
-import {PipelineTemplateService} from '../../../platform-services/apis/pipeline-template.service';
 import {
   FreeTextStaticProperty,
   GenericAdapterSetDescription,
@@ -51,8 +50,7 @@ export class AdapterStartedDialog {
         public dialogRef: MatDialogRef<AdapterStartedDialog>,
         private restService: RestService,
         @Inject(MAT_DIALOG_DATA) public data: any,
-        private ShepherdService: ShepherdService,
-        private pipelineTemplateService: PipelineTemplateService) { }
+        private ShepherdService: ShepherdService) { }
 
     ngOnInit() {
         this.startAdapter();
@@ -86,25 +84,26 @@ export class AdapterStartedDialog {
                     }
 
                     if (this.data.saveInDataLake) {
-                        const templateName = "org.apache.streampipes.manager.template.instances.DataLakePipelineTemplate";
-                        x.notifications[0].title
-                        this.pipelineTemplateService.getPipelineTemplateInvocation(x.notifications[0].title + "/streams", templateName)
-                            .subscribe(res => {
-
-                                res.list.forEach(property => {
-                                    if (property instanceof FreeTextStaticProperty && "domId2db_measurement" == property.internalName) {
-                                        property.value = this.data.adapter.label.toLowerCase().replace(" ", "_");
-                                    } else if (property instanceof MappingPropertyUnary && "domId2timestamp_mapping" == property.internalName) {
-                                        property.selectedProperty = "s0::" + this.data.dataLakeTimestampField;
-                                    }
-
-
-                                });
-
-                                res.pipelineTemplateId = templateName;
-                                res.name = this.data.adapter.label;
-                                this.pipelineTemplateService.createPipelineTemplateInvocation(res);
-                            });
+                        // TODO pipeline templates are currently not working, this should be changed to use the new UI model
+                        // const templateName = "org.apache.streampipes.manager.template.instances.DataLakePipelineTemplate";
+                        // x.notifications[0].title
+                        // this.pipelineTemplateService.getPipelineTemplateInvocation(x.notifications[0].title + "/streams", templateName)
+                        //     .subscribe(res => {
+                        //
+                        //         res.list.forEach(property => {
+                        //             if (property instanceof FreeTextStaticProperty && "domId2db_measurement" == property.internalName) {
+                        //                 property.value = this.data.adapter.label.toLowerCase().replace(" ", "_");
+                        //             } else if (property instanceof MappingPropertyUnary && "domId2timestamp_mapping" == property.internalName) {
+                        //                 property.selectedProperty = "s0::" + this.data.dataLakeTimestampField;
+                        //             }
+                        //
+                        //
+                        //         });
+                        //
+                        //         res.pipelineTemplateId = templateName;
+                        //         res.name = this.data.adapter.label;
+                        //         this.pipelineTemplateService.createPipelineTemplateInvocation(res);
+                        //     });
                     }
                 }
             });
diff --git a/ui/src/app/connect/new-adapter/new-adapter.component.ts b/ui/src/app/connect/new-adapter/new-adapter.component.ts
index 90e1c60..6e72e6a 100644
--- a/ui/src/app/connect/new-adapter/new-adapter.component.ts
+++ b/ui/src/app/connect/new-adapter/new-adapter.component.ts
@@ -47,7 +47,7 @@ import {ShepherdService} from '../../services/tour/shepherd.service';
 import {Logger} from '../../shared/logger/default-log.service';
 import {ConnectService} from '../connect.service';
 import {TimestampPipe} from '../filter/timestamp.pipe';
-import {ConfigurationInfo} from '../model/message/ConfigurationInfo';
+import {ConfigurationInfo} from '../model/ConfigurationInfo';
 import {RestService} from '../rest.service';
 import {EventSchemaComponent} from '../schema-editor/event-schema/event-schema.component';
 import {TransformationRuleService} from '../transformation-rule.service';
diff --git a/ui/src/app/connect/schema-editor/event-property-row/event-property-row.component.ts b/ui/src/app/connect/schema-editor/event-property-row/event-property-row.component.ts
index 1bee6ae..679c50b 100644
--- a/ui/src/app/connect/schema-editor/event-property-row/event-property-row.component.ts
+++ b/ui/src/app/connect/schema-editor/event-property-row/event-property-row.component.ts
@@ -18,7 +18,6 @@
 
 import {Component, EventEmitter, Input, OnChanges, Output, SimpleChanges} from "@angular/core";
 import {UUID} from "angular2-uuid";
-import {DomainPropertyProbabilityList} from "../model/DomainPropertyProbabilityList";
 import {TreeNode} from "angular-tree-component";
 import {MatDialog} from "@angular/material/dialog";
 import {
@@ -40,7 +39,6 @@ export class EventPropertyRowComponent implements OnChanges {
 
     @Input() node: TreeNode;
     @Input() isEditable = true;
-    @Input() domainPropertyGuesses: DomainPropertyProbabilityList[] = [];
     @Input() eventSchema: EventSchema = new EventSchema();
     @Input() countSelected: number;
 
@@ -111,7 +109,6 @@ export class EventPropertyRowComponent implements OnChanges {
         }
     }
 
-
     public openEditDialog(data): void {
         let dialogRef = this.dialog.open(EditEventPropertyComponent, {
             data: {
diff --git a/ui/src/app/connect/schema-editor/event-schema-preview/event-schema-preview.component.ts b/ui/src/app/connect/schema-editor/event-schema-preview/event-schema-preview.component.ts
index 77a5d90..671942d 100644
--- a/ui/src/app/connect/schema-editor/event-schema-preview/event-schema-preview.component.ts
+++ b/ui/src/app/connect/schema-editor/event-schema-preview/event-schema-preview.component.ts
@@ -17,7 +17,7 @@
  */
 
 import {Component, Input} from "@angular/core";
-import {EventSchema} from "../model/EventSchema";
+import {EventSchema} from "../../../core-model/gen/streampipes-model";
 
 @Component({
     selector: 'app-event-schema-preview',
diff --git a/ui/src/app/connect/schema-editor/model/DomainPropertyProbability.ts b/ui/src/app/connect/schema-editor/model/DomainPropertyProbability.ts
deleted file mode 100644
index f23696d..0000000
--- a/ui/src/app/connect/schema-editor/model/DomainPropertyProbability.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfsClass} from '../../../platform-services/tsonld/RdfsClass';
-import {RdfProperty} from '../../../platform-services/tsonld/RdfsProperty';
-import {RdfId} from '../../../platform-services/tsonld/RdfId';
-
-@RdfsClass('sp:DomainPropertyProbability')
-export class DomainPropertyProbability {
-
-    private static serialVersionUID = -3994041794693686406;
-
-    @RdfId
-    public id: string;
-
-    @RdfProperty('sp:domainProperty')
-    public domainProperty: string;
-
-
-    @RdfProperty('sp:probability')
-    public probability: string;
-
-    constructor () {
-    }
-}
\ No newline at end of file
diff --git a/ui/src/app/connect/schema-editor/model/DomainPropertyProbabilityList.ts b/ui/src/app/connect/schema-editor/model/DomainPropertyProbabilityList.ts
deleted file mode 100644
index cd85630..0000000
--- a/ui/src/app/connect/schema-editor/model/DomainPropertyProbabilityList.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfsClass} from '../../../platform-services/tsonld/RdfsClass';
-import {RdfProperty} from '../../../platform-services/tsonld/RdfsProperty';
-import {RdfId} from '../../../platform-services/tsonld/RdfId';
-import {DomainPropertyProbability} from './DomainPropertyProbability';
-
-@RdfsClass('sp:DomainPropertyProbabilityList')
-export class DomainPropertyProbabilityList {
-
-    @RdfId
-    public id: string;
-
-    @RdfProperty('sp:list')
-    public list: Array<DomainPropertyProbability>;
-
-    @RdfProperty('sp:runtimeName')
-    public runtimeName: String;
-
-    constructor () {
-        this.list = [];
-    }
-}
\ No newline at end of file
diff --git a/ui/src/app/connect/schema-editor/model/Enumeration.ts b/ui/src/app/connect/schema-editor/model/Enumeration.ts
deleted file mode 100644
index 4163e74..0000000
--- a/ui/src/app/connect/schema-editor/model/Enumeration.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {Injectable} from '@angular/core';
-import {RdfsClass} from '../../../platform-services/tsonld/RdfsClass';
-import {RdfProperty} from '../../../platform-services/tsonld/RdfsProperty';
-import {RdfId} from '../../../platform-services/tsonld/RdfId';
-
-@Injectable()
-@RdfsClass('http://schema.org/Enumeration')
-export class Enumeration {
-
-    private static serialVersionUID = -3994041794693686406;
-
-    @RdfId
-    public id: string;
-
-    @RdfProperty('http://www.w3.org/2000/01/rdf-schema#label')
-    public label: string;
-
-    @RdfProperty('http://www.w3.org/2000/01/rdf-schema#description')
-    public description: string;
-
-
-   @RdfProperty('sp:hasRuntimeValue')
-    public runtimeValues: Array<String>;
-
-
-    constructor () {
-        this.runtimeValues = new Array(0);
-    }
-
-    public copy(): Enumeration {
-        const newEnumeration = new Enumeration();
-
-        for (let ep of this.runtimeValues) {
-            newEnumeration.runtimeValues.push(ep);
-        }
-
-        return newEnumeration;
-    }
-
-}
\ No newline at end of file
diff --git a/ui/src/app/connect/schema-editor/model/EventProperty.ts b/ui/src/app/connect/schema-editor/model/EventProperty.ts
deleted file mode 100644
index b46a9c5..0000000
--- a/ui/src/app/connect/schema-editor/model/EventProperty.ts
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfId} from '../../../platform-services/tsonld/RdfId';
-import {RdfProperty} from '../../../platform-services/tsonld/RdfsProperty';
-import {RdfsClass} from '../../../platform-services/tsonld/RdfsClass';
-
-
-@RdfsClass('sp:EventProperty')
-export abstract class EventProperty {
-
-  private static serialVersioUID = 7079045979946059387;
-  protected static prefix = 'urn:fzi.de:sepa:';
-
-  propertyID: string; // one time value to identify property!!
-  parent: EventProperty;
-  child?: EventProperty;
-
-  propertySelector:string;
-
-  propertyNumber: number; // what the user sees in the UI
-
-  @RdfId
-  public id: string;
-
-  @RdfProperty('http://www.w3.org/2000/01/rdf-schema#label')
-  public label: string;
-
-  @RdfProperty('http://www.w3.org/2000/01/rdf-schema#description')
-  public description: string;
-
-  @RdfProperty('sp:hasRuntimeName')
-  public runtimeName: string;
-
-  @RdfProperty('sp:domainProperty')
-  public domainProperty: string;
-
-  @RdfProperty('sp:hasIndex')
-  public index: number;
-
-  @RdfProperty('sp:hasPropertyScope')
-  public propertyScope = 'MEASUREMENT_PROPERTY';
-
-  constructor(propertyID: string, parent: EventProperty, child?: EventProperty) {
-    this.propertyID = propertyID;
-    this.id = "http://eventProperty.de/" + propertyID;
-    this.parent = parent;
-    this.child = child;
-  }
-
-  public getRuntimeName(): string {
-    return this.runtimeName;
-  }
-
-  public setRuntimeName(propertyName: string): void {
-    this.runtimeName = propertyName;
-  }
-
-  public setDomainProperty(domainProperty: string): void {
-    this.domainProperty = domainProperty;
-
-  }
-
-  public getPropertyNumber(): string {
-    return this.propertyNumber.toString();
-  }
-
-  public setLabel(humanReadableTitle: string): void {
-    this.label = humanReadableTitle;
-  }
-
-  public getLabel(): string {
-    return this.label;
-  }
-
-  public getDescription(): string {
-    return this.description;
-  }
-
-  public setDescription(humanReadableDescription: string): void {
-    this.description = humanReadableDescription;
-  }
-
-  public abstract copy(): EventProperty;
-
-}
diff --git a/ui/src/app/connect/schema-editor/model/EventPropertyList.ts b/ui/src/app/connect/schema-editor/model/EventPropertyList.ts
deleted file mode 100644
index 2b5f44a..0000000
--- a/ui/src/app/connect/schema-editor/model/EventPropertyList.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {EventProperty} from './EventProperty';
-import {RdfsClass} from '../../../platform-services/tsonld/RdfsClass';
-import {RdfProperty} from '../../../platform-services/tsonld/RdfsProperty';
-import {EventPropertyPrimitive} from "./EventPropertyPrimitive";
-
-//  extends EventProperty
-
-@RdfsClass('sp:EventPropertyList')
-export class EventPropertyList extends EventProperty {
-
-    @RdfProperty('sp:hasEventProperty')
-    eventProperty: EventPropertyPrimitive;
-
-    constructor(propertyID: string, parent: EventProperty) {
-        super(propertyID, parent);
-    }
-
-    public copy(): EventProperty {
-        const result = new EventPropertyList(this.id, null);
-        result.id = this.id;
-        result.label = this.label;
-        result.description = this.description;
-        result.runtimeName = this.runtimeName;
-        result.domainProperty = this.domainProperty;
-        result.eventProperty = this.eventProperty;
-
-        return result;
-    }
-
-}
diff --git a/ui/src/app/connect/schema-editor/model/EventPropertyNested.ts b/ui/src/app/connect/schema-editor/model/EventPropertyNested.ts
deleted file mode 100644
index 2df4db6..0000000
--- a/ui/src/app/connect/schema-editor/model/EventPropertyNested.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {EventProperty} from './EventProperty';
-import {RdfsClass} from '../../../platform-services/tsonld/RdfsClass';
-import {RdfProperty} from '../../../platform-services/tsonld/RdfsProperty';
-
-@RdfsClass('sp:EventPropertyNested')
-export class EventPropertyNested extends EventProperty {
-
-    @RdfProperty('sp:hasEventProperty')
-    eventProperties: EventProperty[];
-
-    constructor(propertyID: string, parent: EventProperty) {
-        super(propertyID, parent);
-        this.eventProperties = new Array(0);
-    }
-
-    public copy(): EventProperty {
-        const result = new EventPropertyNested(this.id, null);
-        result.id = this.id;
-        result.label = this.label;
-        result.description = this.description;
-        result.runtimeName = this.runtimeName;
-        result.domainProperty = this.domainProperty;
-
-        for (let ep of this.eventProperties) {
-            result.eventProperties.push(ep.copy());
-        }
-
-        return result;
-    }
-
-
-}
diff --git a/ui/src/app/connect/schema-editor/model/EventPropertyPrimitive.ts b/ui/src/app/connect/schema-editor/model/EventPropertyPrimitive.ts
deleted file mode 100644
index 70217e6..0000000
--- a/ui/src/app/connect/schema-editor/model/EventPropertyPrimitive.ts
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {EventProperty} from './EventProperty';
-import {RdfsClass} from '../../../platform-services/tsonld/RdfsClass';
-import {RdfProperty} from '../../../platform-services/tsonld/RdfsProperty';
-
-
-@RdfsClass('sp:EventPropertyPrimitive')
-export class EventPropertyPrimitive extends EventProperty {
-
-
-    constructor (propertyID?: string, parent?: EventProperty) {
-        super(propertyID, parent);
-    }
-
-    @RdfProperty('sp:hasPropertyType')
-    public runtimeType: string;
-
-    @RdfProperty('sp:hasMeasurementUnit')
-    public measurementUnit: string;
-
-    public measurementUnitTmp: string;
-
-    public oldMeasurementUnit: string;
-
-    public hadMeasarumentUnit: boolean
-
-    // used to add a EventProperty Primitive with a static value in the event schema
-    public staticValue: string = "";
-
-    @RdfProperty('sp:hasValueSpecification')
-    public valueSpecification: string;
-
-    //Use for the timestamp tranformation
-    timestampTransformationMode: string;
-
-    timestampTransformationFormatString: string;
-
-    timestampTransformationMultiplier: number;
-
-
-    public copy(): EventProperty {
-        const result = new EventPropertyPrimitive(this.id, null);
-        result.id = this.id;
-        result.label = this.label;
-        result.description = this.description;
-        result.runtimeName = this.runtimeName;
-        result.domainProperty = this.domainProperty;
-
-        result.runtimeType = this.runtimeType;
-        result.measurementUnit = this.measurementUnit;
-        result.measurementUnitTmp = this.measurementUnitTmp;
-        result.oldMeasurementUnit = this.oldMeasurementUnit;
-        result.valueSpecification = this.valueSpecification;
-
-        result.hadMeasarumentUnit = this.hadMeasarumentUnit;
-
-        result.staticValue = this.staticValue;
-
-        result.timestampTransformationMode = this.timestampTransformationMode;
-        result.timestampTransformationFormatString = this.timestampTransformationFormatString;
-        result.timestampTransformationMultiplier = this.timestampTransformationMultiplier;
-
-        return result;
-    }
-
-    public setRuntimeType(runtimeType: string): void {
-        this.runtimeType = runtimeType;
-    }
-
-
-
-
-
-}
diff --git a/ui/src/app/connect/schema-editor/model/EventSchema.ts b/ui/src/app/connect/schema-editor/model/EventSchema.ts
deleted file mode 100644
index cdb132d..0000000
--- a/ui/src/app/connect/schema-editor/model/EventSchema.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {Injectable} from '@angular/core';
-import {RdfId} from '../../../platform-services/tsonld/RdfId';
-import {RdfsClass} from '../../../platform-services/tsonld/RdfsClass';
-import {RdfProperty} from '../../../platform-services/tsonld/RdfsProperty';
-import {EventProperty} from './EventProperty';
-
-@Injectable()
-@RdfsClass('sp:EventSchema')
-export class EventSchema {
-
-    private static serialVersionUID = -3994041794693686406;
-
-    @RdfId
-    public id: string;
-
-    @RdfProperty('sp:hasEventProperty')
-    public eventProperties: EventProperty[];
-
-
-    constructor () {
-        this.eventProperties = new Array(0);
-    }
-
-    public copy(): EventSchema {
-        const newEventSchema = new EventSchema();
-
-        for (const ep of this.eventProperties) {
-            newEventSchema.eventProperties.push(ep.copy());
-        }
-
-        return newEventSchema;
-    }
-
-}
-
diff --git a/ui/src/app/connect/schema-editor/model/ExampleNode.ts b/ui/src/app/connect/schema-editor/model/ExampleNode.ts
deleted file mode 100644
index d63c325..0000000
--- a/ui/src/app/connect/schema-editor/model/ExampleNode.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {EventProperty} from "./EventProperty";
-
-export class ExampleNode extends EventProperty {
-    name: string;
-    level: number;
-    expandable: boolean;
-    isExpanded?: boolean;
-    child = undefined;
-    parent = undefined;
-
-    public copy(): EventProperty {
-      throw new Error("Method not implemented.");
-    }
-  }
\ No newline at end of file
diff --git a/ui/src/app/connect/schema-editor/model/GuessSchema.ts b/ui/src/app/connect/schema-editor/model/GuessSchema.ts
deleted file mode 100644
index 886172a..0000000
--- a/ui/src/app/connect/schema-editor/model/GuessSchema.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfsClass} from '../../../platform-services/tsonld/RdfsClass';
-import {RdfProperty} from '../../../platform-services/tsonld/RdfsProperty';
-import {RdfId} from '../../../platform-services/tsonld/RdfId';
-import {EventSchema} from './EventSchema';
-import {DomainPropertyProbabilityList} from './DomainPropertyProbabilityList';
-
-@RdfsClass('sp:GuessSchema')
-export class GuessSchema {
-  private static serialVersionUID = -3994041794693686406;
-
-  @RdfId
-  public id: string;
-
-  @RdfProperty('sp:hasEventSchema')
-  public eventSchema: EventSchema;
-
-  @RdfProperty('sp:propertyProbabilityList')
-  public eventProperties: Array<DomainPropertyProbabilityList>;
-
-  constructor() {}
-}
diff --git a/ui/src/app/connect/schema-editor/model/QuantitativeValue.ts b/ui/src/app/connect/schema-editor/model/QuantitativeValue.ts
deleted file mode 100644
index e5a08c7..0000000
--- a/ui/src/app/connect/schema-editor/model/QuantitativeValue.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfsClass} from '../../../platform-services/tsonld/RdfsClass';
-import {RdfProperty} from '../../../platform-services/tsonld/RdfsProperty';
-import {RdfId} from '../../../platform-services/tsonld/RdfId';
-import {Float} from '../../../platform-services/tsonld/Float';
-
-@RdfsClass('http://schema.org/QuantitativeValue')
-export class QuantitativeValue {
-    private static QuantitativeValue = -3994041794693686406;
-
-    @RdfId
-    public id: string;
-
-    @RdfProperty('http://schema.org/minValue')
-    @Float
-    public minValue: Number;
-
-    @RdfProperty('http://schema.org/maxValue')
-    @Float
-    public maxValue: Number;
-
-    @RdfProperty('http://schema.org/step')
-    @Float
-    public step: Number;
-
-    constructor() {}
-}
\ No newline at end of file
diff --git a/ui/src/app/connect/static-properties/base/abstract-static-property.ts b/ui/src/app/connect/static-properties/base/abstract-static-property.ts
index f9175e8..c15dd02 100644
--- a/ui/src/app/connect/static-properties/base/abstract-static-property.ts
+++ b/ui/src/app/connect/static-properties/base/abstract-static-property.ts
@@ -23,7 +23,7 @@ import {
 } from "../../../core-model/gen/streampipes-model";
 import {Directive, EventEmitter, Input, Output} from "@angular/core";
 import {FormGroup} from "@angular/forms";
-import {ConfigurationInfo} from "../../model/message/ConfigurationInfo";
+import {ConfigurationInfo} from "../../model/ConfigurationInfo";
 import {InvocablePipelineElementUnion} from "../../../editor/model/editor.model";
 
 @Directive()
diff --git a/ui/src/app/connect/static-properties/static-collection/static-collection.component.ts b/ui/src/app/connect/static-properties/static-collection/static-collection.component.ts
index 526a1f7..7fdc3b1 100644
--- a/ui/src/app/connect/static-properties/static-collection/static-collection.component.ts
+++ b/ui/src/app/connect/static-properties/static-collection/static-collection.component.ts
@@ -17,7 +17,7 @@
  */
 
 import {Component, OnInit} from '@angular/core';
-import {ConfigurationInfo} from '../../model/message/ConfigurationInfo';
+import {ConfigurationInfo} from '../../model/ConfigurationInfo';
 import {StaticPropertyUtilService} from '../static-property-util.service';
 import {CollectionStaticProperty} from "../../../core-model/gen/streampipes-model";
 import {AbstractValidatedStaticPropertyRenderer} from "../base/abstract-validated-static-property";
diff --git a/ui/src/app/connect/static-properties/static-color-picker/static-color-picker.component.ts b/ui/src/app/connect/static-properties/static-color-picker/static-color-picker.component.ts
index f1a1a50..0f723af 100644
--- a/ui/src/app/connect/static-properties/static-color-picker/static-color-picker.component.ts
+++ b/ui/src/app/connect/static-properties/static-color-picker/static-color-picker.component.ts
@@ -17,7 +17,7 @@
  */
 
 import {Component, OnInit} from "@angular/core";
-import {ConfigurationInfo} from "../../model/message/ConfigurationInfo";
+import {ConfigurationInfo} from "../../model/ConfigurationInfo";
 import {StaticPropertyUtilService} from "../static-property-util.service";
 import {FormGroup, Validators} from "@angular/forms";
 import {ColorPickerStaticProperty} from "../../../core-model/gen/streampipes-model";
diff --git a/ui/src/app/connect/static-properties/static-free-input/static-free-input.component.ts b/ui/src/app/connect/static-properties/static-free-input/static-free-input.component.ts
index 327ad94..a47f58f 100644
--- a/ui/src/app/connect/static-properties/static-free-input/static-free-input.component.ts
+++ b/ui/src/app/connect/static-properties/static-free-input/static-free-input.component.ts
@@ -19,7 +19,7 @@
 import {Component, OnInit, ViewChild} from '@angular/core';
 import {ValidatorFn, Validators} from '@angular/forms';
 import {StaticPropertyUtilService} from '../static-property-util.service';
-import {ConfigurationInfo} from "../../model/message/ConfigurationInfo";
+import {ConfigurationInfo} from "../../model/ConfigurationInfo";
 import {FreeTextStaticProperty} from "../../../core-model/gen/streampipes-model";
 import {xsService} from "../../../NS/XS.service";
 import {ValidateNumber, ValidateString, ValidateUrl} from "../input.validator";
diff --git a/ui/src/app/connect/static-properties/static-property-util.service.ts b/ui/src/app/connect/static-properties/static-property-util.service.ts
index 43b4c5b..b56b5c4 100644
--- a/ui/src/app/connect/static-properties/static-property-util.service.ts
+++ b/ui/src/app/connect/static-properties/static-property-util.service.ts
@@ -35,7 +35,6 @@ import {
   StaticPropertyAlternatives,
   StaticPropertyGroup
 } from "../../core-model/gen/streampipes-model";
-import {URI} from "../model/URI";
 
 @Injectable()
 export class StaticPropertyUtilService{
@@ -108,10 +107,6 @@ export class StaticPropertyUtilService{
             clone.members = val.members.map(elem => this.clone(elem));
             clone.memberType = val.memberType;
         }
-        else if (val instanceof URI) {
-            clone = new URI(id);
-            clone.tmp = val.tmp
-        }
         //SelectionStaticProperty
         else if (val instanceof RuntimeResolvableAnyStaticProperty ||  val instanceof RuntimeResolvableOneOfStaticProperty){
             val instanceof RuntimeResolvableAnyStaticProperty ? clone = new RuntimeResolvableAnyStaticProperty() :
diff --git a/ui/src/app/connect/static-properties/static-property.component.ts b/ui/src/app/connect/static-properties/static-property.component.ts
index 5a38c8a..27546ba 100644
--- a/ui/src/app/connect/static-properties/static-property.component.ts
+++ b/ui/src/app/connect/static-properties/static-property.component.ts
@@ -21,7 +21,7 @@ import {Logger} from '../../shared/logger/default-log.service';
 
 import {xsService} from '../../NS/XS.service';
 import {StaticPropertyUtilService} from './static-property-util.service';
-import {ConfigurationInfo} from "../model/message/ConfigurationInfo";
+import {ConfigurationInfo} from "../model/ConfigurationInfo";
 import {
   AnyStaticProperty,
   CodeInputStaticProperty,
diff --git a/ui/src/app/connect/static-properties/static-runtime-resolvable-input/base-runtime-resolvable-input.ts b/ui/src/app/connect/static-properties/static-runtime-resolvable-input/base-runtime-resolvable-input.ts
index 8b5cb24..43ffc80 100644
--- a/ui/src/app/connect/static-properties/static-runtime-resolvable-input/base-runtime-resolvable-input.ts
+++ b/ui/src/app/connect/static-properties/static-runtime-resolvable-input/base-runtime-resolvable-input.ts
@@ -26,7 +26,7 @@ import {
 import {RuntimeResolvableService} from "./runtime-resolvable.service";
 import {Observable} from "rxjs";
 import {Directive, Input, OnChanges, SimpleChanges} from "@angular/core";
-import {ConfigurationInfo} from "../../model/message/ConfigurationInfo";
+import {ConfigurationInfo} from "../../model/ConfigurationInfo";
 
 @Directive()
 export abstract class BaseRuntimeResolvableInput<T extends RuntimeResolvableAnyStaticProperty | RuntimeResolvableOneOfStaticProperty>
diff --git a/ui/src/app/connect/static-properties/static-secret-input/static-secret-input.component.ts b/ui/src/app/connect/static-properties/static-secret-input/static-secret-input.component.ts
index bbabbae..95f288a 100644
--- a/ui/src/app/connect/static-properties/static-secret-input/static-secret-input.component.ts
+++ b/ui/src/app/connect/static-properties/static-secret-input/static-secret-input.component.ts
@@ -19,7 +19,7 @@
 import {Component, EventEmitter, OnInit, Output} from '@angular/core';
 import {Validators} from '@angular/forms';
 import {StaticPropertyUtilService} from '../static-property-util.service';
-import {ConfigurationInfo} from "../../model/message/ConfigurationInfo";
+import {ConfigurationInfo} from "../../model/ConfigurationInfo";
 import {SecretStaticProperty} from "../../../core-model/gen/streampipes-model";
 import {AbstractValidatedStaticPropertyRenderer} from "../base/abstract-validated-static-property";
 
diff --git a/ui/src/app/connect/transformation-rule.service.spec.ts b/ui/src/app/connect/transformation-rule.service.spec.ts
index 8a55cdc..acaae9a 100644
--- a/ui/src/app/connect/transformation-rule.service.spec.ts
+++ b/ui/src/app/connect/transformation-rule.service.spec.ts
@@ -20,14 +20,13 @@ import {getTestBed, TestBed} from '@angular/core/testing';
 import {HttpClientTestingModule} from '@angular/common/http/testing';
 import {TransformationRuleService} from './transformation-rule.service';
 import {Logger} from '../shared/logger/default-log.service';
-import {EventSchema} from './schema-editor/model/EventSchema';
-import {EventPropertyPrimitive} from './schema-editor/model/EventPropertyPrimitive';
-import {RenameRuleDescription} from './model/connect/rules/RenameRuleDescription';
-import {EventProperty} from './schema-editor/model/EventProperty';
-import {EventPropertyNested} from './schema-editor/model/EventPropertyNested';
-import {AddNestedRuleDescription} from './model/connect/rules/AddNestedRuleDescription';
-import {MoveRuleDescription} from './model/connect/rules/MoveRuleDesctiption';
-import {DeleteRuleDescription} from './model/connect/rules/DeleteRuleDescription';
+import {
+    CreateNestedRuleDescription,
+    DeleteRuleDescription,
+    EventPropertyNested,
+    EventPropertyPrimitive,
+    EventPropertyUnion, EventSchema, MoveRuleDescription, RenameRuleDescription
+} from "../core-model/gen/streampipes-model";
 
 describe('TransformationRuleService', () => {
 
@@ -51,11 +50,13 @@ describe('TransformationRuleService', () => {
 
     it('Get complete key from schema nested', () => {
 
-        const eventProperties: EventProperty[] = [];
-        const eventPropertyPrimitive: EventPropertyPrimitive = new EventPropertyPrimitive('id_1', null);
-        eventPropertyPrimitive.setRuntimeName('a');
-        const eventPropertyNested: EventPropertyNested = new EventPropertyNested('id_2', null);
-        eventPropertyNested.setRuntimeName('b');
+        const eventProperties: EventPropertyUnion[] = [];
+        const eventPropertyPrimitive: EventPropertyPrimitive = new EventPropertyPrimitive();
+        eventPropertyPrimitive.elementId = 'id_1';
+        eventPropertyPrimitive.runtimeName = 'a';
+        const eventPropertyNested: EventPropertyNested = new EventPropertyNested();
+        eventPropertyNested.elementId = 'id_2';
+        eventPropertyNested.runtimeName = 'b';
         eventPropertyNested.eventProperties.push(eventPropertyPrimitive);
         eventProperties.push(eventPropertyNested);
 
@@ -66,9 +67,10 @@ describe('TransformationRuleService', () => {
 
     it('Get complete key from schema primitve', () => {
 
-        const eventProperties: EventProperty[] = [];
-        const eventPropertyPrimitive: EventPropertyPrimitive = new EventPropertyPrimitive('id_1', null);
-        eventPropertyPrimitive.setRuntimeName('a');
+        const eventProperties: EventPropertyUnion[] = [];
+        const eventPropertyPrimitive: EventPropertyPrimitive = new EventPropertyPrimitive();
+        eventPropertyPrimitive.elementId = 'id_1';
+        eventPropertyPrimitive.runtimeName = 'a';
 
         eventProperties.push(eventPropertyPrimitive);
 
@@ -78,9 +80,9 @@ describe('TransformationRuleService', () => {
     });
 
     it('check get all ids with one id', () => {
-        const eventProperties: EventProperty[] = [];
-        const eventPropertyPrimitive: EventPropertyPrimitive = new EventPropertyPrimitive('id_1', null);
-
+        const eventProperties: EventPropertyUnion[] = [];
+        const eventPropertyPrimitive: EventPropertyPrimitive = new EventPropertyPrimitive();
+        eventPropertyPrimitive.elementId = 'id_1';
         eventProperties.push(eventPropertyPrimitive);
 
         var result: string[] = service.getAllIds(eventProperties);
@@ -90,14 +92,17 @@ describe('TransformationRuleService', () => {
     });
 
     it('check get all ids with multiple ids', () => {
-        const eventProperties: EventProperty[] = [];
-        const eventPropertyPrimitive: EventPropertyPrimitive = new EventPropertyPrimitive('id_1', null);
-        const eventPropertyPrimitive1: EventPropertyPrimitive = new EventPropertyPrimitive('id_2', null);
-        const eventPropertyNesteted: EventPropertyNested = new EventPropertyNested('id_3', null);
-        eventPropertyNesteted.eventProperties.push(eventPropertyPrimitive1);
+        const eventProperties: EventPropertyUnion[] = [];
+        const eventPropertyPrimitive: EventPropertyPrimitive = new EventPropertyPrimitive();
+        eventPropertyPrimitive.elementId = 'id_1';
+        const eventPropertyPrimitive1: EventPropertyPrimitive = new EventPropertyPrimitive();
+        eventPropertyPrimitive1.elementId = 'id_2';
+        const eventPropertyNested: EventPropertyNested = new EventPropertyNested();
+        eventPropertyNested.elementId = 'id_3';
+        eventPropertyNested.eventProperties.push(eventPropertyPrimitive1);
 
         eventProperties.push(eventPropertyPrimitive);
-        eventProperties.push(eventPropertyNesteted);
+        eventProperties.push(eventPropertyNested);
 
         var result: string[] = service.getAllIds(eventProperties);
         expect(result.length).toBe(3);
@@ -112,11 +117,12 @@ describe('TransformationRuleService', () => {
         const oldEventSchema: EventSchema = new EventSchema();
 
         const newEventSchema: EventSchema = new EventSchema();
-        const propertyNested: EventPropertyNested = new EventPropertyNested("id", null);
+        const propertyNested: EventPropertyNested = new EventPropertyNested();
+        propertyNested.elementId = "id";
         propertyNested.runtimeName = 'a';
         newEventSchema.eventProperties.push(propertyNested);
 
-        var result: AddNestedRuleDescription[] = service.getCreateNestedRules(newEventSchema.eventProperties,
+        var result: CreateNestedRuleDescription[] = service.getCreateNestedRules(newEventSchema.eventProperties,
             oldEventSchema, newEventSchema);
 
         expect(result.length).toBe(1);
@@ -128,16 +134,16 @@ describe('TransformationRuleService', () => {
         const oldEventSchema: EventSchema = new EventSchema();
 
         const newEventSchema: EventSchema = new EventSchema();
-        const nestedNested: EventPropertyNested = new EventPropertyNested("id_2", null);
+        const nestedNested: EventPropertyNested = new EventPropertyNested();
         nestedNested.runtimeName = 'a';
 
-        const nestedProperty: EventPropertyNested = new EventPropertyNested("id_1", null);
+        const nestedProperty: EventPropertyNested = new EventPropertyNested();
         nestedProperty.runtimeName = 'b';
         nestedNested.eventProperties.push(nestedProperty);
         newEventSchema.eventProperties.push(nestedNested);
 
 
-        var result: AddNestedRuleDescription[] = service.getCreateNestedRules(newEventSchema.eventProperties,
+        var result: CreateNestedRuleDescription[] = service.getCreateNestedRules(newEventSchema.eventProperties,
             oldEventSchema, newEventSchema);
 
         expect(result.length).toBe(2);
@@ -149,17 +155,17 @@ describe('TransformationRuleService', () => {
     it('Create Move Rules simple', () => {
 
         const oldEventSchema: EventSchema = new EventSchema();
-        const oldPropertyToMove: EventPropertyPrimitive = new EventPropertyPrimitive("id_1", null);
+        const oldPropertyToMove: EventPropertyPrimitive = new EventPropertyPrimitive();
         oldPropertyToMove.runtimeName = "a";
-        const oldNestedProperty: EventPropertyNested = new EventPropertyNested("id_2", null);
+        const oldNestedProperty: EventPropertyNested = new EventPropertyNested();
         oldNestedProperty.runtimeName = "b";
         oldEventSchema.eventProperties.push(oldPropertyToMove);
         oldEventSchema.eventProperties.push(oldNestedProperty);
 
         const newEventSchema: EventSchema = new EventSchema();
-        const newPropertyToMove: EventPropertyPrimitive = new EventPropertyPrimitive("id_1", null);
+        const newPropertyToMove: EventPropertyPrimitive = new EventPropertyPrimitive();
         newPropertyToMove.runtimeName = "a";
-        const newNestedProperty: EventPropertyNested = new EventPropertyNested("id_2", null);
+        const newNestedProperty: EventPropertyNested = new EventPropertyNested();
         newNestedProperty.runtimeName = "b";
         newNestedProperty.eventProperties.push(newPropertyToMove);
         newEventSchema.eventProperties.push(newNestedProperty);
@@ -181,7 +187,7 @@ describe('TransformationRuleService', () => {
 
     it('Delete simple', () => {
         const oldEventSchema: EventSchema = new EventSchema();
-        const eventProperty: EventPropertyPrimitive = new EventPropertyPrimitive("id", null);
+        const eventProperty: EventPropertyPrimitive = new EventPropertyPrimitive();
         eventProperty.runtimeName = "a";
         oldEventSchema.eventProperties.push(eventProperty);
 
@@ -196,15 +202,18 @@ describe('TransformationRuleService', () => {
 
     it('Delete nested', () => {
         const oldEventSchema: EventSchema = new EventSchema();
-        const eventProperty: EventPropertyPrimitive = new EventPropertyPrimitive("id_2", null);
+        const eventProperty: EventPropertyPrimitive = new EventPropertyPrimitive();
+        eventProperty.elementId = 'id_2';
         eventProperty.runtimeName = "a";
-        const eventPropertyNested: EventPropertyNested = new EventPropertyNested("id_1", null);
+        const eventPropertyNested: EventPropertyNested = new EventPropertyNested();
+        eventPropertyNested.elementId = 'id_1';
         eventPropertyNested.eventProperties.push(eventProperty);
         eventPropertyNested.runtimeName = "b";
         oldEventSchema.eventProperties.push(eventPropertyNested);
 
         var newEventSchema: EventSchema = new EventSchema();
-        const newEventPropertyNested: EventPropertyNested = new EventPropertyNested("id_1", null);
+        const newEventPropertyNested: EventPropertyNested = new EventPropertyNested();
+        newEventPropertyNested.elementId = 'id_1';
         newEventPropertyNested.runtimeName = "b";
         newEventSchema.eventProperties.push(newEventPropertyNested);
 
@@ -226,12 +235,14 @@ describe('TransformationRuleService', () => {
     it('Rename simple', () => {
 
         var oldEventSchema: EventSchema = new EventSchema();
-        var oldEventPropertyPrimitive: EventPropertyPrimitive = new EventPropertyPrimitive('id_1', null);
+        var oldEventPropertyPrimitive: EventPropertyPrimitive = new EventPropertyPrimitive();
+        oldEventPropertyPrimitive.elementId = 'id_1';
         oldEventPropertyPrimitive.runtimeName = 'a';
         oldEventSchema.eventProperties.push(oldEventPropertyPrimitive);
 
         var newEventSchema: EventSchema = new EventSchema();
-        var newEventPropertyPrimitive: EventPropertyPrimitive = new EventPropertyPrimitive('id_1', null);
+        var newEventPropertyPrimitive: EventPropertyPrimitive = new EventPropertyPrimitive();
+        newEventPropertyPrimitive.elementId = 'id_1';
         newEventPropertyPrimitive.runtimeName = 'b';
         newEventSchema.eventProperties.push(newEventPropertyPrimitive);
 
@@ -247,17 +258,21 @@ describe('TransformationRuleService', () => {
      it('Rename nested', () => {
 
         var oldEventSchema: EventSchema = new EventSchema();
-        var oldNestedEventProperty: EventPropertyNested = new EventPropertyNested('id_2', null);
+        var oldNestedEventProperty: EventPropertyNested = new EventPropertyNested();
+        oldNestedEventProperty.elementId = 'id_2';
         oldNestedEventProperty.runtimeName = 'b';
-        var oldEventPropertyPrimitive: EventPropertyPrimitive = new EventPropertyPrimitive('id_1', null);
+        var oldEventPropertyPrimitive: EventPropertyPrimitive = new EventPropertyPrimitive();
+        oldEventPropertyPrimitive.elementId = 'id_1';
         oldEventPropertyPrimitive.runtimeName = 'a';
         oldNestedEventProperty.eventProperties.push(oldEventPropertyPrimitive);
         oldEventSchema.eventProperties.push(oldNestedEventProperty);
 
         var newEventSchema: EventSchema = new EventSchema();
-        var newNestedEventProperty: EventPropertyNested = new EventPropertyNested('id_2', null);
+        var newNestedEventProperty: EventPropertyNested = new EventPropertyNested();
+        newNestedEventProperty.elementId = 'id_2';
         newNestedEventProperty.runtimeName = 'b';
-        var newEventPropertyPrimitive: EventPropertyPrimitive = new EventPropertyPrimitive('id_1', null);
+        var newEventPropertyPrimitive: EventPropertyPrimitive = new EventPropertyPrimitive();
+        newEventPropertyPrimitive.elementId = 'id_1';
         newEventPropertyPrimitive.runtimeName = 'b';
         newNestedEventProperty.eventProperties.push(newEventPropertyPrimitive);
         newEventSchema.eventProperties.push(newNestedEventProperty);
diff --git a/ui/src/app/connect/transformation-rule.service.ts b/ui/src/app/connect/transformation-rule.service.ts
index ee7294e..081985d 100644
--- a/ui/src/app/connect/transformation-rule.service.ts
+++ b/ui/src/app/connect/transformation-rule.service.ts
@@ -34,7 +34,7 @@ import {
     UnitTransformRuleDescription
 } from '../core-model/gen/streampipes-model';
 import {Logger} from '../shared/logger/default-log.service';
-import {TimestampTransformationRuleMode} from './model/connect/rules/TimestampTransformationRuleMode';
+import {TimestampTransformationRuleMode} from './model/TimestampTransformationRuleMode';
 
 @Injectable()
 export class TransformationRuleService {
diff --git a/ui/src/app/core-model/dashboard/DashboardWidget.ts b/ui/src/app/core-model/dashboard/DashboardWidget.ts
deleted file mode 100644
index c5964dc..0000000
--- a/ui/src/app/core-model/dashboard/DashboardWidget.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import { UnnamedStreamPipesEntity } from '../../connect/model/UnnamedStreamPipesEntity';
-import { RdfsClass } from '../../platform-services/tsonld/RdfsClass';
-import { RdfProperty } from '../../platform-services/tsonld/RdfsProperty';
-import { DashboardWidgetSettings } from './DashboardWidgetSettings';
-
-@RdfsClass('sp:DashboardWidgetModel')
-export class DashboardWidget extends UnnamedStreamPipesEntity {
-
-    @RdfProperty('sp:hasDashboardWidgetSettings')
-    dashboardWidgetSettings: DashboardWidgetSettings;
-
-    @RdfProperty('sp:hasPipelineId')
-    visualizablePipelineId: string;
-
-    @RdfProperty('sp:hasTopic')
-    visualizablePipelineTopic: string;
-
-    @RdfProperty('sp:couchDbId')
-    _id: string;
-
-    @RdfProperty('sp:couchDbRev')
-    _ref: string;
-
-    @RdfProperty('sp:hasDashboardWidgetId')
-    widgetId: string;
-
-    constructor() {
-        super();
-    }
-}
diff --git a/ui/src/app/core-model/dashboard/DashboardWidgetSettings.ts b/ui/src/app/core-model/dashboard/DashboardWidgetSettings.ts
deleted file mode 100644
index 69e9327..0000000
--- a/ui/src/app/core-model/dashboard/DashboardWidgetSettings.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfProperty} from "../../platform-services/tsonld/RdfsProperty";
-import {StaticProperty} from "../../connect/model/StaticProperty";
-import {EventSchema} from "../../connect/schema-editor/model/EventSchema";
-import {RdfsClass} from "../../platform-services/tsonld/RdfsClass";
-import {UnnamedStreamPipesEntity} from "../../connect/model/UnnamedStreamPipesEntity";
-
-@RdfsClass('sp:DashboardWidgetSettings')
-export class DashboardWidgetSettings extends UnnamedStreamPipesEntity {
-
-    @RdfProperty('sp:hasDashboardWidgetLabel')
-    widgetLabel: string;
-
-    @RdfProperty('sp:hasDashboardWidgetName')
-    widgetName:string;
-
-    @RdfProperty('sp:hasStaticProperty')
-    config: Array<StaticProperty>;
-
-    @RdfProperty('sp:hasSchema')
-    requiredSchema: EventSchema;
-
-    @RdfProperty('sp:hasWidgetIconName')
-    widgetIconName: string;
-
-    @RdfProperty('sp:hasWidgetDescription')
-    widgetDescription: string;
-
-    constructor() {
-        super();
-    }
-}
\ No newline at end of file
diff --git a/ui/src/app/core-model/dashboard/VisualizablePipeline.ts b/ui/src/app/core-model/dashboard/VisualizablePipeline.ts
deleted file mode 100644
index 8d15e60..0000000
--- a/ui/src/app/core-model/dashboard/VisualizablePipeline.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {RdfsClass} from "../../platform-services/tsonld/RdfsClass";
-import {EventSchema} from "../../connect/schema-editor/model/EventSchema";
-import {RdfId} from "../../platform-services/tsonld/RdfId";
-import {RdfProperty} from "../../platform-services/tsonld/RdfsProperty";
-
-@RdfsClass('sp:VisualizablePipeline')
-export class VisualizablePipeline {
-
-    @RdfId
-    public id: string;
-
-    @RdfProperty('sp:hasSchema')
-    schema: EventSchema;
-
-    @RdfProperty('sp:hasPipelineId')
-    pipelineId: string;
-
-    @RdfProperty('sp:couchDbId')
-    _id: string;
-
-    @RdfProperty('sp:couchDbRev')
-    _ref:string;
-
-    @RdfProperty('sp:hasVisualizationName')
-    visualizationName:string;
-
-    @RdfProperty('sp:hasTopic')
-    topic:string;
-
-    pipelineName: string;
-
-    constructor(id: string) {
-        this.id = id;
-    }
-
-}
\ No newline at end of file
diff --git a/ui/src/app/core-model/datalake/DateRange.ts b/ui/src/app/core-model/datalake/DateRange.ts
index 36bec0c..b258b10 100644
--- a/ui/src/app/core-model/datalake/DateRange.ts
+++ b/ui/src/app/core-model/datalake/DateRange.ts
@@ -16,16 +16,9 @@
  *
  */
 
-import { RdfsClass } from '../../platform-services/tsonld/RdfsClass';
-import { RdfProperty } from '../../platform-services/tsonld/RdfsProperty';
-
-@RdfsClass('sp:DateRange')
 export class DateRange {
 
-    @RdfProperty('sp:startDate')
     public startDate: Date;
-
-    @RdfProperty('sp:endDate')
     public endDate: Date;
 
     constructor(startDate: Date, endDate: Date) {
diff --git a/ui/src/app/core-services/shared/shared-dashboard.service.ts b/ui/src/app/core-services/shared/shared-dashboard.service.ts
index b2f40ff..57fddfe 100644
--- a/ui/src/app/core-services/shared/shared-dashboard.service.ts
+++ b/ui/src/app/core-services/shared/shared-dashboard.service.ts
@@ -21,6 +21,7 @@ import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs/Observable';
 import { Dashboard } from '../../dashboard/models/dashboard.model';
 import { AuthStatusService } from '../../services/auth-status.service';
+import {map} from "rxjs/operators";
 
 @Injectable()
 export class SharedDatalakeRestService {
@@ -30,15 +31,15 @@ export class SharedDatalakeRestService {
     }
 
     getDashboards(dashboardUrl: string): Observable<Dashboard[]> {
-        return this.http.get(dashboardUrl).map(data => {
+        return this.http.get(dashboardUrl).pipe(map(data => {
            return data as Dashboard[];
-        });
+        }));
     }
 
     updateDashboard(dashboardUrl: string, dashboard: Dashboard): Observable<Dashboard> {
-        return this.http.put(dashboardUrl + '/' + dashboard._id, dashboard).map(data => {
+        return this.http.put(dashboardUrl + '/' + dashboard._id, dashboard).pipe(map(data => {
             return data as Dashboard;
-        });
+        }));
     }
 
     deleteDashboard(dashboardUrl: string, dashboard: Dashboard): Observable<any> {
diff --git a/ui/src/app/dashboard/sdk/matching/mapping-property-generator.ts b/ui/src/app/dashboard/sdk/matching/mapping-property-generator.ts
index 9640ac1..1e7c9c7 100644
--- a/ui/src/app/dashboard/sdk/matching/mapping-property-generator.ts
+++ b/ui/src/app/dashboard/sdk/matching/mapping-property-generator.ts
@@ -16,7 +16,6 @@
  *
  */
 
-import {EventProperty} from "../../../connect/schema-editor/model/EventProperty";
 import {PropertyMatch} from "./property-match";
 import {EventPropertyUnion} from "../../../core-model/gen/streampipes-model";
 
diff --git a/ui/src/app/dashboard/services/dashboard.service.ts b/ui/src/app/dashboard/services/dashboard.service.ts
index 07563a6..de3dae3 100644
--- a/ui/src/app/dashboard/services/dashboard.service.ts
+++ b/ui/src/app/dashboard/services/dashboard.service.ts
@@ -23,7 +23,11 @@ import {Observable} from "rxjs";
 import {AuthStatusService} from "../../services/auth-status.service";
 import {Dashboard} from "../models/dashboard.model";
 import {MeasurementUnit} from "../../core-model/measurement-unit/MeasurementUnit";
-import {DashboardWidgetModel, VisualizablePipeline} from "../../core-model/gen/streampipes-model";
+import {
+    DashboardWidgetModel,
+    Pipeline,
+    VisualizablePipeline
+} from "../../core-model/gen/streampipes-model";
 
 @Injectable()
 export class DashboardService {
@@ -34,10 +38,10 @@ export class DashboardService {
     }
 
 
-    getPipelineById(id: string): Observable<any> {
-        return this.http.get(this.pipelinesUrl + "/" +id).map(data => {
-            return data as any;
-        })
+    getPipelineById(id: string): Observable<Pipeline> {
+        return this.http.get(this.pipelinesUrl + "/" +id).pipe(map(data => {
+            return Pipeline.fromData(data as any);
+        }));
     }
 
     getVisualizablePipelines(): Observable<Array<VisualizablePipeline>> {
@@ -65,27 +69,27 @@ export class DashboardService {
     }
 
     getDashboards(): Observable<Array<Dashboard>> {
-        return this.http.get(this.dashboardUrl).map(data => {
+        return this.http.get(this.dashboardUrl).pipe(map(data => {
            return data as Dashboard[];
-        });
+        }));
     }
 
     getDashboard(dashboardId: string): Observable<Dashboard> {
-        return this.http.get(this.dashboardUrl + "/" +dashboardId).map(data => {
+        return this.http.get(this.dashboardUrl + "/" +dashboardId).pipe(map(data => {
             return data as Dashboard;
-        })
+        }));
     }
 
     getMeasurementUnitInfo(measurementUnitResource: string): Observable<MeasurementUnit> {
-        return this.http.get(this.measurementUnitsUrl  + "/" + encodeURIComponent(measurementUnitResource)).map(data => {
+        return this.http.get(this.measurementUnitsUrl  + "/" + encodeURIComponent(measurementUnitResource)).pipe(map(data => {
             return data as MeasurementUnit
-        });
+        }));
     }
 
     updateDashboard(dashboard: Dashboard): Observable<Dashboard> {
-        return this.http.put(this.dashboardUrl + "/" +dashboard._id, dashboard).map(data => {
+        return this.http.put(this.dashboardUrl + "/" +dashboard._id, dashboard).pipe(map(data => {
             return data as Dashboard;
-        });
+        }));
     }
 
     deleteDashboard(dashboard: Dashboard): Observable<any> {
diff --git a/ui/src/app/data-explorer/components/widgets/utils/group-configuration/group-configuration.component.ts b/ui/src/app/data-explorer/components/widgets/utils/group-configuration/group-configuration.component.ts
index 1d1cb85..5dfea9f 100644
--- a/ui/src/app/data-explorer/components/widgets/utils/group-configuration/group-configuration.component.ts
+++ b/ui/src/app/data-explorer/components/widgets/utils/group-configuration/group-configuration.component.ts
@@ -17,7 +17,7 @@
  */
 
 import {Component, EventEmitter, Input, OnInit, Output} from '@angular/core';
-import {EventProperty} from '../../../../../connect/schema-editor/model/EventProperty';
+import {EventPropertyUnion} from "../../../../../core-model/gen/streampipes-model";
 
 @Component({
   selector: 'sp-group-configuration',
@@ -44,7 +44,7 @@ export class GroupConfigurationComponent implements OnInit {
   // update: EventEmitter<any> = new EventEmitter();
 
   @Input()
-  dimensionProperties: EventProperty[];
+  dimensionProperties: EventPropertyUnion[];
 
   constructor() {
   }
diff --git a/ui/src/app/data-explorer/data-explorer.component.ts b/ui/src/app/data-explorer/data-explorer.component.ts
index c96119c..7837a71 100644
--- a/ui/src/app/data-explorer/data-explorer.component.ts
+++ b/ui/src/app/data-explorer/data-explorer.component.ts
@@ -17,12 +17,11 @@
  */
 
 import {Component, OnInit, ViewChild} from '@angular/core';
-import { DateRange } from '../core-model/datalake/DateRange';
 import { IDataViewDashboard } from './models/dataview-dashboard.model';
 import { DataViewDataExplorerService } from './services/data-view-data-explorer.service';
 import { RefreshDashboardService } from './services/refresh-dashboard.service';
-import {DashboardPanelComponent} from "../dashboard/components/panel/dashboard-panel.component";
 import {DataExplorerDashboardPanelComponent} from "./components/panel/data-explorer-dashboard-panel.component";
+import {DateRange} from "../core-model/datalake/DateRange";
 
 @Component({
     selector: 'sp-data-explorer',
diff --git a/ui/src/app/data-explorer/registry/data-explorer-widget-registry.ts b/ui/src/app/data-explorer/registry/data-explorer-widget-registry.ts
index f89ee85..5d57926 100644
--- a/ui/src/app/data-explorer/registry/data-explorer-widget-registry.ts
+++ b/ui/src/app/data-explorer/registry/data-explorer-widget-registry.ts
@@ -16,9 +16,6 @@
  *
  */
 
-import { DashboardWidgetSettings } from '../../core-model/dashboard/DashboardWidgetSettings';
-import { WidgetConfig } from '../components/widgets/base/base-config';
-import { TableConfig } from '../components/widgets/table/table-config';
 import {IWidget} from "../models/dataview-dashboard.model";
 
 export class DataExplorerWidgetRegistry {
diff --git a/ui/src/app/data-explorer/registry/widget-config-builder.ts b/ui/src/app/data-explorer/registry/widget-config-builder.ts
index 31ea533..1a03760 100644
--- a/ui/src/app/data-explorer/registry/widget-config-builder.ts
+++ b/ui/src/app/data-explorer/registry/widget-config-builder.ts
@@ -16,11 +16,12 @@
  *
  */
 
-import {ColorPickerStaticProperty} from '../../connect/model/ColorPickerStaticProperty';
-import {FreeTextStaticProperty} from '../../connect/model/FreeTextStaticProperty';
-import {DashboardWidgetSettings} from '../../core-model/dashboard/DashboardWidgetSettings';
 import {CollectedSchemaRequirements} from '../sdk/collected-schema-requirements';
 import {Datatypes} from '../sdk/model/datatypes';
+import {
+    ColorPickerStaticProperty, DashboardWidgetSettings,
+    FreeTextStaticProperty
+} from "../../core-model/gen/streampipes-model";
 
 export class WidgetConfigBuilder {
 
@@ -71,6 +72,7 @@ export class WidgetConfigBuilder {
 
     requiredColorParameter(id: string, label: string, description: string, defaultColor?: string): WidgetConfigBuilder {
         const csp = new ColorPickerStaticProperty();
+        csp["@class"] = "org.apache.streampipes.model.staticproperty.ColorPickerStaticProperty";
         csp.internalName = id;
         csp.label = label;
         csp.description = description;
@@ -107,6 +109,7 @@ export class WidgetConfigBuilder {
         fst.label = label;
         fst.description = description;
         fst.requiredDatatype = datatype;
+        fst["@class"] = "org.apache.streampipes.model.staticproperty.FreeTextStaticProperty";
 
         return fst;
     }
diff --git a/ui/src/app/data-explorer/sdk/collected-schema-requirements.ts b/ui/src/app/data-explorer/sdk/collected-schema-requirements.ts
index da96d05..d907ad9 100644
--- a/ui/src/app/data-explorer/sdk/collected-schema-requirements.ts
+++ b/ui/src/app/data-explorer/sdk/collected-schema-requirements.ts
@@ -16,13 +16,14 @@
  *
  */
 
-import {StaticProperty} from "../../connect/model/StaticProperty";
-import {EventProperty} from "../../connect/schema-editor/model/EventProperty";
-import {EventSchema} from "../../connect/schema-editor/model/EventSchema";
+import {
+    EventPropertyUnion,
+    EventSchema, StaticPropertyUnion
+} from "../../core-model/gen/streampipes-model";
 
 export class CollectedSchemaRequirements {
 
-    constructor(private requiredEventProperties: Array<EventProperty>, private requiredMappingProperties: Array<StaticProperty>) {
+    constructor(private requiredEventProperties: Array<EventPropertyUnion>, private requiredMappingProperties: Array<StaticPropertyUnion>) {
 
     }
 
@@ -32,7 +33,7 @@ export class CollectedSchemaRequirements {
         return eventSchema;
     }
 
-    getRequiredMappingProperties(): Array<StaticProperty> {
+    getRequiredMappingProperties(): Array<StaticPropertyUnion> {
         return this.requiredMappingProperties;
     }
 }
\ No newline at end of file
diff --git a/ui/src/app/data-explorer/sdk/ep-requirements.ts b/ui/src/app/data-explorer/sdk/ep-requirements.ts
index b298a7a..3932574 100644
--- a/ui/src/app/data-explorer/sdk/ep-requirements.ts
+++ b/ui/src/app/data-explorer/sdk/ep-requirements.ts
@@ -16,51 +16,51 @@
  *
  */
 
-import {EventProperty} from "../../connect/schema-editor/model/EventProperty";
-import {EventPropertyPrimitive} from "../../connect/schema-editor/model/EventPropertyPrimitive";
 import {Datatypes} from "./model/datatypes";
+import {EventPropertyPrimitive, EventPropertyUnion} from "../../core-model/gen/streampipes-model";
 
 export class EpRequirements {
 
     private static ep(): EventPropertyPrimitive {
-        let ep = new EventPropertyPrimitive(undefined, undefined);
+        let ep = new EventPropertyPrimitive();
+        ep["@class"] = "org.apache.streampipes.model.schema.EventPropertyPrimitive";
         return ep;
     }
 
-    static anyProperty(): EventProperty {
+    static anyProperty(): EventPropertyUnion {
         return EpRequirements.ep();
     }
 
-    static imageReq(): EventProperty {
+    static imageReq(): EventPropertyUnion {
         return EpRequirements.domainPropertyReq("https://image.com");
     }
 
-    static timestampReq(): EventProperty {
+    static timestampReq(): EventPropertyUnion {
         return EpRequirements.domainPropertyReq("http://schema.org/DateTime");
     }
 
-    static numberReq(): EventProperty {
+    static numberReq(): EventPropertyUnion {
         return EpRequirements.datatypeReq(Datatypes.Number);
     }
 
-    static stringReq(): EventProperty {
+    static stringReq(): EventPropertyUnion {
         return EpRequirements.datatypeReq(Datatypes.String);
     }
 
-    static integerReq(): EventProperty {
+    static integerReq(): EventPropertyUnion {
         return EpRequirements.datatypeReq(Datatypes.Integer);
     }
 
     static domainPropertyReq(domainProperty: string): EventPropertyPrimitive {
         let eventProperty = EpRequirements.ep();
-        eventProperty.setDomainProperty(domainProperty);
+        eventProperty.domainProperties = [domainProperty];
         return eventProperty;
 
     }
 
     static datatypeReq(datatype: Datatypes): EventPropertyPrimitive {
         let eventProperty = EpRequirements.ep();
-        eventProperty.setRuntimeType(datatype.toUri());
+        eventProperty.runtimeType = datatype.toUri();
         return eventProperty;
 }
 
diff --git a/ui/src/app/data-explorer/sdk/extractor/static-property-extractor.ts b/ui/src/app/data-explorer/sdk/extractor/static-property-extractor.ts
index 93d0adb..6527ca2 100644
--- a/ui/src/app/data-explorer/sdk/extractor/static-property-extractor.ts
+++ b/ui/src/app/data-explorer/sdk/extractor/static-property-extractor.ts
@@ -16,17 +16,17 @@
  *
  */
 
-import {EventSchema} from "../../../connect/schema-editor/model/EventSchema";
-import {StaticProperty} from "../../../connect/model/StaticProperty";
-import {MappingPropertyUnary} from "../../../connect/model/MappingPropertyUnary";
-import {FreeTextStaticProperty} from "../../../connect/model/FreeTextStaticProperty";
-import {ColorPickerStaticProperty} from "../../../connect/model/ColorPickerStaticProperty";
-import {MappingPropertyNary} from "../../../connect/model/MappingPropertyNary";
+import {
+    ColorPickerStaticProperty,
+    EventSchema, FreeTextStaticProperty, MappingPropertyNary,
+    MappingPropertyUnary,
+    StaticPropertyUnion
+} from "../../../core-model/gen/streampipes-model";
 
 export class StaticPropertyExtractor {
 
     constructor(private inputSchema: EventSchema,
-                private staticProperties: Array<StaticProperty>) {
+                private staticProperties: Array<StaticPropertyUnion>) {
 
     }
 
@@ -66,7 +66,7 @@ export class StaticPropertyExtractor {
         return this.singleValueParameter(internalId) as number;
     }
 
-    getStaticPropertyByName(internalId: string): StaticProperty {
+    getStaticPropertyByName(internalId: string): StaticPropertyUnion {
         return this.staticProperties.find(sp => (sp.internalName == internalId));
     }
 
diff --git a/ui/src/app/data-explorer/sdk/matching/domain-property-match.ts b/ui/src/app/data-explorer/sdk/matching/domain-property-match.ts
index 836df01..b0041cd 100644
--- a/ui/src/app/data-explorer/sdk/matching/domain-property-match.ts
+++ b/ui/src/app/data-explorer/sdk/matching/domain-property-match.ts
@@ -18,11 +18,15 @@
 
 export class DomainPropertyMatch {
 
-    match(domainPropertyRequirement: string, domainPropertyOffer: string) {
-        if (domainPropertyRequirement == undefined) {
+    match(domainPropertyRequirements: Array<string>, domainPropertyOffers: Array<string>) {
+        if (domainPropertyRequirements == undefined || domainPropertyRequirements.length == 0) {
             return true;
         } else {
-            return domainPropertyRequirement == domainPropertyOffer;
+            if (!domainPropertyOffers) {
+                return false;
+            } else {
+                return domainPropertyRequirements[0] == domainPropertyOffers[0];
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/ui/src/app/data-explorer/sdk/matching/mapping-property-generator.ts b/ui/src/app/data-explorer/sdk/matching/mapping-property-generator.ts
index 3f47e1c..2545c49 100644
--- a/ui/src/app/data-explorer/sdk/matching/mapping-property-generator.ts
+++ b/ui/src/app/data-explorer/sdk/matching/mapping-property-generator.ts
@@ -16,15 +16,15 @@
  *
  */
 
-import {EventProperty} from "../../../connect/schema-editor/model/EventProperty";
 import {PropertyMatch} from "./property-match";
+import {EventPropertyUnion} from "../../../core-model/gen/streampipes-model";
 
 export class MappingPropertyGenerator {
 
     private selector: string = "s0";
     private separator: string = "::";
 
-    constructor(private requiredEventProperty: EventProperty, private providedEventProperties: Array<EventProperty>) {
+    constructor(private requiredEventProperty: EventPropertyUnion, private providedEventProperties: Array<EventPropertyUnion>) {
 
     }
 
diff --git a/ui/src/app/data-explorer/sdk/matching/primitive-property-match.ts b/ui/src/app/data-explorer/sdk/matching/primitive-property-match.ts
index 6fadf06..be42e17 100644
--- a/ui/src/app/data-explorer/sdk/matching/primitive-property-match.ts
+++ b/ui/src/app/data-explorer/sdk/matching/primitive-property-match.ts
@@ -16,16 +16,16 @@
  *
  */
 
-import {EventPropertyPrimitive} from "../../../connect/schema-editor/model/EventPropertyPrimitive";
 import {DatatypeMatch} from "./datatype-match";
 import {DomainPropertyMatch} from "./domain-property-match";
+import {EventPropertyPrimitive} from "../../../core-model/gen/streampipes-model";
 
 export class PrimitivePropertyMatch {
 
     match(requirement: EventPropertyPrimitive, offer: EventPropertyPrimitive) {
         if (requirement != undefined) {
             return new DatatypeMatch().match(requirement.runtimeType, offer.runtimeType) &&
-                new DomainPropertyMatch().match(requirement.domainProperty, offer.domainProperty);
+                new DomainPropertyMatch().match(requirement.domainProperties, offer.domainProperties);
         } else {
             return true;
         }
diff --git a/ui/src/app/data-explorer/sdk/matching/property-match.ts b/ui/src/app/data-explorer/sdk/matching/property-match.ts
index 29e145c..f8f9365 100644
--- a/ui/src/app/data-explorer/sdk/matching/property-match.ts
+++ b/ui/src/app/data-explorer/sdk/matching/property-match.ts
@@ -16,13 +16,15 @@
  *
  */
 
-import {EventProperty} from "../../../connect/schema-editor/model/EventProperty";
-import {EventPropertyPrimitive} from "../../../connect/schema-editor/model/EventPropertyPrimitive";
 import {PrimitivePropertyMatch} from "./primitive-property-match";
+import {
+    EventPropertyPrimitive,
+    EventPropertyUnion
+} from "../../../core-model/gen/streampipes-model";
 
 export class PropertyMatch {
 
-    match(requirement: EventProperty, offer: EventProperty): boolean {
+    match(requirement: EventPropertyUnion, offer: EventPropertyUnion): boolean {
         if (requirement instanceof EventPropertyPrimitive && offer instanceof EventPropertyPrimitive) {
             return new PrimitivePropertyMatch().match(requirement, offer);
         } else {
diff --git a/ui/src/app/data-explorer/sdk/schema-requirements-builder.ts b/ui/src/app/data-explorer/sdk/schema-requirements-builder.ts
index ad0c14e..562c772 100644
--- a/ui/src/app/data-explorer/sdk/schema-requirements-builder.ts
+++ b/ui/src/app/data-explorer/sdk/schema-requirements-builder.ts
@@ -16,16 +16,17 @@
  *
  */
 
-import {EventProperty} from "../../connect/schema-editor/model/EventProperty";
-import {StaticProperty} from "../../connect/model/StaticProperty";
 import {CollectedSchemaRequirements} from "./collected-schema-requirements";
-import {MappingPropertyUnary} from "../../connect/model/MappingPropertyUnary";
-import {MappingPropertyNary} from "../../connect/model/MappingPropertyNary";
+import {
+    EventPropertyUnion, MappingPropertyNary,
+    MappingPropertyUnary,
+    StaticPropertyUnion
+} from "../../core-model/gen/streampipes-model";
 
 export class SchemaRequirementsBuilder {
 
-    private requiredEventProperties: Array<EventProperty>;
-    private staticProperties: Array<StaticProperty>;
+    private requiredEventProperties: Array<EventPropertyUnion>;
+    private staticProperties: Array<StaticPropertyUnion>;
 
     private constructor() {
         this.requiredEventProperties = [];
@@ -36,8 +37,8 @@ export class SchemaRequirementsBuilder {
         return new SchemaRequirementsBuilder();
     }
 
-    requiredPropertyWithUnaryMapping(internalId: string, label: string, description: string, eventProperty: EventProperty): SchemaRequirementsBuilder {
-        eventProperty.setRuntimeName(internalId);
+    requiredPropertyWithUnaryMapping(internalId: string, label: string, description: string, eventProperty: EventPropertyUnion): SchemaRequirementsBuilder {
+        eventProperty.runtimeName = internalId;
         let mp = this.makeMappingProperty(internalId, label, description, new MappingPropertyUnary());
 
         this.staticProperties.push(mp);
@@ -46,8 +47,8 @@ export class SchemaRequirementsBuilder {
         return this;
     }
 
-    requiredPropertyWithNaryMapping(internalId: string, label: string, description: string, eventProperty: EventProperty): SchemaRequirementsBuilder {
-        eventProperty.setRuntimeName(internalId);
+    requiredPropertyWithNaryMapping(internalId: string, label: string, description: string, eventProperty: EventPropertyUnion): SchemaRequirementsBuilder {
+        eventProperty.runtimeName = internalId;
         let mp = this.makeMappingProperty(internalId, label, description, new MappingPropertyNary());
 
         this.staticProperties.push(mp);
@@ -56,7 +57,7 @@ export class SchemaRequirementsBuilder {
         return this;
     }
 
-    makeMappingProperty(internalId: string, label: string, description: string, sp: StaticProperty): StaticProperty {
+    makeMappingProperty(internalId: string, label: string, description: string, sp: StaticPropertyUnion): StaticPropertyUnion {
         sp.internalName = internalId;
         sp.label = label;
         sp.description = description;
diff --git a/ui/src/app/data-explorer/services/data-view-data-explorer.service.ts b/ui/src/app/data-explorer/services/data-view-data-explorer.service.ts
index 9566b17..940143b 100644
--- a/ui/src/app/data-explorer/services/data-view-data-explorer.service.ts
+++ b/ui/src/app/data-explorer/services/data-view-data-explorer.service.ts
@@ -41,9 +41,9 @@ export class DataViewDataExplorerService {
 
   getVisualizableData(): Observable<DataLakeMeasure[]> {
 
-    return this.dataLakeRestService.getAllInfos().map(data => {
+    return this.dataLakeRestService.getAllInfos().pipe(map(data => {
       return (data as any[]).map(d => DataLakeMeasure.fromData(d as DataLakeMeasure));
-    });
+    }));
   }
 
   getDataViews(): Observable<IDataViewDashboard[]> {
diff --git a/ui/src/app/editor/dialog/customize/customize.component.ts b/ui/src/app/editor/dialog/customize/customize.component.ts
index 1c6fd37..71ddda1 100644
--- a/ui/src/app/editor/dialog/customize/customize.component.ts
+++ b/ui/src/app/editor/dialog/customize/customize.component.ts
@@ -23,7 +23,7 @@ import {JsplumbService} from "../../services/jsplumb.service";
 import {DataProcessorInvocation, EventSchema} from "../../../core-model/gen/streampipes-model";
 import {FormBuilder, FormGroup} from "@angular/forms";
 import {ShepherdService} from "../../../services/tour/shepherd.service";
-import {ConfigurationInfo} from "../../../connect/model/message/ConfigurationInfo";
+import {ConfigurationInfo} from "../../../connect/model/ConfigurationInfo";
 
 @Component({
   selector: 'customize-pipeline-element',
diff --git a/ui/src/app/editor/services/editor.service.ts b/ui/src/app/editor/services/editor.service.ts
index ef70c1d..4ec4b83 100644
--- a/ui/src/app/editor/services/editor.service.ts
+++ b/ui/src/app/editor/services/editor.service.ts
@@ -51,14 +51,14 @@ export class EditorService {
 
     recommendPipelineElement(pipeline): Observable<PipelineElementRecommendationMessage> {
         return this.http.post(this.pipelinesResourceUrl +"/recommend", pipeline)
-            .map(data => PipelineElementRecommendationMessage.fromData(data as any));
+            .pipe(map(data => PipelineElementRecommendationMessage.fromData(data as any)));
     }
 
     updatePartialPipeline(pipeline): Observable<PipelineModificationMessage> {
         return this.http.post(this.pipelinesResourceUrl +"/update", pipeline)
-            .map(data => {
+            .pipe(map(data => {
                 return PipelineModificationMessage.fromData(data as any);
-            });
+            }));
     }
 
   updateDataSet(dataSet): Observable<DataSetModificationMessage> {
diff --git a/ui/src/app/notifications/service/notifications.service.ts b/ui/src/app/notifications/service/notifications.service.ts
index 024c447..26d36d3 100644
--- a/ui/src/app/notifications/service/notifications.service.ts
+++ b/ui/src/app/notifications/service/notifications.service.ts
@@ -21,6 +21,7 @@ import {Observable} from "rxjs";
 import {ExistingNotification, NotificationCount, NotificationItem} from "../model/notifications.model";
 import {Injectable} from "@angular/core";
 import {NotificationUtils} from "../utils/notifications.utils";
+import {map} from "rxjs/operators";
 
 @Injectable()
 export class NotificationsService {
@@ -30,9 +31,9 @@ export class NotificationsService {
     }
 
     getUnreadNotificationsCount(): Observable<NotificationCount> {
-        return this.http.get(this.notificationUrl + "/count").map(data => {
+        return this.http.get(this.notificationUrl + "/count").pipe(map(data => {
             return data as NotificationCount;
-        })
+        }));
     }
 
     getNotifications(existingNotification: ExistingNotification, offset: number, limit: number): Observable<NotificationItem[]> {
@@ -44,9 +45,9 @@ export class NotificationsService {
                 + "offset=" + offset
                 + "&"
                 + "count=" + limit)
-            .map(data => {
+            .pipe(map(data => {
                 return data as NotificationItem[];
-            });
+            }));
     }
 
     updateNotification(notificationItem: NotificationItem): Observable<any> {
diff --git a/ui/src/app/platform-services/apis/pipeline-element.service.ts b/ui/src/app/platform-services/apis/pipeline-element.service.ts
index c95712e..6c16d14 100644
--- a/ui/src/app/platform-services/apis/pipeline-element.service.ts
+++ b/ui/src/app/platform-services/apis/pipeline-element.service.ts
@@ -18,7 +18,6 @@
 
 import {Injectable} from "@angular/core";
 import {HttpClient} from "@angular/common/http";
-import {AuthStatusService} from "../../services/auth-status.service";
 import {Observable} from "rxjs";
 import {
   DataProcessorInvocation,
@@ -26,6 +25,7 @@ import {
   DataSourceDescription
 } from "../../core-model/gen/streampipes-model";
 import {PlatformServicesCommons} from "./commons.service";
+import {map} from "rxjs/operators";
 
 @Injectable()
 export class PipelineElementService {
@@ -35,21 +35,21 @@ export class PipelineElementService {
   }
 
   getDataProcessors(): Observable<Array<DataProcessorInvocation>> {
-    return this.http.get(this.dataProcessorsUrl + "/own").map(data => {
+    return this.http.get(this.dataProcessorsUrl + "/own").pipe(map(data => {
       return (data as []).map(dpi => DataProcessorInvocation.fromData(dpi));
-    })
+    }));
   }
 
   getDataSinks(): Observable<Array<DataSinkInvocation>> {
-    return this.http.get(this.dataSinksUrl + "/own").map(data => {
+    return this.http.get(this.dataSinksUrl + "/own").pipe(map(data => {
       return (data as []).map(dpi => DataSinkInvocation.fromData(dpi));
-    })
+    }));
   }
 
   getDataSources(): Observable<Array<DataSourceDescription>> {
-    return this.http.get(this.dataSourcesUrl + "/own").map(data => {
+    return this.http.get(this.dataSourcesUrl + "/own").pipe(map(data => {
       return (data as []).map(dpi => DataSourceDescription.fromData(dpi));
-    })
+    }));
   }
 
   getDocumentation(appId) {
diff --git a/ui/src/app/platform-services/apis/pipeline-template.service.ts b/ui/src/app/platform-services/apis/pipeline-template.service.ts
index d806ac6..75f729d 100644
--- a/ui/src/app/platform-services/apis/pipeline-template.service.ts
+++ b/ui/src/app/platform-services/apis/pipeline-template.service.ts
@@ -16,104 +16,103 @@
  *
  */
 
-import {Injectable} from '@angular/core';
-import {HttpClient} from '@angular/common/http';
-import {Observable} from 'rxjs';
-import {map} from 'rxjs/operators';
-import {FreeTextStaticProperty} from '../../connect/model/FreeTextStaticProperty';
-import {PipelineTemplateInvocation} from '../../connect/model/PipelineTemplateInvocation';
-import {StaticProperty} from '../../connect/model/StaticProperty';
-import {AuthStatusService} from '../../services/auth-status.service';
-import 'rxjs-compat/add/operator/map';
-
-@Injectable()
-export class PipelineTemplateService {
-
-    constructor(
-        private http: HttpClient,
-        private authStatusService: AuthStatusService,
-    ) {}
-
-    getServerUrl() {
-        return '/streampipes-backend';
-    }
-
-    // getDataSets(): Observable<DataSetDescription[]> {
-    //     return this.http
-    //         .get(this.getServerUrl() + '/api/v2/users/'+ this.authStatusService.email + '/pipeline-templates/streams')
-    //         .pipe(map(response => {
-    //
-    //
-    //
-    //             // TODO remove this
-    //             // quick fix to deserialize URIs
-    //             response['@graph'].forEach(function (object) {
-    //                if (object['sp:domainProperty'] != undefined) {
-    //                    // object['sp:domainProperty']['@type'] = "sp:URI";
-    //                    object['sp:domainProperty'] = object['sp:domainProperty']['@id'];
-    //                    delete object['sp:domainProperty']['@id'];
-    //                }
-    //             });
-    //
-    //             const res = this.tsonLdSerializerService.fromJsonLd(response, 'sp:DataStreamContainer');
-    //             return res.list;
-    //         }));
-    // }
-    //
-    // getOperators(dataSet: DataSetDescription): Observable<PipelineTemplateDescription[]> {
-    //     return this.http
-    //         .get(this.getServerUrl() + '/api/v2/users/'+ this.authStatusService.email + '/pipeline-templates?dataset=' + dataSet.id)
-    //         .pipe(map(response => {
-    //             const res = this.tsonLdSerializerService.fromJsonLd(response, 'sp:PipelineTemplateDescriptionContainer');
-    //             return res.list;
-    //         }));
-    // }
-
-    getPipelineTemplateInvocation(dataSetId:string, templateId: string): Observable<PipelineTemplateInvocation> {
-        return this.http
-            .get(this.getServerUrl() + '/api/v2/users/'+ this.authStatusService.email + '/pipeline-templates/invocation?streamId=' + dataSetId + '&templateId=' + templateId)
-            .pipe(map(response => {
-
-                var res: PipelineTemplateInvocation;
-
-                // Currently tsonld dows not support objects that just contain one root object without an enclosing @graph array
-                if ('@graph' in response) {
-                    //res = this.tsonLdSerializerService.fromJsonLd(response, 'sp:PipelineTemplateInvocation');
-                } else {
-                    res = new PipelineTemplateInvocation(response['@id']);
-                    res.dataSetId = response['sp:hasDataSetId'];
-                    res.name = response['hasElementName'];
-                    res.pipelineTemplateId = response['sp:hasInternalName'];
-                }
-
-                // TODO find better solution
-                // This will remove preconfigured values from the UI
-                res.list.forEach(property => {
-                    if (this.isFreeTextStaticProperty(property)) {
-                        if (this.asFreeTextStaticProperty(property).value != undefined) {
-                            this.asFreeTextStaticProperty(property).render = false;
-                        }
-                    }
-                });
-                return res;
-            }));
-    }
-
-    isFreeTextStaticProperty(val) {
-        return val instanceof FreeTextStaticProperty;
-    }
-
-    asFreeTextStaticProperty(val: StaticProperty): FreeTextStaticProperty {
-        return <FreeTextStaticProperty> val;
-    }
-
-    createPipelineTemplateInvocation(invocation: PipelineTemplateInvocation) {
-
-        // this.tsonLdSerializerService.toJsonLd(invocation).subscribe(res => {
-        //     this.http
-        //         .post(this.getServerUrl() + '/api/v2/users/'+ this.authStatusService.email + '/pipeline-templates', res)
-        //         .subscribe();
-        // });
-    }
-
-}
\ No newline at end of file
+// import {Injectable} from '@angular/core';
+// import {HttpClient} from '@angular/common/http';
+// import {Observable} from 'rxjs';
+// import {map} from 'rxjs/operators';
+// import {AuthStatusService} from '../../services/auth-status.service';
+// import 'rxjs-compat/add/operator/map';
+// import {PipelineTemplateInvocation} from "../../connect/model/PipelineTemplateInvocation";
+// import {FreeTextStaticProperty, StaticPropertyUnion} from "../../core-model/gen/streampipes-model";
+//
+// @Injectable()
+// export class PipelineTemplateService {
+//
+//     constructor(
+//         private http: HttpClient,
+//         private authStatusService: AuthStatusService,
+//     ) {}
+//
+//     getServerUrl() {
+//         return '/streampipes-backend';
+//     }
+//
+//     // getDataSets(): Observable<DataSetDescription[]> {
+//     //     return this.http
+//     //         .get(this.getServerUrl() + '/api/v2/users/'+ this.authStatusService.email + '/pipeline-templates/streams')
+//     //         .pipe(map(response => {
+//     //
+//     //
+//     //
+//     //             // TODO remove this
+//     //             // quick fix to deserialize URIs
+//     //             response['@graph'].forEach(function (object) {
+//     //                if (object['sp:domainProperty'] != undefined) {
+//     //                    // object['sp:domainProperty']['@type'] = "sp:URI";
+//     //                    object['sp:domainProperty'] = object['sp:domainProperty']['@id'];
+//     //                    delete object['sp:domainProperty']['@id'];
+//     //                }
+//     //             });
+//     //
+//     //             const res = this.tsonLdSerializerService.fromJsonLd(response, 'sp:DataStreamContainer');
+//     //             return res.list;
+//     //         }));
+//     // }
+//     //
+//     // getOperators(dataSet: DataSetDescription): Observable<PipelineTemplateDescription[]> {
+//     //     return this.http
+//     //         .get(this.getServerUrl() + '/api/v2/users/'+ this.authStatusService.email + '/pipeline-templates?dataset=' + dataSet.id)
+//     //         .pipe(map(response => {
+//     //             const res = this.tsonLdSerializerService.fromJsonLd(response, 'sp:PipelineTemplateDescriptionContainer');
+//     //             return res.list;
+//     //         }));
+//     // }
+//
+//     getPipelineTemplateInvocation(dataSetId:string, templateId: string): Observable<PipelineTemplateInvocation> {
+//         return this.http
+//             .get(this.getServerUrl() + '/api/v2/users/'+ this.authStatusService.email + '/pipeline-templates/invocation?streamId=' + dataSetId + '&templateId=' + templateId)
+//             .pipe(map(response => {
+//
+//                 var res: PipelineTemplateInvocation;
+//
+//                 // Currently tsonld dows not support objects that just contain one root object without an enclosing @graph array
+//                 if ('@graph' in response) {
+//                     //res = this.tsonLdSerializerService.fromJsonLd(response, 'sp:PipelineTemplateInvocation');
+//                 } else {
+//                     res = new PipelineTemplateInvocation(response['@id']);
+//                     res.dataSetId = response['sp:hasDataSetId'];
+//                     res.name = response['hasElementName'];
+//                     res.pipelineTemplateId = response['sp:hasInternalName'];
+//                 }
+//
+//                 // TODO find better solution
+//                 // This will remove preconfigured values from the UI
+//                 res.list.forEach(property => {
+//                     if (this.isFreeTextStaticProperty(property)) {
+//                         if (this.asFreeTextStaticProperty(property).value != undefined) {
+//                             this.asFreeTextStaticProperty(property).render = false;
+//                         }
+//                     }
+//                 });
+//                 return res;
+//             }));
+//     }
+//
+//     isFreeTextStaticProperty(val) {
+//         return val instanceof FreeTextStaticProperty;
+//     }
+//
+//     asFreeTextStaticProperty(val: StaticPropertyUnion): FreeTextStaticProperty {
+//         return <FreeTextStaticProperty> val;
+//     }
+//
+//     createPipelineTemplateInvocation(invocation: PipelineTemplateInvocation) {
+//
+//         // this.tsonLdSerializerService.toJsonLd(invocation).subscribe(res => {
+//         //     this.http
+//         //         .post(this.getServerUrl() + '/api/v2/users/'+ this.authStatusService.email + '/pipeline-templates', res)
+//         //         .subscribe();
+//         // });
+//     }
+//
+// }
\ No newline at end of file
diff --git a/ui/src/app/platform-services/platform.module.ts b/ui/src/app/platform-services/platform.module.ts
index 66588e3..4ce0f72 100644
--- a/ui/src/app/platform-services/platform.module.ts
+++ b/ui/src/app/platform-services/platform.module.ts
@@ -17,7 +17,6 @@
  */
 
 import {NgModule} from '@angular/core';
-import {PipelineTemplateService} from './apis/pipeline-template.service';
 import {PipelineElementService} from "./apis/pipeline-element.service";
 import {PipelineService} from "./apis/pipeline.service";
 import {PlatformServicesCommons} from "./apis/commons.service";
@@ -29,7 +28,7 @@ import {PipelineElementEndpointService} from "./apis/pipeline-element-endpoint.s
   providers: [
     PlatformServicesCommons,
     PipelineElementEndpointService,
-    PipelineTemplateService,
+    //PipelineTemplateService,
     PipelineElementService,
     PipelineService
   ],
diff --git a/ui/src/app/platform-services/tsonld/Float.ts b/ui/src/app/platform-services/tsonld/Float.ts
deleted file mode 100644
index 75d3ba8..0000000
--- a/ui/src/app/platform-services/tsonld/Float.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements.  See the NOTICE file distributed with
- *   this work for additional information regarding copyright ownership.
- *   The ASF licenses this file to You under the Apache License, Version 2.0
- *   (the "License"); you may not use this file except in compliance with
- *   the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
- */
-
-export function Float(target: any, key: string) {
-    Reflect.defineMetadata('Float', 'float', target, key);
-}
\ No newline at end of file
diff --git a/ui/src/app/platform-services/tsonld/RdfId.js b/ui/src/app/platform-services/tsonld/RdfId.js
deleted file mode 100644
index 49c7ed1..0000000
--- a/ui/src/app/platform-services/tsonld/RdfId.js
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-function RdfId(target, key) {
-    Reflect.defineMetadata('RdfsId', 'rdfsId', target, key);
-    Reflect.defineMetadata('TsId', key, target, '@id');
-}
-exports.RdfId = RdfId;
diff --git a/ui/src/app/platform-services/tsonld/RdfId.ts b/ui/src/app/platform-services/tsonld/RdfId.ts
deleted file mode 100644
index fc4830d..0000000
--- a/ui/src/app/platform-services/tsonld/RdfId.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-export function RdfId(target: any, key: string) {
-   Reflect.defineMetadata('RdfsId', 'rdfsId', target, key);
-  Reflect.defineMetadata('TsId', key, target,'@id');
-}
diff --git a/ui/src/app/platform-services/tsonld/RdfsClass.js b/ui/src/app/platform-services/tsonld/RdfsClass.js
deleted file mode 100644
index 00d7bb4..0000000
--- a/ui/src/app/platform-services/tsonld/RdfsClass.js
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-function RdfsClass(propertyName) {
-    return function (target) {
-        Reflect.defineMetadata('RdfsClass', propertyName, target);
-    };
-}
-exports.RdfsClass = RdfsClass;
diff --git a/ui/src/app/platform-services/tsonld/RdfsClass.ts b/ui/src/app/platform-services/tsonld/RdfsClass.ts
deleted file mode 100644
index 4e1730b..0000000
--- a/ui/src/app/platform-services/tsonld/RdfsClass.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-export function RdfsClass(propertyName: String) {
-  return function(target: Function) {
-    Reflect.defineMetadata('RdfsClass', propertyName, target);
-  };
-}
diff --git a/ui/src/app/platform-services/tsonld/RdfsProperty.js b/ui/src/app/platform-services/tsonld/RdfsProperty.js
deleted file mode 100644
index 8d799dd..0000000
--- a/ui/src/app/platform-services/tsonld/RdfsProperty.js
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-function RdfProperty(propertyName) {
-    return function (target, key) {
-        Reflect.defineMetadata('RdfProperty', propertyName, target, key);
-        Reflect.defineMetadata('TsProperty', key, target, propertyName);
-    };
-}
-exports.RdfProperty = RdfProperty;
diff --git a/ui/src/app/platform-services/tsonld/RdfsProperty.ts b/ui/src/app/platform-services/tsonld/RdfsProperty.ts
deleted file mode 100644
index fed6677..0000000
--- a/ui/src/app/platform-services/tsonld/RdfsProperty.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-export function RdfProperty(propertyName: string) {
-  return (target: any, key: string) => {
-    Reflect.defineMetadata('RdfProperty', propertyName, target, key);
-    Reflect.defineMetadata('TsProperty', key, target, propertyName);
-  };
-}