You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by wi...@apache.org on 2020/11/28 12:41:23 UTC
[incubator-streampipes] 02/02: Merge branch 'dev' into
edge-extensions
This is an automated email from the ASF dual-hosted git repository.
wiener pushed a commit to branch edge-extensions
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit bae29cb0b1e7d03be64f77e8c0e3026abd05c0f5
Merge: 7f2a546 b1a7af8
Author: Patrick Wiener <wi...@fzi.de>
AuthorDate: Sat Nov 28 13:41:01 2020 +0100
Merge branch 'dev' into edge-extensions
.../model/connect/adapter/AdapterDescription.java | 13 +-
ui/src/app/core-model/gen/streampipes-model.ts | 279 +--------------------
2 files changed, 7 insertions(+), 285 deletions(-)
diff --cc ui/src/app/core-model/gen/streampipes-model.ts
index 7244c12,712f6d4..e9e95be
--- a/ui/src/app/core-model/gen/streampipes-model.ts
+++ b/ui/src/app/core-model/gen/streampipes-model.ts
@@@ -19,10 -19,10 +19,10 @@@
/* tslint:disable */
/* eslint-disable */
// @ts-nocheck
- // Generated using typescript-generator version 2.24.612 on 2020-11-28 13:30:20.
-// Generated using typescript-generator version 2.24.612 on 2020-11-25 23:55:30.
++// Generated using typescript-generator version 2.24.612 on 2020-11-10 15:19:54.
export class AbstractStreamPipesEntity {
-- "@class": "org.apache.streampipes.model.base.NamedStreamPipesEntity" | "org.apache.streampipes.model.connect.adapter.AdapterDescription" | "org.apache.streampipes.model.connect.adapter.AdapterSetDescription" | "org.apache.streampipes.model.connect.adapter.GenericAdapterSetDescription" | "org.apache.streampipes.model.connect.adapter.SpecificAdapterSetDescription" | "org.apache.streampipes.model.connect.adapter.AdapterStreamDescription" | "org.apache.streampipes.model.connect.adapter. [...]
++ "@class": "org.apache.streampipes.model.base.NamedStreamPipesEntity" | "org.apache.streampipes.model.connect.adapter.AdapterDescription" | "org.apache.streampipes.model.connect.adapter.AdapterSetDescription" | "org.apache.streampipes.model.connect.adapter.GenericAdapterSetDescription" | "org.apache.streampipes.model.connect.adapter.SpecificAdapterSetDescription" | "org.apache.streampipes.model.connect.adapter.AdapterStreamDescription" | "org.apache.streampipes.model.connect.adapter. [...]
static fromData(data: AbstractStreamPipesEntity, target?: AbstractStreamPipesEntity): AbstractStreamPipesEntity {
if (!data) {
@@@ -34,27 -34,27 +34,8 @@@
}
}
--export class AccessibleSensorActuatorResource {
-- connectionInfo: string;
-- connectionType: string;
-- name: string;
-- type: string;
--
-- static fromData(data: AccessibleSensorActuatorResource, target?: AccessibleSensorActuatorResource): AccessibleSensorActuatorResource {
-- if (!data) {
-- return data;
-- }
-- const instance = target || new AccessibleSensorActuatorResource();
-- instance.name = data.name;
-- instance.type = data.type;
-- instance.connectionInfo = data.connectionInfo;
-- instance.connectionType = data.connectionType;
-- return instance;
-- }
--}
--
export class UnnamedStreamPipesEntity extends AbstractStreamPipesEntity {
-- "@class": "org.apache.streampipes.model.base.UnnamedStreamPipesEntity" | "org.apache.streampipes.model.connect.guess.GuessSchema" | "org.apache.streampipes.model.connect.rules.TransformationRuleDescription" | "org.apache.streampipes.model.connect.rules.value.ValueTransformationRuleDescription" | "org.apache.streampipes.model.connect.rules.value.AddTimestampRuleDescription" | "org.apache.streampipes.model.connect.rules.value.AddValueTransformationRuleDescription" | "org.apache.stream [...]
++ "@class": "org.apache.streampipes.model.base.UnnamedStreamPipesEntity" | "org.apache.streampipes.model.connect.guess.GuessSchema" | "org.apache.streampipes.model.connect.rules.TransformationRuleDescription" | "org.apache.streampipes.model.connect.rules.value.ValueTransformationRuleDescription" | "org.apache.streampipes.model.connect.rules.value.AddTimestampRuleDescription" | "org.apache.streampipes.model.connect.rules.value.AddValueTransformationRuleDescription" | "org.apache.stream [...]
elementId: string;
static fromData(data: UnnamedStreamPipesEntity, target?: UnnamedStreamPipesEntity): UnnamedStreamPipesEntity {
@@@ -615,21 -615,21 +596,6 @@@ export class ApplicationLink extends Un
}
}
--export class CPU {
-- arch: string;
-- cores: number;
--
-- static fromData(data: CPU, target?: CPU): CPU {
-- if (!data) {
-- return data;
-- }
-- const instance = target || new CPU();
-- instance.cores = data.cores;
-- instance.arch = data.arch;
-- return instance;
-- }
--}
--
export class Category {
_id: string;
_rev: string;
@@@ -751,21 -751,21 +717,6 @@@ export class CreateNestedRuleDescriptio
}
}
--export class Cuda {
-- cudaDriverVersion: string;
-- cudaRuntimeVersion: string;
--
-- static fromData(data: Cuda, target?: Cuda): Cuda {
-- if (!data) {
-- return data;
-- }
-- const instance = target || new Cuda();
-- instance.cudaDriverVersion = data.cudaDriverVersion;
-- instance.cudaRuntimeVersion = data.cudaRuntimeVersion;
-- return instance;
-- }
--}
--
export class CustomOutputStrategy extends OutputStrategy {
"@class": "org.apache.streampipes.model.output.CustomOutputStrategy";
availablePropertyKeys: string[];
@@@ -800,19 -800,19 +751,6 @@@ export class CustomTransformOutputStrat
}
}
--export class DISK {
-- diskTotal: number;
--
-- static fromData(data: DISK, target?: DISK): DISK {
-- if (!data) {
-- return data;
-- }
-- const instance = target || new DISK();
-- instance.diskTotal = data.diskTotal;
-- return instance;
-- }
--}
--
export class DashboardEntity extends UnnamedStreamPipesEntity {
"@class": "org.apache.streampipes.model.dashboard.DashboardEntity" | "org.apache.streampipes.model.dashboard.DashboardWidgetModel" | "org.apache.streampipes.model.dashboard.VisualizablePipeline" | "org.apache.streampipes.model.datalake.DataExplorerWidgetModel";
_id: string;
@@@ -992,13 -992,13 +930,6 @@@ export class InvocableStreamPipesEntit
configured: boolean;
correspondingPipeline: string;
correspondingUser: string;
-- deploymentRunningInstanceId: string;
-- deploymentTargetNodeHostname: string;
-- deploymentTargetNodeId: string;
-- deploymentTargetNodePort: number;
-- elementEndpointHostname: string;
-- elementEndpointPort: number;
-- elementEndpointServiceName: string;
inputStreams: SpDataStreamUnion[];
staticProperties: StaticPropertyUnion[];
statusInfoSettings: ElementStatusInfoSettings;
@@@ -1020,13 -1020,13 +951,6 @@@
instance.correspondingPipeline = data.correspondingPipeline;
instance.correspondingUser = data.correspondingUser;
instance.streamRequirements = __getCopyArrayFn(SpDataStream.fromDataUnion)(data.streamRequirements);
-- instance.elementEndpointHostname = data.elementEndpointHostname;
-- instance.elementEndpointPort = data.elementEndpointPort;
-- instance.deploymentTargetNodeId = data.deploymentTargetNodeId;
-- instance.deploymentTargetNodeHostname = data.deploymentTargetNodeHostname;
-- instance.deploymentTargetNodePort = data.deploymentTargetNodePort;
-- instance.deploymentRunningInstanceId = data.deploymentRunningInstanceId;
-- instance.elementEndpointServiceName = data.elementEndpointServiceName;
instance.configured = data.configured;
instance.uncompleted = data.uncompleted;
return instance;
@@@ -1168,25 -1168,25 +1092,6 @@@ export class DeleteRuleDescription exte
}
}
--export class Docker {
-- apiVersion: string;
-- hasDocker: boolean;
-- hasNvidiaRuntime: boolean;
-- serverVersion: string;
--
-- static fromData(data: Docker, target?: Docker): Docker {
-- if (!data) {
-- return data;
-- }
-- const instance = target || new Docker();
-- instance.hasDocker = data.hasDocker;
-- instance.hasNvidiaRuntime = data.hasNvidiaRuntime;
-- instance.serverVersion = data.serverVersion;
-- instance.apiVersion = data.apiVersion;
-- return instance;
-- }
--}
--
export class DomainPropertyProbability extends UnnamedStreamPipesEntity {
"@class": "org.apache.streampipes.model.connect.guess.DomainPropertyProbability";
domainProperty: string;
@@@ -1675,23 -1675,23 +1580,6 @@@ export class Frequency extends EventStr
}
}
--export class GPU {
-- cudaCores: number;
-- hasGPU: boolean;
-- type: string;
--
-- static fromData(data: GPU, target?: GPU): GPU {
-- if (!data) {
-- return data;
-- }
-- const instance = target || new GPU();
-- instance.hasGPU = data.hasGPU;
-- instance.cudaCores = data.cudaCores;
-- instance.type = data.type;
-- return instance;
-- }
--}
--
export interface GenericAdapterDescription {
eventSchema: EventSchema;
formatDescription: FormatDescription;
@@@ -1754,25 -1754,25 +1642,6 @@@ export class GuessSchema extends Unname
}
}
--export class HardwareResource {
-- cpu: CPU;
-- disk: DISK;
-- gpu: GPU;
-- memory: MEM;
--
-- static fromData(data: HardwareResource, target?: HardwareResource): HardwareResource {
-- if (!data) {
-- return data;
-- }
-- const instance = target || new HardwareResource();
-- instance.cpu = CPU.fromData(data.cpu);
-- instance.memory = MEM.fromData(data.memory);
-- instance.disk = DISK.fromData(data.disk);
-- instance.gpu = GPU.fromData(data.gpu);
-- return instance;
-- }
--}
--
export class TransportProtocol extends UnnamedStreamPipesEntity {
"@class": "org.apache.streampipes.model.grounding.TransportProtocol" | "org.apache.streampipes.model.grounding.JmsTransportProtocol" | "org.apache.streampipes.model.grounding.KafkaTransportProtocol" | "org.apache.streampipes.model.grounding.MqttTransportProtocol";
brokerHostname: string;
@@@ -1922,19 -1922,19 +1791,6 @@@ export class ListOutputStrategy extend
}
}
--export class MEM {
-- memTotal: number;
--
-- static fromData(data: MEM, target?: MEM): MEM {
-- if (!data) {
-- return data;
-- }
-- const instance = target || new MEM();
-- instance.memTotal = data.memTotal;
-- return instance;
-- }
--}
--
export class MappingProperty extends StaticProperty {
"@class": "org.apache.streampipes.model.staticproperty.MappingProperty" | "org.apache.streampipes.model.staticproperty.MappingPropertyUnary" | "org.apache.streampipes.model.staticproperty.MappingPropertyNary";
mapsFromOptions: string[];
@@@ -2092,93 -2092,93 +1948,6 @@@ export class MqttTransportProtocol exte
}
}
--export class Node {
-- nodeInfo: NodeInfo;
--
-- static fromData(data: Node, target?: Node): Node {
-- if (!data) {
-- return data;
-- }
-- const instance = target || new Node();
-- instance.nodeInfo = NodeInfo.fromData(data.nodeInfo);
-- return instance;
-- }
--}
--
--export class NodeBrokerInfo {
-- host: string;
-- port: number;
--
-- static fromData(data: NodeBrokerInfo, target?: NodeBrokerInfo): NodeBrokerInfo {
-- if (!data) {
-- return data;
-- }
-- const instance = target || new NodeBrokerInfo();
-- instance.host = data.host;
-- instance.port = data.port;
-- return instance;
-- }
--}
--
--export class NodeInfo {
-- nodeBrokerInfo: NodeBrokerInfo;
-- nodeControllerId: string;
-- nodeControllerPort: number;
-- nodeMetadata: NodeMetadata;
-- nodeResources: NodeResources;
-- supportedPipelineElementAppIds: string[];
--
-- static fromData(data: NodeInfo, target?: NodeInfo): NodeInfo {
-- if (!data) {
-- return data;
-- }
-- const instance = target || new NodeInfo();
-- instance.nodeControllerId = data.nodeControllerId;
-- instance.nodeControllerPort = data.nodeControllerPort;
-- instance.nodeMetadata = NodeMetadata.fromData(data.nodeMetadata);
-- instance.nodeBrokerInfo = NodeBrokerInfo.fromData(data.nodeBrokerInfo);
-- instance.nodeResources = NodeResources.fromData(data.nodeResources);
-- instance.supportedPipelineElementAppIds = __getCopyArrayFn(__identity<string>())(data.supportedPipelineElementAppIds);
-- return instance;
-- }
--}
--
--export class NodeMetadata {
-- nodeAddress: string;
-- nodeLocationTags: string[];
-- nodeModel: string;
-- nodeType: string;
--
-- static fromData(data: NodeMetadata, target?: NodeMetadata): NodeMetadata {
-- if (!data) {
-- return data;
-- }
-- const instance = target || new NodeMetadata();
-- instance.nodeAddress = data.nodeAddress;
-- instance.nodeModel = data.nodeModel;
-- instance.nodeType = data.nodeType;
-- instance.nodeLocationTags = __getCopyArrayFn(__identity<string>())(data.nodeLocationTags);
-- return instance;
-- }
--}
--
--export class NodeResources {
-- accessibleSensorActuatorResource: AccessibleSensorActuatorResource[];
-- hardwareResource: HardwareResource;
-- softwareResource: SoftwareResource;
--
-- static fromData(data: NodeResources, target?: NodeResources): NodeResources {
-- if (!data) {
-- return data;
-- }
-- const instance = target || new NodeResources();
-- instance.hardwareResource = HardwareResource.fromData(data.hardwareResource);
-- instance.softwareResource = SoftwareResource.fromData(data.softwareResource);
-- instance.accessibleSensorActuatorResource = __getCopyArrayFn(AccessibleSensorActuatorResource.fromData)(data.accessibleSensorActuatorResource);
-- return instance;
-- }
--}
--
export class Notification {
additionalInformation: string;
description: string;
@@@ -2287,31 -2287,31 +2056,6 @@@ export class PipelineCategory
}
}
--export class PipelineElementDockerContainer extends UnnamedStreamPipesEntity {
-- "@class": "org.apache.streampipes.model.node.PipelineElementDockerContainer";
-- containerName: string;
-- containerPorts: string[];
-- envVars: string[];
-- imageURI: string;
-- labels: { [index: string]: string };
-- serviceId: string;
--
-- static fromData(data: PipelineElementDockerContainer, target?: PipelineElementDockerContainer): PipelineElementDockerContainer {
-- if (!data) {
-- return data;
-- }
-- const instance = target || new PipelineElementDockerContainer();
-- super.fromData(data, instance);
-- instance.imageURI = data.imageURI;
-- instance.containerName = data.containerName;
-- instance.serviceId = data.serviceId;
-- instance.containerPorts = __getCopyArrayFn(__identity<string>())(data.containerPorts);
-- instance.envVars = __getCopyArrayFn(__identity<string>())(data.envVars);
-- instance.labels = __getCopyObjectFn(__identity<string>())(data.labels);
-- return instance;
-- }
--}
--
export class PipelineElementRecommendation {
count: number;
description: string;
@@@ -2720,23 -2720,23 +2464,6 @@@ export class SimpleTopicDefinition exte
}
}
--export class SoftwareResource {
-- docker: Docker;
-- kernelVersion: string;
-- os: string;
--
-- static fromData(data: SoftwareResource, target?: SoftwareResource): SoftwareResource {
-- if (!data) {
-- return data;
-- }
-- const instance = target || new SoftwareResource();
-- instance.os = data.os;
-- instance.kernelVersion = data.kernelVersion;
-- instance.docker = Docker.fromData(data.docker);
-- return instance;
-- }
--}
--
export class SpDataStream extends NamedStreamPipesEntity {
"@class": "org.apache.streampipes.model.SpDataStream" | "org.apache.streampipes.model.SpDataSet";
category: string[];