You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by bo...@apache.org on 2022/12/12 20:43:56 UTC
[streampipes] branch dev updated: Some more checkstyle enablements (#847)
This is an automated email from the ASF dual-hosted git repository.
bossenti pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/streampipes.git
The following commit(s) were added to refs/heads/dev by this push:
new cf33668a0 Some more checkstyle enablements (#847)
cf33668a0 is described below
commit cf33668a016921dc831ea90476fa07158dc91b7e
Author: Tim <50...@users.noreply.github.com>
AuthorDate: Mon Dec 12 21:43:50 2022 +0100
Some more checkstyle enablements (#847)
* add checkstyle to streampipes-logging
* add checkstyle to streampipes-model-shared
* simplify checkstyle configuration
* add checkstyle to streampipes-model-client
* add checkstyle to streampipes-model
* fix checkstyle errors
---
streampipes-logging/pom.xml | 11 +-
.../apache/streampipes/logging/LoggerFactory.java | 6 +-
.../org/apache/streampipes/logging/api/Logger.java | 10 +-
.../logging/impl/EventStatisticLogger.java | 8 +-
.../apache/streampipes/logging/impl/PeLogger.java | 52 ++--
.../streampipes/logging/model/LogRequest.java | 42 ++--
streampipes-model-client/pom.xml | 158 +++++++------
.../apache/streampipes/model/client/Category.java | 65 ++---
.../model/client/RunningVisualization.java | 6 +-
.../model/client/connection/Connection.java | 49 ++--
.../client/deployment/DeploymentConfiguration.java | 214 ++++++++---------
.../model/client/deployment/DeploymentType.java | 2 +-
.../model/client/deployment/ElementType.java | 2 +-
.../model/client/deployment/OutputType.java | 2 +-
.../model/client/deployment/RuntimeType.java | 2 +-
.../client/endpoint/ExtensionsServiceEndpoint.java | 52 ++--
.../endpoint/ExtensionsServiceEndpointItem.java | 172 +++++++-------
.../exception/InvalidConnectionException.java | 26 +-
.../client/matching/MatchingResultFactory.java | 16 +-
.../client/matching/MatchingResultMessage.java | 166 ++++++-------
.../model/client/matching/MatchingResultType.java | 57 ++---
.../model/client/monitoring/JobReport.java | 65 +++--
.../model/client/monitoring/TaskReport.java | 66 +++---
.../monitoring/pipeline/AbstractBurrowInfo.java | 40 ++--
.../pipeline/BurrowConsumerGroupStatus.java | 116 ++++-----
.../pipeline/BurrowConsumerGroupStatusInfo.java | 24 +-
.../monitoring/pipeline/BurrowConsumerInfo.java | 34 +--
.../monitoring/pipeline/BurrowTopicInfo.java | 26 +-
.../streampipes/model/client/ontology/Concept.java | 51 ++--
.../streampipes/model/client/ontology/Context.java | 80 +++----
.../model/client/ontology/ElementHeader.java | 101 ++++----
.../model/client/ontology/ElementType.java | 2 +-
.../model/client/ontology/EnumeratedRange.java | 38 +--
.../model/client/ontology/EnumeratedValue.java | 51 ++--
.../model/client/ontology/Instance.java | 47 ++--
.../model/client/ontology/Namespace.java | 50 ++--
.../model/client/ontology/NodeType.java | 2 +-
.../model/client/ontology/OntologyElement.java | 76 +++---
.../model/client/ontology/OntologyNode.java | 177 +++++++-------
.../model/client/ontology/OntologyQuery.java | 58 ++---
.../model/client/ontology/OntologyQueryItem.java | 49 ++--
.../client/ontology/OntologyQueryResponse.java | 71 +++---
.../model/client/ontology/PrimitiveRange.java | 60 +++--
.../model/client/ontology/Property.java | 123 +++++-----
.../client/ontology/QuantitativeValueRange.java | 74 +++---
.../streampipes/model/client/ontology/Range.java | 71 +++---
.../model/client/ontology/RangeType.java | 2 +-
.../model/client/ontology/RdfFormat.java | 2 +-
.../model/client/ontology/Resource.java | 69 +++---
.../model/client/ontology/Statement.java | 57 ++---
.../model/client/setup/InitialSettings.java | 116 ++++-----
.../model/client/user/ChangePasswordRequest.java | 8 +-
.../streampipes/model/client/user/Element.java | 55 +++--
.../streampipes/model/client/user/Group.java | 13 +-
.../client/user/JwtAuthenticationResponse.java | 26 +-
.../model/client/user/LoginRequest.java | 57 ++---
.../model/client/user/PasswordRecoveryToken.java | 18 +-
.../streampipes/model/client/user/Permission.java | 13 +-
.../model/client/user/PermissionBuilder.java | 20 +-
.../model/client/user/PermissionEntry.java | 8 +-
.../streampipes/model/client/user/Principal.java | 231 +++++++++---------
.../model/client/user/RegistrationData.java | 84 +++----
.../apache/streampipes/model/client/user/Role.java | 76 +++---
.../model/client/user/ServiceAccount.java | 12 +-
.../streampipes/model/client/user/Token.java | 53 ++---
.../streampipes/model/client/user/UserAccount.java | 263 ++++++++++-----------
.../model/client/user/UserActivationToken.java | 16 +-
streampipes-model-shared/pom.xml | 9 +-
streampipes-model/pom.xml | 7 +-
.../org/apache/streampipes/model/AdapterType.java | 17 +-
.../apache/streampipes/model/ApplicationLink.java | 105 ++++----
.../streampipes/model/DataProcessorType.java | 79 ++++---
.../org/apache/streampipes/model/DataSinkType.java | 13 +-
.../streampipes/model/NotificationCount.java | 26 +-
.../org/apache/streampipes/model/Response.java | 155 ++++++------
.../org/apache/streampipes/model/SpDataSet.java | 20 +-
.../org/apache/streampipes/model/SpDataStream.java | 30 +--
.../streampipes/model/SpDataStreamContainer.java | 4 +-
.../streampipes/model/StreamPipesErrorMessage.java | 23 +-
.../java/org/apache/streampipes/model/Tuple2.java | 30 ++-
.../apache/streampipes/model/VirtualSensor.java | 52 ++--
.../apache/streampipes/model/assets/AssetLink.java | 8 +-
.../streampipes/model/assets/AssetLinkType.java | 3 +-
.../streampipes/model/assets/SpAssetModel.java | 5 +-
.../model/base/AbstractStreamPipesEntity.java | 49 ++--
.../model/base/InvocableStreamPipesEntity.java | 4 +-
.../model/base/NamedStreamPipesEntity.java | 30 +--
.../model/canvas/PipelineCanvasMetadata.java | 3 +-
.../model/connect/adapter/AdapterDescription.java | 16 +-
.../connect/adapter/AdapterSetDescription.java | 45 ++--
.../connect/adapter/AdapterStreamDescription.java | 64 ++---
.../connect/adapter/GenericAdapterDescription.java | 8 +-
.../adapter/GenericAdapterSetDescription.java | 68 +++---
.../adapter/GenericAdapterStreamDescription.java | 20 +-
.../adapter/SpecificAdapterSetDescription.java | 10 +-
.../model/connect/grounding/FormatDescription.java | 104 ++++----
.../connect/grounding/ProtocolDescription.java | 88 +++----
.../connect/grounding/ProtocolSetDescription.java | 22 +-
.../grounding/ProtocolStreamDescription.java | 22 +-
.../model/connect/guess/FieldStatusInfo.java | 6 +-
.../model/connect/guess/GuessSchema.java | 83 +++----
.../connect/rules/DebugSinkRuleDescription.java | 6 +-
.../rules/TransformationRuleDescription.java | 48 ++--
.../rules/schema/DeleteRuleDescription.java | 36 +--
.../rules/schema/RenameRuleDescription.java | 54 ++---
.../SchemaTransformationRuleDescription.java | 12 +-
.../EventRateTransformationRuleDescription.java | 44 ++--
...oveDuplicatesTransformationRuleDescription.java | 28 +--
.../StreamTransformationRuleDescription.java | 19 +-
.../rules/value/AddTimestampRuleDescription.java | 28 +--
.../AddValueTransformationRuleDescription.java | 44 ++--
...rrectionValueTransformationRuleDescription.java | 74 +++---
.../TimestampTranfsformationRuleDescription.java | 90 +++----
.../value/TimestampTransformationRuleMode.java | 4 +-
.../rules/value/UnitTransformRuleDescription.java | 72 +++---
.../value/ValueTransformationRuleDescription.java | 25 +-
.../model/connect/unit/UnitDescription.java | 40 ++--
.../model/dashboard/DashboardEntity.java | 7 +-
.../streampipes/model/dashboard/DashboardItem.java | 2 +-
.../model/dashboard/DashboardModel.java | 3 +-
.../model/dashboard/DashboardWidgetModel.java | 2 +-
.../model/datalake/DataExplorerWidgetModel.java | 10 +-
.../model/datalake/DataLakeConfiguration.java | 83 +++----
.../model/datalake/DataLakeMeasure.java | 22 +-
.../model/datalake/DataLakeRetentionPolicy.java | 89 ++++---
.../streampipes/model/datalake/DataSeries.java | 64 ++---
.../model/datalake/LabelDefinition.java | 36 +--
.../streampipes/model/datalake/PageResult.java | 39 +--
.../streampipes/model/datalake/SpQueryResult.java | 126 +++++-----
.../streampipes/model/datalake/SpQueryStatus.java | 4 +-
.../streampipes/model/file/FileMetadata.java | 9 +-
.../model/function/FunctionDefinition.java | 8 +-
.../streampipes/model/function/FunctionId.java | 23 +-
.../model/graph/DataProcessorDescription.java | 4 +-
.../model/graph/DataProcessorInvocation.java | 5 +-
.../model/graph/DataSinkDescription.java | 66 +++---
.../model/graph/DataSinkInvocation.java | 2 +-
.../model/graph/DataSourceDescription.java | 10 +-
.../model/graph/PipelineElementContainer.java | 3 +-
.../model/grounding/EventGrounding.java | 103 ++++----
.../model/grounding/JmsTransportProtocol.java | 63 +++--
.../model/grounding/KafkaTransportProtocol.java | 11 +-
.../model/grounding/MqttTransportProtocol.java | 26 +-
.../model/grounding/NatsTransportProtocol.java | 25 +-
.../model/grounding/TopicDefinition.java | 7 +-
.../model/grounding/TransportFormat.java | 59 +++--
.../model/grounding/TransportProtocol.java | 80 +++----
.../streampipes/model/labeling/Category.java | 95 ++++----
.../apache/streampipes/model/labeling/Label.java | 109 +++++----
.../org/apache/streampipes/model/mail/SpEmail.java | 16 +-
.../model/message/DataSetModificationMessage.java | 2 +-
.../model/message/EdgeValidationStatus.java | 2 +-
.../streampipes/model/message/ErrorMessage.java | 31 +--
.../apache/streampipes/model/message/Message.java | 129 +++++-----
.../model/message/NotificationType.java | 143 ++++++-----
.../streampipes/model/message/Notifications.java | 70 +++---
.../model/message/PipelineEdgeValidation.java | 22 +-
.../model/message/PipelineModificationMessage.java | 128 +++++-----
.../model/message/PipelineStatusMessage.java | 88 +++----
.../model/message/PipelineStatusMessageType.java | 46 ++--
.../model/message/SetupStatusMessage.java | 19 +-
.../streampipes/model/message/SuccessMessage.java | 30 +--
.../monitoring/ElementStatusInfoSettings.java | 2 +-
.../model/monitoring/MessageCounter.java | 16 +-
.../streampipes/model/monitoring/SpLogEntry.java | 20 +-
.../output/CustomTransformOutputStrategy.java | 3 +-
.../streampipes/model/output/OutputStrategy.java | 19 +-
.../model/output/TransformOperation.java | 2 +-
.../streampipes/model/pipeline/Pipeline.java | 5 +-
.../model/pipeline/PipelineCategory.java | 107 ++++-----
.../pipeline/PipelineElementRecommendation.java | 111 +++++----
.../PipelineElementRecommendationMessage.java | 84 ++++---
.../model/pipeline/PipelineElementStatus.java | 75 +++---
.../pipeline/PipelineElementValidationInfo.java | 64 ++---
.../model/pipeline/PipelineOperationStatus.java | 132 +++++------
.../apache/streampipes/model/quality/Accuracy.java | 49 ++--
.../quality/EventPropertyQualityDefinition.java | 29 +--
.../quality/EventPropertyQualityRequirement.java | 106 +++++----
.../quality/EventStreamQualityDefinition.java | 18 +-
.../quality/EventStreamQualityRequirement.java | 64 ++---
.../streampipes/model/quality/Frequency.java | 59 +++--
.../apache/streampipes/model/quality/Latency.java | 80 +++----
.../model/quality/MeasurementCapability.java | 54 ++---
.../model/quality/MeasurementObject.java | 54 ++---
.../model/quality/MeasurementProperty.java | 23 +-
.../model/quality/MeasurementRange.java | 74 +++---
.../streampipes/model/quality/Precision.java | 48 ++--
.../streampipes/model/quality/Resolution.java | 48 ++--
.../apache/streampipes/model/runtime/Event.java | 13 +-
.../streampipes/model/runtime/EventConverter.java | 7 +-
.../streampipes/model/runtime/EventFactory.java | 35 +--
.../streampipes/model/runtime/SchemaInfo.java | 8 +-
.../model/runtime/field/AbstractField.java | 12 +-
.../model/runtime/field/FieldParser.java | 4 +-
.../streampipes/model/runtime/field/ListField.java | 16 +-
.../streampipes/model/schema/Enumeration.java | 102 ++++----
.../streampipes/model/schema/EventProperty.java | 77 +++---
.../model/schema/EventPropertyNested.java | 67 +++---
.../model/schema/EventPropertyPrimitive.java | 5 +-
.../streampipes/model/schema/EventSchema.java | 13 +-
.../streampipes/model/schema/PropertyScope.java | 7 +-
.../model/schema/QuantitativeValue.java | 100 ++++----
.../model/schema/ValueSpecification.java | 25 +-
.../model/staticproperty/AnyStaticProperty.java | 2 +-
.../staticproperty/CollectionStaticProperty.java | 8 +-
.../model/staticproperty/DomainStaticProperty.java | 6 +-
.../staticproperty/FreeTextStaticProperty.java | 16 +-
.../model/staticproperty/MappingProperty.java | 11 +-
.../model/staticproperty/MappingPropertyNary.java | 2 +-
.../model/staticproperty/MappingPropertyUnary.java | 2 +-
.../staticproperty/MatchingStaticProperty.java | 80 +++----
.../model/staticproperty/OneOfStaticProperty.java | 2 +-
.../streampipes/model/staticproperty/Option.java | 125 +++++-----
.../staticproperty/PropertyValueSpecification.java | 104 ++++----
.../staticproperty/RemoteOneOfStaticProperty.java | 7 +-
.../RuntimeResolvableAnyStaticProperty.java | 3 +-
.../RuntimeResolvableOneOfStaticProperty.java | 6 +-
.../model/staticproperty/SecretStaticProperty.java | 7 +-
.../staticproperty/SelectionStaticProperty.java | 22 +-
.../model/staticproperty/StaticProperty.java | 52 ++--
.../staticproperty/StaticPropertyAlternative.java | 2 +-
.../staticproperty/StaticPropertyAlternatives.java | 8 +-
.../model/staticproperty/StaticPropertyGroup.java | 19 +-
.../model/staticproperty/StaticPropertyType.java | 38 +--
.../model/staticproperty/TreeInputNode.java | 3 +-
.../model/template/PipelineElementTemplate.java | 8 +-
.../template/PipelineElementTemplateConfig.java | 8 +-
.../template/PipelineTemplateDescription.java | 3 +-
.../PipelineTemplateDescriptionContainer.java | 2 +-
.../model/template/PipelineTemplateInvocation.java | 4 +-
.../org/apache/streampipes/model/util/Cloner.java | 92 +++++--
.../streampipes/model/util/ElementIdGenerator.java | 6 +-
.../apache/streampipes/model/util/EventUtils.java | 2 +-
.../apache/streampipes/model/util/ModelUtils.java | 75 +++---
.../streampipes/model/util/PropertyUtils.java | 4 +-
.../apache/streampipes/model/util/SchemaUtils.java | 15 +-
.../connect/adapter/AdapterDescriptionTest.java | 65 ++---
.../model/datalake/DataLakeMeasureTest.java | 25 +-
.../model/runtime/RuntimeTestUtils.java | 8 +-
.../streampipes/model/runtime/TestEvent.java | 27 ++-
.../model/runtime/TestEventConverter.java | 6 +-
.../model/runtime/TestEventFactory.java | 4 +-
.../model/runtime/TestFieldAddition.java | 6 +-
.../streampipes/model/runtime/TestListField.java | 6 +-
.../model/runtime/TestPropertyRenaming.java | 8 +-
.../streampipes/model/runtime/TestSubset.java | 6 +-
.../manager/data/PipelineGraphBuilder.java | 4 +-
.../manager/matching/ConnectionValidator.java | 2 +-
.../matching/PipelineModificationGenerator.java | 10 +-
.../matching/PipelineVerificationHandlerV2.java | 2 +-
.../pipeline/AbstractPipelineValidationStep.java | 9 +-
.../matching/v2/pipeline/ApplyGroundingStep.java | 8 +-
.../matching/v2/pipeline/ComputeOutputStep.java | 6 +-
.../matching/v2/pipeline/SchemaValidationStep.java | 2 +-
.../manager/preview/ActivePipelinePreviews.java | 2 +-
.../manager/preview/PipelinePreview.java | 2 +-
.../manager/recommender/AllElementsProvider.java | 2 +-
.../manager/template/PipelineGenerator.java | 10 +-
.../PipelineTemplateInvocationGenerator.java | 4 +-
.../PipelineTemplateInvocationHandler.java | 4 +-
.../apache/streampipes/manager/util/TreeUtils.java | 4 +-
.../streampipes/manager/matching/v2/TestUtils.java | 8 +-
.../impl/AdapterDescriptionStorageImpl.java | 2 +-
.../couchdb/impl/AdapterInstanceStorageImpl.java | 2 +-
.../storage/couchdb/impl/CategoryStorageImpl.java | 2 +-
.../couchdb/impl/DashboardWidgetStorageImpl.java | 2 +-
.../impl/DataExplorerWidgetStorageImpl.java | 2 +-
.../storage/couchdb/impl/DataLakeStorageImpl.java | 2 +-
.../storage/couchdb/impl/LabelStorageImpl.java | 2 +-
.../couchdb/impl/MonitoringDataStorageImpl.java | 2 +-
.../couchdb/impl/PipelineCategoryStorageImpl.java | 2 +-
271 files changed, 5333 insertions(+), 5148 deletions(-)
diff --git a/streampipes-logging/pom.xml b/streampipes-logging/pom.xml
index c66f61241..584ac3a78 100644
--- a/streampipes-logging/pom.xml
+++ b/streampipes-logging/pom.xml
@@ -17,7 +17,8 @@
~
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>streampipes-parent</artifactId>
<groupId>org.apache.streampipes</groupId>
@@ -35,4 +36,12 @@
<artifactId>slf4j-api</artifactId>
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
</project>
\ No newline at end of file
diff --git a/streampipes-logging/src/main/java/org/apache/streampipes/logging/LoggerFactory.java b/streampipes-logging/src/main/java/org/apache/streampipes/logging/LoggerFactory.java
index 4fdcb9656..883ac39aa 100644
--- a/streampipes-logging/src/main/java/org/apache/streampipes/logging/LoggerFactory.java
+++ b/streampipes-logging/src/main/java/org/apache/streampipes/logging/LoggerFactory.java
@@ -24,8 +24,8 @@ import org.apache.streampipes.logging.impl.PeLogger;
public class LoggerFactory {
// public static Logger getPeLogger(Class clazz, String correspondingPipeline, String peUri, PeConfig peConfig) {
- public static Logger getPeLogger(Class clazz, String correspondingPipeline, String peUri) {
+ public static Logger getPeLogger(Class clazz, String correspondingPipeline, String peUri) {
// return new PeLogger(clazz, correspondingPipeline, peUri, peConfig);
- return new PeLogger(clazz, correspondingPipeline, peUri);
- }
+ return new PeLogger(clazz, correspondingPipeline, peUri);
+ }
}
diff --git a/streampipes-logging/src/main/java/org/apache/streampipes/logging/api/Logger.java b/streampipes-logging/src/main/java/org/apache/streampipes/logging/api/Logger.java
index 76defc3e9..c1ee5288b 100644
--- a/streampipes-logging/src/main/java/org/apache/streampipes/logging/api/Logger.java
+++ b/streampipes-logging/src/main/java/org/apache/streampipes/logging/api/Logger.java
@@ -22,13 +22,13 @@ import java.io.Serializable;
public interface Logger extends Serializable {
- void info(String s);
+ void info(String s);
- void trace(String s);
+ void trace(String s);
- void debug(String s);
+ void debug(String s);
- void error(String s);
+ void error(String s);
- void warn(String s);
+ void warn(String s);
}
diff --git a/streampipes-logging/src/main/java/org/apache/streampipes/logging/impl/EventStatisticLogger.java b/streampipes-logging/src/main/java/org/apache/streampipes/logging/impl/EventStatisticLogger.java
index 050c558c0..559ce892a 100644
--- a/streampipes-logging/src/main/java/org/apache/streampipes/logging/impl/EventStatisticLogger.java
+++ b/streampipes-logging/src/main/java/org/apache/streampipes/logging/impl/EventStatisticLogger.java
@@ -23,10 +23,10 @@ import java.io.Serializable;
public class EventStatisticLogger implements Serializable {
- // private String prefix;
+ // private String prefix;
- // public static void log(org.apache.streampipes.model.base.InvocableStreamPipesEntity graph) {
- public static void log(String name, String correspondingPipeline, String source) {
+ // public static void log(org.apache.streampipes.model.base.InvocableStreamPipesEntity graph) {
+ public static void log(String name, String correspondingPipeline, String source) {
// TODO: Uncomment when "Event statistic" should be used
/* String prefix = "SYSTEMLOG EVENT STATISTIC" + " - "
// + "serviceName: " + peConfig.getName() + " - "
@@ -36,6 +36,6 @@ public class EventStatisticLogger implements Serializable {
org.slf4j.Logger logger = LoggerFactory.getLogger(EventStatisticLogger.class);
logger.info(prefix + 1);
*/
- }
+ }
}
diff --git a/streampipes-logging/src/main/java/org/apache/streampipes/logging/impl/PeLogger.java b/streampipes-logging/src/main/java/org/apache/streampipes/logging/impl/PeLogger.java
index ce68d44a5..392cc8edd 100644
--- a/streampipes-logging/src/main/java/org/apache/streampipes/logging/impl/PeLogger.java
+++ b/streampipes-logging/src/main/java/org/apache/streampipes/logging/impl/PeLogger.java
@@ -19,44 +19,44 @@
package org.apache.streampipes.logging.impl;
import org.apache.streampipes.logging.api.Logger;
+
import org.slf4j.LoggerFactory;
public class PeLogger implements Logger {
- private org.slf4j.Logger LOG;
-
- private String prefix;
+ private org.slf4j.Logger logger;
+ private String prefix;
- //public PeLogger(Class clazz, String correspondingPipeline, String peUri, PeConfig peConfig){
- public PeLogger(Class clazz, String correspondingPipeline, String peUri){
- this.prefix = "USERLOG" + " - "
- // + "serviceName: " + peConfig.getName() + " - "
- + "correspondingPipeline: " + correspondingPipeline + " - "
- + "peURI: " + peUri + " - ";
+ //public PeLogger(Class clazz, String correspondingPipeline, String peUri, PeConfig peConfig){
+ public PeLogger(Class clazz, String correspondingPipeline, String peUri) {
+ this.prefix = "USERLOG" + " - "
+ // + "serviceName: " + peConfig.getName() + " - "
+ + "correspondingPipeline: " + correspondingPipeline + " - "
+ + "peURI: " + peUri + " - ";
- LOG = LoggerFactory.getLogger(clazz);
- }
+ logger = LoggerFactory.getLogger(clazz);
+ }
- public void info(String s) {
- LOG.info(prefix + s);
- }
+ public void info(String s) {
+ logger.info(prefix + s);
+ }
- public void trace(String s) {
- LOG.trace(prefix + s);
- }
+ public void trace(String s) {
+ logger.trace(prefix + s);
+ }
- public void debug(String s) {
- LOG.debug(prefix + s);
- }
+ public void debug(String s) {
+ logger.debug(prefix + s);
+ }
- public void error(String s) {
- LOG.error(prefix + s);
- }
+ public void error(String s) {
+ logger.error(prefix + s);
+ }
- public void warn(String s) {
- LOG.warn(prefix + s);
- }
+ public void warn(String s) {
+ logger.warn(prefix + s);
+ }
}
diff --git a/streampipes-logging/src/main/java/org/apache/streampipes/logging/model/LogRequest.java b/streampipes-logging/src/main/java/org/apache/streampipes/logging/model/LogRequest.java
index 79d727052..66fd5803e 100644
--- a/streampipes-logging/src/main/java/org/apache/streampipes/logging/model/LogRequest.java
+++ b/streampipes-logging/src/main/java/org/apache/streampipes/logging/model/LogRequest.java
@@ -20,31 +20,31 @@ package org.apache.streampipes.logging.model;
public class LogRequest {
- private String sourceID;
- private String dateFrom;
- private String dateTo;
+ private String sourceID;
+ private String dateFrom;
+ private String dateTo;
- public String getSourceID() {
- return sourceID;
- }
+ public String getSourceID() {
+ return sourceID;
+ }
- public void setSourceID(String source) {
- this.sourceID = source;
- }
+ public void setSourceID(String source) {
+ this.sourceID = source;
+ }
- public String getDateFrom() {
- return dateFrom;
- }
+ public String getDateFrom() {
+ return dateFrom;
+ }
- public void setDateFrom(String dateFrom) {
- this.dateFrom = dateFrom;
- }
+ public void setDateFrom(String dateFrom) {
+ this.dateFrom = dateFrom;
+ }
- public String getDateTo() {
- return dateTo;
- }
+ public String getDateTo() {
+ return dateTo;
+ }
- public void setDateTo(String dateTo) {
- this.dateTo = dateTo;
- }
+ public void setDateTo(String dateTo) {
+ this.dateTo = dateTo;
+ }
}
diff --git a/streampipes-model-client/pom.xml b/streampipes-model-client/pom.xml
index ec96d7f86..b10045b82 100644
--- a/streampipes-model-client/pom.xml
+++ b/streampipes-model-client/pom.xml
@@ -16,84 +16,90 @@
~
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.streampipes</groupId>
- <artifactId>streampipes-parent</artifactId>
- <version>0.91.0-SNAPSHOT</version>
- </parent>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.streampipes</groupId>
+ <artifactId>streampipes-parent</artifactId>
+ <version>0.91.0-SNAPSHOT</version>
+ </parent>
- <artifactId>streampipes-model-client</artifactId>
- <packaging>jar</packaging>
+ <artifactId>streampipes-model-client</artifactId>
+ <packaging>jar</packaging>
- <dependencies>
- <!-- StreamPipes dependencies -->
- <dependency>
- <groupId>org.apache.streampipes</groupId>
- <artifactId>streampipes-commons</artifactId>
- <version>0.91.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.streampipes</groupId>
- <artifactId>streampipes-model-shared</artifactId>
- <version>0.91.0-SNAPSHOT</version>
- </dependency>
+ <dependencies>
+ <!-- StreamPipes dependencies -->
+ <dependency>
+ <groupId>org.apache.streampipes</groupId>
+ <artifactId>streampipes-commons</artifactId>
+ <version>0.91.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.streampipes</groupId>
+ <artifactId>streampipes-model-shared</artifactId>
+ <version>0.91.0-SNAPSHOT</version>
+ </dependency>
- <!-- External dependencies -->
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- </dependency>
- <dependency>
- <groupId>com.google.code.gson</groupId>
- <artifactId>gson</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- </dependency>
- </dependencies>
+ <!-- External dependencies -->
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </dependency>
+ </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>cz.habarta.typescript-generator</groupId>
- <artifactId>typescript-generator-maven-plugin</artifactId>
- <version>2.27.744</version>
- <executions>
- <execution>
- <id>generate</id>
- <goals>
- <goal>generate</goal>
- </goals>
- <phase>process-classes</phase>
- </execution>
- </executions>
- <configuration>
- <jsonLibrary>jackson2</jsonLibrary>
- <classesWithAnnotations>
- <annotation>org.apache.streampipes.model.shared.annotation.TsModel</annotation>
- </classesWithAnnotations>
- <excludePropertyAnnotations>
- <annotation>org.apache.streampipes.model.shared.annotation.TsIgnore</annotation>
- </excludePropertyAnnotations>
- <excludeClasses>
- <class>io.fogsy.empire.core.empire.SupportsRdfId</class>
- <class>java.io.Serializable</class>
- </excludeClasses>
- <outputKind>module</outputKind>
- <outputFileType>implementationFile</outputFileType>
- <outputKind>module</outputKind>
- <disableTaggedUnions>false</disableTaggedUnions>
- <mapClasses>asClasses</mapClasses>
- <sortDeclarations>true</sortDeclarations>
- <tsNoCheck>true</tsNoCheck>
- <extensions>
- <extension>cz.habarta.typescript.generator.ext.JsonDeserializationExtension</extension>
- </extensions>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>cz.habarta.typescript-generator</groupId>
+ <artifactId>typescript-generator-maven-plugin</artifactId>
+ <version>2.27.744</version>
+ <executions>
+ <execution>
+ <id>generate</id>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ <phase>process-classes</phase>
+ </execution>
+ </executions>
+ <configuration>
+ <jsonLibrary>jackson2</jsonLibrary>
+ <classesWithAnnotations>
+ <annotation>org.apache.streampipes.model.shared.annotation.TsModel</annotation>
+ </classesWithAnnotations>
+ <excludePropertyAnnotations>
+ <annotation>org.apache.streampipes.model.shared.annotation.TsIgnore</annotation>
+ </excludePropertyAnnotations>
+ <excludeClasses>
+ <class>io.fogsy.empire.core.empire.SupportsRdfId</class>
+ <class>java.io.Serializable</class>
+ </excludeClasses>
+ <outputKind>module</outputKind>
+ <outputFileType>implementationFile</outputFileType>
+ <outputKind>module</outputKind>
+ <disableTaggedUnions>false</disableTaggedUnions>
+ <mapClasses>asClasses</mapClasses>
+ <sortDeclarations>true</sortDeclarations>
+ <tsNoCheck>true</tsNoCheck>
+ <extensions>
+ <extension>cz.habarta.typescript.generator.ext.JsonDeserializationExtension</extension>
+ </extensions>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/Category.java b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/Category.java
index 7351c614c..f8f8f7fbf 100644
--- a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/Category.java
+++ b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/Category.java
@@ -20,35 +20,40 @@ package org.apache.streampipes.model.client;
public class Category {
- private String type;
- private String label;
- private String description;
-
-
- public Category(String type, String label, String description) {
- super();
- this.type = type;
- this.label = label;
- this.description = description;
- }
-
- public String getType() {
- return type;
- }
- public void setType(String type) {
- this.type = type;
- }
- public String getLabel() {
- return label;
- }
- public void setLabel(String label) {
- this.label = label;
- }
- public String getDescription() {
- return description;
- }
- public void setDescription(String description) {
- this.description = description;
- }
+ private String type;
+ private String label;
+ private String description;
+
+
+ public Category(String type, String label, String description) {
+ super();
+ this.type = type;
+ this.label = label;
+ this.description = description;
+ }
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ public String getLabel() {
+ return label;
+ }
+
+ public void setLabel(String label) {
+ this.label = label;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
}
diff --git a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/RunningVisualization.java b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/RunningVisualization.java
index c03919721..da59a7370 100644
--- a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/RunningVisualization.java
+++ b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/RunningVisualization.java
@@ -24,10 +24,8 @@ import java.util.UUID;
public class RunningVisualization {
- private @SerializedName("_id")
- String id;
- private @SerializedName("_rev")
- String rev;
+ private @SerializedName("_id") String id;
+ private @SerializedName("_rev") String rev;
private String pipelineId;
private String pipelineName;
diff --git a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/connection/Connection.java b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/connection/Connection.java
index 8ac960209..0d61c1296 100644
--- a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/connection/Connection.java
+++ b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/connection/Connection.java
@@ -20,29 +20,28 @@ package org.apache.streampipes.model.client.connection;
public class Connection {
- private String from;
- private String to;
-
- public Connection(String from, String to)
- {
- this.from = from;
- this.to = to;
- }
-
- public String getFrom() {
- return from;
- }
-
- public void setFrom(String from) {
- this.from = from;
- }
-
- public String getTo() {
- return to;
- }
-
- public void setTo(String to) {
- this.to = to;
- }
-
+ private String from;
+ private String to;
+
+ public Connection(String from, String to) {
+ this.from = from;
+ this.to = to;
+ }
+
+ public String getFrom() {
+ return from;
+ }
+
+ public void setFrom(String from) {
+ this.from = from;
+ }
+
+ public String getTo() {
+ return to;
+ }
+
+ public void setTo(String to) {
+ this.to = to;
+ }
+
}
diff --git a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/deployment/DeploymentConfiguration.java b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/deployment/DeploymentConfiguration.java
index 783ddab51..8190deb15 100644
--- a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/deployment/DeploymentConfiguration.java
+++ b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/deployment/DeploymentConfiguration.java
@@ -20,111 +20,111 @@ package org.apache.streampipes.model.client.deployment;
public class DeploymentConfiguration {
- private String groupId;
- private String artifactId;
- private String classNamePrefix;
-
- private String elementId;
- private boolean draft;
-
- private int port;
-
- private DeploymentType deploymentType;
- private ElementType elementType;
- private OutputType outputType;
- private RuntimeType runtimeType;
-
- public DeploymentConfiguration() {
-
- }
-
- public DeploymentConfiguration(String groupId, String artifactId,
- String classNamePrefix, int port) {
- super();
- this.groupId = groupId;
- this.artifactId = artifactId;
- this.classNamePrefix = classNamePrefix;
- this.port = port;
- }
-
- public String getGroupId() {
- return groupId;
- }
-
- public void setGroupId(String groupId) {
- this.groupId = groupId;
- }
-
- public String getArtifactId() {
- return artifactId;
- }
-
- public void setArtifactId(String artifactId) {
- this.artifactId = artifactId;
- }
-
- public String getClassNamePrefix() {
- return classNamePrefix;
- }
-
- public void setClassNamePrefix(String classNamePrefix) {
- this.classNamePrefix = classNamePrefix;
- }
-
- public int getPort() {
- return port;
- }
-
- public void setPort(int port) {
- this.port = port;
- }
-
- public String getElementId() {
- return elementId;
- }
-
- public void setElementId(String elementId) {
- this.elementId = elementId;
- }
-
- public boolean isDraft() {
- return draft;
- }
-
- public void setDraft(boolean draft) {
- this.draft = draft;
- }
-
- public DeploymentType getDeploymentType() {
- return deploymentType;
- }
-
- public void setDeploymentType(DeploymentType deploymentType) {
- this.deploymentType = deploymentType;
- }
-
- public void setElementType(ElementType elementType) {
- this.elementType = elementType;
- }
-
- public ElementType getElementType() {
- return elementType;
- }
-
- public RuntimeType getRuntimeType() {
- return runtimeType;
- }
-
- public void setRuntimeType(RuntimeType runtimeType) {
- this.runtimeType = runtimeType;
- }
-
- public OutputType getOutputType() {
- return outputType;
- }
-
- public void setOutputType(OutputType outputType) {
- this.outputType = outputType;
- }
-
+ private String groupId;
+ private String artifactId;
+ private String classNamePrefix;
+
+ private String elementId;
+ private boolean draft;
+
+ private int port;
+
+ private DeploymentType deploymentType;
+ private ElementType elementType;
+ private OutputType outputType;
+ private RuntimeType runtimeType;
+
+ public DeploymentConfiguration() {
+
+ }
+
+ public DeploymentConfiguration(String groupId, String artifactId,
+ String classNamePrefix, int port) {
+ super();
+ this.groupId = groupId;
+ this.artifactId = artifactId;
+ this.classNamePrefix = classNamePrefix;
+ this.port = port;
+ }
+
+ public String getGroupId() {
+ return groupId;
+ }
+
+ public void setGroupId(String groupId) {
+ this.groupId = groupId;
+ }
+
+ public String getArtifactId() {
+ return artifactId;
+ }
+
+ public void setArtifactId(String artifactId) {
+ this.artifactId = artifactId;
+ }
+
+ public String getClassNamePrefix() {
+ return classNamePrefix;
+ }
+
+ public void setClassNamePrefix(String classNamePrefix) {
+ this.classNamePrefix = classNamePrefix;
+ }
+
+ public int getPort() {
+ return port;
+ }
+
+ public void setPort(int port) {
+ this.port = port;
+ }
+
+ public String getElementId() {
+ return elementId;
+ }
+
+ public void setElementId(String elementId) {
+ this.elementId = elementId;
+ }
+
+ public boolean isDraft() {
+ return draft;
+ }
+
+ public void setDraft(boolean draft) {
+ this.draft = draft;
+ }
+
+ public DeploymentType getDeploymentType() {
+ return deploymentType;
+ }
+
+ public void setDeploymentType(DeploymentType deploymentType) {
+ this.deploymentType = deploymentType;
+ }
+
+ public ElementType getElementType() {
+ return elementType;
+ }
+
+ public void setElementType(ElementType elementType) {
+ this.elementType = elementType;
+ }
+
+ public RuntimeType getRuntimeType() {
+ return runtimeType;
+ }
+
+ public void setRuntimeType(RuntimeType runtimeType) {
+ this.runtimeType = runtimeType;
+ }
+
+ public OutputType getOutputType() {
+ return outputType;
+ }
+
+ public void setOutputType(OutputType outputType) {
+ this.outputType = outputType;
+ }
+
}
diff --git a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/deployment/DeploymentType.java b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/deployment/DeploymentType.java
index 9ae111ef4..d0b667717 100644
--- a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/deployment/DeploymentType.java
+++ b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/deployment/DeploymentType.java
@@ -20,5 +20,5 @@ package org.apache.streampipes.model.client.deployment;
public enum DeploymentType {
- CONTAINER, STANDALONE, OSGI
+ CONTAINER, STANDALONE, OSGI
}
diff --git a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/deployment/ElementType.java b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/deployment/ElementType.java
index 73203b0d1..c79b84d41 100644
--- a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/deployment/ElementType.java
+++ b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/deployment/ElementType.java
@@ -19,5 +19,5 @@
package org.apache.streampipes.model.client.deployment;
public enum ElementType {
- SEP, SEPA, SEC
+ SEP, SEPA, SEC
}
diff --git a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/deployment/OutputType.java b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/deployment/OutputType.java
index 14b280815..693d0580c 100644
--- a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/deployment/OutputType.java
+++ b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/deployment/OutputType.java
@@ -19,5 +19,5 @@
package org.apache.streampipes.model.client.deployment;
public enum OutputType {
- IMPLEMENTATION, DESCRIPTION, DIRECT_IMPORT
+ IMPLEMENTATION, DESCRIPTION, DIRECT_IMPORT
}
diff --git a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/deployment/RuntimeType.java b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/deployment/RuntimeType.java
index e7909ebfe..0d4a05420 100644
--- a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/deployment/RuntimeType.java
+++ b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/deployment/RuntimeType.java
@@ -19,5 +19,5 @@
package org.apache.streampipes.model.client.deployment;
public enum RuntimeType {
- FLINK, ESPER, STORM, ALGORITHM
+ FLINK, ESPER, STORM, ALGORITHM
}
diff --git a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/endpoint/ExtensionsServiceEndpoint.java b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/endpoint/ExtensionsServiceEndpoint.java
index f164d80e3..b4d34e401 100644
--- a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/endpoint/ExtensionsServiceEndpoint.java
+++ b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/endpoint/ExtensionsServiceEndpoint.java
@@ -22,40 +22,40 @@ import com.google.gson.annotations.SerializedName;
public class ExtensionsServiceEndpoint {
- private @SerializedName("_id") String id;
- private @SerializedName("_rev") String rev;
+ private @SerializedName("_id") String id;
+ private @SerializedName("_rev") String rev;
- private String endpointUrl;
+ private String endpointUrl;
- public ExtensionsServiceEndpoint() {
+ public ExtensionsServiceEndpoint() {
- }
+ }
- public ExtensionsServiceEndpoint(String endpointUrl) {
- this.endpointUrl = endpointUrl;
- }
+ public ExtensionsServiceEndpoint(String endpointUrl) {
+ this.endpointUrl = endpointUrl;
+ }
- public String getId() {
- return id;
- }
+ public String getId() {
+ return id;
+ }
- public void setId(String id) {
- this.id = id;
- }
+ public void setId(String id) {
+ this.id = id;
+ }
- public String getRev() {
- return rev;
- }
+ public String getRev() {
+ return rev;
+ }
- public void setRev(String rev) {
- this.rev = rev;
- }
+ public void setRev(String rev) {
+ this.rev = rev;
+ }
- public String getEndpointUrl() {
- return endpointUrl;
- }
+ public String getEndpointUrl() {
+ return endpointUrl;
+ }
- public void setEndpointUrl(String endpointUrl) {
- this.endpointUrl = endpointUrl;
- }
+ public void setEndpointUrl(String endpointUrl) {
+ this.endpointUrl = endpointUrl;
+ }
}
diff --git a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/endpoint/ExtensionsServiceEndpointItem.java b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/endpoint/ExtensionsServiceEndpointItem.java
index 985426516..739ea9dde 100644
--- a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/endpoint/ExtensionsServiceEndpointItem.java
+++ b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/endpoint/ExtensionsServiceEndpointItem.java
@@ -25,119 +25,119 @@ import java.util.List;
@TsModel
public class ExtensionsServiceEndpointItem {
- private String name;
- private String description;
- private String elementId;
- private String uri;
- private String type;
- private String appId;
+ private String name;
+ private String description;
+ private String elementId;
+ private String uri;
+ private String type;
+ private String appId;
- private boolean includesIcon;
- private boolean includesDocs;
+ private boolean includesIcon;
+ private boolean includesDocs;
- private boolean installed;
- private boolean editable;
- private boolean available;
+ private boolean installed;
+ private boolean editable;
+ private boolean available;
- private List<ExtensionsServiceEndpointItem> streams;
+ private List<ExtensionsServiceEndpointItem> streams;
- public ExtensionsServiceEndpointItem() {
+ public ExtensionsServiceEndpointItem() {
- }
+ }
- public String getName() {
- return name;
- }
+ public String getName() {
+ return name;
+ }
- public void setName(String name) {
- this.name = name;
- }
+ public void setName(String name) {
+ this.name = name;
+ }
- public String getDescription() {
- return description;
- }
+ public String getDescription() {
+ return description;
+ }
- public void setDescription(String description) {
- this.description = description;
- }
+ public void setDescription(String description) {
+ this.description = description;
+ }
- public String getUri() {
- return uri;
- }
+ public String getUri() {
+ return uri;
+ }
- public void setUri(String uri) {
- this.uri = uri;
- }
+ public void setUri(String uri) {
+ this.uri = uri;
+ }
- public List<ExtensionsServiceEndpointItem> getStreams() {
- return streams;
- }
+ public List<ExtensionsServiceEndpointItem> getStreams() {
+ return streams;
+ }
- public void setStreams(List<ExtensionsServiceEndpointItem> streams) {
- this.streams = streams;
- }
+ public void setStreams(List<ExtensionsServiceEndpointItem> streams) {
+ this.streams = streams;
+ }
- public boolean isInstalled() {
- return installed;
- }
+ public boolean isInstalled() {
+ return installed;
+ }
- public void setInstalled(boolean installed) {
- this.installed = installed;
- }
+ public void setInstalled(boolean installed) {
+ this.installed = installed;
+ }
- public String getType() {
- return type;
- }
+ public String getType() {
+ return type;
+ }
- public void setType(String type) {
- this.type = type;
- }
+ public void setType(String type) {
+ this.type = type;
+ }
- public String getAppId() {
- return appId;
- }
+ public String getAppId() {
+ return appId;
+ }
- public void setAppId(String appId) {
- this.appId = appId;
- }
+ public void setAppId(String appId) {
+ this.appId = appId;
+ }
- public boolean isEditable() {
- return editable;
- }
+ public boolean isEditable() {
+ return editable;
+ }
- public void setEditable(boolean editable) {
- this.editable = editable;
- }
+ public void setEditable(boolean editable) {
+ this.editable = editable;
+ }
- public String getElementId() {
- return elementId;
- }
+ public String getElementId() {
+ return elementId;
+ }
- public void setElementId(String elementId) {
- this.elementId = elementId;
- }
+ public void setElementId(String elementId) {
+ this.elementId = elementId;
+ }
- public boolean isIncludesIcon() {
- return includesIcon;
- }
+ public boolean isIncludesIcon() {
+ return includesIcon;
+ }
- public void setIncludesIcon(boolean includesIcon) {
- this.includesIcon = includesIcon;
- }
+ public void setIncludesIcon(boolean includesIcon) {
+ this.includesIcon = includesIcon;
+ }
- public boolean isIncludesDocs() {
- return includesDocs;
- }
+ public boolean isIncludesDocs() {
+ return includesDocs;
+ }
- public void setIncludesDocs(boolean includesDocs) {
- this.includesDocs = includesDocs;
- }
+ public void setIncludesDocs(boolean includesDocs) {
+ this.includesDocs = includesDocs;
+ }
- public boolean isAvailable() {
- return available;
- }
+ public boolean isAvailable() {
+ return available;
+ }
- public void setAvailable(boolean available) {
- this.available = available;
- }
+ public void setAvailable(boolean available) {
+ this.available = available;
+ }
}
diff --git a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/exception/InvalidConnectionException.java b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/exception/InvalidConnectionException.java
index 9a6475a0e..ab18a217a 100644
--- a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/exception/InvalidConnectionException.java
+++ b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/exception/InvalidConnectionException.java
@@ -18,21 +18,21 @@
package org.apache.streampipes.model.client.exception;
-import java.util.List;
-
import org.apache.streampipes.model.client.matching.MatchingResultMessage;
+import java.util.List;
+
public class InvalidConnectionException extends Exception {
- private static final long serialVersionUID = 1L;
-
- private List<MatchingResultMessage> errorLog;
-
- public InvalidConnectionException(List<MatchingResultMessage> errorLog) {
- this.errorLog = errorLog;
- }
-
- public List<MatchingResultMessage> getErrorLog() {
- return errorLog;
- }
+ private static final long serialVersionUID = 1L;
+
+ private List<MatchingResultMessage> errorLog;
+
+ public InvalidConnectionException(List<MatchingResultMessage> errorLog) {
+ this.errorLog = errorLog;
+ }
+
+ public List<MatchingResultMessage> getErrorLog() {
+ return errorLog;
+ }
}
diff --git a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/matching/MatchingResultFactory.java b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/matching/MatchingResultFactory.java
index b77e1ce9b..2c104acd6 100644
--- a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/matching/MatchingResultFactory.java
+++ b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/matching/MatchingResultFactory.java
@@ -20,12 +20,12 @@ package org.apache.streampipes.model.client.matching;
public class MatchingResultFactory {
- public static MatchingResultMessage build(MatchingResultType type, boolean success, String rightSubject) {
- MatchingResultMessage message = new MatchingResultMessage();
- message.setMatchingSuccessful(success);
- message.setTitle(type.getTitle());
- message.setDescription(type.getDescription());
- message.setRequirementSubject(rightSubject);
- return message;
- }
+ public static MatchingResultMessage build(MatchingResultType type, boolean success, String rightSubject) {
+ MatchingResultMessage message = new MatchingResultMessage();
+ message.setMatchingSuccessful(success);
+ message.setTitle(type.getTitle());
+ message.setDescription(type.getDescription());
+ message.setRequirementSubject(rightSubject);
+ return message;
+ }
}
diff --git a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/matching/MatchingResultMessage.java b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/matching/MatchingResultMessage.java
index 0fc9166f5..040ff6efc 100644
--- a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/matching/MatchingResultMessage.java
+++ b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/matching/MatchingResultMessage.java
@@ -25,84 +25,90 @@ import java.util.Objects;
@TsModel
public class MatchingResultMessage {
- private boolean matchingSuccessful;
-
- private String title;
- private String description;
-
- private String offerSubject;
- private String requirementSubject;
-
- private String reasonText;
-
-
- public MatchingResultMessage() {
-
- }
-
- public String getTitle() {
- return title;
- }
-
- public void setTitle(String title) {
- this.title = title;
- }
-
- public boolean isMatchingSuccessful() {
- return matchingSuccessful;
- }
-
- public void setMatchingSuccessful(boolean matchingSuccessful) {
- this.matchingSuccessful = matchingSuccessful;
- }
-
- public String getOfferSubject() {
- return offerSubject;
- }
-
- public void setOfferSubject(String offerSubject) {
- this.offerSubject = offerSubject;
- }
-
- public String getRequirementSubject() {
- return requirementSubject;
- }
-
- public void setRequirementSubject(String requirementSubject) {
- this.requirementSubject = requirementSubject;
- }
-
- public String getReasonText() {
- return reasonText;
- }
-
- public void setReasonText(String reasonText) {
- this.reasonText = reasonText;
- }
-
- public String getDescription() {
- return description;
- }
-
- public void setDescription(String description) {
- this.description = description;
- }
-
- @Override
- public String toString() {
- return title + " - " + description + "\n" + "(required: " +requirementSubject + ")";
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
- MatchingResultMessage that = (MatchingResultMessage) o;
- return matchingSuccessful == that.matchingSuccessful && Objects.equals(title, that.title) && Objects.equals(description, that.description) && Objects.equals(offerSubject, that.offerSubject) && Objects.equals(requirementSubject, that.requirementSubject) && Objects.equals(reasonText, that.reasonText);
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(matchingSuccessful, title, description, offerSubject, requirementSubject, reasonText);
- }
+ private boolean matchingSuccessful;
+
+ private String title;
+ private String description;
+
+ private String offerSubject;
+ private String requirementSubject;
+
+ private String reasonText;
+
+
+ public MatchingResultMessage() {
+
+ }
+
+ public String getTitle() {
+ return title;
+ }
+
+ public void setTitle(String title) {
+ this.title = title;
+ }
+
+ public boolean isMatchingSuccessful() {
+ return matchingSuccessful;
+ }
+
+ public void setMatchingSuccessful(boolean matchingSuccessful) {
+ this.matchingSuccessful = matchingSuccessful;
+ }
+
+ public String getOfferSubject() {
+ return offerSubject;
+ }
+
+ public void setOfferSubject(String offerSubject) {
+ this.offerSubject = offerSubject;
+ }
+
+ public String getRequirementSubject() {
+ return requirementSubject;
+ }
+
+ public void setRequirementSubject(String requirementSubject) {
+ this.requirementSubject = requirementSubject;
+ }
+
+ public String getReasonText() {
+ return reasonText;
+ }
+
+ public void setReasonText(String reasonText) {
+ this.reasonText = reasonText;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ @Override
+ public String toString() {
+ return title + " - " + description + "\n" + "(required: " + requirementSubject + ")";
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
+ MatchingResultMessage that = (MatchingResultMessage) o;
+ return matchingSuccessful == that.matchingSuccessful && Objects.equals(title, that.title)
+ && Objects.equals(description, that.description) && Objects.equals(offerSubject, that.offerSubject)
+ && Objects.equals(requirementSubject, that.requirementSubject) && Objects.equals(reasonText, that.reasonText);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(matchingSuccessful, title, description, offerSubject, requirementSubject, reasonText);
+ }
}
diff --git a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/matching/MatchingResultType.java b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/matching/MatchingResultType.java
index 64127eb58..225a89953 100644
--- a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/matching/MatchingResultType.java
+++ b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/matching/MatchingResultType.java
@@ -19,32 +19,33 @@
package org.apache.streampipes.model.client.matching;
public enum MatchingResultType {
-
- DATATYPE_MATCH("Datatype Match", "A required datatype is not present in the input event property."),
- STREAM_MATCH("Stream Match", ""),
- DOMAIN_PROPERTY_MATCH("Domain Property Match", "A required domain property is not present in the input event property."),
- FORMAT_MATCH("Format Match", "No supported transport format found."),
- GROUNDING_MATCH("Grounding Match", ""),
- PROTOCOL_MATCH("Protocol Match", "No supported communication protocol found."),
- PROPERTY_MATCH("Property Match", "A required property is not present in the input event schema."),
- SCHEMA_MATCH("Schema Match", "A required schema is not present in the input event stream."),
- MEASUREMENT_UNIT_MATCH("Measurement Unit Match", ""),
- STREAM_QUALITY("Stream Quality Match", "");
-
- private String title;
- private String description;
-
- MatchingResultType(String title, String description) {
- this.title = title;
- this.description = description;
- }
-
- public String getTitle() {
- return title;
- }
-
- public String getDescription() {
- return description;
- }
-
+
+ DATATYPE_MATCH("Datatype Match", "A required datatype is not present in the input event property."),
+ STREAM_MATCH("Stream Match", ""),
+ DOMAIN_PROPERTY_MATCH("Domain Property Match",
+ "A required domain property is not present in the input event property."),
+ FORMAT_MATCH("Format Match", "No supported transport format found."),
+ GROUNDING_MATCH("Grounding Match", ""),
+ PROTOCOL_MATCH("Protocol Match", "No supported communication protocol found."),
+ PROPERTY_MATCH("Property Match", "A required property is not present in the input event schema."),
+ SCHEMA_MATCH("Schema Match", "A required schema is not present in the input event stream."),
+ MEASUREMENT_UNIT_MATCH("Measurement Unit Match", ""),
+ STREAM_QUALITY("Stream Quality Match", "");
+
+ private String title;
+ private String description;
+
+ MatchingResultType(String title, String description) {
+ this.title = title;
+ this.description = description;
+ }
+
+ public String getTitle() {
+ return title;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
}
diff --git a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/monitoring/JobReport.java b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/monitoring/JobReport.java
index 42fcc57f2..7abadf9ed 100644
--- a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/monitoring/JobReport.java
+++ b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/monitoring/JobReport.java
@@ -23,43 +23,42 @@ import java.util.List;
public class JobReport {
- // contains report of a single job
- // TODO needed?
-
- //TODO store in database and create queries
-
- private String elementId;
- private Date generationDate;
- private List<TaskReport> taskReports;
-
- public JobReport(String elementId, Date generationDate, List<TaskReport> taskResults)
- {
- this.generationDate = generationDate;
- this.taskReports = taskResults;
- this.elementId = elementId;
- }
+ // contains report of a single job
+ // TODO needed?
- public Date getGenerationDate() {
- return generationDate;
- }
+ //TODO store in database and create queries
- public void setGenerationDate(Date generationDate) {
- this.generationDate = generationDate;
- }
+ private String elementId;
+ private Date generationDate;
+ private List<TaskReport> taskReports;
- public List<TaskReport> getTaskReports() {
- return taskReports;
- }
+ public JobReport(String elementId, Date generationDate, List<TaskReport> taskResults) {
+ this.generationDate = generationDate;
+ this.taskReports = taskResults;
+ this.elementId = elementId;
+ }
- public void setTaskReports(List<TaskReport> taskReports) {
- this.taskReports = taskReports;
- }
+ public Date getGenerationDate() {
+ return generationDate;
+ }
- public String getElementId() {
- return elementId;
- }
+ public void setGenerationDate(Date generationDate) {
+ this.generationDate = generationDate;
+ }
- public void setElementId(String elementId) {
- this.elementId = elementId;
- }
+ public List<TaskReport> getTaskReports() {
+ return taskReports;
+ }
+
+ public void setTaskReports(List<TaskReport> taskReports) {
+ this.taskReports = taskReports;
+ }
+
+ public String getElementId() {
+ return elementId;
+ }
+
+ public void setElementId(String elementId) {
+ this.elementId = elementId;
+ }
}
diff --git a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/monitoring/TaskReport.java b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/monitoring/TaskReport.java
index ecbd19b8f..a2daae739 100644
--- a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/monitoring/TaskReport.java
+++ b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/monitoring/TaskReport.java
@@ -21,37 +21,37 @@ package org.apache.streampipes.model.client.monitoring;
import java.util.Date;
public class TaskReport {
- //contains report of an individual task
- private Date executionDate;
- private boolean success;
- private String taskName;
-
- private String optionalMessage;
-
- public TaskReport(String taskName, Date executionDate, boolean success,
- String optinalMessage) {
- super();
- this.executionDate = executionDate;
- this.success = success;
- this.optionalMessage = optinalMessage;
- this.taskName = taskName;
- }
-
- public Date getExecutionDate() {
- return executionDate;
- }
-
- public boolean isSuccess() {
- return success;
- }
-
- public String getOptionalMessage() {
- return optionalMessage;
- }
-
- @Override
- public String toString()
- {
- return "{ \nTask Execution: " +taskName +"\nDate: " +executionDate.toString() +"\nSuccess: " +success + "\nMessage: " +optionalMessage +"}";
- }
+ //contains report of an individual task
+ private Date executionDate;
+ private boolean success;
+ private String taskName;
+
+ private String optionalMessage;
+
+ public TaskReport(String taskName, Date executionDate, boolean success,
+ String optinalMessage) {
+ super();
+ this.executionDate = executionDate;
+ this.success = success;
+ this.optionalMessage = optinalMessage;
+ this.taskName = taskName;
+ }
+
+ public Date getExecutionDate() {
+ return executionDate;
+ }
+
+ public boolean isSuccess() {
+ return success;
+ }
+
+ public String getOptionalMessage() {
+ return optionalMessage;
+ }
+
+ @Override
+ public String toString() {
+ return "{ \nTask Execution: " + taskName + "\nDate: " + executionDate.toString() + "\nSuccess: " + success
+ + "\nMessage: " + optionalMessage + "}";
+ }
}
diff --git a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/monitoring/pipeline/AbstractBurrowInfo.java b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/monitoring/pipeline/AbstractBurrowInfo.java
index f14462589..d2277698c 100644
--- a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/monitoring/pipeline/AbstractBurrowInfo.java
+++ b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/monitoring/pipeline/AbstractBurrowInfo.java
@@ -20,30 +20,30 @@ package org.apache.streampipes.model.client.monitoring.pipeline;
public abstract class AbstractBurrowInfo {
- protected String error;
- protected String message;
+ protected String error;
+ protected String message;
- public AbstractBurrowInfo(String error, String message) {
- this.error = error;
- this.message = message;
- }
+ public AbstractBurrowInfo(String error, String message) {
+ this.error = error;
+ this.message = message;
+ }
- public AbstractBurrowInfo() {
- }
+ public AbstractBurrowInfo() {
+ }
- public String getError() {
- return error;
- }
+ public String getError() {
+ return error;
+ }
- public void setError(String error) {
- this.error = error;
- }
+ public void setError(String error) {
+ this.error = error;
+ }
- public String getMessage() {
- return message;
- }
+ public String getMessage() {
+ return message;
+ }
- public void setMessage(String message) {
- this.message = message;
- }
+ public void setMessage(String message) {
+ this.message = message;
+ }
}
diff --git a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/monitoring/pipeline/BurrowConsumerGroupStatus.java b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/monitoring/pipeline/BurrowConsumerGroupStatus.java
index 8b6d62f03..dfd5b90b5 100644
--- a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/monitoring/pipeline/BurrowConsumerGroupStatus.java
+++ b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/monitoring/pipeline/BurrowConsumerGroupStatus.java
@@ -20,81 +20,81 @@ package org.apache.streampipes.model.client.monitoring.pipeline;
public class BurrowConsumerGroupStatus {
- private String cluster;
- private String group;
- private String status;
- private boolean complete;
- private String[] partitions;
+ private String cluster;
+ private String group;
+ private String status;
+ private boolean complete;
+ private String[] partitions;
- private Integer partition_count;
- private Integer maxlag;
- private Integer totallag;
+ private Integer partitionCount;
+ private Integer maxlag;
+ private Integer totallag;
- public BurrowConsumerGroupStatus() {
+ public BurrowConsumerGroupStatus() {
- }
+ }
- public String getCluster() {
- return cluster;
- }
+ public String getCluster() {
+ return cluster;
+ }
- public void setCluster(String cluster) {
- this.cluster = cluster;
- }
+ public void setCluster(String cluster) {
+ this.cluster = cluster;
+ }
- public String getGroup() {
- return group;
- }
+ public String getGroup() {
+ return group;
+ }
- public void setGroup(String group) {
- this.group = group;
- }
+ public void setGroup(String group) {
+ this.group = group;
+ }
- public String getStatus() {
- return status;
- }
+ public String getStatus() {
+ return status;
+ }
- public void setStatus(String status) {
- this.status = status;
- }
+ public void setStatus(String status) {
+ this.status = status;
+ }
- public boolean isComplete() {
- return complete;
- }
+ public boolean isComplete() {
+ return complete;
+ }
- public void setComplete(boolean complete) {
- this.complete = complete;
- }
+ public void setComplete(boolean complete) {
+ this.complete = complete;
+ }
- public String[] getPartitions() {
- return partitions;
- }
+ public String[] getPartitions() {
+ return partitions;
+ }
- public void setPartitions(String[] partitions) {
- this.partitions = partitions;
- }
+ public void setPartitions(String[] partitions) {
+ this.partitions = partitions;
+ }
- public Integer getPartition_count() {
- return partition_count;
- }
+ public Integer getPartitionCount() {
+ return partitionCount;
+ }
- public void setPartition_count(Integer partition_count) {
- this.partition_count = partition_count;
- }
+ public void setPartitionCount(Integer partitionCount) {
+ this.partitionCount = partitionCount;
+ }
- public Integer getMaxlag() {
- return maxlag;
- }
+ public Integer getMaxlag() {
+ return maxlag;
+ }
- public void setMaxlag(Integer maxlag) {
- this.maxlag = maxlag;
- }
+ public void setMaxlag(Integer maxlag) {
+ this.maxlag = maxlag;
+ }
- public Integer getTotallag() {
- return totallag;
- }
+ public Integer getTotallag() {
+ return totallag;
+ }
- public void setTotallag(Integer totallag) {
- this.totallag = totallag;
- }
+ public void setTotallag(Integer totallag) {
+ this.totallag = totallag;
+ }
}
diff --git a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/monitoring/pipeline/BurrowConsumerGroupStatusInfo.java b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/monitoring/pipeline/BurrowConsumerGroupStatusInfo.java
index 77d39a39a..784109213 100644
--- a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/monitoring/pipeline/BurrowConsumerGroupStatusInfo.java
+++ b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/monitoring/pipeline/BurrowConsumerGroupStatusInfo.java
@@ -20,20 +20,20 @@ package org.apache.streampipes.model.client.monitoring.pipeline;
public class BurrowConsumerGroupStatusInfo extends AbstractBurrowInfo {
- private BurrowConsumerGroupStatus status;
+ private BurrowConsumerGroupStatus status;
- public BurrowConsumerGroupStatusInfo(String error, String message) {
- super(error, message);
- }
+ public BurrowConsumerGroupStatusInfo(String error, String message) {
+ super(error, message);
+ }
- public BurrowConsumerGroupStatusInfo() {
- }
+ public BurrowConsumerGroupStatusInfo() {
+ }
- public BurrowConsumerGroupStatus getStatus() {
- return status;
- }
+ public BurrowConsumerGroupStatus getStatus() {
+ return status;
+ }
- public void setStatus(BurrowConsumerGroupStatus status) {
- this.status = status;
- }
+ public void setStatus(BurrowConsumerGroupStatus status) {
+ this.status = status;
+ }
}
diff --git a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/monitoring/pipeline/BurrowConsumerInfo.java b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/monitoring/pipeline/BurrowConsumerInfo.java
index c57d6a160..d345beb63 100644
--- a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/monitoring/pipeline/BurrowConsumerInfo.java
+++ b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/monitoring/pipeline/BurrowConsumerInfo.java
@@ -18,28 +18,28 @@
package org.apache.streampipes.model.client.monitoring.pipeline;
-public class BurrowConsumerInfo extends AbstractBurrowInfo{
+public class BurrowConsumerInfo extends AbstractBurrowInfo {
- private String[] consumers;
+ private String[] consumers;
- public BurrowConsumerInfo(String error, String message, String[] consumers) {
- super(error, message);
- this.consumers = consumers;
- }
+ public BurrowConsumerInfo(String error, String message, String[] consumers) {
+ super(error, message);
+ this.consumers = consumers;
+ }
- public BurrowConsumerInfo(String[] consumers) {
- this.consumers = consumers;
- }
+ public BurrowConsumerInfo(String[] consumers) {
+ this.consumers = consumers;
+ }
- public BurrowConsumerInfo() {
+ public BurrowConsumerInfo() {
- }
+ }
- public String[] getConsumers() {
- return consumers;
- }
+ public String[] getConsumers() {
+ return consumers;
+ }
- public void setConsumers(String[] consumers) {
- this.consumers = consumers;
- }
+ public void setConsumers(String[] consumers) {
+ this.consumers = consumers;
+ }
}
diff --git a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/monitoring/pipeline/BurrowTopicInfo.java b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/monitoring/pipeline/BurrowTopicInfo.java
index 8c9d8d863..4a69e15dc 100644
--- a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/monitoring/pipeline/BurrowTopicInfo.java
+++ b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/monitoring/pipeline/BurrowTopicInfo.java
@@ -20,21 +20,21 @@ package org.apache.streampipes.model.client.monitoring.pipeline;
public class BurrowTopicInfo extends AbstractBurrowInfo {
- private Long[] offsets;
+ private Long[] offsets;
- public BurrowTopicInfo(String error, String message, Long[] offsets) {
- super(error, message);
- this.offsets = offsets;
- }
+ public BurrowTopicInfo(String error, String message, Long[] offsets) {
+ super(error, message);
+ this.offsets = offsets;
+ }
- public BurrowTopicInfo() {
- }
+ public BurrowTopicInfo() {
+ }
- public Long[] getOffsets() {
- return offsets;
- }
+ public Long[] getOffsets() {
+ return offsets;
+ }
- public void setOffsets(Long[] offsets) {
- this.offsets = offsets;
- }
+ public void setOffsets(Long[] offsets) {
+ this.offsets = offsets;
+ }
}
diff --git a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/Concept.java b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/Concept.java
index 5f19198dd..eef530075 100644
--- a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/Concept.java
+++ b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/Concept.java
@@ -22,31 +22,30 @@ import java.util.ArrayList;
import java.util.List;
public class Concept extends OntologyElement {
-
- private List<Property> domainProperties;
-
- public Concept(ElementHeader elementHeader, String rdfsLabel, String rdfsDescription, List<Property> domainProperties)
- {
- super(elementHeader, rdfsLabel, rdfsDescription);
- this.domainProperties = domainProperties;
- }
-
- public Concept()
- {
- this.domainProperties = new ArrayList<>();
- }
-
- public Concept(ElementHeader header) {
- super(header);
- }
-
- public List<Property> getDomainProperties() {
- return domainProperties;
- }
-
- public void setDomainProperties(List<Property> domainProperties) {
- this.domainProperties = domainProperties;
- }
-
+
+ private List<Property> domainProperties;
+
+ public Concept(ElementHeader elementHeader, String rdfsLabel, String rdfsDescription,
+ List<Property> domainProperties) {
+ super(elementHeader, rdfsLabel, rdfsDescription);
+ this.domainProperties = domainProperties;
+ }
+
+ public Concept() {
+ this.domainProperties = new ArrayList<>();
+ }
+
+ public Concept(ElementHeader header) {
+ super(header);
+ }
+
+ public List<Property> getDomainProperties() {
+ return domainProperties;
+ }
+
+ public void setDomainProperties(List<Property> domainProperties) {
+ this.domainProperties = domainProperties;
+ }
+
}
diff --git a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/Context.java b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/Context.java
index c0720664f..55d2d9370 100644
--- a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/Context.java
+++ b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/Context.java
@@ -22,44 +22,44 @@ import java.io.InputStream;
public class Context {
- private InputStream inputStream;
- private String baseUri;
-
- private String contextId;
-
- private RdfFormat rdfFormat;
-
- public InputStream getInputStream() {
- return inputStream;
- }
-
- public void setInputStream(InputStream inputStream) {
- this.inputStream = inputStream;
- }
-
- public String getBaseUri() {
- return baseUri;
- }
-
- public void setBaseUri(String baseUri) {
- this.baseUri = baseUri;
- }
-
- public String getContextId() {
- return contextId;
- }
-
- public void setContextId(String contextId) {
- this.contextId = contextId;
- }
-
- public RdfFormat getRdfFormat() {
- return rdfFormat;
- }
-
- public void setRdfFormat(RdfFormat rdfFormat) {
- this.rdfFormat = rdfFormat;
- }
-
-
+ private InputStream inputStream;
+ private String baseUri;
+
+ private String contextId;
+
+ private RdfFormat rdfFormat;
+
+ public InputStream getInputStream() {
+ return inputStream;
+ }
+
+ public void setInputStream(InputStream inputStream) {
+ this.inputStream = inputStream;
+ }
+
+ public String getBaseUri() {
+ return baseUri;
+ }
+
+ public void setBaseUri(String baseUri) {
+ this.baseUri = baseUri;
+ }
+
+ public String getContextId() {
+ return contextId;
+ }
+
+ public void setContextId(String contextId) {
+ this.contextId = contextId;
+ }
+
+ public RdfFormat getRdfFormat() {
+ return rdfFormat;
+ }
+
+ public void setRdfFormat(RdfFormat rdfFormat) {
+ this.rdfFormat = rdfFormat;
+ }
+
+
}
diff --git a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/ElementHeader.java b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/ElementHeader.java
index 88bdf1fab..a584eeecb 100644
--- a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/ElementHeader.java
+++ b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/ElementHeader.java
@@ -20,51 +20,58 @@ package org.apache.streampipes.model.client.ontology;
public class ElementHeader {
- private String id;
- private String title;
-
- private String prefix;
- private String namespace;
-
-
- public ElementHeader(String id, String title, String prefix,
- String namespace) {
- super();
- this.id = id;
- this.title = title;
- this.prefix = prefix;
- this.namespace = namespace;
- }
-
- public ElementHeader(String propertyId, String title) {
- this.id = propertyId;
- this.title = title;
- }
-
- public String getId() {
- return id;
- }
- public void setId(String id) {
- this.id = id;
- }
- public String getTitle() {
- return title;
- }
- public void setTitle(String title) {
- this.title = title;
- }
- public String getPrefix() {
- return prefix;
- }
- public void setPrefix(String prefix) {
- this.prefix = prefix;
- }
- public String getNamespace() {
- return namespace;
- }
- public void setNamespace(String namespace) {
- this.namespace = namespace;
- }
-
-
+ private String id;
+ private String title;
+
+ private String prefix;
+ private String namespace;
+
+
+ public ElementHeader(String id, String title, String prefix,
+ String namespace) {
+ super();
+ this.id = id;
+ this.title = title;
+ this.prefix = prefix;
+ this.namespace = namespace;
+ }
+
+ public ElementHeader(String propertyId, String title) {
+ this.id = propertyId;
+ this.title = title;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getTitle() {
+ return title;
+ }
+
+ public void setTitle(String title) {
+ this.title = title;
+ }
+
+ public String getPrefix() {
+ return prefix;
+ }
+
+ public void setPrefix(String prefix) {
+ this.prefix = prefix;
+ }
+
+ public String getNamespace() {
+ return namespace;
+ }
+
+ public void setNamespace(String namespace) {
+ this.namespace = namespace;
+ }
+
+
}
diff --git a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/ElementType.java b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/ElementType.java
index fd79d16df..6e76c4071 100644
--- a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/ElementType.java
+++ b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/ElementType.java
@@ -19,5 +19,5 @@
package org.apache.streampipes.model.client.ontology;
public enum ElementType {
-Property, Concept, Instance
+ Property, Concept, Instance
}
diff --git a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/EnumeratedRange.java b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/EnumeratedRange.java
index bfb561947..ab6c98990 100644
--- a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/EnumeratedRange.java
+++ b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/EnumeratedRange.java
@@ -22,23 +22,23 @@ import java.util.List;
public class EnumeratedRange extends Range {
- private static final String TITLE = "";
- private static final String DESCRIPTION = "";
-
- private List<EnumeratedValue> enumeratedValues;
-
- public EnumeratedRange(List<EnumeratedValue> enumeratedValues) {
- super(RangeType.ENUMERATION, TITLE, DESCRIPTION);
- this.enumeratedValues = enumeratedValues;
- }
-
- public List<EnumeratedValue> getEnumeratedValues() {
- return enumeratedValues;
- }
-
- public void setEnumeratedValues(List<EnumeratedValue> enumeratedValues) {
- this.enumeratedValues = enumeratedValues;
- }
-
-
+ private static final String TITLE = "";
+ private static final String DESCRIPTION = "";
+
+ private List<EnumeratedValue> enumeratedValues;
+
+ public EnumeratedRange(List<EnumeratedValue> enumeratedValues) {
+ super(RangeType.ENUMERATION, TITLE, DESCRIPTION);
+ this.enumeratedValues = enumeratedValues;
+ }
+
+ public List<EnumeratedValue> getEnumeratedValues() {
+ return enumeratedValues;
+ }
+
+ public void setEnumeratedValues(List<EnumeratedValue> enumeratedValues) {
+ this.enumeratedValues = enumeratedValues;
+ }
+
+
}
diff --git a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/EnumeratedValue.java b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/EnumeratedValue.java
index 6a629eb84..59c734364 100644
--- a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/EnumeratedValue.java
+++ b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/EnumeratedValue.java
@@ -20,28 +20,31 @@ package org.apache.streampipes.model.client.ontology;
public class EnumeratedValue {
- private String elementName;
- private String runtimeValue;
-
-
- public EnumeratedValue(String elementName, String runtimeValue) {
- super();
- this.elementName = elementName;
- this.runtimeValue = runtimeValue;
- }
-
- public String getElementName() {
- return elementName;
- }
- public void setElementName(String elementName) {
- this.elementName = elementName;
- }
- public String getRuntimeValue() {
- return runtimeValue;
- }
- public void setRuntimeValue(String runtimeValue) {
- this.runtimeValue = runtimeValue;
- }
-
-
+ private String elementName;
+ private String runtimeValue;
+
+
+ public EnumeratedValue(String elementName, String runtimeValue) {
+ super();
+ this.elementName = elementName;
+ this.runtimeValue = runtimeValue;
+ }
+
+ public String getElementName() {
+ return elementName;
+ }
+
+ public void setElementName(String elementName) {
+ this.elementName = elementName;
+ }
+
+ public String getRuntimeValue() {
+ return runtimeValue;
+ }
+
+ public void setRuntimeValue(String runtimeValue) {
+ this.runtimeValue = runtimeValue;
+ }
+
+
}
diff --git a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/Instance.java b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/Instance.java
index 9df33c8af..54e8a4143 100644
--- a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/Instance.java
+++ b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/Instance.java
@@ -23,28 +23,27 @@ import java.util.List;
public class Instance extends OntologyElement {
-private List<Property> domainProperties;
-
- public Instance(ElementHeader elementHeader, String rdfsLabel, String rdfsDescription, List<Property> domainProperties)
- {
- super(elementHeader, rdfsLabel, rdfsDescription);
- this.domainProperties = domainProperties;
- }
-
- public Instance()
- {
- this.domainProperties = new ArrayList<>();
- }
-
- public Instance(ElementHeader header) {
- super(header);
- }
-
- public List<Property> getDomainProperties() {
- return domainProperties;
- }
-
- public void setDomainProperties(List<Property> domainProperties) {
- this.domainProperties = domainProperties;
- }
+ private List<Property> domainProperties;
+
+ public Instance(ElementHeader elementHeader, String rdfsLabel, String rdfsDescription,
+ List<Property> domainProperties) {
+ super(elementHeader, rdfsLabel, rdfsDescription);
+ this.domainProperties = domainProperties;
+ }
+
+ public Instance() {
+ this.domainProperties = new ArrayList<>();
+ }
+
+ public Instance(ElementHeader header) {
+ super(header);
+ }
+
+ public List<Property> getDomainProperties() {
+ return domainProperties;
+ }
+
+ public void setDomainProperties(List<Property> domainProperties) {
+ this.domainProperties = domainProperties;
+ }
}
diff --git a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/Namespace.java b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/Namespace.java
index 2c62dfe6a..5445cdc33 100644
--- a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/Namespace.java
+++ b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/Namespace.java
@@ -20,27 +20,31 @@ package org.apache.streampipes.model.client.ontology;
public class Namespace {
- private String prefix;
- private String namespaceId;
-
-
- public Namespace(String prefix, String namespaceId) {
- super();
- this.prefix = prefix;
- this.namespaceId = namespaceId;
- }
- public String getPrefix() {
- return prefix;
- }
- public void setPrefix(String prefix) {
- this.prefix = prefix;
- }
- public String getNamespaceId() {
- return namespaceId;
- }
- public void setNamespaceId(String name) {
- this.namespaceId = name;
- }
-
-
+ private String prefix;
+ private String namespaceId;
+
+
+ public Namespace(String prefix, String namespaceId) {
+ super();
+ this.prefix = prefix;
+ this.namespaceId = namespaceId;
+ }
+
+ public String getPrefix() {
+ return prefix;
+ }
+
+ public void setPrefix(String prefix) {
+ this.prefix = prefix;
+ }
+
+ public String getNamespaceId() {
+ return namespaceId;
+ }
+
+ public void setNamespaceId(String name) {
+ this.namespaceId = name;
+ }
+
+
}
diff --git a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/NodeType.java b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/NodeType.java
index 22ca559ff..07ea638ad 100644
--- a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/NodeType.java
+++ b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/NodeType.java
@@ -19,5 +19,5 @@
package org.apache.streampipes.model.client.ontology;
public enum NodeType {
-CLASS, INSTANCE, PROPERTY
+ CLASS, INSTANCE, PROPERTY
}
diff --git a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/OntologyElement.java b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/OntologyElement.java
index 42dcf3dc2..132fbcf6d 100644
--- a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/OntologyElement.java
+++ b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/OntologyElement.java
@@ -19,50 +19,48 @@
package org.apache.streampipes.model.client.ontology;
public abstract class OntologyElement {
-
- private ElementHeader elementHeader;
-
- private String rdfsLabel;
- private String rdfsDescription;
-
- public OntologyElement(ElementHeader elementHeader, String rdfsLabel, String rdfsDescription)
- {
- this.elementHeader = elementHeader;
- this.rdfsLabel = rdfsLabel;
- this.rdfsDescription = rdfsDescription;
- }
-
- public OntologyElement()
- {
-
- }
- public OntologyElement(ElementHeader header) {
- this.elementHeader = header;
- }
+ private ElementHeader elementHeader;
- public String getRdfsLabel() {
- return rdfsLabel;
- }
+ private String rdfsLabel;
+ private String rdfsDescription;
- public void setRdfsLabel(String rdfsLabel) {
- this.rdfsLabel = rdfsLabel;
- }
+ public OntologyElement(ElementHeader elementHeader, String rdfsLabel, String rdfsDescription) {
+ this.elementHeader = elementHeader;
+ this.rdfsLabel = rdfsLabel;
+ this.rdfsDescription = rdfsDescription;
+ }
- public String getRdfsDescription() {
- return rdfsDescription;
- }
+ public OntologyElement() {
- public void setRdfsDescription(String rdfsDescription) {
- this.rdfsDescription = rdfsDescription;
- }
+ }
- public ElementHeader getElementHeader() {
- return elementHeader;
- }
+ public OntologyElement(ElementHeader header) {
+ this.elementHeader = header;
+ }
+
+ public String getRdfsLabel() {
+ return rdfsLabel;
+ }
+
+ public void setRdfsLabel(String rdfsLabel) {
+ this.rdfsLabel = rdfsLabel;
+ }
+
+ public String getRdfsDescription() {
+ return rdfsDescription;
+ }
+
+ public void setRdfsDescription(String rdfsDescription) {
+ this.rdfsDescription = rdfsDescription;
+ }
+
+ public ElementHeader getElementHeader() {
+ return elementHeader;
+ }
+
+ public void setElementHeader(ElementHeader elementHeader) {
+ this.elementHeader = elementHeader;
+ }
- public void setElementHeader(ElementHeader elementHeader) {
- this.elementHeader = elementHeader;
- }
-
}
diff --git a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/OntologyNode.java b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/OntologyNode.java
index 1a0432f12..019a560c3 100644
--- a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/OntologyNode.java
+++ b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/OntologyNode.java
@@ -23,92 +23,93 @@ import java.util.List;
public class OntologyNode {
- private String prefix;
- private String namespace;
-
- private String id;
- private String title;
- private String icon;
-
- private List<OntologyNode> nodes;
-
- public OntologyNode(String id, String title, NodeType nodeType) {
- this.nodes = new ArrayList<>();
- this.id = id;
- this.title = title;
- this.icon = toIconUrl(nodeType);
- }
-
- public OntologyNode(String id, String title, String prefix, String namespace, NodeType nodeType) {
- this(id, title, nodeType);
- this.prefix = prefix;
- this.namespace = namespace;
- }
-
- private String toIconUrl(NodeType nodeType)
- {
- return "Test";
- //return Configuration.getInstance().WEBAPP_BASE_URL + Configuration.getInstance().CONTEXT_PATH + "/img/" +nodeType.name() +".png";
- }
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public String getTitle() {
- return title;
- }
-
- public void setTitle(String text) {
- this.title = text;
- }
-
- public List<OntologyNode> getNodes() {
- return nodes;
- }
-
- public void setNodes(List<OntologyNode> children) {
- this.nodes = children;
- }
-
- public String getIcon() {
- return icon;
- }
-
- public void setIcon(String icon) {
- this.icon = icon;
- }
-
- public String getPrefix() {
- return prefix;
- }
-
- public void setPrefix(String prefix) {
- this.prefix = prefix;
- }
-
- public String getNamespace() {
- return namespace;
- }
-
- public void setNamespace(String namespace) {
- this.namespace = namespace;
- }
-
- @Override
- public int hashCode() {
- return id.hashCode();
- }
-
- @Override
- public boolean equals(Object other)
- {
- if (! (other instanceof OntologyNode)) return false;
- else
- return this.id.equals(((OntologyNode)other).getId());
- }
+ private String prefix;
+ private String namespace;
+
+ private String id;
+ private String title;
+ private String icon;
+
+ private List<OntologyNode> nodes;
+
+ public OntologyNode(String id, String title, NodeType nodeType) {
+ this.nodes = new ArrayList<>();
+ this.id = id;
+ this.title = title;
+ this.icon = toIconUrl(nodeType);
+ }
+
+ public OntologyNode(String id, String title, String prefix, String namespace, NodeType nodeType) {
+ this(id, title, nodeType);
+ this.prefix = prefix;
+ this.namespace = namespace;
+ }
+
+ private String toIconUrl(NodeType nodeType) {
+ return "Test";
+ // return Configuration.getInstance().WEBAPP_BASE_URL +
+ // Configuration.getInstance().CONTEXT_PATH + "/img/" +nodeType.name() +".png";
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getTitle() {
+ return title;
+ }
+
+ public void setTitle(String text) {
+ this.title = text;
+ }
+
+ public List<OntologyNode> getNodes() {
+ return nodes;
+ }
+
+ public void setNodes(List<OntologyNode> children) {
+ this.nodes = children;
+ }
+
+ public String getIcon() {
+ return icon;
+ }
+
+ public void setIcon(String icon) {
+ this.icon = icon;
+ }
+
+ public String getPrefix() {
+ return prefix;
+ }
+
+ public void setPrefix(String prefix) {
+ this.prefix = prefix;
+ }
+
+ public String getNamespace() {
+ return namespace;
+ }
+
+ public void setNamespace(String namespace) {
+ this.namespace = namespace;
+ }
+
+ @Override
+ public int hashCode() {
+ return id.hashCode();
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ if (!(other instanceof OntologyNode)) {
+ return false;
+ } else {
+ return this.id.equals(((OntologyNode) other).getId());
+ }
+ }
}
diff --git a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/OntologyQuery.java b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/OntologyQuery.java
index d86b9d1f3..9f3ad6e3e 100644
--- a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/OntologyQuery.java
+++ b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/OntologyQuery.java
@@ -22,33 +22,33 @@ import java.util.List;
public class OntologyQuery {
- private String requiredClass;
-
- private List<OntologyQueryItem> requiredProperties;
-
-
- public OntologyQuery(String requiredClass,
- List<OntologyQueryItem> requiredProperties) {
- super();
- this.requiredClass = requiredClass;
- this.requiredProperties = requiredProperties;
- }
-
- public String getRequiredClass() {
- return requiredClass;
- }
-
- public void setRequiredClass(String requiredClass) {
- this.requiredClass = requiredClass;
- }
-
- public List<OntologyQueryItem> getRequiredProperties() {
- return requiredProperties;
- }
-
- public void setRequiredProperties(List<OntologyQueryItem> requiredProperties) {
- this.requiredProperties = requiredProperties;
- }
-
-
+ private String requiredClass;
+
+ private List<OntologyQueryItem> requiredProperties;
+
+
+ public OntologyQuery(String requiredClass,
+ List<OntologyQueryItem> requiredProperties) {
+ super();
+ this.requiredClass = requiredClass;
+ this.requiredProperties = requiredProperties;
+ }
+
+ public String getRequiredClass() {
+ return requiredClass;
+ }
+
+ public void setRequiredClass(String requiredClass) {
+ this.requiredClass = requiredClass;
+ }
+
+ public List<OntologyQueryItem> getRequiredProperties() {
+ return requiredProperties;
+ }
+
+ public void setRequiredProperties(List<OntologyQueryItem> requiredProperties) {
+ this.requiredProperties = requiredProperties;
+ }
+
+
}
diff --git a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/OntologyQueryItem.java b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/OntologyQueryItem.java
index 1cafd1d46..9c52d0f5d 100644
--- a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/OntologyQueryItem.java
+++ b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/OntologyQueryItem.java
@@ -22,28 +22,29 @@ import java.util.List;
public class OntologyQueryItem {
- private String propertyId;
-
- private List<OntologyQueryResponse> queryResponse;
-
- public OntologyQueryItem(String propertyValue, List<OntologyQueryResponse> queryResponse) {
- super();
- this.propertyId = propertyId;
- }
-
- public String getPropertyId() {
- return propertyId;
- }
- public void setPropertyId(String propertyId) {
- this.propertyId = propertyId;
- }
-
- public List<OntologyQueryResponse> getQueryResponse() {
- return queryResponse;
- }
-
- public void setQueryResponse(List<OntologyQueryResponse> queryResponse) {
- this.queryResponse = queryResponse;
- }
-
+ private String propertyId;
+
+ private List<OntologyQueryResponse> queryResponse;
+
+ public OntologyQueryItem(String propertyValue, List<OntologyQueryResponse> queryResponse) {
+ super();
+ this.propertyId = propertyId;
+ }
+
+ public String getPropertyId() {
+ return propertyId;
+ }
+
+ public void setPropertyId(String propertyId) {
+ this.propertyId = propertyId;
+ }
+
+ public List<OntologyQueryResponse> getQueryResponse() {
+ return queryResponse;
+ }
+
+ public void setQueryResponse(List<OntologyQueryResponse> queryResponse) {
+ this.queryResponse = queryResponse;
+ }
+
}
diff --git a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/OntologyQueryResponse.java b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/OntologyQueryResponse.java
index e5fc654d6..e36b870eb 100644
--- a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/OntologyQueryResponse.java
+++ b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/OntologyQueryResponse.java
@@ -20,48 +20,47 @@ package org.apache.streampipes.model.client.ontology;
public class OntologyQueryResponse {
- private String label;
- private String description;
-
- private String propertyValue;
+ private String label;
+ private String description;
-
- public OntologyQueryResponse(String label, String description,
- String propertyValue) {
- super();
- this.label = label;
- this.description = description;
- this.propertyValue = propertyValue;
- }
+ private String propertyValue;
- public OntologyQueryResponse() {
- // TODO Auto-generated constructor stub
- }
- public String getLabel() {
- return label;
- }
+ public OntologyQueryResponse(String label, String description,
+ String propertyValue) {
+ super();
+ this.label = label;
+ this.description = description;
+ this.propertyValue = propertyValue;
+ }
- public void setLabel(String label) {
- this.label = label;
- }
+ public OntologyQueryResponse() {
+ // TODO Auto-generated constructor stub
+ }
- public String getDescription() {
- return description;
- }
+ public String getLabel() {
+ return label;
+ }
- public void setDescription(String description) {
- this.description = description;
- }
+ public void setLabel(String label) {
+ this.label = label;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public String getPropertyValue() {
+ return propertyValue;
+ }
+
+ public void setPropertyValue(String propertyValue) {
+ this.propertyValue = propertyValue;
+ }
- public String getPropertyValue() {
- return propertyValue;
- }
- public void setPropertyValue(String propertyValue) {
- this.propertyValue = propertyValue;
- }
-
-
-
}
diff --git a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/PrimitiveRange.java b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/PrimitiveRange.java
index 0ef48dd60..2bbd18f25 100644
--- a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/PrimitiveRange.java
+++ b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/PrimitiveRange.java
@@ -20,35 +20,33 @@ package org.apache.streampipes.model.client.ontology;
public class PrimitiveRange extends Range {
- private static final String TITLE = "";
- private static final String DESCRIPTION = "";
-
- private String rdfsDatatype;
-
- private String value;
-
- public PrimitiveRange(String rdfsDatatype) {
- super(RangeType.PRIMITIVE, TITLE, DESCRIPTION);
- this.rdfsDatatype = rdfsDatatype;
- }
-
- public String getRdfsDatatype() {
- return rdfsDatatype;
- }
-
- public void setRdfsDatatype(String rdfsDatatype) {
- this.rdfsDatatype = rdfsDatatype;
- }
-
- public String getValue() {
- return value;
- }
-
- public void setValue(String value) {
- this.value = value;
- }
-
-
-
-
+ private static final String TITLE = "";
+ private static final String DESCRIPTION = "";
+
+ private String rdfsDatatype;
+
+ private String value;
+
+ public PrimitiveRange(String rdfsDatatype) {
+ super(RangeType.PRIMITIVE, TITLE, DESCRIPTION);
+ this.rdfsDatatype = rdfsDatatype;
+ }
+
+ public String getRdfsDatatype() {
+ return rdfsDatatype;
+ }
+
+ public void setRdfsDatatype(String rdfsDatatype) {
+ this.rdfsDatatype = rdfsDatatype;
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+
}
diff --git a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/Property.java b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/Property.java
index a997b0284..41b50df2f 100644
--- a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/Property.java
+++ b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/Property.java
@@ -19,65 +19,66 @@
package org.apache.streampipes.model.client.ontology;
public class Property extends OntologyElement {
-
- private Range range;
-
- private boolean rangeDefined;
- private boolean labelDefined;
-
- public Property(ElementHeader elementHeader, String rdfsLabel, String rdfsDescription, Range range)
- {
- super(elementHeader, rdfsLabel, rdfsDescription);
- this.range = range;
- this.labelDefined = true;
- this.rangeDefined = true;
- }
-
- public Property() {
- // TODO Auto-generated constructor stub
- }
-
- public Property(ElementHeader header) {
- super(header);
- this.rangeDefined = false;
- this.labelDefined = false;
- }
-
- public Range getRange() {
- return range;
- }
-
- public void setRange(Range range) {
- this.range = range;
- }
-
- public boolean isRangeDefined() {
- return rangeDefined;
- }
-
- public void setRangeDefined(boolean rangeDefined) {
- this.rangeDefined = rangeDefined;
- }
-
- public boolean isLabelDefined() {
- return labelDefined;
- }
-
- public void setLabelDefined(boolean labelDefined) {
- this.labelDefined = labelDefined;
- }
-
- @Override
- public int hashCode() {
- return this.getElementHeader().getId().hashCode();
- }
-
- @Override
- public boolean equals(Object other)
- {
- if (! (other instanceof Property)) return false;
- else return this.getElementHeader().getId().equals(((Property)other).getElementHeader().getId());
- }
-
-
+
+ private Range range;
+
+ private boolean rangeDefined;
+ private boolean labelDefined;
+
+ public Property(ElementHeader elementHeader, String rdfsLabel, String rdfsDescription, Range range) {
+ super(elementHeader, rdfsLabel, rdfsDescription);
+ this.range = range;
+ this.labelDefined = true;
+ this.rangeDefined = true;
+ }
+
+ public Property() {
+ // TODO Auto-generated constructor stub
+ }
+
+ public Property(ElementHeader header) {
+ super(header);
+ this.rangeDefined = false;
+ this.labelDefined = false;
+ }
+
+ public Range getRange() {
+ return range;
+ }
+
+ public void setRange(Range range) {
+ this.range = range;
+ }
+
+ public boolean isRangeDefined() {
+ return rangeDefined;
+ }
+
+ public void setRangeDefined(boolean rangeDefined) {
+ this.rangeDefined = rangeDefined;
+ }
+
+ public boolean isLabelDefined() {
+ return labelDefined;
+ }
+
+ public void setLabelDefined(boolean labelDefined) {
+ this.labelDefined = labelDefined;
+ }
+
+ @Override
+ public int hashCode() {
+ return this.getElementHeader().getId().hashCode();
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ if (!(other instanceof Property)) {
+ return false;
+ } else {
+ return this.getElementHeader().getId().equals(((Property) other).getElementHeader().getId());
+ }
+ }
+
+
}
diff --git a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/QuantitativeValueRange.java b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/QuantitativeValueRange.java
index ff205be14..50cb21ae7 100644
--- a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/QuantitativeValueRange.java
+++ b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/QuantitativeValueRange.java
@@ -20,48 +20,48 @@ package org.apache.streampipes.model.client.ontology;
public class QuantitativeValueRange extends Range {
- private static final String TITLE = "";
- private static final String DESCRIPTION = "";
-
- private int minValue;
- private int maxValue;
-
- private String unitCode;
-
- public QuantitativeValueRange(int minValue, int maxValue, String unitCode) {
- this();
- this.minValue = minValue;
- this.maxValue = maxValue;
- this.unitCode = unitCode;
- }
+ private static final String TITLE = "";
+ private static final String DESCRIPTION = "";
- public QuantitativeValueRange() {
- super(RangeType.QUANTITATIVE_VALUE, TITLE, DESCRIPTION);
- }
+ private int minValue;
+ private int maxValue;
- public int getMinValue() {
- return minValue;
- }
+ private String unitCode;
- public void setMinValue(int minValue) {
- this.minValue = minValue;
- }
+ public QuantitativeValueRange(int minValue, int maxValue, String unitCode) {
+ this();
+ this.minValue = minValue;
+ this.maxValue = maxValue;
+ this.unitCode = unitCode;
+ }
- public int getMaxValue() {
- return maxValue;
- }
+ public QuantitativeValueRange() {
+ super(RangeType.QUANTITATIVE_VALUE, TITLE, DESCRIPTION);
+ }
- public void setMaxValue(int maxValue) {
- this.maxValue = maxValue;
- }
+ public int getMinValue() {
+ return minValue;
+ }
+
+ public void setMinValue(int minValue) {
+ this.minValue = minValue;
+ }
+
+ public int getMaxValue() {
+ return maxValue;
+ }
+
+ public void setMaxValue(int maxValue) {
+ this.maxValue = maxValue;
+ }
+
+ public String getUnitCode() {
+ return unitCode;
+ }
+
+ public void setUnitCode(String unitCode) {
+ this.unitCode = unitCode;
+ }
- public String getUnitCode() {
- return unitCode;
- }
- public void setUnitCode(String unitCode) {
- this.unitCode = unitCode;
- }
-
-
}
diff --git a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/Range.java b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/Range.java
index 02c8f5972..a18d0004b 100644
--- a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/Range.java
+++ b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/Range.java
@@ -20,38 +20,41 @@ package org.apache.streampipes.model.client.ontology;
public abstract class Range {
- private String title;
- private String description;
-
- private RangeType rangeType;
-
- public Range(RangeType rangeType, String title, String description) {
- super();
- this.title = title;
- this.rangeType = rangeType;
- this.description = description;
- }
-
-
- public String getTitle() {
- return title;
- }
- public void setTitle(String title) {
- this.title = title;
- }
- public String getDescription() {
- return description;
- }
- public void setDescription(String description) {
- this.description = description;
- }
-
- public RangeType getRangeType() {
- return rangeType;
- }
-
- public void setRangeType(RangeType rangeType) {
- this.rangeType = rangeType;
- }
-
+ private String title;
+ private String description;
+
+ private RangeType rangeType;
+
+ public Range(RangeType rangeType, String title, String description) {
+ super();
+ this.title = title;
+ this.rangeType = rangeType;
+ this.description = description;
+ }
+
+
+ public String getTitle() {
+ return title;
+ }
+
+ public void setTitle(String title) {
+ this.title = title;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public RangeType getRangeType() {
+ return rangeType;
+ }
+
+ public void setRangeType(RangeType rangeType) {
+ this.rangeType = rangeType;
+ }
+
}
diff --git a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/RangeType.java b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/RangeType.java
index 2d98f38c4..08508132f 100644
--- a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/RangeType.java
+++ b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/RangeType.java
@@ -20,5 +20,5 @@ package org.apache.streampipes.model.client.ontology;
public enum RangeType {
- PRIMITIVE, QUANTITATIVE_VALUE, ENUMERATION, RDFS_CLASS
+ PRIMITIVE, QUANTITATIVE_VALUE, ENUMERATION, RDFS_CLASS
}
diff --git a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/RdfFormat.java b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/RdfFormat.java
index 38d6ef45d..bd81234fb 100644
--- a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/RdfFormat.java
+++ b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/RdfFormat.java
@@ -19,5 +19,5 @@
package org.apache.streampipes.model.client.ontology;
public enum RdfFormat {
- RDFXML, JSONLD, TURTLE, RDFA
+ RDFXML, JSONLD, TURTLE, RDFA
}
diff --git a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/Resource.java b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/Resource.java
index 10b022e81..8ee133531 100644
--- a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/Resource.java
+++ b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/Resource.java
@@ -20,35 +20,42 @@ package org.apache.streampipes.model.client.ontology;
public class Resource {
- private ElementType elementType;
- private String namespace;
- private String elementName;
-
- private String instanceOf;
-
-
- public String getNamespace() {
- return namespace;
- }
- public void setNamespace(String namespace) {
- this.namespace = namespace;
- }
- public String getElementName() {
- return elementName;
- }
- public void setElementName(String elementName) {
- this.elementName = elementName;
- }
- public ElementType getElementType() {
- return elementType;
- }
- public void setElementType(ElementType elementType) {
- this.elementType = elementType;
- }
- public String getInstanceOf() {
- return instanceOf;
- }
- public void setInstanceOf(String instanceOf) {
- this.instanceOf = instanceOf;
- }
+ private ElementType elementType;
+ private String namespace;
+ private String elementName;
+
+ private String instanceOf;
+
+
+ public String getNamespace() {
+ return namespace;
+ }
+
+ public void setNamespace(String namespace) {
+ this.namespace = namespace;
+ }
+
+ public String getElementName() {
+ return elementName;
+ }
+
+ public void setElementName(String elementName) {
+ this.elementName = elementName;
+ }
+
+ public ElementType getElementType() {
+ return elementType;
+ }
+
+ public void setElementType(ElementType elementType) {
+ this.elementType = elementType;
+ }
+
+ public String getInstanceOf() {
+ return instanceOf;
+ }
+
+ public void setInstanceOf(String instanceOf) {
+ this.instanceOf = instanceOf;
+ }
}
diff --git a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/Statement.java b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/Statement.java
index 78b2684d3..b54055981 100644
--- a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/Statement.java
+++ b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/ontology/Statement.java
@@ -20,31 +20,34 @@ package org.apache.streampipes.model.client.ontology;
public class Statement {
- private String predicate;
- private String object;
-
- public Statement(String predicate, String object) {
- super();
- this.predicate = predicate;
- this.object = object;
- }
-
- public Statement() {
-
- }
-
- public String getPredicate() {
- return predicate;
- }
- public void setPredicate(String predicate) {
- this.predicate = predicate;
- }
- public String getObject() {
- return object;
- }
- public void setObject(String object) {
- this.object = object;
- }
-
-
+ private String predicate;
+ private String object;
+
+ public Statement(String predicate, String object) {
+ super();
+ this.predicate = predicate;
+ this.object = object;
+ }
+
+ public Statement() {
+
+ }
+
+ public String getPredicate() {
+ return predicate;
+ }
+
+ public void setPredicate(String predicate) {
+ this.predicate = predicate;
+ }
+
+ public String getObject() {
+ return object;
+ }
+
+ public void setObject(String object) {
+ this.object = object;
+ }
+
+
}
diff --git a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/setup/InitialSettings.java b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/setup/InitialSettings.java
index 5f223cd21..d1936393a 100644
--- a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/setup/InitialSettings.java
+++ b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/setup/InitialSettings.java
@@ -22,62 +22,62 @@ import org.apache.streampipes.commons.random.UUIDGenerator;
public class InitialSettings {
- private String adminEmail;
- private String adminPassword;
- private String initialServiceAccountName;
- private String initialServiceAccountSecret;
- private Boolean installPipelineElements;
- private String initialAdminUserSid;
-
- public InitialSettings() {
- this.initialAdminUserSid = UUIDGenerator.generateUuid();
- }
-
- public String getAdminPassword() {
- return adminPassword;
- }
-
- public void setAdminPassword(String adminPassword) {
- this.adminPassword = adminPassword;
- }
-
- public Boolean getInstallPipelineElements() {
- return installPipelineElements;
- }
-
- public void setInstallPipelineElements(Boolean installPipelineElements) {
- this.installPipelineElements = installPipelineElements;
- }
-
- public String getAdminEmail() {
- return adminEmail;
- }
-
- public void setAdminEmail(String adminEmail) {
- this.adminEmail = adminEmail;
- }
-
- public String getInitialServiceAccountName() {
- return initialServiceAccountName;
- }
-
- public void setInitialServiceAccountName(String initialServiceAccountName) {
- this.initialServiceAccountName = initialServiceAccountName;
- }
-
- public String getInitialServiceAccountSecret() {
- return initialServiceAccountSecret;
- }
-
- public void setInitialServiceAccountSecret(String initialServiceAccountSecret) {
- this.initialServiceAccountSecret = initialServiceAccountSecret;
- }
-
- public String getInitialAdminUserSid() {
- return initialAdminUserSid;
- }
-
- public void setInitialAdminUserSid(String initialAdminUserSid) {
- this.initialAdminUserSid = initialAdminUserSid;
- }
+ private String adminEmail;
+ private String adminPassword;
+ private String initialServiceAccountName;
+ private String initialServiceAccountSecret;
+ private Boolean installPipelineElements;
+ private String initialAdminUserSid;
+
+ public InitialSettings() {
+ this.initialAdminUserSid = UUIDGenerator.generateUuid();
+ }
+
+ public String getAdminPassword() {
+ return adminPassword;
+ }
+
+ public void setAdminPassword(String adminPassword) {
+ this.adminPassword = adminPassword;
+ }
+
+ public Boolean getInstallPipelineElements() {
+ return installPipelineElements;
+ }
+
+ public void setInstallPipelineElements(Boolean installPipelineElements) {
+ this.installPipelineElements = installPipelineElements;
+ }
+
+ public String getAdminEmail() {
+ return adminEmail;
+ }
+
+ public void setAdminEmail(String adminEmail) {
+ this.adminEmail = adminEmail;
+ }
+
+ public String getInitialServiceAccountName() {
+ return initialServiceAccountName;
+ }
+
+ public void setInitialServiceAccountName(String initialServiceAccountName) {
+ this.initialServiceAccountName = initialServiceAccountName;
+ }
+
+ public String getInitialServiceAccountSecret() {
+ return initialServiceAccountSecret;
+ }
+
+ public void setInitialServiceAccountSecret(String initialServiceAccountSecret) {
+ this.initialServiceAccountSecret = initialServiceAccountSecret;
+ }
+
+ public String getInitialAdminUserSid() {
+ return initialAdminUserSid;
+ }
+
+ public void setInitialAdminUserSid(String initialAdminUserSid) {
+ this.initialAdminUserSid = initialAdminUserSid;
+ }
}
diff --git a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/user/ChangePasswordRequest.java b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/user/ChangePasswordRequest.java
index 02c93770f..36dbb1cca 100644
--- a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/user/ChangePasswordRequest.java
+++ b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/user/ChangePasswordRequest.java
@@ -31,6 +31,10 @@ public class ChangePasswordRequest {
return newPassword;
}
+ public void setNewPassword(String newPassword) {
+ this.newPassword = newPassword;
+ }
+
public String getExistingPassword() {
return existingPassword;
}
@@ -38,8 +42,4 @@ public class ChangePasswordRequest {
public void setExistingPassword(String existingPassword) {
this.existingPassword = existingPassword;
}
-
- public void setNewPassword(String newPassword) {
- this.newPassword = newPassword;
- }
}
diff --git a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/user/Element.java b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/user/Element.java
index d4e640bc2..bd1feb5a2 100644
--- a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/user/Element.java
+++ b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/user/Element.java
@@ -20,32 +20,31 @@ package org.apache.streampipes.model.client.user;
public class Element {
- private String elementId;
- private boolean publicElement;
-
- public Element() {
- }
-
- public Element(String elementId, boolean publicElement)
- {
- this.elementId = elementId;
- this.publicElement = publicElement;
- }
-
- public String getElementId() {
- return elementId;
- }
-
- public void setElementId(String elementId) {
- this.elementId = elementId;
- }
-
- public boolean isPublicElement() {
- return publicElement;
- }
-
- public void setPublicElement(boolean publicElement) {
- this.publicElement = publicElement;
- }
-
+ private String elementId;
+ private boolean publicElement;
+
+ public Element() {
+ }
+
+ public Element(String elementId, boolean publicElement) {
+ this.elementId = elementId;
+ this.publicElement = publicElement;
+ }
+
+ public String getElementId() {
+ return elementId;
+ }
+
+ public void setElementId(String elementId) {
+ this.elementId = elementId;
+ }
+
+ public boolean isPublicElement() {
+ return publicElement;
+ }
+
+ public void setPublicElement(boolean publicElement) {
+ this.publicElement = publicElement;
+ }
+
}
diff --git a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/user/Group.java b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/user/Group.java
index 8b319f0e5..7cccfadd1 100644
--- a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/user/Group.java
+++ b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/user/Group.java
@@ -17,9 +17,10 @@
*/
package org.apache.streampipes.model.client.user;
+import org.apache.streampipes.model.shared.annotation.TsModel;
+
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.google.gson.annotations.SerializedName;
-import org.apache.streampipes.model.shared.annotation.TsModel;
import java.util.HashSet;
import java.util.Set;
@@ -31,7 +32,7 @@ public class Group {
protected @SerializedName("_rev") String rev;
@JsonIgnore
- private String $type = "group";
+ private String type = "group";
private String groupName;
@@ -73,11 +74,11 @@ public class Group {
this.roles = roles;
}
- public String get$type() {
- return $type;
+ public String getType() {
+ return type;
}
- public void set$type(String $type) {
- this.$type = $type;
+ public void setType(String type) {
+ this.type = type;
}
}
diff --git a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/user/JwtAuthenticationResponse.java b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/user/JwtAuthenticationResponse.java
index 755597dec..a86f68039 100644
--- a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/user/JwtAuthenticationResponse.java
+++ b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/user/JwtAuthenticationResponse.java
@@ -20,22 +20,22 @@ package org.apache.streampipes.model.client.user;
public class JwtAuthenticationResponse {
- private String accessToken;
+ private String accessToken;
- public static JwtAuthenticationResponse from(String accessToken) {
- return new JwtAuthenticationResponse(accessToken);
- }
+ private JwtAuthenticationResponse(String accessToken) {
+ this.accessToken = accessToken;
+ }
- private JwtAuthenticationResponse(String accessToken) {
- this.accessToken = accessToken;
- }
+ public static JwtAuthenticationResponse from(String accessToken) {
+ return new JwtAuthenticationResponse(accessToken);
+ }
- public String getAccessToken() {
- return accessToken;
- }
+ public String getAccessToken() {
+ return accessToken;
+ }
- public void setAccessToken(String accessToken) {
- this.accessToken = accessToken;
- }
+ public void setAccessToken(String accessToken) {
+ this.accessToken = accessToken;
+ }
}
diff --git a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/user/LoginRequest.java b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/user/LoginRequest.java
index 939485918..6615f6e7b 100644
--- a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/user/LoginRequest.java
+++ b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/user/LoginRequest.java
@@ -20,31 +20,34 @@ package org.apache.streampipes.model.client.user;
public class LoginRequest {
- private String username;
- private String password;
-
- public LoginRequest() {
-
- }
-
- public LoginRequest(String username, String password) {
- super();
- this.username = username;
- this.password = password;
- }
-
- public String getUsername() {
- return username;
- }
- public void setUsername(String username) {
- this.username = username;
- }
- public String getPassword() {
- return password;
- }
- public void setPassword(String password) {
- this.password = password;
- }
-
-
+ private String username;
+ private String password;
+
+ public LoginRequest() {
+
+ }
+
+ public LoginRequest(String username, String password) {
+ super();
+ this.username = username;
+ this.password = password;
+ }
+
+ public String getUsername() {
+ return username;
+ }
+
+ public void setUsername(String username) {
+ this.username = username;
+ }
+
+ public String getPassword() {
+ return password;
+ }
+
+ public void setPassword(String password) {
+ this.password = password;
+ }
+
+
}
diff --git a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/user/PasswordRecoveryToken.java b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/user/PasswordRecoveryToken.java
index de93d96fc..cb8ae692e 100644
--- a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/user/PasswordRecoveryToken.java
+++ b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/user/PasswordRecoveryToken.java
@@ -22,7 +22,11 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
public class PasswordRecoveryToken extends AbstractMailToken {
@JsonIgnore
- private String $type = "password-recovery";
+ private String type = "password-recovery";
+
+ public PasswordRecoveryToken() {
+
+ }
public static PasswordRecoveryToken create(String token, String username) {
PasswordRecoveryToken passwordRecoveryToken = new PasswordRecoveryToken();
@@ -32,15 +36,11 @@ public class PasswordRecoveryToken extends AbstractMailToken {
return passwordRecoveryToken;
}
- public PasswordRecoveryToken() {
-
- }
-
- public String get$type() {
- return $type;
+ public String getType() {
+ return type;
}
- public void set$type(String $type) {
- this.$type = $type;
+ public void setType(String type) {
+ this.type = type;
}
}
diff --git a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/user/Permission.java b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/user/Permission.java
index d1ed39776..315481c24 100644
--- a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/user/Permission.java
+++ b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/user/Permission.java
@@ -17,9 +17,10 @@
*/
package org.apache.streampipes.model.client.user;
+import org.apache.streampipes.model.shared.annotation.TsModel;
+
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.google.gson.annotations.SerializedName;
-import org.apache.streampipes.model.shared.annotation.TsModel;
import java.util.ArrayList;
import java.util.List;
@@ -31,7 +32,7 @@ public class Permission {
protected @SerializedName("_rev") String rev;
@JsonIgnore
- private String $type = "permission";
+ private String type = "permission";
private String objectInstanceId;
private String objectClassName;
@@ -97,12 +98,12 @@ public class Permission {
this.grantedAuthorities = grantedAuthorities;
}
- public String get$type() {
- return $type;
+ public String getType() {
+ return type;
}
- public void set$type(String $type) {
- this.$type = $type;
+ public void setType(String type) {
+ this.type = type;
}
public boolean isPublicElement() {
diff --git a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/user/PermissionBuilder.java b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/user/PermissionBuilder.java
index c1af5c3f7..b7857caf7 100644
--- a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/user/PermissionBuilder.java
+++ b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/user/PermissionBuilder.java
@@ -21,16 +21,6 @@ public class PermissionBuilder {
private Permission permission;
- public static PermissionBuilder create(String objectInstanceId,
- Class<?> objectInstanceClass,
- String ownerSid) {
- return new PermissionBuilder(
- objectInstanceId,
- objectInstanceClass,
- ownerSid
- );
- }
-
private PermissionBuilder(String objectInstanceId,
Class<?> objectInstanceClass,
String ownerSid) {
@@ -40,6 +30,16 @@ public class PermissionBuilder {
this.permission.setOwnerSid(ownerSid);
}
+ public static PermissionBuilder create(String objectInstanceId,
+ Class<?> objectInstanceClass,
+ String ownerSid) {
+ return new PermissionBuilder(
+ objectInstanceId,
+ objectInstanceClass,
+ ownerSid
+ );
+ }
+
public PermissionBuilder with(PermissionEntry permissionEntry) {
this.permission.addPermissionEntry(permissionEntry);
diff --git a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/user/PermissionEntry.java b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/user/PermissionEntry.java
index f9dd25d8a..2dcc436bc 100644
--- a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/user/PermissionEntry.java
+++ b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/user/PermissionEntry.java
@@ -50,8 +50,12 @@ public class PermissionEntry {
@Override
public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
PermissionEntry that = (PermissionEntry) o;
return sid.equals(that.sid) && principalType == that.principalType;
}
diff --git a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/user/Principal.java b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/user/Principal.java
index a8fe7a1cf..bcdd9e0b1 100644
--- a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/user/Principal.java
+++ b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/user/Principal.java
@@ -27,122 +27,117 @@ import java.util.Set;
public abstract class Principal {
- protected @SerializedName("_id") String principalId;
- protected @SerializedName("_rev") String rev;
-
- @JsonIgnore
- private String $type = "principal";
-
- private boolean accountEnabled;
- private boolean accountLocked;
- private boolean accountExpired;
-
- protected String username;
-
- protected Set<String> objectPermissions;
-
- protected Set<Role> roles;
- protected Set<String> groups;
-
- private PrincipalType principalType;
-
- public Principal(PrincipalType principalType) {
- this.principalType = principalType;
- this.roles = new HashSet<>();
- this.groups = new HashSet<>();
- this.objectPermissions = new HashSet<>();
- }
-
-
- public String getRev() {
- return rev;
- }
-
- public void setRev(String rev) {
- this.rev = rev;
- }
-
- public String getPrincipalId() {
- return principalId;
- }
-
- public void setPrincipalId(String principalId) {
- this.principalId = principalId;
- }
-
- private Element find(String elementId, List<Element> source) {
- return source.stream().filter(f -> f.getElementId().equals(elementId)).findFirst().orElseThrow(IllegalArgumentException::new);
- }
-
- public boolean isAccountEnabled() {
- return accountEnabled;
- }
-
- public void setAccountEnabled(boolean accountEnabled) {
- this.accountEnabled = accountEnabled;
- }
-
- public boolean isAccountLocked() {
- return accountLocked;
- }
-
- public void setAccountLocked(boolean accountLocked) {
- this.accountLocked = accountLocked;
- }
-
- public boolean isAccountExpired() {
- return accountExpired;
- }
-
- public void setAccountExpired(boolean accountExpired) {
- this.accountExpired = accountExpired;
- }
-
- public void setUsername(String username) {
- this.username = username;
- }
-
- public Set<Role> getRoles() {
- return roles;
- }
-
- public void setRoles(Set<Role> roles) {
- this.roles = roles;
- }
-
- public PrincipalType getPrincipalType() {
- return principalType;
- }
-
- public void setPrincipalType(PrincipalType principalType) {
- this.principalType = principalType;
- }
-
- public Set<String> getGroups() {
- return groups;
- }
-
- public void setGroups(Set<String> groups) {
- this.groups = groups;
- }
-
- public String getUsername() {
- return username;
- }
-
- public Set<String> getObjectPermissions() {
- return objectPermissions;
- }
-
- public void setObjectPermissions(Set<String> objectPermissions) {
- this.objectPermissions = objectPermissions;
- }
-
- public String get$type() {
- return $type;
- }
-
- public void set$type(String $type) {
- this.$type = $type;
- }
+ protected @SerializedName("_id") String principalId;
+ protected @SerializedName("_rev") String rev;
+ protected String username;
+ protected Set<String> objectPermissions;
+ protected Set<Role> roles;
+ protected Set<String> groups;
+ @JsonIgnore
+ private String type = "principal";
+ private boolean accountEnabled;
+ private boolean accountLocked;
+ private boolean accountExpired;
+ private PrincipalType principalType;
+
+ public Principal(PrincipalType principalType) {
+ this.principalType = principalType;
+ this.roles = new HashSet<>();
+ this.groups = new HashSet<>();
+ this.objectPermissions = new HashSet<>();
+ }
+
+
+ public String getRev() {
+ return rev;
+ }
+
+ public void setRev(String rev) {
+ this.rev = rev;
+ }
+
+ public String getPrincipalId() {
+ return principalId;
+ }
+
+ public void setPrincipalId(String principalId) {
+ this.principalId = principalId;
+ }
+
+ private Element find(String elementId, List<Element> source) {
+ return source.stream().filter(f -> f.getElementId().equals(elementId)).findFirst()
+ .orElseThrow(IllegalArgumentException::new);
+ }
+
+ public boolean isAccountEnabled() {
+ return accountEnabled;
+ }
+
+ public void setAccountEnabled(boolean accountEnabled) {
+ this.accountEnabled = accountEnabled;
+ }
+
+ public boolean isAccountLocked() {
+ return accountLocked;
+ }
+
+ public void setAccountLocked(boolean accountLocked) {
+ this.accountLocked = accountLocked;
+ }
+
+ public boolean isAccountExpired() {
+ return accountExpired;
+ }
+
+ public void setAccountExpired(boolean accountExpired) {
+ this.accountExpired = accountExpired;
+ }
+
+ public Set<Role> getRoles() {
+ return roles;
+ }
+
+ public void setRoles(Set<Role> roles) {
+ this.roles = roles;
+ }
+
+ public PrincipalType getPrincipalType() {
+ return principalType;
+ }
+
+ public void setPrincipalType(PrincipalType principalType) {
+ this.principalType = principalType;
+ }
+
+ public Set<String> getGroups() {
+ return groups;
+ }
+
+ public void setGroups(Set<String> groups) {
+ this.groups = groups;
+ }
+
+ public String getUsername() {
+ return username;
+ }
+
+ public void setUsername(String username) {
+ this.username = username;
+ }
+
+ public Set<String> getObjectPermissions() {
+ return objectPermissions;
+ }
+
+ public void setObjectPermissions(Set<String> objectPermissions) {
+ this.objectPermissions = objectPermissions;
+ }
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
}
diff --git a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/user/RegistrationData.java b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/user/RegistrationData.java
index 3b431d65c..24658a75a 100644
--- a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/user/RegistrationData.java
+++ b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/user/RegistrationData.java
@@ -22,45 +22,47 @@ import java.util.List;
public class RegistrationData {
- private String username;
- private String password;
- private Role role;
-
- private List<String> roles;
-
- public RegistrationData()
- {
-
- }
-
- public String getUsername() {
- return username;
- }
- public void setUsername(String username) {
- this.username = username;
- }
- public String getPassword() {
- return password;
- }
- public void setPassword(String password) {
- this.password = password;
- }
-
- public List<String> getRoles() {
- return roles;
- }
-
- public void setRoles(List<String> roles) {
- this.roles = roles;
- }
-
- public Role getRole() {
- return role;
- }
-
- public void setRole(Role selectedRole) {
- this.role = selectedRole;
- }
-
-
+ private String username;
+ private String password;
+ private Role role;
+
+ private List<String> roles;
+
+ public RegistrationData() {
+
+ }
+
+ public String getUsername() {
+ return username;
+ }
+
+ public void setUsername(String username) {
+ this.username = username;
+ }
+
+ public String getPassword() {
+ return password;
+ }
+
+ public void setPassword(String password) {
+ this.password = password;
+ }
+
+ public List<String> getRoles() {
+ return roles;
+ }
+
+ public void setRoles(List<String> roles) {
+ this.roles = roles;
+ }
+
+ public Role getRole() {
+ return role;
+ }
+
+ public void setRole(Role selectedRole) {
+ this.role = selectedRole;
+ }
+
+
}
diff --git a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/user/Role.java b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/user/Role.java
index b9010b7de..7e2747595 100644
--- a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/user/Role.java
+++ b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/user/Role.java
@@ -31,69 +31,69 @@ public enum Role {
ROLE_SERVICE_ADMIN(Constants.ROLE_SERVICE_ADMIN_VALUE),
ROLE_PIPELINE_ADMIN(
- Constants.ROLE_PIPELINE_ADMIN_VALUE,
- Privilege.PRIVILEGE_READ_PIPELINE,
- Privilege.PRIVILEGE_WRITE_PIPELINE,
- Privilege.PRIVILEGE_DELETE_PIPELINE,
- Privilege.PRIVILEGE_READ_PIPELINE_ELEMENT
+ Constants.ROLE_PIPELINE_ADMIN_VALUE,
+ Privilege.PRIVILEGE_READ_PIPELINE,
+ Privilege.PRIVILEGE_WRITE_PIPELINE,
+ Privilege.PRIVILEGE_DELETE_PIPELINE,
+ Privilege.PRIVILEGE_READ_PIPELINE_ELEMENT
),
ROLE_DASHBOARD_ADMIN(
- Constants.ROLE_DASHBOARD_ADMIN_VALUE,
- Privilege.PRIVILEGE_READ_DASHBOARD,
- Privilege.PRIVILEGE_WRITE_DASHBOARD,
- Privilege.PRIVILEGE_DELETE_DASHBOARD
+ Constants.ROLE_DASHBOARD_ADMIN_VALUE,
+ Privilege.PRIVILEGE_READ_DASHBOARD,
+ Privilege.PRIVILEGE_WRITE_DASHBOARD,
+ Privilege.PRIVILEGE_DELETE_DASHBOARD
),
ROLE_DATA_EXPLORER_ADMIN(
- Constants.ROLE_DATA_EXPLORER_ADMIN_VALUE,
- Privilege.PRIVILEGE_READ_DATA_EXPLORER_VIEW,
- Privilege.PRIVILEGE_READ_DATA_EXPLORER_WIDGET,
- Privilege.PRIVILEGE_WRITE_DATA_EXPLORER_VIEW,
- Privilege.PRIVILEGE_WRITE_DATA_EXPLORER_WIDGET,
- Privilege.PRIVILEGE_DELETE_DATA_EXPLORER_VIEW,
- Privilege.PRIVILEGE_DELETE_DATA_EXPLORER_WIDGET,
- Privilege.PRIVILEGE_READ_PIPELINE
+ Constants.ROLE_DATA_EXPLORER_ADMIN_VALUE,
+ Privilege.PRIVILEGE_READ_DATA_EXPLORER_VIEW,
+ Privilege.PRIVILEGE_READ_DATA_EXPLORER_WIDGET,
+ Privilege.PRIVILEGE_WRITE_DATA_EXPLORER_VIEW,
+ Privilege.PRIVILEGE_WRITE_DATA_EXPLORER_WIDGET,
+ Privilege.PRIVILEGE_DELETE_DATA_EXPLORER_VIEW,
+ Privilege.PRIVILEGE_DELETE_DATA_EXPLORER_WIDGET,
+ Privilege.PRIVILEGE_READ_PIPELINE
),
ROLE_CONNECT_ADMIN(
- Constants.ROLE_CONNECT_ADMIN_VALUE,
- Privilege.PRIVILEGE_WRITE_ADAPTER
+ Constants.ROLE_CONNECT_ADMIN_VALUE,
+ Privilege.PRIVILEGE_WRITE_ADAPTER
),
ROLE_DASHBOARD_USER(
- Constants.ROLE_DASHBOARD_USER_VALUE,
- Privilege.PRIVILEGE_READ_DASHBOARD,
- Privilege.PRIVILEGE_READ_DASHBOARD_WIDGET,
- Privilege.PRIVILEGE_READ_PIPELINE
+ Constants.ROLE_DASHBOARD_USER_VALUE,
+ Privilege.PRIVILEGE_READ_DASHBOARD,
+ Privilege.PRIVILEGE_READ_DASHBOARD_WIDGET,
+ Privilege.PRIVILEGE_READ_PIPELINE
),
ROLE_DATA_EXPLORER_USER(
- Constants.ROLE_DATA_EXPLORER_USER_VALUE,
- Privilege.PRIVILEGE_READ_DATA_EXPLORER_VIEW,
- Privilege.PRIVILEGE_READ_DATA_EXPLORER_WIDGET,
- Privilege.PRIVILEGE_READ_PIPELINE
+ Constants.ROLE_DATA_EXPLORER_USER_VALUE,
+ Privilege.PRIVILEGE_READ_DATA_EXPLORER_VIEW,
+ Privilege.PRIVILEGE_READ_DATA_EXPLORER_WIDGET,
+ Privilege.PRIVILEGE_READ_PIPELINE
),
ROLE_PIPELINE_USER(
- Constants.ROLE_PIPELINE_USER_VALUE,
- Privilege.PRIVILEGE_READ_PIPELINE,
- Privilege.PRIVILEGE_READ_PIPELINE_ELEMENT
+ Constants.ROLE_PIPELINE_USER_VALUE,
+ Privilege.PRIVILEGE_READ_PIPELINE,
+ Privilege.PRIVILEGE_READ_PIPELINE_ELEMENT
),
ROLE_APP_USER(Constants.ROLE_APP_USER_VALUE,
- Privilege.PRIVILEGE_READ_PIPELINE,
- Privilege.PRIVILEGE_READ_PIPELINE_ELEMENT),
+ Privilege.PRIVILEGE_READ_PIPELINE,
+ Privilege.PRIVILEGE_READ_PIPELINE_ELEMENT),
ROLE_ASSET_USER(Constants.ROLE_ASSET_USER_VALUE,
- Privilege.PRIVILEGE_READ_GENERIC_STORAGE,
- Privilege.PRIVILEGE_READ_ASSETS),
+ Privilege.PRIVILEGE_READ_GENERIC_STORAGE,
+ Privilege.PRIVILEGE_READ_ASSETS),
ROLE_ASSET_ADMIN(Constants.ROLE_ASSET_ADMIN_VALUE,
- Privilege.PRIVILEGE_READ_ASSETS,
- Privilege.PRIVILEGE_READ_GENERIC_STORAGE,
- Privilege.PRIVILEGE_WRITE_GENERIC_STORAGE,
- Privilege.PRIVILEGE_WRITE_ASSETS);
+ Privilege.PRIVILEGE_READ_ASSETS,
+ Privilege.PRIVILEGE_READ_GENERIC_STORAGE,
+ Privilege.PRIVILEGE_WRITE_GENERIC_STORAGE,
+ Privilege.PRIVILEGE_WRITE_ASSETS);
private List<Privilege> privileges;
private String roleString;
diff --git a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/user/ServiceAccount.java b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/user/ServiceAccount.java
index ea45b7da4..acc87e799 100644
--- a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/user/ServiceAccount.java
+++ b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/user/ServiceAccount.java
@@ -27,9 +27,13 @@ public class ServiceAccount extends Principal {
private String clientSecret;
private boolean secretEncrypted;
+ public ServiceAccount() {
+ super(PrincipalType.SERVICE_ACCOUNT);
+ }
+
public static ServiceAccount from(String serviceAccountName,
- String clientSecret,
- Set<Role> roles) {
+ String clientSecret,
+ Set<Role> roles) {
ServiceAccount account = new ServiceAccount();
account.setUsername(serviceAccountName);
account.setClientSecret(clientSecret);
@@ -40,10 +44,6 @@ public class ServiceAccount extends Principal {
return account;
}
- public ServiceAccount() {
- super(PrincipalType.SERVICE_ACCOUNT);
- }
-
public String getClientSecret() {
return clientSecret;
}
diff --git a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/user/Token.java b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/user/Token.java
index 07de07728..a368d7851 100644
--- a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/user/Token.java
+++ b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/user/Token.java
@@ -20,31 +20,30 @@ package org.apache.streampipes.model.client.user;
public class Token {
- private String principal;
- private String credentials;
-
- public Token(String principal, String credentials) {
- super();
- this.principal = principal;
- this.credentials = credentials;
- }
-
- public String getPrincipal() {
- return principal;
- }
-
- public void setPrincipal(String principal) {
- this.principal = principal;
- }
-
- public String getCredentials() {
- return credentials;
- }
-
- public void setCredentials(String credentials) {
- this.credentials = credentials;
- }
-
-
-
+ private String principal;
+ private String credentials;
+
+ public Token(String principal, String credentials) {
+ super();
+ this.principal = principal;
+ this.credentials = credentials;
+ }
+
+ public String getPrincipal() {
+ return principal;
+ }
+
+ public void setPrincipal(String principal) {
+ this.principal = principal;
+ }
+
+ public String getCredentials() {
+ return credentials;
+ }
+
+ public void setCredentials(String credentials) {
+ this.credentials = credentials;
+ }
+
+
}
diff --git a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/user/UserAccount.java b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/user/UserAccount.java
index 009e156f5..3c6f5d96e 100644
--- a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/user/UserAccount.java
+++ b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/user/UserAccount.java
@@ -27,138 +27,133 @@ import java.util.Set;
@TsModel
public class UserAccount extends Principal {
- protected String fullName;
- protected String password;
-
- protected List<String> preferredDataStreams;
- protected List<String> preferredDataProcessors;
- protected List<String> preferredDataSinks;
-
- protected List<UserApiToken> userApiTokens;
-
- protected boolean hideTutorial;
- protected boolean darkMode = false;
-
- public static UserAccount from(String username,
- String encryptedPassword,
- Set<Role> roles) {
- UserAccount account = new UserAccount();
- account.setUsername(username);
- account.setPassword(encryptedPassword);
- account.setRoles(roles);
- account.setAccountEnabled(true);
- account.setAccountLocked(false);
-
- return account;
- }
-
- public UserAccount() {
- super(PrincipalType.USER_ACCOUNT);
- this.hideTutorial = false;
- this.userApiTokens = new ArrayList<>();
- this.preferredDataProcessors = new ArrayList<>();
- this.preferredDataSinks = new ArrayList<>();
- this.preferredDataStreams = new ArrayList<>();
- }
-
- public void setPassword(String password) {
- this.password = password;
- }
-
- public Set<Role> getRoles() {
- return roles;
- }
-
- public void setRoles(Set<Role> roles) {
- this.roles = roles;
- }
-
- public List<String> getPreferredDataStreams() {
- return preferredDataStreams;
- }
-
- public void setPreferredDataStreams(List<String> preferredDataStreams) {
- this.preferredDataStreams = preferredDataStreams;
- }
-
- public List<String> getPreferredDataProcessors() {
- return preferredDataProcessors;
- }
-
- public void setPreferredDataProcessors(List<String> preferredDataProcessors) {
- this.preferredDataProcessors = preferredDataProcessors;
- }
-
- public List<String> getPreferredDataSinks() {
- return preferredDataSinks;
- }
-
- public void setPreferredDataSinks(List<String> preferredDataSinks) {
- this.preferredDataSinks = preferredDataSinks;
- }
-
- public void addPreferredDataStream(String elementId)
- {
- this.preferredDataStreams.add(elementId);
- }
-
- public void addPreferredDataProcessor(String elementId)
- {
- this.preferredDataProcessors.add(elementId);
- }
-
- public void addPreferredDataSink(String elementId)
- {
- this.preferredDataSinks.add(elementId);
- }
-
- public void removePreferredDataStream(String elementId) {
- this.preferredDataStreams.remove(elementId);
- }
-
- public void removePreferredDataProcessor(String elementId)
- {
- this.preferredDataProcessors.remove(elementId);
- }
-
- public void removePreferredDataSink(String elementId)
- {
- this.preferredDataSinks.remove(elementId);
- }
-
- public String getFullName() {
- return fullName;
- }
-
- public void setFullName(String fullName) {
- this.fullName = fullName;
- }
-
- public List<UserApiToken> getUserApiTokens() {
- return userApiTokens;
- }
-
- public void setUserApiTokens(List<UserApiToken> userApiTokens) {
- this.userApiTokens = userApiTokens;
- }
-
- public boolean isHideTutorial() {
- return hideTutorial;
- }
-
- public void setHideTutorial(boolean hideTutorial) {
- this.hideTutorial = hideTutorial;
- }
-
- public boolean isDarkMode() {
- return darkMode;
- }
-
- public void setDarkMode(boolean darkMode) {
- this.darkMode = darkMode;
- }
-
- public String getPassword() {
- return password;
- }
+ protected String fullName;
+ protected String password;
+
+ protected List<String> preferredDataStreams;
+ protected List<String> preferredDataProcessors;
+ protected List<String> preferredDataSinks;
+
+ protected List<UserApiToken> userApiTokens;
+
+ protected boolean hideTutorial;
+ protected boolean darkMode = false;
+
+ public UserAccount() {
+ super(PrincipalType.USER_ACCOUNT);
+ this.hideTutorial = false;
+ this.userApiTokens = new ArrayList<>();
+ this.preferredDataProcessors = new ArrayList<>();
+ this.preferredDataSinks = new ArrayList<>();
+ this.preferredDataStreams = new ArrayList<>();
+ }
+
+ public static UserAccount from(String username,
+ String encryptedPassword,
+ Set<Role> roles) {
+ UserAccount account = new UserAccount();
+ account.setUsername(username);
+ account.setPassword(encryptedPassword);
+ account.setRoles(roles);
+ account.setAccountEnabled(true);
+ account.setAccountLocked(false);
+
+ return account;
+ }
+
+ public Set<Role> getRoles() {
+ return roles;
+ }
+
+ public void setRoles(Set<Role> roles) {
+ this.roles = roles;
+ }
+
+ public List<String> getPreferredDataStreams() {
+ return preferredDataStreams;
+ }
+
+ public void setPreferredDataStreams(List<String> preferredDataStreams) {
+ this.preferredDataStreams = preferredDataStreams;
+ }
+
+ public List<String> getPreferredDataProcessors() {
+ return preferredDataProcessors;
+ }
+
+ public void setPreferredDataProcessors(List<String> preferredDataProcessors) {
+ this.preferredDataProcessors = preferredDataProcessors;
+ }
+
+ public List<String> getPreferredDataSinks() {
+ return preferredDataSinks;
+ }
+
+ public void setPreferredDataSinks(List<String> preferredDataSinks) {
+ this.preferredDataSinks = preferredDataSinks;
+ }
+
+ public void addPreferredDataStream(String elementId) {
+ this.preferredDataStreams.add(elementId);
+ }
+
+ public void addPreferredDataProcessor(String elementId) {
+ this.preferredDataProcessors.add(elementId);
+ }
+
+ public void addPreferredDataSink(String elementId) {
+ this.preferredDataSinks.add(elementId);
+ }
+
+ public void removePreferredDataStream(String elementId) {
+ this.preferredDataStreams.remove(elementId);
+ }
+
+ public void removePreferredDataProcessor(String elementId) {
+ this.preferredDataProcessors.remove(elementId);
+ }
+
+ public void removePreferredDataSink(String elementId) {
+ this.preferredDataSinks.remove(elementId);
+ }
+
+ public String getFullName() {
+ return fullName;
+ }
+
+ public void setFullName(String fullName) {
+ this.fullName = fullName;
+ }
+
+ public List<UserApiToken> getUserApiTokens() {
+ return userApiTokens;
+ }
+
+ public void setUserApiTokens(List<UserApiToken> userApiTokens) {
+ this.userApiTokens = userApiTokens;
+ }
+
+ public boolean isHideTutorial() {
+ return hideTutorial;
+ }
+
+ public void setHideTutorial(boolean hideTutorial) {
+ this.hideTutorial = hideTutorial;
+ }
+
+ public boolean isDarkMode() {
+ return darkMode;
+ }
+
+ public void setDarkMode(boolean darkMode) {
+ this.darkMode = darkMode;
+ }
+
+ public String getPassword() {
+ return password;
+ }
+
+ public void setPassword(String password) {
+ this.password = password;
+ }
}
diff --git a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/user/UserActivationToken.java b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/user/UserActivationToken.java
index 6d713e7db..1fe6ab028 100644
--- a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/user/UserActivationToken.java
+++ b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/user/UserActivationToken.java
@@ -22,7 +22,10 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
public class UserActivationToken extends AbstractMailToken {
@JsonIgnore
- private String $type = "user-activation";
+ private String type = "user-activation";
+
+ public UserActivationToken() {
+ }
public static UserActivationToken create(String token, String username) {
UserActivationToken userActivationToken = new UserActivationToken();
@@ -32,14 +35,11 @@ public class UserActivationToken extends AbstractMailToken {
return userActivationToken;
}
- public UserActivationToken() {
- }
-
- public String get$type() {
- return $type;
+ public String getType() {
+ return type;
}
- public void set$type(String $type) {
- this.$type = $type;
+ public void setType(String type) {
+ this.type = type;
}
}
diff --git a/streampipes-model-shared/pom.xml b/streampipes-model-shared/pom.xml
index 6d90b892a..879329471 100644
--- a/streampipes-model-shared/pom.xml
+++ b/streampipes-model-shared/pom.xml
@@ -27,5 +27,12 @@
<artifactId>streampipes-model-shared</artifactId>
-
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
</project>
\ No newline at end of file
diff --git a/streampipes-model/pom.xml b/streampipes-model/pom.xml
index b36703f3c..e16aac663 100644
--- a/streampipes-model/pom.xml
+++ b/streampipes-model/pom.xml
@@ -16,7 +16,8 @@
~
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>streampipes-model</artifactId>
@@ -119,6 +120,10 @@
</extensions>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ </plugin>
</plugins>
</build>
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/AdapterType.java b/streampipes-model/src/main/java/org/apache/streampipes/model/AdapterType.java
index 3ab4cf486..37bbdf93f 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/AdapterType.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/AdapterType.java
@@ -17,10 +17,11 @@
*/
package org.apache.streampipes.model;
+import org.apache.streampipes.model.shared.annotation.TsModel;
+
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.JsonNode;
-import org.apache.streampipes.model.shared.annotation.TsModel;
@TsModel
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -36,14 +37,19 @@ public enum AdapterType {
Energy("Energy", ""),
Debugging("Testing & Debugging", "");
- private String label;
- private String description;
+ private final String label;
+ private final String description;
AdapterType(String label, String description) {
this.label = label;
this.description = description;
}
+ @JsonCreator
+ public static AdapterType fromString(JsonNode json) {
+ return AdapterType.valueOf(json.get("code").asText());
+ }
+
public String getCode() {
return this.name();
}
@@ -55,9 +61,4 @@ public enum AdapterType {
public String getDescription() {
return description;
}
-
- @JsonCreator
- public static AdapterType fromString(JsonNode json) {
- return AdapterType.valueOf(json.get("code").asText());
- }
}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/ApplicationLink.java b/streampipes-model/src/main/java/org/apache/streampipes/model/ApplicationLink.java
index 24340b1e1..08fec232f 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/ApplicationLink.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/ApplicationLink.java
@@ -22,73 +22,74 @@ import org.apache.streampipes.model.base.UnnamedStreamPipesEntity;
public class ApplicationLink extends UnnamedStreamPipesEntity {
- private String applicationName;
+ private String applicationName;
- private String applicationDescription;
+ private String applicationDescription;
- private String applicationUrl;
+ private String applicationUrl;
- private String applicationIconUrl;
+ private String applicationIconUrl;
- private String applicationLinkType;
+ private String applicationLinkType;
- public ApplicationLink() {
- super();
- }
+ public ApplicationLink() {
+ super();
+ }
- public ApplicationLink(String applicationName, String applicationDescription, String applicationUrl, String applicationIconUrl) {
- super();
- this.applicationName = applicationName;
- this.applicationDescription = applicationDescription;
- this.applicationUrl = applicationUrl;
- this.applicationIconUrl = applicationIconUrl;
- }
+ public ApplicationLink(String applicationName, String applicationDescription, String applicationUrl,
+ String applicationIconUrl) {
+ super();
+ this.applicationName = applicationName;
+ this.applicationDescription = applicationDescription;
+ this.applicationUrl = applicationUrl;
+ this.applicationIconUrl = applicationIconUrl;
+ }
- public ApplicationLink(ApplicationLink other) {
- super(other);
- this.applicationName = other.getApplicationName();
- this.applicationDescription = other.getApplicationDescription();
- this.applicationUrl = other.getApplicationUrl();
- this.applicationIconUrl = other.getApplicationIconUrl();
- }
+ public ApplicationLink(ApplicationLink other) {
+ super(other);
+ this.applicationName = other.getApplicationName();
+ this.applicationDescription = other.getApplicationDescription();
+ this.applicationUrl = other.getApplicationUrl();
+ this.applicationIconUrl = other.getApplicationIconUrl();
+ }
- public String getApplicationName() {
- return applicationName;
- }
+ public String getApplicationName() {
+ return applicationName;
+ }
- public void setApplicationName(String applicationName) {
- this.applicationName = applicationName;
- }
+ public void setApplicationName(String applicationName) {
+ this.applicationName = applicationName;
+ }
- public String getApplicationDescription() {
- return applicationDescription;
- }
+ public String getApplicationDescription() {
+ return applicationDescription;
+ }
- public void setApplicationDescription(String applicationDescription) {
- this.applicationDescription = applicationDescription;
- }
+ public void setApplicationDescription(String applicationDescription) {
+ this.applicationDescription = applicationDescription;
+ }
- public String getApplicationUrl() {
- return applicationUrl;
- }
+ public String getApplicationUrl() {
+ return applicationUrl;
+ }
- public void setApplicationUrl(String applicationUrl) {
- this.applicationUrl = applicationUrl;
- }
+ public void setApplicationUrl(String applicationUrl) {
+ this.applicationUrl = applicationUrl;
+ }
- public String getApplicationIconUrl() {
- return applicationIconUrl;
- }
+ public String getApplicationIconUrl() {
+ return applicationIconUrl;
+ }
- public void setApplicationIconUrl(String applicationIconUrl) {
- this.applicationIconUrl = applicationIconUrl;
- }
+ public void setApplicationIconUrl(String applicationIconUrl) {
+ this.applicationIconUrl = applicationIconUrl;
+ }
- public String getApplicationLinkType() {
- return applicationLinkType;
- }
+ public String getApplicationLinkType() {
+ return applicationLinkType;
+ }
- public void setApplicationLinkType(String applicationLinkType) {
- this.applicationLinkType = applicationLinkType;
- }
+ public void setApplicationLinkType(String applicationLinkType) {
+ this.applicationLinkType = applicationLinkType;
+ }
}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/DataProcessorType.java b/streampipes-model/src/main/java/org/apache/streampipes/model/DataProcessorType.java
index cef2fcc98..7dc650636 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/DataProcessorType.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/DataProcessorType.java
@@ -18,55 +18,56 @@
package org.apache.streampipes.model;
+import org.apache.streampipes.model.shared.annotation.TsModel;
+
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.JsonNode;
-import org.apache.streampipes.model.shared.annotation.TsModel;
@TsModel
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum DataProcessorType {
- FILTER("Filters and Thresholds", "b"),
- BOOLEAN_OPERATOR("Boolean Operators", ""),
- STRING_OPERATOR("Text/String Operators", ""),
- COUNT_OPERATOR("Count Operators", ""),
- AGGREGATE("Aggregation", ""),
- ENRICH_TEXT("Text/NLP Operators", ""),
- ENRICH("Enrichment", ""),
- GEO("Geospatial Operations", ""),
- IMAGE_PROCESSING("Image Processing", ""),
- PATTERN_DETECT("Pattern Detection", ""),
- ALGORITHM("Algorithm", ""),
- VALUE_OBSERVER("Value Observation", ""),
- STRUCTURE_ANALYTICS("Structure/Stream Analytics", ""),
- TRANSFORM("Transformation", ""),
- TIME("Time Operators", ""),
- SCRIPTING("Scripting/Code", ""),
- UNCATEGORIZED("Uncategorized", "");
-
- private String label;
- private String description;
-
- DataProcessorType(String label, String description) {
- this.label = label;
- this.description = description;
- }
+ FILTER("Filters and Thresholds", "b"),
+ BOOLEAN_OPERATOR("Boolean Operators", ""),
+ STRING_OPERATOR("Text/String Operators", ""),
+ COUNT_OPERATOR("Count Operators", ""),
+ AGGREGATE("Aggregation", ""),
+ ENRICH_TEXT("Text/NLP Operators", ""),
+ ENRICH("Enrichment", ""),
+ GEO("Geospatial Operations", ""),
+ IMAGE_PROCESSING("Image Processing", ""),
+ PATTERN_DETECT("Pattern Detection", ""),
+ ALGORITHM("Algorithm", ""),
+ VALUE_OBSERVER("Value Observation", ""),
+ STRUCTURE_ANALYTICS("Structure/Stream Analytics", ""),
+ TRANSFORM("Transformation", ""),
+ TIME("Time Operators", ""),
+ SCRIPTING("Scripting/Code", ""),
+ UNCATEGORIZED("Uncategorized", "");
+
+ private String label;
+ private String description;
+
+ DataProcessorType(String label, String description) {
+ this.label = label;
+ this.description = description;
+ }
- public String getCode() {
- return this.name();
- }
+ @JsonCreator
+ public static AdapterType fromString(JsonNode json) {
+ return AdapterType.valueOf(json.get("code").asText());
+ }
- public String getLabel() {
- return label;
- }
+ public String getCode() {
+ return this.name();
+ }
- public String getDescription() {
- return description;
- }
+ public String getLabel() {
+ return label;
+ }
- @JsonCreator
- public static AdapterType fromString(JsonNode json) {
- return AdapterType.valueOf(json.get("code").asText());
- }
+ public String getDescription() {
+ return description;
+ }
}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/DataSinkType.java b/streampipes-model/src/main/java/org/apache/streampipes/model/DataSinkType.java
index 482d27aea..64b6417b3 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/DataSinkType.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/DataSinkType.java
@@ -18,10 +18,11 @@
package org.apache.streampipes.model;
+import org.apache.streampipes.model.shared.annotation.TsModel;
+
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.JsonNode;
-import org.apache.streampipes.model.shared.annotation.TsModel;
@TsModel
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -46,6 +47,11 @@ public enum DataSinkType {
this.description = description;
}
+ @JsonCreator
+ public static AdapterType fromString(JsonNode json) {
+ return AdapterType.valueOf(json.get("code").asText());
+ }
+
public String getCode() {
return this.name();
}
@@ -57,9 +63,4 @@ public enum DataSinkType {
public String getDescription() {
return description;
}
-
- @JsonCreator
- public static AdapterType fromString(JsonNode json) {
- return AdapterType.valueOf(json.get("code").asText());
- }
}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/NotificationCount.java b/streampipes-model/src/main/java/org/apache/streampipes/model/NotificationCount.java
index 90986abc8..50748eb63 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/NotificationCount.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/NotificationCount.java
@@ -1,19 +1,21 @@
/*
- * 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
+ * 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
+ * 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.
*
- * 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.
*/
+
package org.apache.streampipes.model;
public class NotificationCount {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/Response.java b/streampipes-model/src/main/java/org/apache/streampipes/model/Response.java
index c1a8fa00d..de4feeb23 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/Response.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/Response.java
@@ -20,80 +20,85 @@ package org.apache.streampipes.model;
public class Response {
- private Boolean success;
- private String elementId;
- private String optionalMessage;
-
- public Response() {
-
- }
-
- public Response(String elementId, boolean success)
- {
- this(elementId, success, "");
- }
-
- public Response(String elementId, boolean success, String optionalMessage)
- {
- this.elementId = elementId;
- this.success = success;
- this.optionalMessage = optionalMessage;
- }
-
- public Boolean isSuccess() {
- return success;
- }
-
- public String getElementId() {
- return elementId;
- }
-
- public String getOptionalMessage() {
- return optionalMessage;
- }
-
- public void setSuccess(Boolean success) {
- this.success = success;
- }
-
- public void setElementId(String elementId) {
- this.elementId = elementId;
- }
-
- public void setOptionalMessage(String optionalMessage) {
- this.optionalMessage = optionalMessage;
- }
-
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + ((elementId == null) ? 0 : elementId.hashCode());
- result = prime * result + ((optionalMessage == null) ? 0 : optionalMessage.hashCode());
- result = prime * result + (success ? 1231 : 1237);
- return result;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- Response other = (Response) obj;
- if (elementId == null) {
- if (other.elementId != null)
- return false;
- } else if (!elementId.equals(other.elementId))
- return false;
- if (optionalMessage == null) {
- if (other.optionalMessage != null)
- return false;
- } else if (!optionalMessage.equals(other.optionalMessage))
- return false;
- return success == other.success;
- }
+ private Boolean success;
+ private String elementId;
+ private String optionalMessage;
+
+ public Response() {
+
+ }
+
+ public Response(String elementId, boolean success) {
+ this(elementId, success, "");
+ }
+
+ public Response(String elementId, boolean success, String optionalMessage) {
+ this.elementId = elementId;
+ this.success = success;
+ this.optionalMessage = optionalMessage;
+ }
+
+ public Boolean isSuccess() {
+ return success;
+ }
+
+ public String getElementId() {
+ return elementId;
+ }
+
+ public void setElementId(String elementId) {
+ this.elementId = elementId;
+ }
+
+ public String getOptionalMessage() {
+ return optionalMessage;
+ }
+
+ public void setOptionalMessage(String optionalMessage) {
+ this.optionalMessage = optionalMessage;
+ }
+
+ public void setSuccess(Boolean success) {
+ this.success = success;
+ }
+
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((elementId == null) ? 0 : elementId.hashCode());
+ result = prime * result + ((optionalMessage == null) ? 0 : optionalMessage.hashCode());
+ result = prime * result + (success ? 1231 : 1237);
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+ if (obj == null) {
+ return false;
+ }
+ if (getClass() != obj.getClass()) {
+ return false;
+ }
+ Response other = (Response) obj;
+ if (elementId == null) {
+ if (other.elementId != null) {
+ return false;
+ }
+ } else if (!elementId.equals(other.elementId)) {
+ return false;
+ }
+ if (optionalMessage == null) {
+ if (other.optionalMessage != null) {
+ return false;
+ }
+ } else if (!optionalMessage.equals(other.optionalMessage)) {
+ return false;
+ }
+ return success == other.success;
+ }
}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/SpDataSet.java b/streampipes-model/src/main/java/org/apache/streampipes/model/SpDataSet.java
index 3bbf25c1a..c997d8219 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/SpDataSet.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/SpDataSet.java
@@ -33,14 +33,13 @@ public class SpDataSet extends SpDataStream {
private String selectedEndpointUrl;
public SpDataSet(String uri, String name, String description, String iconUrl, List<EventStreamQualityDefinition>
- hasEventStreamQualities,
+ hasEventStreamQualities,
EventGrounding eventGrounding,
EventSchema eventSchema) {
super(uri, name, description, iconUrl, hasEventStreamQualities, eventGrounding, eventSchema);
}
- public SpDataSet(String uri, String name, String description, EventSchema eventSchema)
- {
+ public SpDataSet(String uri, String name, String description, EventSchema eventSchema) {
super(uri, name, description, eventSchema);
}
@@ -52,12 +51,14 @@ public class SpDataSet extends SpDataStream {
public SpDataSet(SpDataSet other) {
super(other);
this.datasetInvocationId = other.getDatasetInvocationId();
- if (other.getSupportedGrounding() != null) this.supportedGrounding = new EventGrounding(other.getSupportedGrounding());
+ if (other.getSupportedGrounding() != null) {
+ this.supportedGrounding = new EventGrounding(other.getSupportedGrounding());
+ }
}
public String getBrokerHostname() {
- if (getEventGrounding() == null || getEventGrounding().getTransportProtocol() == null ||
- getEventGrounding().getTransportProtocol().getBrokerHostname() == null) {
+ if (getEventGrounding() == null || getEventGrounding().getTransportProtocol() == null
+ || getEventGrounding().getTransportProtocol().getBrokerHostname() == null) {
return "";
} else {
return getEventGrounding().getTransportProtocol().getBrokerHostname();
@@ -65,12 +66,11 @@ public class SpDataSet extends SpDataStream {
}
public String getActualTopicName() {
- if (getEventGrounding() == null || getEventGrounding().getTransportProtocol() == null ||
- getEventGrounding().getTransportProtocol().getTopicDefinition() == null) {
+ if (getEventGrounding() == null || getEventGrounding().getTransportProtocol() == null
+ || getEventGrounding().getTransportProtocol().getTopicDefinition() == null) {
return "";
} else {
- return getEventGrounding().getTransportProtocol().getTopicDefinition()
- .getActualTopicName();
+ return getEventGrounding().getTransportProtocol().getTopicDefinition().getActualTopicName();
}
}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/SpDataStream.java b/streampipes-model/src/main/java/org/apache/streampipes/model/SpDataStream.java
index 2205c3abe..5aed03ccf 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/SpDataStream.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/SpDataStream.java
@@ -18,8 +18,6 @@
package org.apache.streampipes.model;
-import com.fasterxml.jackson.annotation.JsonSubTypes;
-import org.apache.commons.lang3.RandomStringUtils;
import org.apache.streampipes.model.base.NamedStreamPipesEntity;
import org.apache.streampipes.model.grounding.EventGrounding;
import org.apache.streampipes.model.quality.EventStreamQualityDefinition;
@@ -29,13 +27,16 @@ import org.apache.streampipes.model.quality.MeasurementObject;
import org.apache.streampipes.model.schema.EventSchema;
import org.apache.streampipes.model.util.Cloner;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import org.apache.commons.lang3.RandomStringUtils;
+
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
@JsonSubTypes({
- @JsonSubTypes.Type(SpDataStream.class),
- @JsonSubTypes.Type(SpDataSet.class)
+ @JsonSubTypes.Type(SpDataStream.class),
+ @JsonSubTypes.Type(SpDataSet.class)
})
public class SpDataStream extends NamedStreamPipesEntity {
@@ -54,14 +55,12 @@ public class SpDataStream extends NamedStreamPipesEntity {
protected List<MeasurementCapability> measurementCapability;
protected List<MeasurementObject> measurementObject;
-
+ protected List<String> category;
private int index;
-
private String correspondingAdapterId;
- protected List<String> category;
-
- public SpDataStream(String uri, String name, String description, String iconUrl, List<EventStreamQualityDefinition> hasEventStreamQualities,
+ public SpDataStream(String uri, String name, String description, String iconUrl,
+ List<EventStreamQualityDefinition> hasEventStreamQualities,
EventGrounding eventGrounding,
EventSchema eventSchema) {
super(uri, name, description, iconUrl);
@@ -92,10 +91,13 @@ public class SpDataStream extends NamedStreamPipesEntity {
this.eventSchema = new EventSchema(other.getEventSchema());
}
if (other.getHasEventStreamQualities() != null) {
- this.hasEventStreamQualities = other.getHasEventStreamQualities().stream().map(EventStreamQualityDefinition::new).collect(Collectors.toCollection(ArrayList::new));
+ this.hasEventStreamQualities = other.getHasEventStreamQualities().stream().map(EventStreamQualityDefinition::new)
+ .collect(Collectors.toCollection(ArrayList::new));
}
if (other.getRequiresEventStreamQualities() != null) {
- this.requiresEventStreamQualities = other.getRequiresEventStreamQualities().stream().map(EventStreamQualityRequirement::new).collect(Collectors.toCollection(ArrayList::new));
+ this.requiresEventStreamQualities =
+ other.getRequiresEventStreamQualities().stream().map(EventStreamQualityRequirement::new)
+ .collect(Collectors.toCollection(ArrayList::new));
}
if (other.getMeasurementCapability() != null) {
this.measurementCapability = new Cloner().mc(other.getMeasurementCapability());
@@ -110,7 +112,7 @@ public class SpDataStream extends NamedStreamPipesEntity {
}
public void setHasEventStreamQualities(
- List<EventStreamQualityDefinition> hasEventStreamQualities) {
+ List<EventStreamQualityDefinition> hasEventStreamQualities) {
this.hasEventStreamQualities = hasEventStreamQualities;
}
@@ -120,7 +122,7 @@ public class SpDataStream extends NamedStreamPipesEntity {
}
public void setRequiresEventStreamQualities(
- List<EventStreamQualityRequirement> requiresEventStreamQualities) {
+ List<EventStreamQualityRequirement> requiresEventStreamQualities) {
this.requiresEventStreamQualities = requiresEventStreamQualities;
}
@@ -145,7 +147,7 @@ public class SpDataStream extends NamedStreamPipesEntity {
}
public void setMeasurementCapability(
- List<MeasurementCapability> measurementCapability) {
+ List<MeasurementCapability> measurementCapability) {
this.measurementCapability = measurementCapability;
}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/SpDataStreamContainer.java b/streampipes-model/src/main/java/org/apache/streampipes/model/SpDataStreamContainer.java
index 93bf310af..075f303f9 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/SpDataStreamContainer.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/SpDataStreamContainer.java
@@ -27,8 +27,8 @@ public class SpDataStreamContainer extends UnnamedStreamPipesEntity {
private List<SpDataStream> list;
public SpDataStreamContainer() {
- super();
- this.list = new ArrayList<>();
+ super();
+ this.list = new ArrayList<>();
}
public SpDataStreamContainer(List<SpDataStream> dataStreams) {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/StreamPipesErrorMessage.java b/streampipes-model/src/main/java/org/apache/streampipes/model/StreamPipesErrorMessage.java
index aa25b5bc2..a52ee29e3 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/StreamPipesErrorMessage.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/StreamPipesErrorMessage.java
@@ -18,9 +18,10 @@
package org.apache.streampipes.model;
-import org.apache.commons.lang3.exception.ExceptionUtils;
import org.apache.streampipes.model.shared.annotation.TsModel;
+import org.apache.commons.lang3.exception.ExceptionUtils;
+
@TsModel
public class StreamPipesErrorMessage {
@@ -31,16 +32,6 @@ public class StreamPipesErrorMessage {
private String cause;
private String fullStackTrace;
- public static StreamPipesErrorMessage from(Exception exception) {
- String cause = exception.getCause() != null ? exception.getCause().getMessage() : exception.getMessage();
- return new StreamPipesErrorMessage(
- "error",
- exception.getMessage(),
- "",
- ExceptionUtils.getStackTrace(exception),
- cause);
- }
-
public StreamPipesErrorMessage() {
}
@@ -65,6 +56,16 @@ public class StreamPipesErrorMessage {
this.cause = cause;
}
+ public static StreamPipesErrorMessage from(Exception exception) {
+ String cause = exception.getCause() != null ? exception.getCause().getMessage() : exception.getMessage();
+ return new StreamPipesErrorMessage(
+ "error",
+ exception.getMessage(),
+ "",
+ ExceptionUtils.getStackTrace(exception),
+ cause);
+ }
+
public String getLevel() {
return level;
}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/Tuple2.java b/streampipes-model/src/main/java/org/apache/streampipes/model/Tuple2.java
index 11b783f05..ef5fe5b17 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/Tuple2.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/Tuple2.java
@@ -17,30 +17,36 @@
*/
package org.apache.streampipes.model;
-public class Tuple2<A, B> {
+public class Tuple2<K, V> {
- public final A a;
- public final B b;
+ public final K k;
+ public final V v;
- public Tuple2(A a, B b) {
- this.a = a;
- this.b = b;
+ public Tuple2(K k, V v) {
+ this.k = k;
+ this.v = v;
}
@Override
public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
Tuple2<?, ?> tuple = (Tuple2<?, ?>) o;
- if (!a.equals(tuple.a)) return false;
- return b.equals(tuple.b);
+ if (!k.equals(tuple.k)) {
+ return false;
+ }
+ return v.equals(tuple.v);
}
@Override
public int hashCode() {
- int result = a.hashCode();
- result = 31 * result + b.hashCode();
+ int result = k.hashCode();
+ result = 31 * result + v.hashCode();
return result;
}
}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/VirtualSensor.java b/streampipes-model/src/main/java/org/apache/streampipes/model/VirtualSensor.java
index 177cdb3cb..0034a96f8 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/VirtualSensor.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/VirtualSensor.java
@@ -22,31 +22,29 @@ import org.apache.streampipes.model.pipeline.ElementComposition;
public class VirtualSensor extends ElementComposition {
- protected String createdBy;
-
- protected int outputIndex;
-
- public VirtualSensor()
- {
- super();
- }
-
- public String getCreatedBy() {
- return createdBy;
- }
-
- public void setCreatedBy(String createdBy) {
- this.createdBy = createdBy;
- }
-
- public int getOutputIndex() {
- return outputIndex;
- }
-
- public void setOutputIndex(int outputIndex) {
- this.outputIndex = outputIndex;
- }
-
-
-
+ protected String createdBy;
+
+ protected int outputIndex;
+
+ public VirtualSensor() {
+ super();
+ }
+
+ public String getCreatedBy() {
+ return createdBy;
+ }
+
+ public void setCreatedBy(String createdBy) {
+ this.createdBy = createdBy;
+ }
+
+ public int getOutputIndex() {
+ return outputIndex;
+ }
+
+ public void setOutputIndex(int outputIndex) {
+ this.outputIndex = outputIndex;
+ }
+
+
}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/assets/AssetLink.java b/streampipes-model/src/main/java/org/apache/streampipes/model/assets/AssetLink.java
index 74d15f002..3617dc52f 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/assets/AssetLink.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/assets/AssetLink.java
@@ -73,8 +73,12 @@ public class AssetLink {
@Override
public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
AssetLink assetLink = (AssetLink) o;
return resourceId.equals(assetLink.resourceId) && queryHint.equals(assetLink.queryHint);
}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/assets/AssetLinkType.java b/streampipes-model/src/main/java/org/apache/streampipes/model/assets/AssetLinkType.java
index 79d6c2687..f2b045e97 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/assets/AssetLinkType.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/assets/AssetLinkType.java
@@ -18,9 +18,10 @@
package org.apache.streampipes.model.assets;
+import org.apache.streampipes.commons.constants.GenericDocTypes;
+
import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.gson.annotations.SerializedName;
-import org.apache.streampipes.commons.constants.GenericDocTypes;
import java.util.ArrayList;
import java.util.List;
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/assets/SpAssetModel.java b/streampipes-model/src/main/java/org/apache/streampipes/model/assets/SpAssetModel.java
index 99787aa0b..0140eafdf 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/assets/SpAssetModel.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/assets/SpAssetModel.java
@@ -18,13 +18,14 @@
package org.apache.streampipes.model.assets;
+import org.apache.streampipes.commons.constants.GenericDocTypes;
+
import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.gson.annotations.SerializedName;
-import org.apache.streampipes.commons.constants.GenericDocTypes;
public class SpAssetModel extends SpAsset {
- public static final String appDocType = GenericDocTypes.DOC_ASSET_MANGEMENT;
+ public static final String APP_DOC_TYPE = GenericDocTypes.DOC_ASSET_MANGEMENT;
@JsonProperty("_id")
private @SerializedName("_id") String id;
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/base/AbstractStreamPipesEntity.java b/streampipes-model/src/main/java/org/apache/streampipes/model/base/AbstractStreamPipesEntity.java
index d73a47642..0c1165d78 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/base/AbstractStreamPipesEntity.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/base/AbstractStreamPipesEntity.java
@@ -19,9 +19,10 @@
package org.apache.streampipes.model.base;
+import org.apache.streampipes.model.shared.annotation.TsModel;
+
import com.fasterxml.jackson.annotation.JsonTypeInfo;
import com.google.gson.annotations.SerializedName;
-import org.apache.streampipes.model.shared.annotation.TsModel;
import java.io.Serializable;
import java.util.Objects;
@@ -31,36 +32,40 @@ import java.util.Objects;
* top-level StreamPipes element
*/
-@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, property="@class")
+@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, property = "@class")
@TsModel
public class AbstractStreamPipesEntity implements Serializable {
- private static final long serialVersionUID = -8593749314663582071L;
+ private static final long serialVersionUID = -8593749314663582071L;
- protected @SerializedName("_id") String elementId;
+ protected @SerializedName("_id") String elementId;
- AbstractStreamPipesEntity() {
+ AbstractStreamPipesEntity() {
- }
+ }
- AbstractStreamPipesEntity(AbstractStreamPipesEntity other) {
- this.elementId = other.getElementId();
- }
+ AbstractStreamPipesEntity(AbstractStreamPipesEntity other) {
+ this.elementId = other.getElementId();
+ }
- public String getElementId() {
- return elementId;
- }
+ public String getElementId() {
+ return elementId;
+ }
- public void setElementId(String elementId) {
- this.elementId = elementId;
- }
+ public void setElementId(String elementId) {
+ this.elementId = elementId;
+ }
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
- AbstractStreamPipesEntity that = (AbstractStreamPipesEntity) o;
- return Objects.equals(elementId, that.elementId);
- }
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
+ AbstractStreamPipesEntity that = (AbstractStreamPipesEntity) o;
+ return Objects.equals(elementId, that.elementId);
+ }
}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/base/InvocableStreamPipesEntity.java b/streampipes-model/src/main/java/org/apache/streampipes/model/base/InvocableStreamPipesEntity.java
index e4a75171e..3a87cc5ba 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/base/InvocableStreamPipesEntity.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/base/InvocableStreamPipesEntity.java
@@ -73,7 +73,7 @@ public abstract class InvocableStreamPipesEntity extends NamedStreamPipesEntity
if (other.getStaticProperties() != null) {
this.staticProperties = new Cloner().staticProperties(other.getStaticProperties());
}
- this.DOM = other.getDOM();
+ this.dom = other.getDom();
if (other.getSupportedGrounding() != null) {
this.supportedGrounding = new EventGrounding(other.getSupportedGrounding());
}
@@ -178,7 +178,7 @@ public abstract class InvocableStreamPipesEntity extends NamedStreamPipesEntity
//public Logger getLogger(Class clazz, PeConfig peConfig) {
public Logger getLogger(Class clazz) {
- // return LoggerFactory.getPeLogger(clazz, getCorrespondingPipeline(), getUri(), peConfig);
+ //return LoggerFactory.getPeLogger(clazz, getCorrespondingPipeline(), getUri(), peConfig);
return LoggerFactory.getPeLogger(clazz, getCorrespondingPipeline(), getUri());
}
}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/base/NamedStreamPipesEntity.java b/streampipes-model/src/main/java/org/apache/streampipes/model/base/NamedStreamPipesEntity.java
index b714d5985..7d6aedfd3 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/base/NamedStreamPipesEntity.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/base/NamedStreamPipesEntity.java
@@ -19,11 +19,12 @@
package org.apache.streampipes.model.base;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.google.gson.annotations.SerializedName;
import org.apache.streampipes.model.ApplicationLink;
import org.apache.streampipes.model.util.Cloner;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.gson.annotations.SerializedName;
+
import java.util.ArrayList;
import java.util.List;
@@ -36,30 +37,19 @@ public abstract class NamedStreamPipesEntity extends AbstractStreamPipesEntity {
@JsonProperty("_rev")
protected @SerializedName("_rev") String rev;
-
+ protected String dom;
+ protected List<String> connectedTo;
private String name;
-
private String description;
-
private String iconUrl;
-
private String appId;
-
private boolean includesAssets;
-
private boolean includesLocales;
-
private List<String> includedAssets;
-
private List<String> includedLocales;
-
private List<ApplicationLink> applicationLinks;
-
private boolean internallyManaged;
- protected String DOM;
- protected List<String> connectedTo;
-
public NamedStreamPipesEntity() {
super();
@@ -95,7 +85,7 @@ public abstract class NamedStreamPipesEntity extends AbstractStreamPipesEntity {
this.name = other.getName();
this.iconUrl = other.getIconUrl();
this.elementId = other.getElementId();
- this.DOM = other.getDOM();
+ this.dom = other.getDom();
this.internallyManaged = other.isInternallyManaged();
this.connectedTo = other.getConnectedTo();
if (other.getApplicationLinks() != null) {
@@ -146,12 +136,12 @@ public abstract class NamedStreamPipesEntity extends AbstractStreamPipesEntity {
this.elementId = uri;
}
- public void setDOM(String DOM) {
- this.DOM = DOM;
+ public String getDom() {
+ return dom;
}
- public String getDOM() {
- return DOM;
+ public void setDom(String dom) {
+ this.dom = dom;
}
public List<String> getConnectedTo() {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/canvas/PipelineCanvasMetadata.java b/streampipes-model/src/main/java/org/apache/streampipes/model/canvas/PipelineCanvasMetadata.java
index d22c9be92..c110f4a6d 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/canvas/PipelineCanvasMetadata.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/canvas/PipelineCanvasMetadata.java
@@ -17,9 +17,10 @@
*/
package org.apache.streampipes.model.canvas;
+import org.apache.streampipes.model.shared.annotation.TsModel;
+
import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.gson.annotations.SerializedName;
-import org.apache.streampipes.model.shared.annotation.TsModel;
import java.util.List;
import java.util.Map;
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/adapter/AdapterDescription.java b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/adapter/AdapterDescription.java
index 613730ca4..efbcb7e1c 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/adapter/AdapterDescription.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/adapter/AdapterDescription.java
@@ -18,7 +18,6 @@
package org.apache.streampipes.model.connect.adapter;
-import com.fasterxml.jackson.annotation.JsonSubTypes;
import org.apache.streampipes.model.base.NamedStreamPipesEntity;
import org.apache.streampipes.model.connect.rules.TransformationRuleDescription;
import org.apache.streampipes.model.connect.rules.schema.SchemaTransformationRuleDescription;
@@ -35,6 +34,8 @@ import org.apache.streampipes.model.shared.annotation.TsModel;
import org.apache.streampipes.model.staticproperty.StaticProperty;
import org.apache.streampipes.model.util.Cloner;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -143,14 +144,14 @@ public abstract class AdapterDescription extends NamedStreamPipesEntity {
return config;
}
- public void addConfig(StaticProperty sp) {
- this.config.add(sp);
- }
-
public void setConfig(List<StaticProperty> config) {
this.config = config;
}
+ public void addConfig(StaticProperty sp) {
+ this.config.add(sp);
+ }
+
public String getAdapterType() {
return adapterType;
}
@@ -207,10 +208,7 @@ public abstract class AdapterDescription extends NamedStreamPipesEntity {
@Override
public String toString() {
- return "AdapterDescription{"
- + ", elementId='" + elementId + '\''
- + ", DOM='" + DOM + '\''
- + '}';
+ return String.format("AdapterDescription{elementId= '%s', DOM= '%s'}", elementId, dom);
}
public long getCreatedAt() {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/adapter/AdapterSetDescription.java b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/adapter/AdapterSetDescription.java
index 6d83ba869..1239c2cf9 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/adapter/AdapterSetDescription.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/adapter/AdapterSetDescription.java
@@ -18,37 +18,40 @@
package org.apache.streampipes.model.connect.adapter;
-import com.fasterxml.jackson.annotation.JsonSubTypes;
import org.apache.streampipes.model.SpDataSet;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+
@JsonSubTypes({
- @JsonSubTypes.Type(GenericAdapterSetDescription.class),
- @JsonSubTypes.Type(SpecificAdapterSetDescription.class)
+ @JsonSubTypes.Type(GenericAdapterSetDescription.class),
+ @JsonSubTypes.Type(SpecificAdapterSetDescription.class)
})
public abstract class AdapterSetDescription extends AdapterDescription {
- public AdapterSetDescription() {
- this.dataSet = new SpDataSet();
- }
+ private SpDataSet dataSet;
- public AdapterSetDescription(String uri, String name, String description) {
- super(uri, name, description);
- this.dataSet = new SpDataSet();
- }
+ public AdapterSetDescription() {
+ this.dataSet = new SpDataSet();
+ }
- public AdapterSetDescription(AdapterSetDescription other) {
- super(other);
- if (other.getDataSet() != null) this.setDataSet(new SpDataSet(other.getDataSet()));
- }
-
- private SpDataSet dataSet;
+ public AdapterSetDescription(String uri, String name, String description) {
+ super(uri, name, description);
+ this.dataSet = new SpDataSet();
+ }
- public SpDataSet getDataSet() {
- return dataSet;
+ public AdapterSetDescription(AdapterSetDescription other) {
+ super(other);
+ if (other.getDataSet() != null) {
+ this.setDataSet(new SpDataSet(other.getDataSet()));
}
+ }
- public void setDataSet(SpDataSet dataSet) {
- this.dataSet = dataSet;
- }
+ public SpDataSet getDataSet() {
+ return dataSet;
+ }
+
+ public void setDataSet(SpDataSet dataSet) {
+ this.dataSet = dataSet;
+ }
}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/adapter/AdapterStreamDescription.java b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/adapter/AdapterStreamDescription.java
index 0598ad86f..c047a69c9 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/adapter/AdapterStreamDescription.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/adapter/AdapterStreamDescription.java
@@ -17,50 +17,52 @@
*/
package org.apache.streampipes.model.connect.adapter;
-import com.fasterxml.jackson.annotation.JsonSubTypes;
+
import org.apache.streampipes.model.SpDataStream;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+
@JsonSubTypes({
- @JsonSubTypes.Type(SpecificAdapterStreamDescription.class),
- @JsonSubTypes.Type(SpecificAdapterStreamDescription.class)
+ @JsonSubTypes.Type(SpecificAdapterStreamDescription.class),
+ @JsonSubTypes.Type(SpecificAdapterStreamDescription.class)
})
public abstract class AdapterStreamDescription extends AdapterDescription {
- private SpDataStream dataStream;
+ private SpDataStream dataStream;
- private boolean running;
+ private boolean running;
- public AdapterStreamDescription() {
- super();
- this.dataStream = new SpDataStream();
- }
+ public AdapterStreamDescription() {
+ super();
+ this.dataStream = new SpDataStream();
+ }
- public AdapterStreamDescription(String elementId, String name, String description) {
- super(elementId, name, description);
- this.dataStream = new SpDataStream();
- }
+ public AdapterStreamDescription(String elementId, String name, String description) {
+ super(elementId, name, description);
+ this.dataStream = new SpDataStream();
+ }
- public AdapterStreamDescription(AdapterStreamDescription other) {
- super(other);
- this.running = other.isRunning();
- if (other.getDataStream() != null) {
- this.dataStream = new SpDataStream(other.getDataStream());
- }
+ public AdapterStreamDescription(AdapterStreamDescription other) {
+ super(other);
+ this.running = other.isRunning();
+ if (other.getDataStream() != null) {
+ this.dataStream = new SpDataStream(other.getDataStream());
}
+ }
- public SpDataStream getDataStream() {
- return dataStream;
- }
+ public SpDataStream getDataStream() {
+ return dataStream;
+ }
- public void setDataStream(SpDataStream dataStream) {
- this.dataStream = dataStream;
- }
+ public void setDataStream(SpDataStream dataStream) {
+ this.dataStream = dataStream;
+ }
- public boolean isRunning() {
- return running;
- }
+ public boolean isRunning() {
+ return running;
+ }
- public void setRunning(boolean running) {
- this.running = running;
- }
+ public void setRunning(boolean running) {
+ this.running = running;
+ }
}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/adapter/GenericAdapterDescription.java b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/adapter/GenericAdapterDescription.java
index 3d4699fb5..7468b79fa 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/adapter/GenericAdapterDescription.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/adapter/GenericAdapterDescription.java
@@ -27,13 +27,13 @@ import java.util.List;
public interface GenericAdapterDescription {
- ProtocolDescription getProtocolDescription();
+ ProtocolDescription getProtocolDescription();
- FormatDescription getFormatDescription();
+ FormatDescription getFormatDescription();
- List<TransformationRuleDescription> getRules();
+ List<TransformationRuleDescription> getRules();
- EventSchema getEventSchema();
+ EventSchema getEventSchema();
}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/adapter/GenericAdapterSetDescription.java b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/adapter/GenericAdapterSetDescription.java
index a26cfd24b..0779f7ae1 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/adapter/GenericAdapterSetDescription.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/adapter/GenericAdapterSetDescription.java
@@ -28,55 +28,59 @@ import org.apache.streampipes.model.util.ElementIdGenerator;
@TsModel
public class GenericAdapterSetDescription extends AdapterSetDescription implements GenericAdapterDescription {
- public static final String ID = ElementIdGenerator.makeFixedElementId(GenericAdapterSetDescription.class);
+ public static final String ID = ElementIdGenerator.makeFixedElementId(GenericAdapterSetDescription.class);
// private String sourceType = "org.apache.streampipes.model.connect.adapter.GenericAdapterSetDescription";
- private FormatDescription formatDescription;
+ private FormatDescription formatDescription;
- private ProtocolDescription protocolDescription;
+ private ProtocolDescription protocolDescription;
- public GenericAdapterSetDescription() {
- super(ID, "GenericAdapterSetDescription", "");
- }
+ public GenericAdapterSetDescription() {
+ super(ID, "GenericAdapterSetDescription", "");
+ }
- public GenericAdapterSetDescription(FormatDescription formatDescription, ProtocolSetDescription protocolDescription) {
- this.formatDescription = formatDescription;
- this.protocolDescription = protocolDescription;
- }
+ public GenericAdapterSetDescription(FormatDescription formatDescription, ProtocolSetDescription protocolDescription) {
+ this.formatDescription = formatDescription;
+ this.protocolDescription = protocolDescription;
+ }
- public GenericAdapterSetDescription(GenericAdapterSetDescription other) {
- super(other);
+ public GenericAdapterSetDescription(GenericAdapterSetDescription other) {
+ super(other);
- if (other.getFormatDescription() != null) this.formatDescription = new FormatDescription(other.getFormatDescription());
- if (other.getProtocolDescription() != null) this.protocolDescription = new ProtocolSetDescription(other.getProtocolDescription());
+ if (other.getFormatDescription() != null) {
+ this.formatDescription = new FormatDescription(other.getFormatDescription());
}
-
- public FormatDescription getFormatDescription() {
- return formatDescription;
+ if (other.getProtocolDescription() != null) {
+ this.protocolDescription = new ProtocolSetDescription(other.getProtocolDescription());
}
+ }
- @Override
- public EventSchema getEventSchema() {
- if (this.getDataSet() != null) {
- return this.getDataSet().getEventSchema();
- }
- return null;
- }
+ public FormatDescription getFormatDescription() {
+ return formatDescription;
+ }
- public void setFormatDescription(FormatDescription formatDescription) {
- this.formatDescription = formatDescription;
- }
+ public void setFormatDescription(FormatDescription formatDescription) {
+ this.formatDescription = formatDescription;
+ }
- public ProtocolDescription getProtocolDescription() {
- return protocolDescription;
+ @Override
+ public EventSchema getEventSchema() {
+ if (this.getDataSet() != null) {
+ return this.getDataSet().getEventSchema();
}
+ return null;
+ }
- public void setProtocolDescription(ProtocolDescription protocolDescription) {
- this.protocolDescription = protocolDescription;
- }
+ public ProtocolDescription getProtocolDescription() {
+ return protocolDescription;
+ }
+
+ public void setProtocolDescription(ProtocolDescription protocolDescription) {
+ this.protocolDescription = protocolDescription;
+ }
// public String getSourceType() {
// return sourceType;
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/adapter/GenericAdapterStreamDescription.java b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/adapter/GenericAdapterStreamDescription.java
index b116caae0..67a88aa87 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/adapter/GenericAdapterStreamDescription.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/adapter/GenericAdapterStreamDescription.java
@@ -47,18 +47,22 @@ public class GenericAdapterStreamDescription extends AdapterStreamDescription im
public GenericAdapterStreamDescription(GenericAdapterStreamDescription other) {
super(other);
- if (other.getFormatDescription() != null) {
- this.formatDescription = new FormatDescription(other.getFormatDescription());
- }
- if (other.getProtocolDescription() != null) {
- this.protocolDescription = new ProtocolStreamDescription(other.getProtocolDescription());
- }
+ if (other.getFormatDescription() != null) {
+ this.formatDescription = new FormatDescription(other.getFormatDescription());
+ }
+ if (other.getProtocolDescription() != null) {
+ this.protocolDescription = new ProtocolStreamDescription(other.getProtocolDescription());
+ }
}
public FormatDescription getFormatDescription() {
return formatDescription;
}
+ public void setFormatDescription(FormatDescription formatDescription) {
+ this.formatDescription = formatDescription;
+ }
+
@Override
public EventSchema getEventSchema() {
if (this.getDataStream() != null) {
@@ -67,10 +71,6 @@ public class GenericAdapterStreamDescription extends AdapterStreamDescription im
return null;
}
- public void setFormatDescription(FormatDescription formatDescription) {
- this.formatDescription = formatDescription;
- }
-
public ProtocolDescription getProtocolDescription() {
return protocolDescription;
}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/adapter/SpecificAdapterSetDescription.java b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/adapter/SpecificAdapterSetDescription.java
index a3fb416fe..6052a85a3 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/adapter/SpecificAdapterSetDescription.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/adapter/SpecificAdapterSetDescription.java
@@ -23,10 +23,10 @@ import org.apache.streampipes.model.shared.annotation.TsModel;
@TsModel
public class SpecificAdapterSetDescription extends AdapterSetDescription {
- public SpecificAdapterSetDescription() {
- }
+ public SpecificAdapterSetDescription() {
+ }
- public SpecificAdapterSetDescription(AdapterSetDescription other) {
- super(other);
- }
+ public SpecificAdapterSetDescription(AdapterSetDescription other) {
+ super(other);
+ }
}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/grounding/FormatDescription.java b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/grounding/FormatDescription.java
index ba6bb4094..a63472521 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/grounding/FormatDescription.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/grounding/FormatDescription.java
@@ -28,57 +28,55 @@ import java.util.List;
public class FormatDescription extends NamedStreamPipesEntity {
- private List<StaticProperty> config;
-
- private String formatType = "";
-
- public FormatDescription() {
- super();
- this.config = new ArrayList<>();
- }
-
- public FormatDescription(String uri, String name, String description) {
- super(uri, name, description);
- this.config = new ArrayList<>();
- }
-
- public FormatDescription(String uri, String name, String description, List<StaticProperty> config, String formatType) {
- super(uri, name, description);
- this.config = config;
- this.formatType = formatType;
- }
-
- public FormatDescription(FormatDescription other) {
- super(other);
- this.config = new Cloner().staticProperties(other.getConfig());
- this.formatType = other.getFormatType();
- }
-
- public void addConfig(StaticProperty sp) {
- this.config.add(sp);
- }
-
- public List<StaticProperty> getConfig() {
- return config;
- }
-
- public void setConfig(List<StaticProperty> config) {
- this.config = config;
- }
-
- public String getFormatType() {
- return formatType;
- }
-
- public void setFormatType(String formatType) {
- this.formatType = formatType;
- }
-
- @Override
- public String toString() {
- return "FormatDescription{" +
- "formatType=" + formatType +
- "config=" + config +
- '}';
- }
+ private List<StaticProperty> config;
+
+ private String formatType = "";
+
+ public FormatDescription() {
+ super();
+ this.config = new ArrayList<>();
+ }
+
+ public FormatDescription(String uri, String name, String description) {
+ super(uri, name, description);
+ this.config = new ArrayList<>();
+ }
+
+ public FormatDescription(String uri, String name, String description, List<StaticProperty> config,
+ String formatType) {
+ super(uri, name, description);
+ this.config = config;
+ this.formatType = formatType;
+ }
+
+ public FormatDescription(FormatDescription other) {
+ super(other);
+ this.config = new Cloner().staticProperties(other.getConfig());
+ this.formatType = other.getFormatType();
+ }
+
+ public void addConfig(StaticProperty sp) {
+ this.config.add(sp);
+ }
+
+ public List<StaticProperty> getConfig() {
+ return config;
+ }
+
+ public void setConfig(List<StaticProperty> config) {
+ this.config = config;
+ }
+
+ public String getFormatType() {
+ return formatType;
+ }
+
+ public void setFormatType(String formatType) {
+ this.formatType = formatType;
+ }
+
+ @Override
+ public String toString() {
+ return String.format("FormatDescription{formatType='%s', config='%s'}", formatType, config);
+ }
}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/grounding/ProtocolDescription.java b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/grounding/ProtocolDescription.java
index c643aa3c3..fe3efc108 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/grounding/ProtocolDescription.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/grounding/ProtocolDescription.java
@@ -29,63 +29,63 @@ import java.util.List;
@TsModel
public class ProtocolDescription extends NamedStreamPipesEntity {
- @Deprecated
- String sourceType;
+ @Deprecated
+ String sourceType;
- List<StaticProperty> config;
+ List<StaticProperty> config;
- private List<String> category;
+ private List<String> category;
- public ProtocolDescription() {
- this.config = new ArrayList<>();
- }
+ public ProtocolDescription() {
+ this.config = new ArrayList<>();
+ }
- public ProtocolDescription(String uri, String name, String description) {
- super(uri, name, description);
- this.config = new ArrayList<>();
- this.category = new ArrayList<>();
- }
+ public ProtocolDescription(String uri, String name, String description) {
+ super(uri, name, description);
+ this.config = new ArrayList<>();
+ this.category = new ArrayList<>();
+ }
- public ProtocolDescription(String uri, String name, String description, List<StaticProperty> config) {
- super(uri, name, description);
- this.config = config;
- this.category = new ArrayList<>();
- }
+ public ProtocolDescription(String uri, String name, String description, List<StaticProperty> config) {
+ super(uri, name, description);
+ this.config = config;
+ this.category = new ArrayList<>();
+ }
- public ProtocolDescription(ProtocolDescription other) {
- super(other);
+ public ProtocolDescription(ProtocolDescription other) {
+ super(other);
- this.config = new Cloner().staticProperties(other.getConfig());
- if (other.getCategory() != null) {
- this.category = new Cloner().epaTypes(other.getCategory());
- }
+ this.config = new Cloner().staticProperties(other.getConfig());
+ if (other.getCategory() != null) {
+ this.category = new Cloner().epaTypes(other.getCategory());
}
+ }
- public void addConfig(StaticProperty sp) {
- this.config.add(sp);
- }
+ public void addConfig(StaticProperty sp) {
+ this.config.add(sp);
+ }
- public List<StaticProperty> getConfig() {
- return config;
- }
+ public List<StaticProperty> getConfig() {
+ return config;
+ }
- public void setConfig(List<StaticProperty> config) {
- this.config = config;
- }
+ public void setConfig(List<StaticProperty> config) {
+ this.config = config;
+ }
- public String getSourceType() {
- return sourceType;
- }
+ public String getSourceType() {
+ return sourceType;
+ }
- public void setSourceType(String sourceType) {
- this.sourceType = sourceType;
- }
+ public void setSourceType(String sourceType) {
+ this.sourceType = sourceType;
+ }
- public List<String> getCategory() {
- return category;
- }
+ public List<String> getCategory() {
+ return category;
+ }
- public void setCategory(List<String> category) {
- this.category = category;
- }
+ public void setCategory(List<String> category) {
+ this.category = category;
+ }
}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/grounding/ProtocolSetDescription.java b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/grounding/ProtocolSetDescription.java
index ea5e9e6b2..6aece7d8c 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/grounding/ProtocolSetDescription.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/grounding/ProtocolSetDescription.java
@@ -24,18 +24,18 @@ import java.util.List;
public class ProtocolSetDescription extends ProtocolDescription {
- public ProtocolSetDescription() {
- }
+ public ProtocolSetDescription() {
+ }
- public ProtocolSetDescription(String uri, String name, String description) {
- super(uri, name, description);
- }
+ public ProtocolSetDescription(String uri, String name, String description) {
+ super(uri, name, description);
+ }
- public ProtocolSetDescription(String uri, String name, String description, List<StaticProperty> config) {
- super(uri, name, description, config);
- }
+ public ProtocolSetDescription(String uri, String name, String description, List<StaticProperty> config) {
+ super(uri, name, description, config);
+ }
- public ProtocolSetDescription(ProtocolDescription other) {
- super(other);
- }
+ public ProtocolSetDescription(ProtocolDescription other) {
+ super(other);
+ }
}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/grounding/ProtocolStreamDescription.java b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/grounding/ProtocolStreamDescription.java
index b67f9c33d..0e3899f6a 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/grounding/ProtocolStreamDescription.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/grounding/ProtocolStreamDescription.java
@@ -24,18 +24,18 @@ import java.util.List;
public class ProtocolStreamDescription extends ProtocolDescription {
- public ProtocolStreamDescription() {
- }
+ public ProtocolStreamDescription() {
+ }
- public ProtocolStreamDescription(String uri, String name, String description) {
- super(uri, name, description);
- }
+ public ProtocolStreamDescription(String uri, String name, String description) {
+ super(uri, name, description);
+ }
- public ProtocolStreamDescription(String uri, String name, String description, List<StaticProperty> config) {
- super(uri, name, description, config);
- }
+ public ProtocolStreamDescription(String uri, String name, String description, List<StaticProperty> config) {
+ super(uri, name, description, config);
+ }
- public ProtocolStreamDescription(ProtocolDescription other) {
- super(other);
- }
+ public ProtocolStreamDescription(ProtocolDescription other) {
+ super(other);
+ }
}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/guess/FieldStatusInfo.java b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/guess/FieldStatusInfo.java
index a66b83ddb..66599bcf0 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/guess/FieldStatusInfo.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/guess/FieldStatusInfo.java
@@ -24,6 +24,9 @@ public class FieldStatusInfo {
private String additionalInfo;
private boolean changesRequired;
+ public FieldStatusInfo() {
+ }
+
public static FieldStatusInfo good() {
var info = new FieldStatusInfo();
info.setFieldStatus(FieldStatus.GOOD);
@@ -40,9 +43,6 @@ public class FieldStatusInfo {
return info;
}
- public FieldStatusInfo() {
- }
-
public FieldStatus getFieldStatus() {
return fieldStatus;
}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/guess/GuessSchema.java b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/guess/GuessSchema.java
index ba39f8925..020de7710 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/guess/GuessSchema.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/guess/GuessSchema.java
@@ -30,47 +30,48 @@ import java.util.Map;
@TsModel
public class GuessSchema extends UnnamedStreamPipesEntity {
- public EventSchema eventSchema;
-
- public List<Map<String, GuessTypeInfo>> eventPreview;
-
- public Map<String, FieldStatusInfo> fieldStatusInfo;
-
- public GuessSchema() {
- super();
- this.eventPreview = new ArrayList<>();
- this.fieldStatusInfo = new HashMap<>();
- }
-
- public GuessSchema(GuessSchema other) {
- super(other);
- this.eventSchema = other.getEventSchema() != null ? new EventSchema(other.getEventSchema()) : null;
- this.eventPreview = other.getEventPreview();
- this.fieldStatusInfo = other.getFieldStatusInfo();
- }
- public EventSchema getEventSchema() {
- return eventSchema;
- }
-
- public void setEventSchema(EventSchema eventSchema) {
- this.eventSchema = eventSchema;
- }
-
- public List<Map<String, GuessTypeInfo>> getEventPreview() {
- return eventPreview;
- }
-
- public void setEventPreview(List<Map<String, GuessTypeInfo>> eventPreview) {
- this.eventPreview = eventPreview;
- }
-
- public Map<String, FieldStatusInfo> getFieldStatusInfo() {
- return fieldStatusInfo;
- }
-
- public void setFieldStatusInfo(Map<String, FieldStatusInfo> fieldStatusInfo) {
- this.fieldStatusInfo = fieldStatusInfo;
- }
+ public EventSchema eventSchema;
+
+ public List<Map<String, GuessTypeInfo>> eventPreview;
+
+ public Map<String, FieldStatusInfo> fieldStatusInfo;
+
+ public GuessSchema() {
+ super();
+ this.eventPreview = new ArrayList<>();
+ this.fieldStatusInfo = new HashMap<>();
+ }
+
+ public GuessSchema(GuessSchema other) {
+ super(other);
+ this.eventSchema = other.getEventSchema() != null ? new EventSchema(other.getEventSchema()) : null;
+ this.eventPreview = other.getEventPreview();
+ this.fieldStatusInfo = other.getFieldStatusInfo();
+ }
+
+ public EventSchema getEventSchema() {
+ return eventSchema;
+ }
+
+ public void setEventSchema(EventSchema eventSchema) {
+ this.eventSchema = eventSchema;
+ }
+
+ public List<Map<String, GuessTypeInfo>> getEventPreview() {
+ return eventPreview;
+ }
+
+ public void setEventPreview(List<Map<String, GuessTypeInfo>> eventPreview) {
+ this.eventPreview = eventPreview;
+ }
+
+ public Map<String, FieldStatusInfo> getFieldStatusInfo() {
+ return fieldStatusInfo;
+ }
+
+ public void setFieldStatusInfo(Map<String, FieldStatusInfo> fieldStatusInfo) {
+ this.fieldStatusInfo = fieldStatusInfo;
+ }
}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/DebugSinkRuleDescription.java b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/DebugSinkRuleDescription.java
index 41d1c6280..71ce76760 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/DebugSinkRuleDescription.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/DebugSinkRuleDescription.java
@@ -21,7 +21,7 @@ import org.apache.streampipes.model.shared.annotation.TsModel;
@TsModel
public class DebugSinkRuleDescription extends TransformationRuleDescription {
- public DebugSinkRuleDescription() {
- super();
- }
+ public DebugSinkRuleDescription() {
+ super();
+ }
}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/TransformationRuleDescription.java b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/TransformationRuleDescription.java
index 6042022e0..443f53601 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/TransformationRuleDescription.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/TransformationRuleDescription.java
@@ -18,7 +18,6 @@
package org.apache.streampipes.model.connect.rules;
-import com.fasterxml.jackson.annotation.JsonSubTypes;
import org.apache.streampipes.model.base.UnnamedStreamPipesEntity;
import org.apache.streampipes.model.connect.rules.schema.CreateNestedRuleDescription;
import org.apache.streampipes.model.connect.rules.schema.DeleteRuleDescription;
@@ -26,33 +25,40 @@ import org.apache.streampipes.model.connect.rules.schema.MoveRuleDescription;
import org.apache.streampipes.model.connect.rules.schema.RenameRuleDescription;
import org.apache.streampipes.model.connect.rules.stream.EventRateTransformationRuleDescription;
import org.apache.streampipes.model.connect.rules.stream.RemoveDuplicatesTransformationRuleDescription;
-import org.apache.streampipes.model.connect.rules.value.*;
+import org.apache.streampipes.model.connect.rules.value.AddTimestampRuleDescription;
+import org.apache.streampipes.model.connect.rules.value.AddValueTransformationRuleDescription;
+import org.apache.streampipes.model.connect.rules.value.ChangeDatatypeTransformationRuleDescription;
+import org.apache.streampipes.model.connect.rules.value.CorrectionValueTransformationRuleDescription;
+import org.apache.streampipes.model.connect.rules.value.TimestampTranfsformationRuleDescription;
+import org.apache.streampipes.model.connect.rules.value.UnitTransformRuleDescription;
import org.apache.streampipes.model.shared.annotation.TsModel;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+
@TsModel
@JsonSubTypes({
- @JsonSubTypes.Type(AddTimestampRuleDescription.class),
- @JsonSubTypes.Type(AddValueTransformationRuleDescription.class),
- @JsonSubTypes.Type(TimestampTranfsformationRuleDescription.class),
- @JsonSubTypes.Type(UnitTransformRuleDescription.class),
- @JsonSubTypes.Type(EventRateTransformationRuleDescription.class),
- @JsonSubTypes.Type(RemoveDuplicatesTransformationRuleDescription.class),
- @JsonSubTypes.Type(CreateNestedRuleDescription.class),
- @JsonSubTypes.Type(DeleteRuleDescription.class),
- @JsonSubTypes.Type(RenameRuleDescription.class),
- @JsonSubTypes.Type(MoveRuleDescription.class),
- @JsonSubTypes.Type(ChangeDatatypeTransformationRuleDescription.class),
- @JsonSubTypes.Type(CorrectionValueTransformationRuleDescription.class),
- @JsonSubTypes.Type(DebugSinkRuleDescription.class)
+ @JsonSubTypes.Type(AddTimestampRuleDescription.class),
+ @JsonSubTypes.Type(AddValueTransformationRuleDescription.class),
+ @JsonSubTypes.Type(TimestampTranfsformationRuleDescription.class),
+ @JsonSubTypes.Type(UnitTransformRuleDescription.class),
+ @JsonSubTypes.Type(EventRateTransformationRuleDescription.class),
+ @JsonSubTypes.Type(RemoveDuplicatesTransformationRuleDescription.class),
+ @JsonSubTypes.Type(CreateNestedRuleDescription.class),
+ @JsonSubTypes.Type(DeleteRuleDescription.class),
+ @JsonSubTypes.Type(RenameRuleDescription.class),
+ @JsonSubTypes.Type(MoveRuleDescription.class),
+ @JsonSubTypes.Type(ChangeDatatypeTransformationRuleDescription.class),
+ @JsonSubTypes.Type(CorrectionValueTransformationRuleDescription.class),
+ @JsonSubTypes.Type(DebugSinkRuleDescription.class)
})
public abstract class TransformationRuleDescription extends UnnamedStreamPipesEntity {
- public TransformationRuleDescription() {
- super();
- }
+ public TransformationRuleDescription() {
+ super();
+ }
- public TransformationRuleDescription(TransformationRuleDescription other) {
- super();
- }
+ public TransformationRuleDescription(TransformationRuleDescription other) {
+ super();
+ }
}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/schema/DeleteRuleDescription.java b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/schema/DeleteRuleDescription.java
index 9dafc166c..219cd84a9 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/schema/DeleteRuleDescription.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/schema/DeleteRuleDescription.java
@@ -20,28 +20,28 @@ package org.apache.streampipes.model.connect.rules.schema;
public class DeleteRuleDescription extends SchemaTransformationRuleDescription {
- private String runtimeKey;
+ private String runtimeKey;
- public DeleteRuleDescription() {
- super();
- }
+ public DeleteRuleDescription() {
+ super();
+ }
- public DeleteRuleDescription(String runtimeKey) {
- super();
- this.runtimeKey = runtimeKey;
- }
+ public DeleteRuleDescription(String runtimeKey) {
+ super();
+ this.runtimeKey = runtimeKey;
+ }
- public DeleteRuleDescription(DeleteRuleDescription other) {
- super(other);
- this.runtimeKey = other.getRuntimeKey();
- }
+ public DeleteRuleDescription(DeleteRuleDescription other) {
+ super(other);
+ this.runtimeKey = other.getRuntimeKey();
+ }
- public String getRuntimeKey() {
- return runtimeKey;
- }
+ public String getRuntimeKey() {
+ return runtimeKey;
+ }
- public void setRuntimeKey(String runtimeKey) {
- this.runtimeKey = runtimeKey;
- }
+ public void setRuntimeKey(String runtimeKey) {
+ this.runtimeKey = runtimeKey;
+ }
}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/schema/RenameRuleDescription.java b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/schema/RenameRuleDescription.java
index 1634e8dd7..b6ccf443a 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/schema/RenameRuleDescription.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/schema/RenameRuleDescription.java
@@ -20,39 +20,39 @@ package org.apache.streampipes.model.connect.rules.schema;
public class RenameRuleDescription extends SchemaTransformationRuleDescription {
- private String oldRuntimeKey;
+ private String oldRuntimeKey;
- private String newRuntimeKey;
+ private String newRuntimeKey;
- public RenameRuleDescription() {
- super();
- }
+ public RenameRuleDescription() {
+ super();
+ }
- public RenameRuleDescription(String oldRuntimeKey, String newRuntimeKey) {
- super();
- this.oldRuntimeKey = oldRuntimeKey;
- this.newRuntimeKey = newRuntimeKey;
- }
+ public RenameRuleDescription(String oldRuntimeKey, String newRuntimeKey) {
+ super();
+ this.oldRuntimeKey = oldRuntimeKey;
+ this.newRuntimeKey = newRuntimeKey;
+ }
- public RenameRuleDescription(RenameRuleDescription other) {
- super(other);
- this.oldRuntimeKey = other.getOldRuntimeKey();
- this.newRuntimeKey = other.getNewRuntimeKey();
- }
+ public RenameRuleDescription(RenameRuleDescription other) {
+ super(other);
+ this.oldRuntimeKey = other.getOldRuntimeKey();
+ this.newRuntimeKey = other.getNewRuntimeKey();
+ }
- public String getOldRuntimeKey() {
- return oldRuntimeKey;
- }
+ public String getOldRuntimeKey() {
+ return oldRuntimeKey;
+ }
- public void setOldRuntimeKey(String oldRuntimeKey) {
- this.oldRuntimeKey = oldRuntimeKey;
- }
+ public void setOldRuntimeKey(String oldRuntimeKey) {
+ this.oldRuntimeKey = oldRuntimeKey;
+ }
- public String getNewRuntimeKey() {
- return newRuntimeKey;
- }
+ public String getNewRuntimeKey() {
+ return newRuntimeKey;
+ }
- public void setNewRuntimeKey(String newRuntimeKey) {
- this.newRuntimeKey = newRuntimeKey;
- }
+ public void setNewRuntimeKey(String newRuntimeKey) {
+ this.newRuntimeKey = newRuntimeKey;
+ }
}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/schema/SchemaTransformationRuleDescription.java b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/schema/SchemaTransformationRuleDescription.java
index a996c8080..ce9b7f252 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/schema/SchemaTransformationRuleDescription.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/schema/SchemaTransformationRuleDescription.java
@@ -22,12 +22,12 @@ import org.apache.streampipes.model.connect.rules.TransformationRuleDescription;
public abstract class SchemaTransformationRuleDescription extends TransformationRuleDescription {
- public SchemaTransformationRuleDescription() {
- super();
- }
+ public SchemaTransformationRuleDescription() {
+ super();
+ }
- public SchemaTransformationRuleDescription(TransformationRuleDescription other) {
- super();
- }
+ public SchemaTransformationRuleDescription(TransformationRuleDescription other) {
+ super();
+ }
}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/stream/EventRateTransformationRuleDescription.java b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/stream/EventRateTransformationRuleDescription.java
index c37a889a0..8d73a3d4c 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/stream/EventRateTransformationRuleDescription.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/stream/EventRateTransformationRuleDescription.java
@@ -20,35 +20,35 @@ package org.apache.streampipes.model.connect.rules.stream;
public class EventRateTransformationRuleDescription extends StreamTransformationRuleDescription {
- private long aggregationTimeWindow;
+ private long aggregationTimeWindow;
- //None (Values from last event), max, min, mean, sum (of the values in the time window)
- private String aggregationType;
+ //None (Values from last event), max, min, mean, sum (of the values in the time window)
+ private String aggregationType;
- public EventRateTransformationRuleDescription() {
+ public EventRateTransformationRuleDescription() {
- }
+ }
- public EventRateTransformationRuleDescription(EventRateTransformationRuleDescription other) {
- super(other);
- this.aggregationTimeWindow = other.getAggregationTimeWindow();
- this.aggregationType = other.getAggregationType();
- }
+ public EventRateTransformationRuleDescription(EventRateTransformationRuleDescription other) {
+ super(other);
+ this.aggregationTimeWindow = other.getAggregationTimeWindow();
+ this.aggregationType = other.getAggregationType();
+ }
- public long getAggregationTimeWindow() {
- return aggregationTimeWindow;
- }
+ public long getAggregationTimeWindow() {
+ return aggregationTimeWindow;
+ }
- public void setAggregationTimeWindow(long aggregationTimeWindow) {
- this.aggregationTimeWindow = aggregationTimeWindow;
- }
+ public void setAggregationTimeWindow(long aggregationTimeWindow) {
+ this.aggregationTimeWindow = aggregationTimeWindow;
+ }
- public String getAggregationType() {
- return aggregationType;
- }
+ public String getAggregationType() {
+ return aggregationType;
+ }
- public void setAggregationType(String aggregationTypes) {
- this.aggregationType = aggregationTypes;
- }
+ public void setAggregationType(String aggregationTypes) {
+ this.aggregationType = aggregationTypes;
+ }
}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/stream/RemoveDuplicatesTransformationRuleDescription.java b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/stream/RemoveDuplicatesTransformationRuleDescription.java
index 0a69a1bee..0c67496d4 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/stream/RemoveDuplicatesTransformationRuleDescription.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/stream/RemoveDuplicatesTransformationRuleDescription.java
@@ -20,22 +20,22 @@ package org.apache.streampipes.model.connect.rules.stream;
public class RemoveDuplicatesTransformationRuleDescription extends StreamTransformationRuleDescription {
- private String filterTimeWindow;
+ private String filterTimeWindow;
- public RemoveDuplicatesTransformationRuleDescription() {
- super();
- }
+ public RemoveDuplicatesTransformationRuleDescription() {
+ super();
+ }
- public RemoveDuplicatesTransformationRuleDescription(RemoveDuplicatesTransformationRuleDescription other) {
- super(other);
- this.filterTimeWindow = other.getFilterTimeWindow();
- }
+ public RemoveDuplicatesTransformationRuleDescription(RemoveDuplicatesTransformationRuleDescription other) {
+ super(other);
+ this.filterTimeWindow = other.getFilterTimeWindow();
+ }
- public String getFilterTimeWindow() {
- return filterTimeWindow;
- }
+ public String getFilterTimeWindow() {
+ return filterTimeWindow;
+ }
- public void setFilterTimeWindow(String filterTimeWindow) {
- this.filterTimeWindow = filterTimeWindow;
- }
+ public void setFilterTimeWindow(String filterTimeWindow) {
+ this.filterTimeWindow = filterTimeWindow;
+ }
}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/stream/StreamTransformationRuleDescription.java b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/stream/StreamTransformationRuleDescription.java
index 5e6bca24c..76d3436e2 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/stream/StreamTransformationRuleDescription.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/stream/StreamTransformationRuleDescription.java
@@ -18,20 +18,21 @@
package org.apache.streampipes.model.connect.rules.stream;
-import com.fasterxml.jackson.annotation.JsonSubTypes;
import org.apache.streampipes.model.connect.rules.TransformationRuleDescription;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+
@JsonSubTypes({
- @JsonSubTypes.Type(EventRateTransformationRuleDescription.class),
- @JsonSubTypes.Type(RemoveDuplicatesTransformationRuleDescription.class),
+ @JsonSubTypes.Type(EventRateTransformationRuleDescription.class),
+ @JsonSubTypes.Type(RemoveDuplicatesTransformationRuleDescription.class),
})
public abstract class StreamTransformationRuleDescription extends TransformationRuleDescription {
- public StreamTransformationRuleDescription() {
- super();
- }
+ public StreamTransformationRuleDescription() {
+ super();
+ }
- public StreamTransformationRuleDescription(TransformationRuleDescription other) {
- super();
- }
+ public StreamTransformationRuleDescription(TransformationRuleDescription other) {
+ super();
+ }
}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/value/AddTimestampRuleDescription.java b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/value/AddTimestampRuleDescription.java
index 572c37c70..fcfd3a3f8 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/value/AddTimestampRuleDescription.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/value/AddTimestampRuleDescription.java
@@ -20,22 +20,22 @@ package org.apache.streampipes.model.connect.rules.value;
public class AddTimestampRuleDescription extends ValueTransformationRuleDescription {
- private String runtimeKey;
+ private String runtimeKey;
- public AddTimestampRuleDescription() {
- super();
- }
+ public AddTimestampRuleDescription() {
+ super();
+ }
- public AddTimestampRuleDescription(AddTimestampRuleDescription other) {
- super(other);
- this.runtimeKey = other.getRuntimeKey();
- }
+ public AddTimestampRuleDescription(AddTimestampRuleDescription other) {
+ super(other);
+ this.runtimeKey = other.getRuntimeKey();
+ }
- public String getRuntimeKey() {
- return runtimeKey;
- }
+ public String getRuntimeKey() {
+ return runtimeKey;
+ }
- public void setRuntimeKey(String runtimeKey) {
- this.runtimeKey = runtimeKey;
- }
+ public void setRuntimeKey(String runtimeKey) {
+ this.runtimeKey = runtimeKey;
+ }
}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/value/AddValueTransformationRuleDescription.java b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/value/AddValueTransformationRuleDescription.java
index 19e068b42..d2adb1094 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/value/AddValueTransformationRuleDescription.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/value/AddValueTransformationRuleDescription.java
@@ -20,33 +20,33 @@ package org.apache.streampipes.model.connect.rules.value;
public class AddValueTransformationRuleDescription extends ValueTransformationRuleDescription {
- private String runtimeKey;
+ private String runtimeKey;
- private String staticValue;
+ private String staticValue;
- public AddValueTransformationRuleDescription() {
- super();
- }
+ public AddValueTransformationRuleDescription() {
+ super();
+ }
- public AddValueTransformationRuleDescription(AddValueTransformationRuleDescription other) {
- super(other);
- this.runtimeKey = other.getRuntimeKey();
- this.staticValue = other.getStaticValue();
- }
+ public AddValueTransformationRuleDescription(AddValueTransformationRuleDescription other) {
+ super(other);
+ this.runtimeKey = other.getRuntimeKey();
+ this.staticValue = other.getStaticValue();
+ }
- public String getRuntimeKey() {
- return runtimeKey;
- }
+ public String getRuntimeKey() {
+ return runtimeKey;
+ }
- public void setRuntimeKey(String runtimeKey) {
- this.runtimeKey = runtimeKey;
- }
+ public void setRuntimeKey(String runtimeKey) {
+ this.runtimeKey = runtimeKey;
+ }
- public String getStaticValue() {
- return staticValue;
- }
+ public String getStaticValue() {
+ return staticValue;
+ }
- public void setStaticValue(String staticValue) {
- this.staticValue = staticValue;
- }
+ public void setStaticValue(String staticValue) {
+ this.staticValue = staticValue;
+ }
}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/value/CorrectionValueTransformationRuleDescription.java b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/value/CorrectionValueTransformationRuleDescription.java
index 2041482e5..774775121 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/value/CorrectionValueTransformationRuleDescription.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/value/CorrectionValueTransformationRuleDescription.java
@@ -1,4 +1,4 @@
-package org.apache.streampipes.model.connect.rules.value;/*
+/*
* 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.
@@ -16,52 +16,54 @@ package org.apache.streampipes.model.connect.rules.value;/*
*
*/
+package org.apache.streampipes.model.connect.rules.value;
+
public class CorrectionValueTransformationRuleDescription extends ValueTransformationRuleDescription {
- private String runtimeKey;
+ private String runtimeKey;
- private double correctionValue;
+ private double correctionValue;
- private String operator;
+ private String operator;
- public CorrectionValueTransformationRuleDescription() {
- super();
- }
+ public CorrectionValueTransformationRuleDescription() {
+ super();
+ }
- public CorrectionValueTransformationRuleDescription(String runtimeKey, double correctionValue, String operator) {
- this.runtimeKey = runtimeKey;
- this.correctionValue = correctionValue;
- this.operator = operator;
- }
+ public CorrectionValueTransformationRuleDescription(String runtimeKey, double correctionValue, String operator) {
+ this.runtimeKey = runtimeKey;
+ this.correctionValue = correctionValue;
+ this.operator = operator;
+ }
- public CorrectionValueTransformationRuleDescription(CorrectionValueTransformationRuleDescription other) {
- super(other);
- this.runtimeKey = other.getRuntimeKey();
- this.correctionValue = other.getCorrectionValue();
- this.operator = other.getOperator();
- }
+ public CorrectionValueTransformationRuleDescription(CorrectionValueTransformationRuleDescription other) {
+ super(other);
+ this.runtimeKey = other.getRuntimeKey();
+ this.correctionValue = other.getCorrectionValue();
+ this.operator = other.getOperator();
+ }
- public String getRuntimeKey() {
- return runtimeKey;
- }
+ public String getRuntimeKey() {
+ return runtimeKey;
+ }
- public void setRuntimeKey(String runtimeKey) {
- this.runtimeKey = runtimeKey;
- }
+ public void setRuntimeKey(String runtimeKey) {
+ this.runtimeKey = runtimeKey;
+ }
- public double getCorrectionValue() {
- return correctionValue;
- }
+ public double getCorrectionValue() {
+ return correctionValue;
+ }
- public void setCorrectionValue(double correctionValue) {
- this.correctionValue = correctionValue;
- }
+ public void setCorrectionValue(double correctionValue) {
+ this.correctionValue = correctionValue;
+ }
- public String getOperator() {
- return operator;
- }
+ public String getOperator() {
+ return operator;
+ }
- public void setOperator(String operator) {
- this.operator = operator;
- }
+ public void setOperator(String operator) {
+ this.operator = operator;
+ }
}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/value/TimestampTranfsformationRuleDescription.java b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/value/TimestampTranfsformationRuleDescription.java
index 951fa218a..dd19158fc 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/value/TimestampTranfsformationRuleDescription.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/value/TimestampTranfsformationRuleDescription.java
@@ -20,63 +20,63 @@ package org.apache.streampipes.model.connect.rules.value;
public class TimestampTranfsformationRuleDescription extends ValueTransformationRuleDescription {
- private String runtimeKey;
+ private String runtimeKey;
- private String mode;
+ private String mode;
- private String formatString;
+ private String formatString;
- private long multiplier;
+ private long multiplier;
- public TimestampTranfsformationRuleDescription() {
- super();
- }
+ public TimestampTranfsformationRuleDescription() {
+ super();
+ }
- public TimestampTranfsformationRuleDescription(String runtimeKey, String mode,
- String formatString, Long multiplier) {
- this.runtimeKey = runtimeKey;
- this.mode = mode;
- this.formatString = formatString;
- this.multiplier = multiplier;
- }
+ public TimestampTranfsformationRuleDescription(String runtimeKey, String mode,
+ String formatString, Long multiplier) {
+ this.runtimeKey = runtimeKey;
+ this.mode = mode;
+ this.formatString = formatString;
+ this.multiplier = multiplier;
+ }
- public TimestampTranfsformationRuleDescription(TimestampTranfsformationRuleDescription other) {
- super(other);
- this.runtimeKey = other.getRuntimeKey();
- this.mode = other.getMode();
- this.formatString = other.getFormatString();
- this.multiplier = other.getMultiplier();
- }
+ public TimestampTranfsformationRuleDescription(TimestampTranfsformationRuleDescription other) {
+ super(other);
+ this.runtimeKey = other.getRuntimeKey();
+ this.mode = other.getMode();
+ this.formatString = other.getFormatString();
+ this.multiplier = other.getMultiplier();
+ }
- public String getRuntimeKey() {
- return runtimeKey;
- }
+ public String getRuntimeKey() {
+ return runtimeKey;
+ }
- public void setRuntimeKey(String runtimeKey) {
- this.runtimeKey = runtimeKey;
- }
+ public void setRuntimeKey(String runtimeKey) {
+ this.runtimeKey = runtimeKey;
+ }
- public String getMode() {
- return mode;
- }
+ public String getMode() {
+ return mode;
+ }
- public void setMode(String mode) {
- this.mode = mode;
- }
+ public void setMode(String mode) {
+ this.mode = mode;
+ }
- public String getFormatString() {
- return formatString;
- }
+ public String getFormatString() {
+ return formatString;
+ }
- public void setFormatString(String formatString) {
- this.formatString = formatString;
- }
+ public void setFormatString(String formatString) {
+ this.formatString = formatString;
+ }
- public long getMultiplier() {
- return multiplier;
- }
+ public long getMultiplier() {
+ return multiplier;
+ }
- public void setMultiplier(long multiplier) {
- this.multiplier = multiplier;
- }
+ public void setMultiplier(long multiplier) {
+ this.multiplier = multiplier;
+ }
}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/value/TimestampTransformationRuleMode.java b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/value/TimestampTransformationRuleMode.java
index 2afd46bf9..fbec7e64d 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/value/TimestampTransformationRuleMode.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/value/TimestampTransformationRuleMode.java
@@ -21,6 +21,6 @@ package org.apache.streampipes.model.connect.rules.value;
public class TimestampTransformationRuleMode {
- public static final String FORMAT_STRING = "formatString";
- public static final String TIME_UNIT = "timeUnit";
+ public static final String FORMAT_STRING = "formatString";
+ public static final String TIME_UNIT = "timeUnit";
}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/value/UnitTransformRuleDescription.java b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/value/UnitTransformRuleDescription.java
index 6641f47ff..ae5c56cfb 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/value/UnitTransformRuleDescription.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/value/UnitTransformRuleDescription.java
@@ -20,51 +20,51 @@ package org.apache.streampipes.model.connect.rules.value;
public class UnitTransformRuleDescription extends ValueTransformationRuleDescription {
- private String runtimeKey;
+ private String runtimeKey;
- private String fromUnitRessourceURL;
+ private String fromUnitRessourceURL;
- private String toUnitRessourceURL;
+ private String toUnitRessourceURL;
- public UnitTransformRuleDescription() {
- super();
- }
+ public UnitTransformRuleDescription() {
+ super();
+ }
- public UnitTransformRuleDescription(String runtimeKey, String fromUnitRessourceURL, String toUnit) {
- super();
- this.runtimeKey = runtimeKey;
- this.fromUnitRessourceURL = fromUnitRessourceURL;
- this.toUnitRessourceURL = toUnit;
- }
+ public UnitTransformRuleDescription(String runtimeKey, String fromUnitRessourceURL, String toUnit) {
+ super();
+ this.runtimeKey = runtimeKey;
+ this.fromUnitRessourceURL = fromUnitRessourceURL;
+ this.toUnitRessourceURL = toUnit;
+ }
- public UnitTransformRuleDescription(UnitTransformRuleDescription other) {
- super(other);
- this.runtimeKey = other.getRuntimeKey();
- this.fromUnitRessourceURL = other.getFromUnitRessourceURL();
- this.toUnitRessourceURL = other.getToUnitRessourceURL();
- }
+ public UnitTransformRuleDescription(UnitTransformRuleDescription other) {
+ super(other);
+ this.runtimeKey = other.getRuntimeKey();
+ this.fromUnitRessourceURL = other.getFromUnitRessourceURL();
+ this.toUnitRessourceURL = other.getToUnitRessourceURL();
+ }
- public String getRuntimeKey() {
- return runtimeKey;
- }
+ public String getRuntimeKey() {
+ return runtimeKey;
+ }
- public void setRuntimeKey(String runtimeKey) {
- this.runtimeKey = runtimeKey;
- }
+ public void setRuntimeKey(String runtimeKey) {
+ this.runtimeKey = runtimeKey;
+ }
- public String getFromUnitRessourceURL() {
- return fromUnitRessourceURL;
- }
+ public String getFromUnitRessourceURL() {
+ return fromUnitRessourceURL;
+ }
- public void setFromUnitRessourceURL(String fromUnitRessourceURL) {
- this.fromUnitRessourceURL = fromUnitRessourceURL;
- }
+ public void setFromUnitRessourceURL(String fromUnitRessourceURL) {
+ this.fromUnitRessourceURL = fromUnitRessourceURL;
+ }
- public String getToUnitRessourceURL() {
- return toUnitRessourceURL;
- }
+ public String getToUnitRessourceURL() {
+ return toUnitRessourceURL;
+ }
- public void setToUnitRessourceURL(String toUnitRessourceURL) {
- this.toUnitRessourceURL = toUnitRessourceURL;
- }
+ public void setToUnitRessourceURL(String toUnitRessourceURL) {
+ this.toUnitRessourceURL = toUnitRessourceURL;
+ }
}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/value/ValueTransformationRuleDescription.java b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/value/ValueTransformationRuleDescription.java
index e3063b07e..dee07a215 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/value/ValueTransformationRuleDescription.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/value/ValueTransformationRuleDescription.java
@@ -18,23 +18,24 @@
package org.apache.streampipes.model.connect.rules.value;
-import com.fasterxml.jackson.annotation.JsonSubTypes;
import org.apache.streampipes.model.connect.rules.TransformationRuleDescription;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+
@JsonSubTypes({
- @JsonSubTypes.Type(AddTimestampRuleDescription.class),
- @JsonSubTypes.Type(AddValueTransformationRuleDescription.class),
- @JsonSubTypes.Type(TimestampTranfsformationRuleDescription.class),
- @JsonSubTypes.Type(UnitTransformRuleDescription.class),
- @JsonSubTypes.Type(CorrectionValueTransformationRuleDescription.class),
+ @JsonSubTypes.Type(AddTimestampRuleDescription.class),
+ @JsonSubTypes.Type(AddValueTransformationRuleDescription.class),
+ @JsonSubTypes.Type(TimestampTranfsformationRuleDescription.class),
+ @JsonSubTypes.Type(UnitTransformRuleDescription.class),
+ @JsonSubTypes.Type(CorrectionValueTransformationRuleDescription.class),
})
public abstract class ValueTransformationRuleDescription extends TransformationRuleDescription {
- public ValueTransformationRuleDescription() {
- super();
- }
+ public ValueTransformationRuleDescription() {
+ super();
+ }
- public ValueTransformationRuleDescription(TransformationRuleDescription other) {
- super();
- }
+ public ValueTransformationRuleDescription(TransformationRuleDescription other) {
+ super();
+ }
}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/unit/UnitDescription.java b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/unit/UnitDescription.java
index 28a0cbac1..41ea29328 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/unit/UnitDescription.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/unit/UnitDescription.java
@@ -20,31 +20,31 @@ package org.apache.streampipes.model.connect.unit;
public class UnitDescription {
- private String resource;
- private String label;
+ private String resource;
+ private String label;
- public UnitDescription() {
- }
+ public UnitDescription() {
+ }
- public UnitDescription(String resource, String label) {
- this.resource = resource;
- this.label = label;
- }
+ public UnitDescription(String resource, String label) {
+ this.resource = resource;
+ this.label = label;
+ }
- public String getResource() {
- return resource;
- }
+ public String getResource() {
+ return resource;
+ }
- public void setResource(String resource) {
- this.resource = resource;
- }
+ public void setResource(String resource) {
+ this.resource = resource;
+ }
- public String getLabel() {
- return label;
- }
+ public String getLabel() {
+ return label;
+ }
- public void setLabel(String label) {
- this.label = label;
- }
+ public void setLabel(String label) {
+ this.label = label;
+ }
}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/dashboard/DashboardEntity.java b/streampipes-model/src/main/java/org/apache/streampipes/model/dashboard/DashboardEntity.java
index dca69f2a4..5ef0f8e09 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/dashboard/DashboardEntity.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/dashboard/DashboardEntity.java
@@ -18,14 +18,15 @@
package org.apache.streampipes.model.dashboard;
+import org.apache.streampipes.model.datalake.DataExplorerWidgetModel;
+
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonSubTypes;
import com.google.gson.annotations.SerializedName;
-import org.apache.streampipes.model.datalake.DataExplorerWidgetModel;
@JsonSubTypes({
- @JsonSubTypes.Type(DashboardWidgetModel.class),
- @JsonSubTypes.Type(DataExplorerWidgetModel.class)
+ @JsonSubTypes.Type(DashboardWidgetModel.class),
+ @JsonSubTypes.Type(DataExplorerWidgetModel.class)
})
public abstract class DashboardEntity {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/dashboard/DashboardItem.java b/streampipes-model/src/main/java/org/apache/streampipes/model/dashboard/DashboardItem.java
index 1de237bc7..c7962b041 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/dashboard/DashboardItem.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/dashboard/DashboardItem.java
@@ -59,7 +59,7 @@ public class DashboardItem {
public void setComponent(String component) {
this.component = component;
}
-
+
public List<String> getSettings() {
return settings;
}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/dashboard/DashboardModel.java b/streampipes-model/src/main/java/org/apache/streampipes/model/dashboard/DashboardModel.java
index dcf43e681..5c001011c 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/dashboard/DashboardModel.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/dashboard/DashboardModel.java
@@ -18,9 +18,10 @@
package org.apache.streampipes.model.dashboard;
+import org.apache.streampipes.model.shared.annotation.TsModel;
+
import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.gson.annotations.SerializedName;
-import org.apache.streampipes.model.shared.annotation.TsModel;
import java.util.HashMap;
import java.util.List;
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/dashboard/DashboardWidgetModel.java b/streampipes-model/src/main/java/org/apache/streampipes/model/dashboard/DashboardWidgetModel.java
index 7f7e732b4..5308789df 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/dashboard/DashboardWidgetModel.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/dashboard/DashboardWidgetModel.java
@@ -25,7 +25,7 @@ public class DashboardWidgetModel extends DashboardEntity {
private String widgetId;
- private String widgetType;
+ private String widgetType;
private DashboardWidgetSettings dashboardWidgetSettings;
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/datalake/DataExplorerWidgetModel.java b/streampipes-model/src/main/java/org/apache/streampipes/model/datalake/DataExplorerWidgetModel.java
index 0934c9a2b..2371363ac 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/datalake/DataExplorerWidgetModel.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/datalake/DataExplorerWidgetModel.java
@@ -18,9 +18,10 @@
package org.apache.streampipes.model.datalake;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import org.apache.streampipes.model.dashboard.DashboardEntity;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+
import java.util.HashMap;
import java.util.Map;
@@ -30,20 +31,19 @@ public class DataExplorerWidgetModel extends DashboardEntity {
private String widgetType;
- @JsonSerialize(using = CustomMapSerializer.class, as=Map.class)
+ @JsonSerialize(using = CustomMapSerializer.class, as = Map.class)
private Map<String, Object> baseAppearanceConfig;
- @JsonSerialize(using = CustomMapSerializer.class, as=Map.class)
+ @JsonSerialize(using = CustomMapSerializer.class, as = Map.class)
private Map<String, Object> visualizationConfig;
- @JsonSerialize(using = CustomMapSerializer.class, as=Map.class)
+ @JsonSerialize(using = CustomMapSerializer.class, as = Map.class)
private Map<String, Object> dataConfig;
private String pipelineId;
private String measureName;
-
public DataExplorerWidgetModel() {
super();
this.baseAppearanceConfig = new HashMap<>();
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/datalake/DataLakeConfiguration.java b/streampipes-model/src/main/java/org/apache/streampipes/model/datalake/DataLakeConfiguration.java
index 06d649145..a36e05788 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/datalake/DataLakeConfiguration.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/datalake/DataLakeConfiguration.java
@@ -23,56 +23,57 @@ import java.util.List;
public class DataLakeConfiguration {
- private Integer batchSize;
- private Integer flushDuration;
+ private Integer batchSize;
+ private Integer flushDuration;
- private List<DataLakeRetentionPolicy> retentionPolicies;
+ private List<DataLakeRetentionPolicy> retentionPolicies;
- public DataLakeConfiguration() {
- this.batchSize = 2000;
- this.flushDuration = 500;
- this.retentionPolicies = new ArrayList<DataLakeRetentionPolicy>();
- }
+ public DataLakeConfiguration() {
+ this.batchSize = 2000;
+ this.flushDuration = 500;
+ this.retentionPolicies = new ArrayList<DataLakeRetentionPolicy>();
+ }
- public DataLakeConfiguration(List<DataLakeRetentionPolicy> retentionPolicies) {
- this.batchSize = 2000;
- this.flushDuration = 500;
- this.retentionPolicies = retentionPolicies;
- }
+ public DataLakeConfiguration(List<DataLakeRetentionPolicy> retentionPolicies) {
+ this.batchSize = 2000;
+ this.flushDuration = 500;
+ this.retentionPolicies = retentionPolicies;
+ }
- public DataLakeConfiguration(Integer batchSize, Integer flushDuration) {
- this.batchSize = batchSize;
- this.flushDuration = flushDuration;
- this.retentionPolicies = new ArrayList<DataLakeRetentionPolicy>();
- }
+ public DataLakeConfiguration(Integer batchSize, Integer flushDuration) {
+ this.batchSize = batchSize;
+ this.flushDuration = flushDuration;
+ this.retentionPolicies = new ArrayList<DataLakeRetentionPolicy>();
+ }
- public DataLakeConfiguration(Integer batchSize, Integer flushDuration, List<DataLakeRetentionPolicy> retentionPolicies) {
- this.batchSize = batchSize;
- this.flushDuration = flushDuration;
- this.retentionPolicies = retentionPolicies;
- }
+ public DataLakeConfiguration(Integer batchSize, Integer flushDuration,
+ List<DataLakeRetentionPolicy> retentionPolicies) {
+ this.batchSize = batchSize;
+ this.flushDuration = flushDuration;
+ this.retentionPolicies = retentionPolicies;
+ }
- public List<DataLakeRetentionPolicy> getRetentionPolicies() {
- return retentionPolicies;
- }
+ public List<DataLakeRetentionPolicy> getRetentionPolicies() {
+ return retentionPolicies;
+ }
- public void setRetentionPolicies(List<DataLakeRetentionPolicy> retentionPolicies) {
- this.retentionPolicies = retentionPolicies;
- }
+ public void setRetentionPolicies(List<DataLakeRetentionPolicy> retentionPolicies) {
+ this.retentionPolicies = retentionPolicies;
+ }
- public Integer getBatchSize() {
- return batchSize;
- }
+ public Integer getBatchSize() {
+ return batchSize;
+ }
- public void setBatchSize(Integer batchSize) {
- this.batchSize = batchSize;
- }
+ public void setBatchSize(Integer batchSize) {
+ this.batchSize = batchSize;
+ }
- public Integer getFlushDuration() {
- return flushDuration;
- }
+ public Integer getFlushDuration() {
+ return flushDuration;
+ }
- public void setFlushDuration(Integer flushDuration) {
- this.flushDuration = flushDuration;
- }
+ public void setFlushDuration(Integer flushDuration) {
+ this.flushDuration = flushDuration;
+ }
}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/datalake/DataLakeMeasure.java b/streampipes-model/src/main/java/org/apache/streampipes/model/datalake/DataLakeMeasure.java
index fbc2ef863..ed15c746d 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/datalake/DataLakeMeasure.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/datalake/DataLakeMeasure.java
@@ -18,23 +18,21 @@
package org.apache.streampipes.model.datalake;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.google.gson.annotations.SerializedName;
import org.apache.streampipes.model.base.UnnamedStreamPipesEntity;
import org.apache.streampipes.model.schema.EventSchema;
import org.apache.streampipes.model.shared.annotation.TsIgnore;
import org.apache.streampipes.model.shared.annotation.TsModel;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.gson.annotations.SerializedName;
+
@TsModel
public class DataLakeMeasure extends UnnamedStreamPipesEntity {
public static final String CURRENT_SCHEMA_VERSION = "1.1";
-
- private static final String STREAM_PREFIX_DELIMITER = "::";
-
public static final String ASSERTION_ERROR_MESSAGE = "timestamp field requires a stream prefix (e.g. s0::timestamp)";
-
+ private static final String STREAM_PREFIX_DELIMITER = "::";
@JsonProperty("_rev")
private @SerializedName("_rev") String rev;
@@ -122,9 +120,14 @@ public class DataLakeMeasure extends UnnamedStreamPipesEntity {
return timestampField;
}
+ public void setTimestampField(String timestampField) {
+ assert timestampField.split(STREAM_PREFIX_DELIMITER).length == 2 : ASSERTION_ERROR_MESSAGE;
+ this.timestampField = timestampField;
+ }
/**
* This can be used to get the name of the timestamp property without the stream prefix
+ *
* @return the name of the timestamp property
*/
@TsIgnore
@@ -133,11 +136,6 @@ public class DataLakeMeasure extends UnnamedStreamPipesEntity {
return timestampField.split(STREAM_PREFIX_DELIMITER)[1];
}
- public void setTimestampField(String timestampField) {
- assert timestampField.split(STREAM_PREFIX_DELIMITER).length == 2 : ASSERTION_ERROR_MESSAGE;
- this.timestampField = timestampField;
- }
-
public String getRev() {
return rev;
}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/datalake/DataLakeRetentionPolicy.java b/streampipes-model/src/main/java/org/apache/streampipes/model/datalake/DataLakeRetentionPolicy.java
index b24352280..bcff21c9a 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/datalake/DataLakeRetentionPolicy.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/datalake/DataLakeRetentionPolicy.java
@@ -20,61 +20,58 @@ package org.apache.streampipes.model.datalake;
public class DataLakeRetentionPolicy {
- private String name;
- private String durationLiteral;
- private boolean isDefault;
+ private String name;
+ private String durationLiteral;
+ private boolean isDefault;
- public DataLakeRetentionPolicy(String name, int duration, String durationUnit, boolean isDefault) {
- this.name = name;
- this.durationLiteral = duration + durationUnit;
- this.isDefault = isDefault;
- }
+ public DataLakeRetentionPolicy(String name, int duration, String durationUnit, boolean isDefault) {
+ this.name = name;
+ this.durationLiteral = duration + durationUnit;
+ this.isDefault = isDefault;
+ }
- public DataLakeRetentionPolicy(String name) {
- this.name = name;
- this.isDefault = false;
- setDurationLiteralToInfinity();
- }
+ public DataLakeRetentionPolicy(String name) {
+ this.name = name;
+ this.isDefault = false;
+ setDurationLiteralToInfinity();
+ }
- public DataLakeRetentionPolicy(String name, String durationLiteral, boolean isDefault) {
- this.name = name;
- this.durationLiteral = durationLiteral;
- this.isDefault = isDefault;
- }
+ public DataLakeRetentionPolicy(String name, String durationLiteral, boolean isDefault) {
+ this.name = name;
+ this.durationLiteral = durationLiteral;
+ this.isDefault = isDefault;
+ }
- public String getDurationLiteral() {
- return durationLiteral;
- }
+ public String getDurationLiteral() {
+ return durationLiteral;
+ }
- public void setDurationLiteral(int duration, String durationUnit) {
- this.durationLiteral = duration + durationUnit;
- }
+ public void setDurationLiteral(int duration, String durationUnit) {
+ this.durationLiteral = duration + durationUnit;
+ }
- public void setDurationLiteralToInfinity() {
- this.durationLiteral = "INF";
- }
+ public void setDurationLiteralToInfinity() {
+ this.durationLiteral = "INF";
+ }
- public String getName() {
- return name;
- }
+ public String getName() {
+ return name;
+ }
- public void setName(String name) {
- this.name = name;
- }
+ public void setName(String name) {
+ this.name = name;
+ }
- public boolean isDefault() {
- return isDefault;
- }
+ public boolean isDefault() {
+ return isDefault;
+ }
- public void setDefault(boolean isDefault) {
- this.isDefault = isDefault;
- }
+ public void setDefault(boolean isDefault) {
+ this.isDefault = isDefault;
+ }
- @Override
- public String toString() {
- return "DataLakeRetentionPolicy{" +
- "name='" + name + '\'' +
- ", durationLiteral='" + durationLiteral + '\'' +
- '}';
- }
+ @Override
+ public String toString() {
+ return String.format("DataLakeRetentionPolicy{name='%s', durationLiteral='%s'}", name, durationLiteral);
+ }
}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/datalake/DataSeries.java b/streampipes-model/src/main/java/org/apache/streampipes/model/datalake/DataSeries.java
index 14834ee76..13693a633 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/datalake/DataSeries.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/datalake/DataSeries.java
@@ -27,37 +27,37 @@ import java.util.Map;
@TsModel
public class DataSeries {
- private int total;
- private List<List<Object>> rows;
- private Map<String, String> tags;
- private List<String> headers;
-
- public DataSeries() {
- this.total = 0;
- this.tags = new HashMap<>();
- }
-
- public DataSeries(int total, List<List<Object>> rows, List<String> headers, Map<String, String> tags) {
- this.total = total;
- this.rows = rows;
- this.headers = headers;
- this.tags = tags;
- }
-
- public int getTotal() {
- return total;
- }
-
- public Map<String, String> getTags() {
- return tags;
- }
-
- public List<String> getHeaders() {
- return headers;
- }
-
- public List<List<Object>> getRows() {
- return rows;
- }
+ private int total;
+ private List<List<Object>> rows;
+ private Map<String, String> tags;
+ private List<String> headers;
+
+ public DataSeries() {
+ this.total = 0;
+ this.tags = new HashMap<>();
+ }
+
+ public DataSeries(int total, List<List<Object>> rows, List<String> headers, Map<String, String> tags) {
+ this.total = total;
+ this.rows = rows;
+ this.headers = headers;
+ this.tags = tags;
+ }
+
+ public int getTotal() {
+ return total;
+ }
+
+ public Map<String, String> getTags() {
+ return tags;
+ }
+
+ public List<String> getHeaders() {
+ return headers;
+ }
+
+ public List<List<Object>> getRows() {
+ return rows;
+ }
}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/datalake/LabelDefinition.java b/streampipes-model/src/main/java/org/apache/streampipes/model/datalake/LabelDefinition.java
index 60eb7dbda..3f9dc9e97 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/datalake/LabelDefinition.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/datalake/LabelDefinition.java
@@ -20,27 +20,27 @@ package org.apache.streampipes.model.datalake;
public class LabelDefinition {
- private String classLabel;
- private String labelColumn;
+ private String classLabel;
+ private String labelColumn;
- public LabelDefinition(String classLabel, String labelColumn) {
- this.classLabel = classLabel;
- this.labelColumn = labelColumn;
- }
+ public LabelDefinition(String classLabel, String labelColumn) {
+ this.classLabel = classLabel;
+ this.labelColumn = labelColumn;
+ }
- public String getClassLabel() {
- return classLabel;
- }
+ public String getClassLabel() {
+ return classLabel;
+ }
- public void setClassLabel(String classLabel) {
- this.classLabel = classLabel;
- }
+ public void setClassLabel(String classLabel) {
+ this.classLabel = classLabel;
+ }
- public String getLabelColumn() {
- return labelColumn;
- }
+ public String getLabelColumn() {
+ return labelColumn;
+ }
- public void setLabelColumn(String labelColumn) {
- this.labelColumn = labelColumn;
- }
+ public void setLabelColumn(String labelColumn) {
+ this.labelColumn = labelColumn;
+ }
}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/datalake/PageResult.java b/streampipes-model/src/main/java/org/apache/streampipes/model/datalake/PageResult.java
index be8b4c517..280b6e8e8 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/datalake/PageResult.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/datalake/PageResult.java
@@ -26,29 +26,30 @@ import java.util.Map;
@TsModel
public class PageResult extends DataSeries {
- private int page;
+ private int page;
- private int pageSum;
+ private int pageSum;
- public PageResult(int total, List<String> headers, List<List<Object>> rows, int page, int pageSum, Map<String, String> tags) {
- super(total, rows, headers, tags);
- this.page = page;
- this.pageSum = pageSum;
- }
+ public PageResult(int total, List<String> headers, List<List<Object>> rows, int page, int pageSum,
+ Map<String, String> tags) {
+ super(total, rows, headers, tags);
+ this.page = page;
+ this.pageSum = pageSum;
+ }
- public int getPage() {
- return page;
- }
+ public int getPage() {
+ return page;
+ }
- public void setPage(int page) {
- this.page = page;
- }
+ public void setPage(int page) {
+ this.page = page;
+ }
- public int getPageSum() {
- return pageSum;
- }
+ public int getPageSum() {
+ return pageSum;
+ }
- public void setPageSum(int pageSum) {
- this.pageSum = pageSum;
- }
+ public void setPageSum(int pageSum) {
+ this.pageSum = pageSum;
+ }
}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/datalake/SpQueryResult.java b/streampipes-model/src/main/java/org/apache/streampipes/model/datalake/SpQueryResult.java
index c3c9ef7e8..d65142d33 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/datalake/SpQueryResult.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/datalake/SpQueryResult.java
@@ -26,79 +26,79 @@ import java.util.List;
@TsModel
public class SpQueryResult {
- private int total;
- private List<String> headers;
- private List<DataSeries> allDataSeries;
- private int sourceIndex;
- private SpQueryStatus spQueryStatus;
- private String forId;
-
- public SpQueryResult() {
- this.total = 0;
- this.allDataSeries = new ArrayList<>();
- this.spQueryStatus = SpQueryStatus.OK;
+ private int total;
+ private List<String> headers;
+ private List<DataSeries> allDataSeries;
+ private int sourceIndex;
+ private SpQueryStatus spQueryStatus;
+ private String forId;
+
+ public SpQueryResult() {
+ this.total = 0;
+ this.allDataSeries = new ArrayList<>();
+ this.spQueryStatus = SpQueryStatus.OK;
+ }
+
+ public SpQueryResult(int total, List<String> headers, List<DataSeries> allDataSeries) {
+ this.total = total;
+ this.allDataSeries = allDataSeries;
+ this.headers = headers;
+ this.spQueryStatus = SpQueryStatus.OK;
+ }
+
+ public int getTotal() {
+ return total;
+ }
+
+ public void setTotal(int total) {
+ this.total = total;
+ }
+
+ public void addDataResult(DataSeries dataSeries) {
+ if (this.allDataSeries == null) {
+ this.allDataSeries = new ArrayList<>();
}
- public SpQueryResult(int total, List<String> headers, List<DataSeries> allDataSeries) {
- this.total = total;
- this.allDataSeries = allDataSeries;
- this.headers = headers;
- this.spQueryStatus = SpQueryStatus.OK;
- }
-
- public int getTotal() {
- return total;
- }
+ this.allDataSeries.add(dataSeries);
+ }
- public void addDataResult(DataSeries dataSeries) {
- if (this.allDataSeries == null) {
- this.allDataSeries = new ArrayList<>();
- }
-
- this.allDataSeries.add(dataSeries);
- }
-
- public List<DataSeries> getAllDataSeries() {
- return allDataSeries;
- }
-
- public List<String> getHeaders() {
- return headers;
- }
+ public List<DataSeries> getAllDataSeries() {
+ return allDataSeries;
+ }
- public void setHeaders(List<String> headers) {
- this.headers = headers;
- }
+ public void setAllDataSeries(List<DataSeries> allDataSeries) {
+ this.allDataSeries = allDataSeries;
+ }
- public void setTotal(int total) {
- this.total = total;
- }
+ public List<String> getHeaders() {
+ return headers;
+ }
- public int getSourceIndex() {
- return sourceIndex;
- }
+ public void setHeaders(List<String> headers) {
+ this.headers = headers;
+ }
- public void setSourceIndex(int sourceIndex) {
- this.sourceIndex = sourceIndex;
- }
+ public int getSourceIndex() {
+ return sourceIndex;
+ }
- public void setAllDataSeries(List<DataSeries> allDataSeries) {
- this.allDataSeries = allDataSeries;
- }
+ public void setSourceIndex(int sourceIndex) {
+ this.sourceIndex = sourceIndex;
+ }
- public SpQueryStatus getSpQueryStatus() {
- return spQueryStatus;
- }
+ public SpQueryStatus getSpQueryStatus() {
+ return spQueryStatus;
+ }
- public void setSpQueryStatus(SpQueryStatus spQueryStatus) {
- this.spQueryStatus = spQueryStatus;
- }
+ public void setSpQueryStatus(SpQueryStatus spQueryStatus) {
+ this.spQueryStatus = spQueryStatus;
+ }
- public String getForId() {
- return forId;
- }
+ public String getForId() {
+ return forId;
+ }
- public void setForId(String forId) {
- this.forId = forId;
- }
+ public void setForId(String forId) {
+ this.forId = forId;
+ }
}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/datalake/SpQueryStatus.java b/streampipes-model/src/main/java/org/apache/streampipes/model/datalake/SpQueryStatus.java
index c61b9a8bd..96187b3b8 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/datalake/SpQueryStatus.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/datalake/SpQueryStatus.java
@@ -19,6 +19,6 @@
package org.apache.streampipes.model.datalake;
public enum SpQueryStatus {
- OK,
- TOO_MUCH_DATA
+ OK,
+ TOO_MUCH_DATA
}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/file/FileMetadata.java b/streampipes-model/src/main/java/org/apache/streampipes/model/file/FileMetadata.java
index 8675f8319..656ea6861 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/file/FileMetadata.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/file/FileMetadata.java
@@ -17,17 +17,16 @@
*/
package org.apache.streampipes.model.file;
-import com.google.gson.annotations.SerializedName;
import org.apache.streampipes.model.shared.annotation.TsModel;
+import com.google.gson.annotations.SerializedName;
+
@TsModel
public class FileMetadata {
- private @SerializedName("_id")
- String fileId;
+ private @SerializedName("_id") String fileId;
- private @SerializedName("_rev")
- String rev;
+ private @SerializedName("_rev") String rev;
private String internalFilename;
private String originalFilename;
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/function/FunctionDefinition.java b/streampipes-model/src/main/java/org/apache/streampipes/model/function/FunctionDefinition.java
index 2d0ad972f..d759c9ceb 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/function/FunctionDefinition.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/function/FunctionDefinition.java
@@ -55,9 +55,9 @@ public class FunctionDefinition {
@Override
public String toString() {
- return "FunctionDefinition{" +
- "functionId=" + functionId.toString() +
- ", consumedStreams=" + consumedStreams.toString() +
- '}';
+ return String.format("FunctionDefinition{functionId='%s',consumedStreams='%s'}",
+ functionId.toString(),
+ consumedStreams.toString()
+ );
}
}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/function/FunctionId.java b/streampipes-model/src/main/java/org/apache/streampipes/model/function/FunctionId.java
index bf5d7b687..262c54e09 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/function/FunctionId.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/function/FunctionId.java
@@ -26,11 +26,6 @@ public class FunctionId {
private String id;
private int version;
- public static FunctionId from(String id,
- int version) {
- return new FunctionId(id, version);
- }
-
public FunctionId() {
}
@@ -40,27 +35,29 @@ public class FunctionId {
this.version = version;
}
- public String getId() {
- return id;
+ public static FunctionId from(String id,
+ int version) {
+ return new FunctionId(id, version);
}
- public int getVersion() {
- return version;
+ public String getId() {
+ return id;
}
public void setId(String id) {
this.id = id;
}
+ public int getVersion() {
+ return version;
+ }
+
public void setVersion(int version) {
this.version = version;
}
@Override
public String toString() {
- return "FunctionId{" +
- "id='" + id + '\'' +
- ", version=" + version +
- '}';
+ return String.format("FunctionId{id='%s', version=%d}", id, version);
}
}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/graph/DataProcessorDescription.java b/streampipes-model/src/main/java/org/apache/streampipes/model/graph/DataProcessorDescription.java
index e63d33972..0899eea57 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/graph/DataProcessorDescription.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/graph/DataProcessorDescription.java
@@ -50,7 +50,9 @@ public class DataProcessorDescription extends ConsumableStreamPipesEntity {
this.category = new ArrayList<>();
}
- public DataProcessorDescription(String uri, String name, String description, String iconUrl, List<SpDataStream> spDataStreams, List<StaticProperty> staticProperties, List<OutputStrategy> outputStrategies) {
+ public DataProcessorDescription(String uri, String name, String description, String iconUrl,
+ List<SpDataStream> spDataStreams, List<StaticProperty> staticProperties,
+ List<OutputStrategy> outputStrategies) {
super(uri, name, description, iconUrl);
this.pathName = uri;
this.spDataStreams = spDataStreams;
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/graph/DataProcessorInvocation.java b/streampipes-model/src/main/java/org/apache/streampipes/model/graph/DataProcessorInvocation.java
index d09eb6831..89cac11df 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/graph/DataProcessorInvocation.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/graph/DataProcessorInvocation.java
@@ -71,7 +71,7 @@ public class DataProcessorInvocation extends InvocableStreamPipesEntity implemen
public DataProcessorInvocation(DataProcessorDescription sepa, String domId) {
this(sepa);
- this.DOM = domId;
+ this.dom = domId;
}
public DataProcessorInvocation() {
@@ -79,7 +79,8 @@ public class DataProcessorInvocation extends InvocableStreamPipesEntity implemen
inputStreams = new ArrayList<>();
}
- public DataProcessorInvocation(String uri, String name, String description, String iconUrl, String pathName, List<SpDataStream> spDataStreams, List<StaticProperty> staticProperties) {
+ public DataProcessorInvocation(String uri, String name, String description, String iconUrl, String pathName,
+ List<SpDataStream> spDataStreams, List<StaticProperty> staticProperties) {
super(uri, name, description, iconUrl);
this.pathName = pathName;
this.inputStreams = spDataStreams;
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/graph/DataSinkDescription.java b/streampipes-model/src/main/java/org/apache/streampipes/model/graph/DataSinkDescription.java
index 6703e83f4..40aa13ddd 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/graph/DataSinkDescription.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/graph/DataSinkDescription.java
@@ -25,43 +25,39 @@ import java.util.ArrayList;
import java.util.List;
public class DataSinkDescription extends ConsumableStreamPipesEntity {
-
- private static final long serialVersionUID = -6553066396392585731L;
- private List<String> category;
-
- public DataSinkDescription(String uri, String name, String description, String iconUrl)
- {
- super(uri, name, description, iconUrl);
- this.spDataStreams = new ArrayList<>();
- this.category = new ArrayList<>();
- }
-
- public DataSinkDescription(DataSinkDescription other)
- {
- super(other);
- this.category = new Cloner().ecTypes(other.getCategory());
- }
-
- public DataSinkDescription(String uri, String name, String description)
- {
- this(uri, name, description, "");
- this.category = new ArrayList<>();
- }
-
- public DataSinkDescription()
- {
- super();
- this.category = new ArrayList<>();
- }
+ private static final long serialVersionUID = -6553066396392585731L;
- public List<String> getCategory() {
- return category;
- }
+ private List<String> category;
+
+ public DataSinkDescription(String uri, String name, String description, String iconUrl) {
+ super(uri, name, description, iconUrl);
+ this.spDataStreams = new ArrayList<>();
+ this.category = new ArrayList<>();
+ }
+
+ public DataSinkDescription(DataSinkDescription other) {
+ super(other);
+ this.category = new Cloner().ecTypes(other.getCategory());
+ }
+
+ public DataSinkDescription(String uri, String name, String description) {
+ this(uri, name, description, "");
+ this.category = new ArrayList<>();
+ }
+
+ public DataSinkDescription() {
+ super();
+ this.category = new ArrayList<>();
+ }
+
+ public List<String> getCategory() {
+ return category;
+ }
+
+ public void setCategory(List<String> category) {
+ this.category = category;
+ }
- public void setCategory(List<String> category) {
- this.category = category;
- }
-
}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/graph/DataSinkInvocation.java b/streampipes-model/src/main/java/org/apache/streampipes/model/graph/DataSinkInvocation.java
index eaf8142bd..f33477850 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/graph/DataSinkInvocation.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/graph/DataSinkInvocation.java
@@ -55,7 +55,7 @@ public class DataSinkInvocation extends InvocableStreamPipesEntity {
public DataSinkInvocation(DataSinkDescription sec, String domId) {
this(sec);
- this.setDOM(domId);
+ this.setDom(domId);
}
public DataSinkInvocation() {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/graph/DataSourceDescription.java b/streampipes-model/src/main/java/org/apache/streampipes/model/graph/DataSourceDescription.java
index 320dada35..a22e5f9e5 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/graph/DataSourceDescription.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/graph/DataSourceDescription.java
@@ -30,8 +30,13 @@ import java.util.List;
/**
* class that represents Semantic Event Producers.
*/
+
+
+/**
+ * @deprecated As of release 0.90.0, replaced by {@link DataSourceDescription}
+ */
@TsModel
-@Deprecated
+@Deprecated(since = "0.90.0", forRemoval = true)
public class DataSourceDescription extends NamedStreamPipesEntity {
private static final long serialVersionUID = 5607030219013954697L;
@@ -51,7 +56,8 @@ public class DataSourceDescription extends NamedStreamPipesEntity {
this.spDataStreams.forEach(e -> e.setCategory(Arrays.asList(this.getElementId())));
}
- public DataSourceDescription(String uri, String name, String description, String iconUrl, List<SpDataStream> spDataStreams) {
+ public DataSourceDescription(String uri, String name, String description, String iconUrl,
+ List<SpDataStream> spDataStreams) {
super(uri, name, description, iconUrl);
this.spDataStreams = spDataStreams;
this.setAppId(uri);
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/graph/PipelineElementContainer.java b/streampipes-model/src/main/java/org/apache/streampipes/model/graph/PipelineElementContainer.java
index c77769cb1..b427c887f 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/graph/PipelineElementContainer.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/graph/PipelineElementContainer.java
@@ -34,8 +34,7 @@ public class PipelineElementContainer extends NamedStreamPipesEntity {
}
}
- public PipelineElementContainer(String containerId, String name, String description)
- {
+ public PipelineElementContainer(String containerId, String name, String description) {
super(containerId, name, description);
this.pipelineElementDescriptions = new ArrayList<>();
}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/grounding/EventGrounding.java b/streampipes-model/src/main/java/org/apache/streampipes/model/grounding/EventGrounding.java
index 3a8ff4ede..2a32bdce9 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/grounding/EventGrounding.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/grounding/EventGrounding.java
@@ -18,10 +18,11 @@
package org.apache.streampipes.model.grounding;
-import com.fasterxml.jackson.annotation.JsonIgnore;
import org.apache.streampipes.model.base.UnnamedStreamPipesEntity;
import org.apache.streampipes.model.util.Cloner;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -29,55 +30,53 @@ import java.util.List;
public class EventGrounding extends UnnamedStreamPipesEntity {
- private static final long serialVersionUID = 3149070517282698799L;
-
- private List<TransportProtocol> transportProtocols;
-
- private List<TransportFormat> transportFormats;
-
- public EventGrounding()
- {
- super();
- this.transportFormats = new ArrayList<>();
- }
-
- public EventGrounding(TransportProtocol transportProtocol, TransportFormat transportFormat)
- {
- this();
- this.transportFormats = new ArrayList<>();
- this.transportFormats.add(transportFormat);
- this.transportProtocols = Arrays.asList(transportProtocol);
- }
-
- public EventGrounding(EventGrounding other) {
- super(other);
- this.transportProtocols = new Cloner().protocols(other.getTransportProtocols());
- this.transportFormats = new Cloner().transportFormats(other.getTransportFormats());
- }
-
- public List<TransportProtocol> getTransportProtocols() {
- return transportProtocols;
- }
-
- public void setTransportProtocols(List<TransportProtocol> transportProtocols) {
- this.transportProtocols = transportProtocols;
- }
-
- public void setTransportProtocol(TransportProtocol transportProtocol) {
- this.transportProtocols = Collections.singletonList(transportProtocol);
- }
-
- @JsonIgnore
- public TransportProtocol getTransportProtocol() {
- return transportProtocols.get(0);
- }
-
- public List<TransportFormat> getTransportFormats() {
- return transportFormats;
- }
-
- public void setTransportFormats(List<TransportFormat> transportFormats) {
- this.transportFormats = transportFormats;
- }
-
+ private static final long serialVersionUID = 3149070517282698799L;
+
+ private List<TransportProtocol> transportProtocols;
+
+ private List<TransportFormat> transportFormats;
+
+ public EventGrounding() {
+ super();
+ this.transportFormats = new ArrayList<>();
+ }
+
+ public EventGrounding(TransportProtocol transportProtocol, TransportFormat transportFormat) {
+ this();
+ this.transportFormats = new ArrayList<>();
+ this.transportFormats.add(transportFormat);
+ this.transportProtocols = Arrays.asList(transportProtocol);
+ }
+
+ public EventGrounding(EventGrounding other) {
+ super(other);
+ this.transportProtocols = new Cloner().protocols(other.getTransportProtocols());
+ this.transportFormats = new Cloner().transportFormats(other.getTransportFormats());
+ }
+
+ public List<TransportProtocol> getTransportProtocols() {
+ return transportProtocols;
+ }
+
+ public void setTransportProtocols(List<TransportProtocol> transportProtocols) {
+ this.transportProtocols = transportProtocols;
+ }
+
+ @JsonIgnore
+ public TransportProtocol getTransportProtocol() {
+ return transportProtocols.get(0);
+ }
+
+ public void setTransportProtocol(TransportProtocol transportProtocol) {
+ this.transportProtocols = Collections.singletonList(transportProtocol);
+ }
+
+ public List<TransportFormat> getTransportFormats() {
+ return transportFormats;
+ }
+
+ public void setTransportFormats(List<TransportFormat> transportFormats) {
+ this.transportFormats = transportFormats;
+ }
+
}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/grounding/JmsTransportProtocol.java b/streampipes-model/src/main/java/org/apache/streampipes/model/grounding/JmsTransportProtocol.java
index b15686190..35f50275b 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/grounding/JmsTransportProtocol.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/grounding/JmsTransportProtocol.java
@@ -20,37 +20,34 @@ package org.apache.streampipes.model.grounding;
public class JmsTransportProtocol extends TransportProtocol {
- private static final long serialVersionUID = -5650426611208789835L;
-
- private int port;
-
- public JmsTransportProtocol(String uri, int port, String topicName)
- {
- super(uri, new SimpleTopicDefinition(topicName));
- this.port = port;
- }
-
- public JmsTransportProtocol(JmsTransportProtocol other)
- {
- super(other);
- this.port = other.getPort();
- }
-
- public JmsTransportProtocol()
- {
- super();
- }
-
- public int getPort() {
- return port;
- }
-
- public void setPort(int port) {
- this.port = port;
- }
-
- @Override
- public String toString() {
- return getBrokerHostname() + ":" + getPort();
- }
+ private static final long serialVersionUID = -5650426611208789835L;
+
+ private int port;
+
+ public JmsTransportProtocol(String uri, int port, String topicName) {
+ super(uri, new SimpleTopicDefinition(topicName));
+ this.port = port;
+ }
+
+ public JmsTransportProtocol(JmsTransportProtocol other) {
+ super(other);
+ this.port = other.getPort();
+ }
+
+ public JmsTransportProtocol() {
+ super();
+ }
+
+ public int getPort() {
+ return port;
+ }
+
+ public void setPort(int port) {
+ this.port = port;
+ }
+
+ @Override
+ public String toString() {
+ return getBrokerHostname() + ":" + getPort();
+ }
}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/grounding/KafkaTransportProtocol.java b/streampipes-model/src/main/java/org/apache/streampipes/model/grounding/KafkaTransportProtocol.java
index a37a7121a..9fe5228ab 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/grounding/KafkaTransportProtocol.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/grounding/KafkaTransportProtocol.java
@@ -49,7 +49,8 @@ public class KafkaTransportProtocol extends TransportProtocol {
this.kafkaPort = kafkaPort;
}
- public KafkaTransportProtocol(String kafkaHost, int kafkaPort, String topic, String zookeeperHost, int zookeeperPort) {
+ public KafkaTransportProtocol(String kafkaHost, int kafkaPort, String topic, String zookeeperHost,
+ int zookeeperPort) {
super(kafkaHost, new SimpleTopicDefinition(topic));
this.zookeeperHost = zookeeperHost;
this.zookeeperPort = zookeeperPort;
@@ -81,6 +82,10 @@ public class KafkaTransportProtocol extends TransportProtocol {
super();
}
+ public static long getSerialVersionUID() {
+ return serialVersionUID;
+ }
+
public String getZookeeperHost() {
return zookeeperHost;
}
@@ -105,10 +110,6 @@ public class KafkaTransportProtocol extends TransportProtocol {
this.kafkaPort = kafkaPort;
}
- public static long getSerialVersionUID() {
- return serialVersionUID;
- }
-
public Integer getLingerMs() {
return lingerMs;
}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/grounding/MqttTransportProtocol.java b/streampipes-model/src/main/java/org/apache/streampipes/model/grounding/MqttTransportProtocol.java
index 5377f3f4a..8bd09cb39 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/grounding/MqttTransportProtocol.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/grounding/MqttTransportProtocol.java
@@ -1,19 +1,21 @@
/*
- * 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
+ * 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
+ * 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.
*
- * 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.
*/
+
package org.apache.streampipes.model.grounding;
public class MqttTransportProtocol extends TransportProtocol {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/grounding/NatsTransportProtocol.java b/streampipes-model/src/main/java/org/apache/streampipes/model/grounding/NatsTransportProtocol.java
index 9e56b2fac..4b450b5f4 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/grounding/NatsTransportProtocol.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/grounding/NatsTransportProtocol.java
@@ -1,18 +1,19 @@
/*
- * 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
+ * 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
+ * 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.
*
- * 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.
*/
package org.apache.streampipes.model.grounding;
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/grounding/TopicDefinition.java b/streampipes-model/src/main/java/org/apache/streampipes/model/grounding/TopicDefinition.java
index caa05d82a..e57e4fe05 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/grounding/TopicDefinition.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/grounding/TopicDefinition.java
@@ -18,12 +18,13 @@
package org.apache.streampipes.model.grounding;
-import com.fasterxml.jackson.annotation.JsonSubTypes;
import org.apache.streampipes.model.base.UnnamedStreamPipesEntity;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+
@JsonSubTypes({
- @JsonSubTypes.Type(SimpleTopicDefinition.class),
- @JsonSubTypes.Type(WildcardTopicDefinition.class)
+ @JsonSubTypes.Type(SimpleTopicDefinition.class),
+ @JsonSubTypes.Type(WildcardTopicDefinition.class)
})
public abstract class TopicDefinition extends UnnamedStreamPipesEntity {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/grounding/TransportFormat.java b/streampipes-model/src/main/java/org/apache/streampipes/model/grounding/TransportFormat.java
index 2fc003118..93d9a66ce 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/grounding/TransportFormat.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/grounding/TransportFormat.java
@@ -25,36 +25,33 @@ import java.util.ArrayList;
import java.util.List;
public class TransportFormat extends UnnamedStreamPipesEntity {
-
- private static final long serialVersionUID = -525073244975968386L;
-
- private List<URI> rdfType;
-
- public TransportFormat()
- {
- super();
- this.rdfType = new ArrayList<>();
- }
-
- public TransportFormat(String transportFormatType)
- {
- super();
- this.rdfType = new ArrayList<>();
- this.rdfType.add(URI.create(transportFormatType));
- }
-
- public TransportFormat(TransportFormat other)
- {
- super(other);
- this.rdfType = other.getRdfType();
- }
-
- public List<URI> getRdfType() {
- return rdfType;
- }
-
- public void setRdfType(List<URI> rdfType) {
- this.rdfType = rdfType;
- }
+
+ private static final long serialVersionUID = -525073244975968386L;
+
+ private List<URI> rdfType;
+
+ public TransportFormat() {
+ super();
+ this.rdfType = new ArrayList<>();
+ }
+
+ public TransportFormat(String transportFormatType) {
+ super();
+ this.rdfType = new ArrayList<>();
+ this.rdfType.add(URI.create(transportFormatType));
+ }
+
+ public TransportFormat(TransportFormat other) {
+ super(other);
+ this.rdfType = other.getRdfType();
+ }
+
+ public List<URI> getRdfType() {
+ return rdfType;
+ }
+
+ public void setRdfType(List<URI> rdfType) {
+ this.rdfType = rdfType;
+ }
}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/grounding/TransportProtocol.java b/streampipes-model/src/main/java/org/apache/streampipes/model/grounding/TransportProtocol.java
index b1f57f9a2..29c30a8f5 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/grounding/TransportProtocol.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/grounding/TransportProtocol.java
@@ -18,57 +18,57 @@
package org.apache.streampipes.model.grounding;
-import com.fasterxml.jackson.annotation.JsonSubTypes;
import org.apache.streampipes.model.base.UnnamedStreamPipesEntity;
import org.apache.streampipes.model.util.Cloner;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+
@JsonSubTypes({
- @JsonSubTypes.Type(JmsTransportProtocol.class),
- @JsonSubTypes.Type(KafkaTransportProtocol.class),
- @JsonSubTypes.Type(MqttTransportProtocol.class),
- @JsonSubTypes.Type(NatsTransportProtocol.class)
+ @JsonSubTypes.Type(JmsTransportProtocol.class),
+ @JsonSubTypes.Type(KafkaTransportProtocol.class),
+ @JsonSubTypes.Type(MqttTransportProtocol.class),
+ @JsonSubTypes.Type(NatsTransportProtocol.class)
})
public abstract class TransportProtocol extends UnnamedStreamPipesEntity {
-
- private static final long serialVersionUID = 7625791395504335184L;
- private String brokerHostname;
+ private static final long serialVersionUID = 7625791395504335184L;
+
+ private String brokerHostname;
+
+ private TopicDefinition topicDefinition;
+
+ public TransportProtocol() {
+ super();
+ }
+
+ public TransportProtocol(String hostname, TopicDefinition topicDefinition) {
+ super();
+ this.brokerHostname = hostname;
+ this.topicDefinition = topicDefinition;
+ }
- private TopicDefinition topicDefinition;
-
- public TransportProtocol() {
- super();
- }
-
- public TransportProtocol(String hostname, TopicDefinition topicDefinition)
- {
- super();
- this.brokerHostname = hostname;
- this.topicDefinition = topicDefinition;
- }
+ public TransportProtocol(TransportProtocol other) {
+ super(other);
+ this.brokerHostname = other.getBrokerHostname();
+ if (other.getTopicDefinition() != null) {
+ this.topicDefinition = new Cloner().topicDefinition(other.getTopicDefinition());
+ }
+ }
- public TransportProtocol(TransportProtocol other) {
- super(other);
- this.brokerHostname = other.getBrokerHostname();
- if (other.getTopicDefinition() != null) {
- this.topicDefinition = new Cloner().topicDefinition(other.getTopicDefinition());
- }
- }
+ public String getBrokerHostname() {
+ return brokerHostname;
+ }
- public String getBrokerHostname() {
- return brokerHostname;
- }
+ public void setBrokerHostname(String uri) {
+ this.brokerHostname = uri;
+ }
- public void setBrokerHostname(String uri) {
- this.brokerHostname = uri;
- }
-
- public TopicDefinition getTopicDefinition() {
- return topicDefinition;
- }
+ public TopicDefinition getTopicDefinition() {
+ return topicDefinition;
+ }
- public void setTopicDefinition(TopicDefinition topicDefinition) {
- this.topicDefinition = topicDefinition;
- }
+ public void setTopicDefinition(TopicDefinition topicDefinition) {
+ this.topicDefinition = topicDefinition;
+ }
}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/labeling/Category.java b/streampipes-model/src/main/java/org/apache/streampipes/model/labeling/Category.java
index 48416ef4d..b5b3b45e4 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/labeling/Category.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/labeling/Category.java
@@ -18,50 +18,63 @@
package org.apache.streampipes.model.labeling;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.google.gson.annotations.SerializedName;
import org.apache.streampipes.model.shared.annotation.TsModel;
-import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.gson.annotations.SerializedName;
@TsModel
public class Category {
- private String name;
- private String internalName;
- private String superLabelId;
-
- @JsonProperty("_id")
- private @SerializedName("_id") String id;
-
- @JsonProperty("_rev")
- private @SerializedName("_rev") String rev;
-
- public Category() { }
-
- public String getName() { return name; }
- public void setName(String name) {
- this.name = name;
- }
-
- public String getInternalName() {
- return internalName;
- }
- public void setInternalName(String internalName) {
- this.internalName = internalName;
- }
-
- public String getSuperLabelId() { return superLabelId; }
- public void setSuperLabel(String superLabelId) { this.superLabelId = superLabelId; }
-
- public String getId() {
- return id;
- }
- public void setId(String id) { this.id = id; }
-
- public String getRev() {
- return rev;
- }
- public void setRev(String rev) {
- this.rev = rev;
- }
+ private String name;
+ private String internalName;
+ private String superLabelId;
+
+ @JsonProperty("_id")
+ private @SerializedName("_id") String id;
+
+ @JsonProperty("_rev")
+ private @SerializedName("_rev") String rev;
+
+ public Category() {
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getInternalName() {
+ return internalName;
+ }
+
+ public void setInternalName(String internalName) {
+ this.internalName = internalName;
+ }
+
+ public String getSuperLabelId() {
+ return superLabelId;
+ }
+
+ public void setSuperLabel(String superLabelId) {
+ this.superLabelId = superLabelId;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getRev() {
+ return rev;
+ }
+
+ public void setRev(String rev) {
+ this.rev = rev;
+ }
}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/labeling/Label.java b/streampipes-model/src/main/java/org/apache/streampipes/model/labeling/Label.java
index 07bfd29ea..91b4c68fa 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/labeling/Label.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/labeling/Label.java
@@ -18,55 +18,72 @@
package org.apache.streampipes.model.labeling;
+import org.apache.streampipes.model.shared.annotation.TsModel;
+
import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.gson.annotations.SerializedName;
-import org.apache.streampipes.model.shared.annotation.TsModel;
@TsModel
public class Label {
- private String name;
- private String color;
- private String internalName;
- private String categoryId;
-
- @JsonProperty("_id")
- private @SerializedName("_id") String id;
-
- @JsonProperty("_rev")
- private @SerializedName("_rev") String rev;
-
- public Label() {
- }
-
- public String getName() { return name; }
- public void setName(String name) {
- this.name = name;
- }
-
- public String getColor() { return color; }
- public void setColor(String color) {
- this.color = color;
- }
-
- public String getInternalName() {
- return internalName;
- }
- public void setInternalName(String internalName) {
- this.internalName = internalName;
- }
-
- public String getId() {
- return id;
- }
- public void setId(String id) { this.id = id; }
-
- public String getRev() {
- return rev;
- }
- public void setRev(String rev) {
- this.rev = rev;
- }
-
- public String getCategoryId() { return categoryId; };
- public void setCategoryId(String categoryId) { this.categoryId = categoryId; }
+ private String name;
+ private String color;
+ private String internalName;
+ private String categoryId;
+
+ @JsonProperty("_id")
+ private @SerializedName("_id") String id;
+
+ @JsonProperty("_rev")
+ private @SerializedName("_rev") String rev;
+
+ public Label() {
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getColor() {
+ return color;
+ }
+
+ public void setColor(String color) {
+ this.color = color;
+ }
+
+ public String getInternalName() {
+ return internalName;
+ }
+
+ public void setInternalName(String internalName) {
+ this.internalName = internalName;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getRev() {
+ return rev;
+ }
+
+ public void setRev(String rev) {
+ this.rev = rev;
+ }
+
+ public String getCategoryId() {
+ return categoryId;
+ }
+
+ public void setCategoryId(String categoryId) {
+ this.categoryId = categoryId;
+ }
}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/mail/SpEmail.java b/streampipes-model/src/main/java/org/apache/streampipes/model/mail/SpEmail.java
index 3cfcaf657..a1a1efd61 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/mail/SpEmail.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/mail/SpEmail.java
@@ -25,23 +25,23 @@ public class SpEmail {
private String subject;
private String message;
- public static SpEmail from(List<String> recipients,
- String subject,
- String message) {
- return new SpEmail(recipients, subject, message);
- }
-
public SpEmail() {
}
public SpEmail(List<String> recipients,
- String subject,
- String message) {
+ String subject,
+ String message) {
this.recipients = recipients;
this.subject = subject;
this.message = message;
}
+ public static SpEmail from(List<String> recipients,
+ String subject,
+ String message) {
+ return new SpEmail(recipients, subject, message);
+ }
+
public List<String> getRecipients() {
return recipients;
}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/message/DataSetModificationMessage.java b/streampipes-model/src/main/java/org/apache/streampipes/model/message/DataSetModificationMessage.java
index bf1aaeb38..ae0cc4798 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/message/DataSetModificationMessage.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/message/DataSetModificationMessage.java
@@ -27,7 +27,7 @@ public class DataSetModificationMessage extends Message {
private String invocationId;
public DataSetModificationMessage(
- EventGrounding eventGrounding, String invocationId) {
+ EventGrounding eventGrounding, String invocationId) {
super(true);
this.eventGrounding = eventGrounding;
this.invocationId = invocationId;
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/message/EdgeValidationStatus.java b/streampipes-model/src/main/java/org/apache/streampipes/model/message/EdgeValidationStatus.java
index 26448aa93..36e68cf16 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/message/EdgeValidationStatus.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/message/EdgeValidationStatus.java
@@ -29,7 +29,7 @@ public class EdgeValidationStatus {
}
public EdgeValidationStatus(EdgeValidationStatusType validationStatusType,
- List<Notification> notifications) {
+ List<Notification> notifications) {
this.validationStatusType = validationStatusType;
this.notifications = notifications;
}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/message/ErrorMessage.java b/streampipes-model/src/main/java/org/apache/streampipes/model/message/ErrorMessage.java
index 890043fbe..de399eea5 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/message/ErrorMessage.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/message/ErrorMessage.java
@@ -25,19 +25,20 @@ import java.util.List;
@TsModel
public class ErrorMessage extends Message {
- public ErrorMessage() {
- super();
-
- }
- public ErrorMessage(Notification...notifications) {
- super(false, notifications);
- }
-
- public ErrorMessage(List<Notification> notifications) {
- super(false, notifications.toArray(new Notification[0]));
- }
-
- public ErrorMessage(String elementName, List<Notification> notifications) {
- super(false, notifications, elementName);
- }
+ public ErrorMessage() {
+ super();
+
+ }
+
+ public ErrorMessage(Notification... notifications) {
+ super(false, notifications);
+ }
+
+ public ErrorMessage(List<Notification> notifications) {
+ super(false, notifications.toArray(new Notification[0]));
+ }
+
+ public ErrorMessage(String elementName, List<Notification> notifications) {
+ super(false, notifications, elementName);
+ }
}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/message/Message.java b/streampipes-model/src/main/java/org/apache/streampipes/model/message/Message.java
index a3c274002..68d2beaaf 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/message/Message.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/message/Message.java
@@ -18,85 +18,80 @@
package org.apache.streampipes.model.message;
-import com.fasterxml.jackson.annotation.JsonSubTypes;
import org.apache.streampipes.model.shared.annotation.TsModel;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@TsModel
@JsonSubTypes({
- @JsonSubTypes.Type(DataSetModificationMessage.class),
- @JsonSubTypes.Type(ErrorMessage.class),
- @JsonSubTypes.Type(SuccessMessage.class),
- @JsonSubTypes.Type(PipelineModificationMessage.class),
+ @JsonSubTypes.Type(DataSetModificationMessage.class),
+ @JsonSubTypes.Type(ErrorMessage.class),
+ @JsonSubTypes.Type(SuccessMessage.class),
+ @JsonSubTypes.Type(PipelineModificationMessage.class),
})
public abstract class Message {
- private boolean success;
- private String elementName;
-
- private List<Notification> notifications;
-
- public Message(){
+ private boolean success;
+ private String elementName;
+
+ private List<Notification> notifications;
+
+ public Message() {
+
+ }
+
+ public Message(boolean success) {
+ this.success = success;
+ this.notifications = null;
+ }
+
+ public Message(boolean success, List<Notification> notifications) {
+ super();
+ this.success = success;
+ this.notifications = notifications;
+ }
+
+ public Message(boolean success, List<Notification> notifications, String elementName) {
+ this(success, notifications);
+ this.elementName = elementName;
+ }
+
+ public Message(boolean success, Notification... notifications) {
+ this.success = success;
+ this.notifications = new ArrayList<>();
+ this.notifications.addAll(Arrays.asList(notifications));
}
- public Message(boolean success){
- this.success = success;
- this.notifications = null;
- }
-
- public Message(boolean success, List<Notification> notifications) {
- super();
- this.success = success;
- this.notifications = notifications;
- }
-
- public Message(boolean success, List<Notification> notifications, String elementName) {
- this(success, notifications);
- this.elementName = elementName;
- }
-
-
- public Message(boolean success, Notification...notifications)
- {
- this.success = success;
- this.notifications = new ArrayList<>();
- this.notifications.addAll(Arrays.asList(notifications));
- }
-
- public boolean isSuccess() {
- return success;
- }
-
- public void setSuccess(boolean success) {
- this.success = success;
- }
-
- public List<Notification> getNotifications() {
- return notifications;
- }
-
- public void setNotifications(List<Notification> notifications) {
- this.notifications = notifications;
- }
-
- public boolean addNotification(Notification notification)
- {
- return notifications.add(notification);
- }
-
- public String getElementName() {
- return elementName;
- }
-
- public void setElementName(String elementName) {
- this.elementName = elementName;
- }
-
-
-
-
+ public boolean isSuccess() {
+ return success;
+ }
+
+ public void setSuccess(boolean success) {
+ this.success = success;
+ }
+
+ public List<Notification> getNotifications() {
+ return notifications;
+ }
+
+ public void setNotifications(List<Notification> notifications) {
+ this.notifications = notifications;
+ }
+
+ public boolean addNotification(Notification notification) {
+ return notifications.add(notification);
+ }
+
+ public String getElementName() {
+ return elementName;
+ }
+
+ public void setElementName(String elementName) {
+ this.elementName = elementName;
+ }
}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/message/NotificationType.java b/streampipes-model/src/main/java/org/apache/streampipes/model/message/NotificationType.java
index b0a24bd89..17b187cc9 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/message/NotificationType.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/message/NotificationType.java
@@ -19,76 +19,75 @@
package org.apache.streampipes.model.message;
public enum NotificationType {
- STORAGE_SUCCESS("Success", "Entity successfully stored"),
- URIOFFLINE("URI not available", "Content could not be retrieved."),
- NOSEPAFORMAT("Wrong Format", "Entity could not be recognized."),
- UNKNOWN_ERROR("Unknown Error", "An unforeseen error has occurred."),
- STORAGE_ERROR("Storage Error", "Entity could not be stored."),
- PIPELINE_STORAGE_SUCCESS("Success", "Pipeline stored successfully"),
- PIPELINE_START_SUCCESS("Started", "Pipeline successfully started"),
- PIPELINE_STOP_SUCCESS("Stopped", "Pipeline stopped successfully"),
- NO_VALID_CONNECTION("Not a valid connection", "Expected input event type does not match computed output type"),
- NO_SEPA_FOUND("No element found", "Could not find any element that matches the output of this element."),
- NO_MATCHING_FORMAT_CONNECTION("Not a valid connection", "No supported input format matches produced output format"),
- NO_MATCHING_PROTOCOL_CONNECTION("Not a valid connection", "No supported input protocol matches provided output protocol"),
- REMOTE_SERVER_NOT_ACCESSIBLE("Can't connect to remote server", "Please contact the admin of the system"),
- NO_MATCHING_SCHEME("The JSON from the server is not valid", "The keys in the element description don't map the keys in the JSON response"),
-
- LOGIN_FAILED("Login failed", "Please re-enter your password"),
- LOGIN_SUCCESS("Login success", ""),
- REGISTRATION_FAILED("Registration failed", "Please re-enter your password"),
- REGISTRATION_SUCCESS("Registered user successfully", ""),
- UNAUTHORIZED("Not authorized", ""),
-
- ALREADY_LOGGED_IN("User already logged in", ""),
- NOT_LOGGED_IN("User not logged in", ""),
- LOGOUT_SUCCESS("Successfully logged out", ""),
-
- OPERATION_SUCCESS("Success", ""),
-
- VIRTUAL_SENSOR_STORAGE_SUCCESS("Success", "Pipeline block stored successfully"),
-
- PARSE_ERROR("Parse Exception", "Could not parse element description"),
- WARNING_NO_ICON("Icon missing", ""),
- WARNING_NO_NAME("Name missing", ""),
- WARNING_NO_LABEL("Description missing", ""),
-
- NOT_REMEMBERED("User not remembered", ""),
- REMEMBERED("User remembered", ""),
-
- NOT_REMOVED("Could not remove element", ""),
- REMOVED_ACTION("Action removed", ""),
- REMOVED_SOURCE("Source removed", ""),
- REMOVED_SEPA("Sepa removed", ""),
-
- ADDED_CONFIGURATION("Configuration added", ""),
- INSTALLATION_SUCCESSFUL("Installation successful", ""),
-
- PROPERTY_FILE_WRITTEN("Writing properties file...", ""),
- ADMIN_USER_CREATED("Creating admin user...", ""),
-
- PASSWORD_RECOVERY_LINK_SENT("Check your mail inbox for instructions how to reset your password", "");
-
- private final String title;
- private final String description;
-
- NotificationType(String title, String description) {
- this.title = title;
- this.description = description;
- }
-
- public String title()
- {
- return title;
- }
-
- public String description()
- {
- return description;
- }
-
- public Notification uiNotification()
- {
- return new Notification(title, description);
- }
+ STORAGE_SUCCESS("Success", "Entity successfully stored"),
+ URIOFFLINE("URI not available", "Content could not be retrieved."),
+ NOSEPAFORMAT("Wrong Format", "Entity could not be recognized."),
+ UNKNOWN_ERROR("Unknown Error", "An unforeseen error has occurred."),
+ STORAGE_ERROR("Storage Error", "Entity could not be stored."),
+ PIPELINE_STORAGE_SUCCESS("Success", "Pipeline stored successfully"),
+ PIPELINE_START_SUCCESS("Started", "Pipeline successfully started"),
+ PIPELINE_STOP_SUCCESS("Stopped", "Pipeline stopped successfully"),
+ NO_VALID_CONNECTION("Not a valid connection", "Expected input event type does not match computed output type"),
+ NO_SEPA_FOUND("No element found", "Could not find any element that matches the output of this element."),
+ NO_MATCHING_FORMAT_CONNECTION("Not a valid connection", "No supported input format matches produced output format"),
+ NO_MATCHING_PROTOCOL_CONNECTION("Not a valid connection",
+ "No supported input protocol matches provided output protocol"),
+ REMOTE_SERVER_NOT_ACCESSIBLE("Can't connect to remote server", "Please contact the admin of the system"),
+ NO_MATCHING_SCHEME("The JSON from the server is not valid",
+ "The keys in the element description don't map the keys in the JSON response"),
+
+ LOGIN_FAILED("Login failed", "Please re-enter your password"),
+ LOGIN_SUCCESS("Login success", ""),
+ REGISTRATION_FAILED("Registration failed", "Please re-enter your password"),
+ REGISTRATION_SUCCESS("Registered user successfully", ""),
+ UNAUTHORIZED("Not authorized", ""),
+
+ ALREADY_LOGGED_IN("User already logged in", ""),
+ NOT_LOGGED_IN("User not logged in", ""),
+ LOGOUT_SUCCESS("Successfully logged out", ""),
+
+ OPERATION_SUCCESS("Success", ""),
+
+ VIRTUAL_SENSOR_STORAGE_SUCCESS("Success", "Pipeline block stored successfully"),
+
+ PARSE_ERROR("Parse Exception", "Could not parse element description"),
+ WARNING_NO_ICON("Icon missing", ""),
+ WARNING_NO_NAME("Name missing", ""),
+ WARNING_NO_LABEL("Description missing", ""),
+
+ NOT_REMEMBERED("User not remembered", ""),
+ REMEMBERED("User remembered", ""),
+
+ NOT_REMOVED("Could not remove element", ""),
+ REMOVED_ACTION("Action removed", ""),
+ REMOVED_SOURCE("Source removed", ""),
+ REMOVED_SEPA("Sepa removed", ""),
+
+ ADDED_CONFIGURATION("Configuration added", ""),
+ INSTALLATION_SUCCESSFUL("Installation successful", ""),
+
+ PROPERTY_FILE_WRITTEN("Writing properties file...", ""),
+ ADMIN_USER_CREATED("Creating admin user...", ""),
+
+ PASSWORD_RECOVERY_LINK_SENT("Check your mail inbox for instructions how to reset your password", "");
+
+ private final String title;
+ private final String description;
+
+ NotificationType(String title, String description) {
+ this.title = title;
+ this.description = description;
+ }
+
+ public String title() {
+ return title;
+ }
+
+ public String description() {
+ return description;
+ }
+
+ public Notification uiNotification() {
+ return new Notification(title, description);
+ }
}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/message/Notifications.java b/streampipes-model/src/main/java/org/apache/streampipes/model/message/Notifications.java
index 66dbe16ce..4e14af926 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/message/Notifications.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/message/Notifications.java
... 5259 lines suppressed ...