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 21:17:47 UTC
[streampipes] 05/05: add checkstyle to streampipes-container
This is an automated email from the ASF dual-hosted git repository.
bossenti pushed a commit to branch add-checkstyle
in repository https://gitbox.apache.org/repos/asf/streampipes.git
commit c1924181a350249b71b39815909ee9f590c94ca9
Author: bossenti <bo...@posteo.de>
AuthorDate: Mon Dec 12 22:16:59 2022 +0100
add checkstyle to streampipes-container
---
streampipes-container/pom.xml | 161 ++++++++-------
.../api/AbstractPipelineElementResource.java | 18 +-
.../api/DataProcessorPipelineElementResource.java | 49 ++---
.../api/DataSinkPipelineElementResource.java | 49 ++---
.../api/DataStreamPipelineElementResource.java | 29 ++-
.../api/InvocablePipelineElementResource.java | 60 +++---
.../container/api/PipelineTemplateResource.java | 1 +
.../ResolvesContainerProvidedOutputStrategy.java | 2 +-
.../api/RuntimeResolvableRequestHandler.java | 22 +-
.../streampipes/container/api/WelcomePage.java | 10 +-
.../container/assets/AssetZipGenerator.java | 2 +-
.../container/config/ConfigExtractor.java | 8 +-
.../streampipes/container/declarer/Declarer.java | 4 +-
.../container/declarer/InvocableDeclarer.java | 8 +-
.../declarer/PipelineTemplateDeclarer.java | 2 +-
.../SemanticEventProcessingAgentDeclarer.java | 5 +-
.../declarer/SemanticEventProducerDeclarer.java | 2 +-
.../streampipes/container/html/HTMLGenerator.java | 48 +++--
.../streampipes/container/html/JSONGenerator.java | 5 +-
.../html/model/DataSourceDescriptionHtml.java | 28 +--
.../container/html/model/Description.java | 229 +++++++++++----------
.../container/html/page/WelcomePageGenerator.java | 11 +-
.../container/init/DeclarersSingleton.java | 77 +++----
.../PipelineElementServiceResourceProvider.java | 16 +-
.../container/init/RunningInstances.java | 68 +++---
.../container/locales/LabelGenerator.java | 45 ++--
.../container/model/ExtensionsConfig.java | 17 +-
.../streampipes/container/model/PeConfig.java | 11 +-
.../container/model/SpServiceDefinition.java | 6 +-
.../model/SpServiceDefinitionBuilder.java | 18 +-
.../streampipes/container/util/AssetsUtil.java | 18 +-
.../streampipes/container/util/ElementInfo.java | 38 ++--
.../streampipes/container/util/LocalesUtil.java | 4 +-
.../container/util/ServiceDefinitionUtil.java | 18 +-
.../container/util/StandardTransportFormat.java | 45 ++--
.../apache/streampipes/container/util/Util.java | 37 ++--
36 files changed, 627 insertions(+), 544 deletions(-)
diff --git a/streampipes-container/pom.xml b/streampipes-container/pom.xml
index c3cf49f7a..4321e7788 100644
--- a/streampipes-container/pom.xml
+++ b/streampipes-container/pom.xml
@@ -16,85 +16,94 @@
~
-->
-<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-container</artifactId>
+ <artifactId>streampipes-container</artifactId>
- <name>Semantic Event Processing Agents</name>
+ <name>Semantic Event Processing Agents</name>
- <dependencies>
- <!-- StreamPipes dependencies -->
- <dependency>
- <groupId>org.apache.streampipes</groupId>
- <artifactId>streampipes-connect-api</artifactId>
- <version>0.91.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.streampipes</groupId>
- <artifactId>streampipes-dataformat</artifactId>
- <version>0.91.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.streampipes</groupId>
- <artifactId>streampipes-messaging</artifactId>
- <version>0.91.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.streampipes</groupId>
- <artifactId>streampipes-sdk</artifactId>
- <version>0.91.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.streampipes</groupId>
- <artifactId>streampipes-serializers-json</artifactId>
- <version>0.91.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.streampipes</groupId>
- <artifactId>streampipes-service-discovery</artifactId>
- <version>0.91.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.streampipes</groupId>
- <artifactId>streampipes-rest-shared</artifactId>
- <version>0.91.0-SNAPSHOT</version>
- </dependency>
+ <dependencies>
+ <!-- StreamPipes dependencies -->
+ <dependency>
+ <groupId>org.apache.streampipes</groupId>
+ <artifactId>streampipes-connect-api</artifactId>
+ <version>0.91.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.streampipes</groupId>
+ <artifactId>streampipes-dataformat</artifactId>
+ <version>0.91.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.streampipes</groupId>
+ <artifactId>streampipes-messaging</artifactId>
+ <version>0.91.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.streampipes</groupId>
+ <artifactId>streampipes-sdk</artifactId>
+ <version>0.91.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.streampipes</groupId>
+ <artifactId>streampipes-serializers-json</artifactId>
+ <version>0.91.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.streampipes</groupId>
+ <artifactId>streampipes-service-discovery</artifactId>
+ <version>0.91.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.streampipes</groupId>
+ <artifactId>streampipes-rest-shared</artifactId>
+ <version>0.91.0-SNAPSHOT</version>
+ </dependency>
- <!-- External dependencies -->
- <dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>javax.ws.rs-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>fluent-hc</artifactId>
- </dependency>
- <dependency>
- <groupId>org.rendersnake</groupId>
- <artifactId>rendersnake</artifactId>
- <exclusions>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-webmvc</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
+ <!-- External dependencies -->
+ <dependency>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>javax.ws.rs-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>fluent-hc</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.rendersnake</groupId>
+ <artifactId>rendersnake</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-webmvc</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
- <!-- Test dependencies -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <!-- Test dependencies -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/streampipes-container/src/main/java/org/apache/streampipes/container/api/AbstractPipelineElementResource.java b/streampipes-container/src/main/java/org/apache/streampipes/container/api/AbstractPipelineElementResource.java
index 1c912efb3..859c317d3 100644
--- a/streampipes-container/src/main/java/org/apache/streampipes/container/api/AbstractPipelineElementResource.java
+++ b/streampipes-container/src/main/java/org/apache/streampipes/container/api/AbstractPipelineElementResource.java
@@ -18,8 +18,6 @@
package org.apache.streampipes.container.api;
-import com.google.common.base.Charsets;
-import com.google.common.io.Resources;
import org.apache.streampipes.commons.constants.GlobalStreamPipesConstants;
import org.apache.streampipes.container.assets.AssetZipGenerator;
import org.apache.streampipes.container.declarer.Declarer;
@@ -32,6 +30,9 @@ import org.apache.streampipes.model.grounding.TransportFormat;
import org.apache.streampipes.model.grounding.TransportProtocol;
import org.apache.streampipes.rest.shared.annotation.JacksonSerialized;
import org.apache.streampipes.rest.shared.util.SpMediaType;
+
+import com.google.common.base.Charsets;
+import com.google.common.io.Resources;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -41,6 +42,7 @@ import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
+
import java.io.IOException;
import java.net.URL;
import java.util.ArrayList;
@@ -48,7 +50,7 @@ import java.util.Collection;
import java.util.List;
import java.util.Map;
-public abstract class AbstractPipelineElementResource<D extends Declarer<?>> extends AbstractExtensionsResource {
+public abstract class AbstractPipelineElementResource<T extends Declarer<?>> extends AbstractExtensionsResource {
private static final String SLASH = "/";
@@ -109,7 +111,7 @@ public abstract class AbstractPipelineElementResource<D extends Declarer<?>> ext
return rewrite(desc);
}
- protected D getDeclarerById(String appId) {
+ protected T getDeclarerById(String appId) {
return getElementDeclarers().get(appId);
}
@@ -133,14 +135,14 @@ public abstract class AbstractPipelineElementResource<D extends Declarer<?>> ext
if (desc instanceof ConsumableStreamPipesEntity) {
Collection<TransportProtocol> supportedProtocols =
- DeclarersSingleton.getInstance().getSupportedProtocols();
+ DeclarersSingleton.getInstance().getSupportedProtocols();
Collection<TransportFormat> supportedFormats =
- DeclarersSingleton.getInstance().getSupportedFormats();
+ DeclarersSingleton.getInstance().getSupportedFormats();
if (supportedProtocols.size() > 0 && supportedFormats.size() > 0) {
// Overwrite existing grounding from default provided by declarers singleton
((ConsumableStreamPipesEntity) desc)
- .setSupportedGrounding(makeGrounding(supportedProtocols, supportedFormats));
+ .setSupportedGrounding(makeGrounding(supportedProtocols, supportedFormats));
}
}
}
@@ -169,5 +171,5 @@ public abstract class AbstractPipelineElementResource<D extends Declarer<?>> ext
return appId + SLASH + assetAppendix;
}
- protected abstract Map<String, D> getElementDeclarers();
+ protected abstract Map<String, T> getElementDeclarers();
}
diff --git a/streampipes-container/src/main/java/org/apache/streampipes/container/api/DataProcessorPipelineElementResource.java b/streampipes-container/src/main/java/org/apache/streampipes/container/api/DataProcessorPipelineElementResource.java
index cf4916205..733b7a6e2 100644
--- a/streampipes-container/src/main/java/org/apache/streampipes/container/api/DataProcessorPipelineElementResource.java
+++ b/streampipes-container/src/main/java/org/apache/streampipes/container/api/DataProcessorPipelineElementResource.java
@@ -27,39 +27,40 @@ import org.apache.streampipes.sdk.extractor.ProcessingElementParameterExtractor;
import org.apache.streampipes.svcdiscovery.api.model.SpServicePathPrefix;
import javax.ws.rs.Path;
+
import java.util.Map;
@Path(SpServicePathPrefix.DATA_PROCESSOR)
public class DataProcessorPipelineElementResource extends InvocablePipelineElementResource<DataProcessorInvocation,
- SemanticEventProcessingAgentDeclarer, ProcessingElementParameterExtractor> {
+ SemanticEventProcessingAgentDeclarer, ProcessingElementParameterExtractor> {
- public DataProcessorPipelineElementResource() {
+ public DataProcessorPipelineElementResource() {
- super(DataProcessorInvocation.class);
- }
+ super(DataProcessorInvocation.class);
+ }
- @Override
- protected Map<String, SemanticEventProcessingAgentDeclarer> getElementDeclarers() {
- return DeclarersSingleton.getInstance().getEpaDeclarers();
- }
+ @Override
+ protected Map<String, SemanticEventProcessingAgentDeclarer> getElementDeclarers() {
+ return DeclarersSingleton.getInstance().getEpaDeclarers();
+ }
- @Override
- protected String getInstanceId(String uri, String elementId) {
- return InstanceIdExtractor.extractId(uri);
- }
+ @Override
+ protected String getInstanceId(String uri, String elementId) {
+ return InstanceIdExtractor.extractId(uri);
+ }
- @Override
- protected ProcessingElementParameterExtractor getExtractor(DataProcessorInvocation graph) {
- return new ProcessingElementParameterExtractor(graph);
- }
+ @Override
+ protected ProcessingElementParameterExtractor getExtractor(DataProcessorInvocation graph) {
+ return new ProcessingElementParameterExtractor(graph);
+ }
- @Override
- protected DataProcessorInvocation createGroundingDebugInformation(DataProcessorInvocation graph) {
- graph.getInputStreams().forEach(is -> {
- GroundingDebugUtils.modifyGrounding(is.getEventGrounding());
- });
+ @Override
+ protected DataProcessorInvocation createGroundingDebugInformation(DataProcessorInvocation graph) {
+ graph.getInputStreams().forEach(is -> {
+ GroundingDebugUtils.modifyGrounding(is.getEventGrounding());
+ });
- GroundingDebugUtils.modifyGrounding(graph.getOutputStream().getEventGrounding());
- return graph;
- }
+ GroundingDebugUtils.modifyGrounding(graph.getOutputStream().getEventGrounding());
+ return graph;
+ }
}
diff --git a/streampipes-container/src/main/java/org/apache/streampipes/container/api/DataSinkPipelineElementResource.java b/streampipes-container/src/main/java/org/apache/streampipes/container/api/DataSinkPipelineElementResource.java
index 67483985b..b43581a69 100644
--- a/streampipes-container/src/main/java/org/apache/streampipes/container/api/DataSinkPipelineElementResource.java
+++ b/streampipes-container/src/main/java/org/apache/streampipes/container/api/DataSinkPipelineElementResource.java
@@ -27,38 +27,39 @@ import org.apache.streampipes.sdk.extractor.DataSinkParameterExtractor;
import org.apache.streampipes.svcdiscovery.api.model.SpServicePathPrefix;
import javax.ws.rs.Path;
+
import java.util.Map;
@Path(SpServicePathPrefix.DATA_SINK)
public class DataSinkPipelineElementResource extends InvocablePipelineElementResource<DataSinkInvocation,
- SemanticEventConsumerDeclarer, DataSinkParameterExtractor> {
+ SemanticEventConsumerDeclarer, DataSinkParameterExtractor> {
- public DataSinkPipelineElementResource() {
- super(DataSinkInvocation.class);
- }
+ public DataSinkPipelineElementResource() {
+ super(DataSinkInvocation.class);
+ }
- @Override
- protected Map<String, SemanticEventConsumerDeclarer> getElementDeclarers() {
- return DeclarersSingleton.getInstance().getConsumerDeclarers();
- }
+ @Override
+ protected Map<String, SemanticEventConsumerDeclarer> getElementDeclarers() {
+ return DeclarersSingleton.getInstance().getConsumerDeclarers();
+ }
- @Override
- protected String getInstanceId(String uri, String elementId) {
- //return Util.getInstanceId(uri, PipelineElementPrefix.DATA_SINK, elementId);
- return InstanceIdExtractor.extractId(uri);
- }
+ @Override
+ protected String getInstanceId(String uri, String elementId) {
+ //return Util.getInstanceId(uri, PipelineElementPrefix.DATA_SINK, elementId);
+ return InstanceIdExtractor.extractId(uri);
+ }
- @Override
- protected DataSinkParameterExtractor getExtractor(DataSinkInvocation graph) {
- return new DataSinkParameterExtractor(graph);
- }
+ @Override
+ protected DataSinkParameterExtractor getExtractor(DataSinkInvocation graph) {
+ return new DataSinkParameterExtractor(graph);
+ }
- @Override
- protected DataSinkInvocation createGroundingDebugInformation(DataSinkInvocation graph) {
- graph.getInputStreams().forEach(is -> {
- GroundingDebugUtils.modifyGrounding(is.getEventGrounding());
- });
+ @Override
+ protected DataSinkInvocation createGroundingDebugInformation(DataSinkInvocation graph) {
+ graph.getInputStreams().forEach(is -> {
+ GroundingDebugUtils.modifyGrounding(is.getEventGrounding());
+ });
- return graph;
- }
+ return graph;
+ }
}
diff --git a/streampipes-container/src/main/java/org/apache/streampipes/container/api/DataStreamPipelineElementResource.java b/streampipes-container/src/main/java/org/apache/streampipes/container/api/DataStreamPipelineElementResource.java
index 23421e0a2..361e63a8e 100644
--- a/streampipes-container/src/main/java/org/apache/streampipes/container/api/DataStreamPipelineElementResource.java
+++ b/streampipes-container/src/main/java/org/apache/streampipes/container/api/DataStreamPipelineElementResource.java
@@ -18,7 +18,6 @@
package org.apache.streampipes.container.api;
-import org.apache.streampipes.svcdiscovery.api.model.SpServicePathPrefix;
import org.apache.streampipes.container.assets.AssetZipGenerator;
import org.apache.streampipes.container.declarer.DataSetDeclarer;
import org.apache.streampipes.container.declarer.DataStreamDeclarer;
@@ -27,9 +26,17 @@ import org.apache.streampipes.container.init.RunningDatasetInstances;
import org.apache.streampipes.model.Response;
import org.apache.streampipes.model.SpDataSet;
import org.apache.streampipes.serializers.json.JacksonSerializer;
+import org.apache.streampipes.svcdiscovery.api.model.SpServicePathPrefix;
-import javax.ws.rs.*;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
+
import java.io.IOException;
import java.util.Map;
@@ -47,8 +54,8 @@ public class DataStreamPipelineElementResource extends AbstractPipelineElementRe
public javax.ws.rs.core.Response getAssets(@PathParam("streamId") String streamId) {
try {
return ok(new AssetZipGenerator(streamId,
- getById(streamId)
- .getIncludedAssets()).makeZip());
+ getById(streamId)
+ .getIncludedAssets()).makeZip());
} catch (IOException e) {
e.printStackTrace();
return javax.ws.rs.core.Response.status(500).build();
@@ -60,20 +67,21 @@ public class DataStreamPipelineElementResource extends AbstractPipelineElementRe
@Produces(MediaType.APPLICATION_JSON)
@Consumes(MediaType.APPLICATION_JSON)
public javax.ws.rs.core.Response invokeRuntime(@PathParam("streamId") String streamId, String
- payload) {
+ payload) {
DataStreamDeclarer streamDeclarer = getDeclarerById(streamId);
try {
SpDataSet dataSet = JacksonSerializer.getObjectMapper().readValue(payload, SpDataSet.class);
String runningInstanceId = dataSet.getDatasetInvocationId();
- RunningDatasetInstances.INSTANCE.add(runningInstanceId, dataSet, (DataSetDeclarer) streamDeclarer.getClass().newInstance());
+ RunningDatasetInstances.INSTANCE.add(runningInstanceId, dataSet,
+ (DataSetDeclarer) streamDeclarer.getClass().newInstance());
RunningDatasetInstances.INSTANCE.getInvocation(runningInstanceId).invokeRuntime(dataSet, ()
- -> {
+ -> {
// TODO notify
});
return ok(new Response(runningInstanceId, true));
- } catch (IOException | InstantiationException |
- IllegalAccessException e) {
+ } catch (IOException | InstantiationException
+ | IllegalAccessException e) {
e.printStackTrace();
return ok(new Response("", false, e.getMessage()));
}
@@ -99,6 +107,7 @@ public class DataStreamPipelineElementResource extends AbstractPipelineElementRe
return ok(resp);
}
- return ok(new Response(runningInstanceId, false, "Could not find the running instance with id: " + runningInstanceId));
+ return ok(
+ new Response(runningInstanceId, false, "Could not find the running instance with id: " + runningInstanceId));
}
}
diff --git a/streampipes-container/src/main/java/org/apache/streampipes/container/api/InvocablePipelineElementResource.java b/streampipes-container/src/main/java/org/apache/streampipes/container/api/InvocablePipelineElementResource.java
index 780b70434..fb96eced9 100644
--- a/streampipes-container/src/main/java/org/apache/streampipes/container/api/InvocablePipelineElementResource.java
+++ b/streampipes-container/src/main/java/org/apache/streampipes/container/api/InvocablePipelineElementResource.java
@@ -31,28 +31,35 @@ import org.apache.streampipes.model.runtime.RuntimeOptionsRequest;
import org.apache.streampipes.model.runtime.RuntimeOptionsResponse;
import org.apache.streampipes.rest.shared.annotation.JacksonSerialized;
import org.apache.streampipes.sdk.extractor.AbstractParameterExtractor;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.ws.rs.*;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
+
import java.util.Map;
public abstract class InvocablePipelineElementResource<I extends InvocableStreamPipesEntity, D extends Declarer<?>,
- P extends AbstractParameterExtractor<I>> extends AbstractPipelineElementResource<D> {
+ P extends AbstractParameterExtractor<I>> extends AbstractPipelineElementResource<D> {
private static final Logger LOG = LoggerFactory.getLogger(InvocablePipelineElementResource.class);
-
- protected abstract Map<String, D> getElementDeclarers();
-
- protected abstract String getInstanceId(String uri, String elementId);
-
protected Class<I> clazz;
public InvocablePipelineElementResource(Class<I> clazz) {
this.clazz = clazz;
}
+ protected abstract Map<String, D> getElementDeclarers();
+
+ protected abstract String getInstanceId(String uri, String elementId);
+
@POST
@Path("{elementId}")
@Produces(MediaType.APPLICATION_JSON)
@@ -73,16 +80,18 @@ public abstract class InvocablePipelineElementResource<I extends InvocableStream
String runningInstanceId = getInstanceId(graph.getElementId(), elementId);
if (!RunningInstances.INSTANCE.exists(runningInstanceId)) {
RunningInstances.INSTANCE.add(runningInstanceId, graph, declarer.getClass().newInstance());
- Response resp = RunningInstances.INSTANCE.getInvocation(runningInstanceId).invokeRuntime(graph, getServiceGroup());
+ Response resp =
+ RunningInstances.INSTANCE.getInvocation(runningInstanceId).invokeRuntime(graph, getServiceGroup());
if (!resp.isSuccess()) {
LOG.error("Could not invoke pipeline element {} due to the following error: {}",
- graph.getName(),
- resp.getOptionalMessage());
+ graph.getName(),
+ resp.getOptionalMessage());
RunningInstances.INSTANCE.remove(runningInstanceId);
}
return ok(resp);
} else {
- LOG.info("Pipeline element {} with id {} seems to be already running, skipping invocation request.", graph.getName(), runningInstanceId);
+ LOG.info("Pipeline element {} with id {} seems to be already running, skipping invocation request.",
+ graph.getName(), runningInstanceId);
Response resp = new Response(graph.getElementId(), true);
return ok(resp);
}
@@ -109,19 +118,22 @@ public abstract class InvocablePipelineElementResource<I extends InvocableStream
try {
if (declarer instanceof ResolvesContainerProvidedOptions) {
- responseOptions = new RuntimeResolvableRequestHandler().handleRuntimeResponse((ResolvesContainerProvidedOptions) declarer, req);
+ responseOptions =
+ new RuntimeResolvableRequestHandler().handleRuntimeResponse((ResolvesContainerProvidedOptions) declarer,
+ req);
return ok(responseOptions);
} else if (declarer instanceof SupportsRuntimeConfig) {
- responseOptions = new RuntimeResolvableRequestHandler().handleRuntimeResponse((SupportsRuntimeConfig) declarer, req);
- return ok(responseOptions);
+ responseOptions =
+ new RuntimeResolvableRequestHandler().handleRuntimeResponse((SupportsRuntimeConfig) declarer, req);
+ return ok(responseOptions);
} else {
return javax.ws.rs.core.Response.status(500).build();
}
} catch (SpConfigurationException e) {
return javax.ws.rs.core.Response
- .status(400)
- .entity(e)
- .build();
+ .status(400)
+ .entity(e)
+ .build();
}
}
@@ -130,15 +142,16 @@ public abstract class InvocablePipelineElementResource<I extends InvocableStream
@Produces(MediaType.APPLICATION_JSON)
@Consumes(MediaType.APPLICATION_JSON)
@JacksonSerialized
- public javax.ws.rs.core.Response fetchOutputStrategy(@PathParam("elementId") String elementId, I runtimeOptionsRequest) {
+ public javax.ws.rs.core.Response fetchOutputStrategy(@PathParam("elementId") String elementId,
+ I runtimeOptionsRequest) {
try {
//I runtimeOptionsRequest = JacksonSerializer.getObjectMapper().readValue(payload, clazz);
ResolvesContainerProvidedOutputStrategy<I, P> resolvesOutput =
- (ResolvesContainerProvidedOutputStrategy<I, P>)
- getDeclarerById
- (elementId);
+ (ResolvesContainerProvidedOutputStrategy<I, P>)
+ getDeclarerById
+ (elementId);
return ok(resolvesOutput.resolveOutputStrategy
- (runtimeOptionsRequest, getExtractor(runtimeOptionsRequest)));
+ (runtimeOptionsRequest, getExtractor(runtimeOptionsRequest)));
} catch (SpRuntimeException | SpConfigurationException e) {
return ok(new Response(elementId, false));
}
@@ -149,7 +162,8 @@ public abstract class InvocablePipelineElementResource<I extends InvocableStream
@DELETE
@Path("{elementId}/{runningInstanceId}")
@Produces(MediaType.APPLICATION_JSON)
- public javax.ws.rs.core.Response detach(@PathParam("elementId") String elementId, @PathParam("runningInstanceId") String runningInstanceId) {
+ public javax.ws.rs.core.Response detach(@PathParam("elementId") String elementId,
+ @PathParam("runningInstanceId") String runningInstanceId) {
InvocableDeclarer runningInstance = RunningInstances.INSTANCE.getInvocation(runningInstanceId);
diff --git a/streampipes-container/src/main/java/org/apache/streampipes/container/api/PipelineTemplateResource.java b/streampipes-container/src/main/java/org/apache/streampipes/container/api/PipelineTemplateResource.java
index 0a930aebb..58c8e2919 100644
--- a/streampipes-container/src/main/java/org/apache/streampipes/container/api/PipelineTemplateResource.java
+++ b/streampipes-container/src/main/java/org/apache/streampipes/container/api/PipelineTemplateResource.java
@@ -21,6 +21,7 @@ import org.apache.streampipes.container.declarer.PipelineTemplateDeclarer;
import org.apache.streampipes.container.init.DeclarersSingleton;
import javax.ws.rs.Path;
+
import java.util.Map;
@Path("/template")
diff --git a/streampipes-container/src/main/java/org/apache/streampipes/container/api/ResolvesContainerProvidedOutputStrategy.java b/streampipes-container/src/main/java/org/apache/streampipes/container/api/ResolvesContainerProvidedOutputStrategy.java
index ab44539ae..c215d1644 100644
--- a/streampipes-container/src/main/java/org/apache/streampipes/container/api/ResolvesContainerProvidedOutputStrategy.java
+++ b/streampipes-container/src/main/java/org/apache/streampipes/container/api/ResolvesContainerProvidedOutputStrategy.java
@@ -23,7 +23,7 @@ import org.apache.streampipes.model.schema.EventSchema;
import org.apache.streampipes.sdk.extractor.AbstractParameterExtractor;
public interface ResolvesContainerProvidedOutputStrategy<T extends InvocableStreamPipesEntity, P
- extends AbstractParameterExtractor<T>> {
+ extends AbstractParameterExtractor<T>> {
EventSchema resolveOutputStrategy(T processingElement, P parameterExtractor) throws SpConfigurationException;
}
diff --git a/streampipes-container/src/main/java/org/apache/streampipes/container/api/RuntimeResolvableRequestHandler.java b/streampipes-container/src/main/java/org/apache/streampipes/container/api/RuntimeResolvableRequestHandler.java
index 91e18f97f..e78bf76bb 100644
--- a/streampipes-container/src/main/java/org/apache/streampipes/container/api/RuntimeResolvableRequestHandler.java
+++ b/streampipes-container/src/main/java/org/apache/streampipes/container/api/RuntimeResolvableRequestHandler.java
@@ -34,8 +34,8 @@ public class RuntimeResolvableRequestHandler {
public RuntimeOptionsResponse handleRuntimeResponse(ResolvesContainerProvidedOptions resolvesOptions,
RuntimeOptionsRequest req) throws SpConfigurationException {
List<Option> availableOptions =
- resolvesOptions.resolveOptions(req.getRequestId(),
- makeExtractor(req));
+ resolvesOptions.resolveOptions(req.getRequestId(),
+ makeExtractor(req));
SelectionStaticProperty sp = getConfiguredProperty(req);
sp.setOptions(availableOptions);
@@ -46,24 +46,24 @@ public class RuntimeResolvableRequestHandler {
public RuntimeOptionsResponse handleRuntimeResponse(SupportsRuntimeConfig declarer,
RuntimeOptionsRequest req) throws SpConfigurationException {
StaticProperty result = declarer.resolveConfiguration(
- req.getRequestId(),
- makeExtractor(req));
+ req.getRequestId(),
+ makeExtractor(req));
return new RuntimeOptionsResponse(req, result);
}
private SelectionStaticProperty getConfiguredProperty(RuntimeOptionsRequest req) {
return req.getStaticProperties()
- .stream()
- .filter(p -> p.getInternalName().equals(req.getRequestId()))
- .map(p -> (SelectionStaticProperty) p)
- .findFirst()
- .get();
+ .stream()
+ .filter(p -> p.getInternalName().equals(req.getRequestId()))
+ .map(p -> (SelectionStaticProperty) p)
+ .findFirst()
+ .get();
}
private StaticPropertyExtractor makeExtractor(RuntimeOptionsRequest req) {
return StaticPropertyExtractor.from(req.getStaticProperties(),
- req.getInputStreams(),
- req.getAppId());
+ req.getInputStreams(),
+ req.getAppId());
}
}
diff --git a/streampipes-container/src/main/java/org/apache/streampipes/container/api/WelcomePage.java b/streampipes-container/src/main/java/org/apache/streampipes/container/api/WelcomePage.java
index f8e949e2a..5f1e7babd 100644
--- a/streampipes-container/src/main/java/org/apache/streampipes/container/api/WelcomePage.java
+++ b/streampipes-container/src/main/java/org/apache/streampipes/container/api/WelcomePage.java
@@ -49,10 +49,10 @@ public class WelcomePage {
private WelcomePageGenerator getWelcomePageGenerator() {
return new WelcomePageGenerator(DeclarersSingleton
- .getInstance()
- .getBaseUri(), DeclarersSingleton
- .getInstance()
- .getDeclarers()
- .values());
+ .getInstance()
+ .getBaseUri(), DeclarersSingleton
+ .getInstance()
+ .getDeclarers()
+ .values());
}
}
diff --git a/streampipes-container/src/main/java/org/apache/streampipes/container/assets/AssetZipGenerator.java b/streampipes-container/src/main/java/org/apache/streampipes/container/assets/AssetZipGenerator.java
index a1bcb75d8..fe80a9958 100644
--- a/streampipes-container/src/main/java/org/apache/streampipes/container/assets/AssetZipGenerator.java
+++ b/streampipes-container/src/main/java/org/apache/streampipes/container/assets/AssetZipGenerator.java
@@ -56,7 +56,7 @@ public class AssetZipGenerator {
while ((len = in.read(buffer)) > 0) {
out.write(buffer, 0, len);
}
- } catch(Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
} finally {
in.close();
diff --git a/streampipes-container/src/main/java/org/apache/streampipes/container/config/ConfigExtractor.java b/streampipes-container/src/main/java/org/apache/streampipes/container/config/ConfigExtractor.java
index 93d050ccd..1abdefdf3 100644
--- a/streampipes-container/src/main/java/org/apache/streampipes/container/config/ConfigExtractor.java
+++ b/streampipes-container/src/main/java/org/apache/streampipes/container/config/ConfigExtractor.java
@@ -26,14 +26,14 @@ public class ConfigExtractor implements Serializable {
private SpConfig config;
- public static ConfigExtractor from(String serviceGroup) {
- return new ConfigExtractor(serviceGroup);
- }
-
private ConfigExtractor(String serviceGroup) {
this.config = new ConsulSpConfig(serviceGroup);
}
+ public static ConfigExtractor from(String serviceGroup) {
+ return new ConfigExtractor(serviceGroup);
+ }
+
public SpConfig getConfig() {
return this.config;
}
diff --git a/streampipes-container/src/main/java/org/apache/streampipes/container/declarer/Declarer.java b/streampipes-container/src/main/java/org/apache/streampipes/container/declarer/Declarer.java
index 07a41a92a..c9f874ddf 100644
--- a/streampipes-container/src/main/java/org/apache/streampipes/container/declarer/Declarer.java
+++ b/streampipes-container/src/main/java/org/apache/streampipes/container/declarer/Declarer.java
@@ -21,8 +21,8 @@ package org.apache.streampipes.container.declarer;
import org.apache.streampipes.model.base.NamedStreamPipesEntity;
-public interface Declarer<D extends NamedStreamPipesEntity> {
+public interface Declarer<T extends NamedStreamPipesEntity> {
- D declareModel();
+ T declareModel();
}
diff --git a/streampipes-container/src/main/java/org/apache/streampipes/container/declarer/InvocableDeclarer.java b/streampipes-container/src/main/java/org/apache/streampipes/container/declarer/InvocableDeclarer.java
index e3e05f756..8ceda0ac0 100644
--- a/streampipes-container/src/main/java/org/apache/streampipes/container/declarer/InvocableDeclarer.java
+++ b/streampipes-container/src/main/java/org/apache/streampipes/container/declarer/InvocableDeclarer.java
@@ -18,14 +18,14 @@
package org.apache.streampipes.container.declarer;
+import org.apache.streampipes.model.Response;
import org.apache.streampipes.model.base.InvocableStreamPipesEntity;
import org.apache.streampipes.model.base.NamedStreamPipesEntity;
-import org.apache.streampipes.model.Response;
public interface InvocableDeclarer<D extends NamedStreamPipesEntity,
- I extends InvocableStreamPipesEntity> extends Declarer<D> {
+ I extends InvocableStreamPipesEntity> extends Declarer<D> {
- Response invokeRuntime(I invocationGraph, String serviceId);
+ Response invokeRuntime(I invocationGraph, String serviceId);
- Response detachRuntime(String pipelineId, String serviceId);
+ Response detachRuntime(String pipelineId, String serviceId);
}
diff --git a/streampipes-container/src/main/java/org/apache/streampipes/container/declarer/PipelineTemplateDeclarer.java b/streampipes-container/src/main/java/org/apache/streampipes/container/declarer/PipelineTemplateDeclarer.java
index 93453eee7..a7dee89ac 100644
--- a/streampipes-container/src/main/java/org/apache/streampipes/container/declarer/PipelineTemplateDeclarer.java
+++ b/streampipes-container/src/main/java/org/apache/streampipes/container/declarer/PipelineTemplateDeclarer.java
@@ -19,7 +19,7 @@ package org.apache.streampipes.container.declarer;
import org.apache.streampipes.model.template.PipelineTemplateDescription;
-public interface PipelineTemplateDeclarer extends Declarer<PipelineTemplateDescription> {
+public interface PipelineTemplateDeclarer extends Declarer<PipelineTemplateDescription> {
PipelineTemplateDescription declareModel();
}
diff --git a/streampipes-container/src/main/java/org/apache/streampipes/container/declarer/SemanticEventProcessingAgentDeclarer.java b/streampipes-container/src/main/java/org/apache/streampipes/container/declarer/SemanticEventProcessingAgentDeclarer.java
index 8ae0affba..86ce08039 100644
--- a/streampipes-container/src/main/java/org/apache/streampipes/container/declarer/SemanticEventProcessingAgentDeclarer.java
+++ b/streampipes-container/src/main/java/org/apache/streampipes/container/declarer/SemanticEventProcessingAgentDeclarer.java
@@ -21,6 +21,7 @@ package org.apache.streampipes.container.declarer;
import org.apache.streampipes.model.graph.DataProcessorDescription;
import org.apache.streampipes.model.graph.DataProcessorInvocation;
-public interface SemanticEventProcessingAgentDeclarer extends InvocableDeclarer<DataProcessorDescription, DataProcessorInvocation>{
-
+public interface SemanticEventProcessingAgentDeclarer
+ extends InvocableDeclarer<DataProcessorDescription, DataProcessorInvocation> {
+
}
diff --git a/streampipes-container/src/main/java/org/apache/streampipes/container/declarer/SemanticEventProducerDeclarer.java b/streampipes-container/src/main/java/org/apache/streampipes/container/declarer/SemanticEventProducerDeclarer.java
index 200463c28..112666417 100644
--- a/streampipes-container/src/main/java/org/apache/streampipes/container/declarer/SemanticEventProducerDeclarer.java
+++ b/streampipes-container/src/main/java/org/apache/streampipes/container/declarer/SemanticEventProducerDeclarer.java
@@ -24,5 +24,5 @@ import java.util.List;
@Deprecated
public interface SemanticEventProducerDeclarer extends Declarer<DataSourceDescription> {
- List<DataStreamDeclarer> getEventStreams();
+ List<DataStreamDeclarer> getEventStreams();
}
diff --git a/streampipes-container/src/main/java/org/apache/streampipes/container/html/HTMLGenerator.java b/streampipes-container/src/main/java/org/apache/streampipes/container/html/HTMLGenerator.java
index c8e824cea..e916afdf0 100644
--- a/streampipes-container/src/main/java/org/apache/streampipes/container/html/HTMLGenerator.java
+++ b/streampipes-container/src/main/java/org/apache/streampipes/container/html/HTMLGenerator.java
@@ -20,12 +20,15 @@ package org.apache.streampipes.container.html;
import org.apache.streampipes.container.html.model.DataSourceDescriptionHtml;
import org.apache.streampipes.container.html.model.Description;
+
import org.rendersnake.HtmlCanvas;
import java.io.IOException;
import java.util.List;
-import static org.rendersnake.HtmlAttributesFactory.*;
+import static org.rendersnake.HtmlAttributesFactory.class_;
+import static org.rendersnake.HtmlAttributesFactory.href;
+import static org.rendersnake.HtmlAttributesFactory.name;
public class HTMLGenerator {
@@ -39,34 +42,35 @@ public class HTMLGenerator {
HtmlCanvas html = new HtmlCanvas();
try {
html
- .head()
- .meta(name("viewport").content("width=device-width, initial-scale=1"))
- .macros().javascript("https://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/js/bootstrap.min.js")
- .macros().stylesheet("https://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap.min.css")
- .macros().javascript("https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js")
- .style().write("body {padding-top: 70px;}")._style()
- ._head()
- .body()
- .nav(class_("navbar navbar-inverse navbar-fixed-top").style("background:#0A3F54"))
- .div(class_("container"))
- .div(class_("navbar-header"))
- .a(class_("navbar-brand").style("color:white;"))
- .content("StreamPipes Pipeline Element Container")
- ._div()
- ._div()
- ._nav()
- .div(class_("container"));
+ .head()
+ .meta(name("viewport").content("width=device-width, initial-scale=1"))
+ .macros().javascript("https://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/js/bootstrap.min.js")
+ .macros().stylesheet("https://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap.min.css")
+ .macros().javascript("https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js")
+ .style().write("body {padding-top: 70px;}")._style()
+ ._head()
+ .body()
+ .nav(class_("navbar navbar-inverse navbar-fixed-top").style("background:#0A3F54"))
+ .div(class_("container"))
+ .div(class_("navbar-header"))
+ .a(class_("navbar-brand").style("color:white;"))
+ .content("StreamPipes Pipeline Element Container")
+ ._div()
+ ._div()
+ ._nav()
+ .div(class_("container"));
- html.h4().write("This is a developer-oriented view. Navigate to 'Install Pipeline Elements' in the StreamPipes " +
- "UI to import the elements shown " +
- "here.")._h4();
+ html.h4().write("This is a developer-oriented view."
+ + "Navigate to 'Install Pipeline Elements' in the StreamPipes "
+ + "UI to import the elements shown here.")._h4();
for (Description description : descriptions) {
html.h3();
html.write(description.getName());
html._h3();
- html.h4().write("URI: ").a(href(description.getDescriptionUrl().toString())).content(description.getDescriptionUrl().toString())._h4();
+ html.h4().write("URI: ").a(href(description.getDescriptionUrl().toString()))
+ .content(description.getDescriptionUrl().toString())._h4();
html.h4().write("Description: ").write(description.getDescription())._h4();
if (description instanceof DataSourceDescriptionHtml) {
DataSourceDescriptionHtml semanticEventProducerDescription = (DataSourceDescriptionHtml) description;
diff --git a/streampipes-container/src/main/java/org/apache/streampipes/container/html/JSONGenerator.java b/streampipes-container/src/main/java/org/apache/streampipes/container/html/JSONGenerator.java
index 04dc29330..861b226c7 100644
--- a/streampipes-container/src/main/java/org/apache/streampipes/container/html/JSONGenerator.java
+++ b/streampipes-container/src/main/java/org/apache/streampipes/container/html/JSONGenerator.java
@@ -18,11 +18,12 @@
package org.apache.streampipes.container.html;
+import org.apache.streampipes.container.html.model.DataSourceDescriptionHtml;
+import org.apache.streampipes.container.html.model.Description;
+
import com.google.gson.JsonArray;
import com.google.gson.JsonObject;
import com.google.gson.JsonPrimitive;
-import org.apache.streampipes.container.html.model.DataSourceDescriptionHtml;
-import org.apache.streampipes.container.html.model.Description;
import java.util.List;
diff --git a/streampipes-container/src/main/java/org/apache/streampipes/container/html/model/DataSourceDescriptionHtml.java b/streampipes-container/src/main/java/org/apache/streampipes/container/html/model/DataSourceDescriptionHtml.java
index 8004bb08c..195f4069c 100644
--- a/streampipes-container/src/main/java/org/apache/streampipes/container/html/model/DataSourceDescriptionHtml.java
+++ b/streampipes-container/src/main/java/org/apache/streampipes/container/html/model/DataSourceDescriptionHtml.java
@@ -23,22 +23,22 @@ import java.util.List;
public class DataSourceDescriptionHtml extends Description {
- private List<Description> streams;
+ private List<Description> streams;
- public DataSourceDescriptionHtml(String name, String description, String descriptionUrl, List<Description> streams) {
- super(name, description, descriptionUrl);
- this.streams = streams;
- }
+ public DataSourceDescriptionHtml(String name, String description, String descriptionUrl, List<Description> streams) {
+ super(name, description, descriptionUrl);
+ this.streams = streams;
+ }
- public DataSourceDescriptionHtml() {
- streams = new ArrayList<>();
- }
+ public DataSourceDescriptionHtml() {
+ streams = new ArrayList<>();
+ }
- public List<Description> getStreams() {
- return streams;
- }
+ public List<Description> getStreams() {
+ return streams;
+ }
- public void setStreams(List<Description> streams) {
- this.streams = streams;
- }
+ public void setStreams(List<Description> streams) {
+ this.streams = streams;
+ }
}
diff --git a/streampipes-container/src/main/java/org/apache/streampipes/container/html/model/Description.java b/streampipes-container/src/main/java/org/apache/streampipes/container/html/model/Description.java
index 910df4d8d..fc2371462 100644
--- a/streampipes-container/src/main/java/org/apache/streampipes/container/html/model/Description.java
+++ b/streampipes-container/src/main/java/org/apache/streampipes/container/html/model/Description.java
@@ -20,118 +20,125 @@ package org.apache.streampipes.container.html.model;
public class Description {
- private String name;
- private String description;
- private String elementId;
- private String descriptionUrl;
- private String type;
- private String appId;
-
- private boolean editable;
- private boolean includesIcon;
- private boolean includesDocs;
-
- public Description(String name, String description, String descriptionUrl)
- {
- this.name = name;
- this.description = description;
- this.descriptionUrl = descriptionUrl;
- }
-
- public Description()
- {
-
- }
-
- public String getName() {
- return name;
- }
- public void setName(String name) {
- this.name = name;
- }
-
- public String getDescriptionUrl() {
- return descriptionUrl;
- }
-
- public void setDescriptionUrl(String descriptionUrl) {
- this.descriptionUrl = descriptionUrl;
- }
-
- public String getDescription() {
- return description;
- }
-
- public void setDescription(String description) {
- this.description = description;
- }
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public String getAppId() {
- return appId;
- }
-
- public void setAppId(String appId) {
- this.appId = appId;
- }
-
- public boolean isEditable() {
- return editable;
- }
-
- public void setEditable(boolean editable) {
- this.editable = editable;
- }
-
- public String getElementId() {
- return elementId;
- }
-
- public void setElementId(String elementId) {
- this.elementId = elementId;
- }
-
- public boolean isIncludesIcon() {
- return includesIcon;
- }
-
- public void setIncludesIcon(boolean includesIcon) {
- this.includesIcon = includesIcon;
- }
-
- public boolean isIncludesDocs() {
- return includesDocs;
- }
-
- public void setIncludesDocs(boolean includesDocs) {
- this.includesDocs = includesDocs;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
-
- Description that = (Description) o;
-
- if (!name.equals(that.name)) return false;
- if (!description.equals(that.description)) return false;
- return descriptionUrl.equals(that.descriptionUrl);
-
+ private String name;
+ private String description;
+ private String elementId;
+ private String descriptionUrl;
+ private String type;
+ private String appId;
+
+ private boolean editable;
+ private boolean includesIcon;
+ private boolean includesDocs;
+
+ public Description(String name, String description, String descriptionUrl) {
+ this.name = name;
+ this.description = description;
+ this.descriptionUrl = descriptionUrl;
+ }
+
+ public Description() {
+
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getDescriptionUrl() {
+ return descriptionUrl;
+ }
+
+ public void setDescriptionUrl(String descriptionUrl) {
+ this.descriptionUrl = descriptionUrl;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ public String getAppId() {
+ return appId;
+ }
+
+ public void setAppId(String appId) {
+ this.appId = appId;
+ }
+
+ public boolean isEditable() {
+ return editable;
+ }
+
+ public void setEditable(boolean editable) {
+ this.editable = editable;
+ }
+
+ public String getElementId() {
+ return elementId;
+ }
+
+ public void setElementId(String elementId) {
+ this.elementId = elementId;
+ }
+
+ public boolean isIncludesIcon() {
+ return includesIcon;
+ }
+
+ public void setIncludesIcon(boolean includesIcon) {
+ this.includesIcon = includesIcon;
+ }
+
+ public boolean isIncludesDocs() {
+ return includesDocs;
+ }
+
+ public void setIncludesDocs(boolean includesDocs) {
+ this.includesDocs = includesDocs;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
}
- @Override
- public int hashCode() {
- int result = name.hashCode();
- result = 31 * result + description.hashCode();
- result = 31 * result + descriptionUrl.hashCode();
- return result;
+ Description that = (Description) o;
+
+ if (!name.equals(that.name)) {
+ return false;
}
+ if (!description.equals(that.description)) {
+ return false;
+ }
+ return descriptionUrl.equals(that.descriptionUrl);
+
+ }
+
+ @Override
+ public int hashCode() {
+ int result = name.hashCode();
+ result = 31 * result + description.hashCode();
+ result = 31 * result + descriptionUrl.hashCode();
+ return result;
+ }
}
diff --git a/streampipes-container/src/main/java/org/apache/streampipes/container/html/page/WelcomePageGenerator.java b/streampipes-container/src/main/java/org/apache/streampipes/container/html/page/WelcomePageGenerator.java
index 140c1fc23..5e1d67574 100644
--- a/streampipes-container/src/main/java/org/apache/streampipes/container/html/page/WelcomePageGenerator.java
+++ b/streampipes-container/src/main/java/org/apache/streampipes/container/html/page/WelcomePageGenerator.java
@@ -18,7 +18,12 @@
package org.apache.streampipes.container.html.page;
-import org.apache.streampipes.container.declarer.*;
+import org.apache.streampipes.container.declarer.DataStreamDeclarer;
+import org.apache.streampipes.container.declarer.Declarer;
+import org.apache.streampipes.container.declarer.InvocableDeclarer;
+import org.apache.streampipes.container.declarer.PipelineTemplateDeclarer;
+import org.apache.streampipes.container.declarer.SemanticEventConsumerDeclarer;
+import org.apache.streampipes.container.declarer.SemanticEventProcessingAgentDeclarer;
import org.apache.streampipes.container.html.model.Description;
import org.apache.streampipes.container.locales.LabelGenerator;
import org.apache.streampipes.model.SpDataSet;
@@ -74,9 +79,9 @@ public class WelcomePageGenerator {
desc.setAppId(entity.getAppId());
desc.setEditable(!(entity.isInternallyManaged()));
desc.setIncludesDocs(entity.isIncludesAssets()
- && entity.getIncludedAssets().contains(Assets.DOCUMENTATION));
+ && entity.getIncludedAssets().contains(Assets.DOCUMENTATION));
desc.setIncludesIcon(entity.isIncludesAssets()
- && entity.getIncludedAssets().contains(Assets.ICON));
+ && entity.getIncludedAssets().contains(Assets.ICON));
String uri = baseUri;
if (declarer instanceof SemanticEventConsumerDeclarer) {
uri += "sec/";
diff --git a/streampipes-container/src/main/java/org/apache/streampipes/container/init/DeclarersSingleton.java b/streampipes-container/src/main/java/org/apache/streampipes/container/init/DeclarersSingleton.java
index 967ae027e..c8f356b0d 100644
--- a/streampipes-container/src/main/java/org/apache/streampipes/container/init/DeclarersSingleton.java
+++ b/streampipes-container/src/main/java/org/apache/streampipes/container/init/DeclarersSingleton.java
@@ -21,7 +21,12 @@ package org.apache.streampipes.container.init;
import org.apache.streampipes.connect.api.Connector;
import org.apache.streampipes.connect.api.IAdapter;
import org.apache.streampipes.connect.api.IProtocol;
-import org.apache.streampipes.container.declarer.*;
+import org.apache.streampipes.container.declarer.DataStreamDeclarer;
+import org.apache.streampipes.container.declarer.Declarer;
+import org.apache.streampipes.container.declarer.IStreamPipesFunctionDeclarer;
+import org.apache.streampipes.container.declarer.PipelineTemplateDeclarer;
+import org.apache.streampipes.container.declarer.SemanticEventConsumerDeclarer;
+import org.apache.streampipes.container.declarer.SemanticEventProcessingAgentDeclarer;
import org.apache.streampipes.container.model.SpServiceDefinition;
import org.apache.streampipes.dataformat.SpDataFormatFactory;
import org.apache.streampipes.dataformat.SpDataFormatManager;
@@ -34,23 +39,25 @@ import org.apache.streampipes.svcdiscovery.SpServiceDiscovery;
import org.apache.streampipes.svcdiscovery.api.SpConfig;
import org.apache.streampipes.svcdiscovery.api.model.ConfigItem;
import org.apache.streampipes.vocabulary.StreamPipes;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.net.URI;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import java.util.stream.Collectors;
public class DeclarersSingleton {
private static final Logger LOG = LoggerFactory.getLogger(DeclarersSingleton.class);
-
- private static DeclarersSingleton instance;
-
private static final String Http = "http://";
private static final String Colon = ":";
private static final String Slash = "/";
-
+ private static DeclarersSingleton instance;
private SpServiceDefinition serviceDefinition;
private Map<String, SemanticEventProcessingAgentDeclarer> epaDeclarers;
@@ -150,29 +157,29 @@ public class DeclarersSingleton {
public void supportedProtocols(TransportProtocol... protocols) {
Arrays.asList(protocols).forEach(protocol ->
- this.supportedProtocols.put(protocol.getClass().getCanonicalName(), protocol));
+ this.supportedProtocols.put(protocol.getClass().getCanonicalName(), protocol));
}
public void supportedFormats(TransportFormat... formats) {
Arrays.asList(formats).forEach(format ->
- this.supportedFormats.put(getFormatUri(format), format));
+ this.supportedFormats.put(getFormatUri(format), format));
}
private String getFormatUri(TransportFormat format) {
return format
- .getRdfType()
- .stream()
- .map(URI::toString)
- .filter(t -> !t.equals("http://www.w3.org/2000/01/rdf-schema#"))
- .filter(t -> !t.equals(StreamPipes.TRANSPORT_FORMAT))
- .findFirst()
- .get();
+ .getRdfType()
+ .stream()
+ .map(URI::toString)
+ .filter(t -> !t.equals("http://www.w3.org/2000/01/rdf-schema#"))
+ .filter(t -> !t.equals(StreamPipes.TRANSPORT_FORMAT))
+ .findFirst()
+ .get();
}
public void registerProtocol(SpProtocolDefinitionFactory<?> protocol) {
SpProtocolManager.INSTANCE.register(protocol);
this.supportedProtocols.put(protocol.getTransportProtocolClass(),
- protocol.getTransportProtocol());
+ protocol.getTransportProtocol());
}
public void registerProtocols(SpProtocolDefinitionFactory<?>... protocols) {
@@ -186,7 +193,7 @@ public class DeclarersSingleton {
public void registerDataFormat(SpDataFormatFactory dataFormatDefinition) {
SpDataFormatManager.INSTANCE.register(dataFormatDefinition);
this.supportedFormats.put(dataFormatDefinition.getTransportFormatRdfUri(),
- dataFormatDefinition.getTransportFormat());
+ dataFormatDefinition.getTransportFormat());
}
public void registerDataFormats(SpDataFormatFactory... dataFormatDefinitions) {
@@ -212,7 +219,7 @@ public class DeclarersSingleton {
private void addPipelineTemplateDeclarer(PipelineTemplateDeclarer pipelineTemplateDeclarer) {
pipelineTemplateDeclarers.put(pipelineTemplateDeclarer.declareModel().getAppId(),
- pipelineTemplateDeclarer);
+ pipelineTemplateDeclarer);
}
public Map<String, SemanticEventProcessingAgentDeclarer> getEpaDeclarers() {
@@ -233,17 +240,17 @@ public class DeclarersSingleton {
public Collection<TransportProtocol> getSupportedProtocols() {
return this.supportedProtocols
- .values()
- .stream()
- .map(p -> new Cloner().protocol(p))
- .collect(Collectors.toList());
+ .values()
+ .stream()
+ .map(p -> new Cloner().protocol(p))
+ .collect(Collectors.toList());
}
public Collection<TransportFormat> getSupportedFormats() {
return this.supportedFormats.values()
- .stream()
- .map(TransportFormat::new)
- .collect(Collectors.toList());
+ .stream()
+ .map(TransportFormat::new)
+ .collect(Collectors.toList());
}
public DeclarersSingleton add(Connector c) {
@@ -275,26 +282,26 @@ public class DeclarersSingleton {
public IProtocol getProtocol(String id) {
return getAllProtocols().stream()
- .filter(protocol -> protocol.getId().equals(id))
- .findAny()
- .orElse(null);
+ .filter(protocol -> protocol.getId().equals(id))
+ .findAny()
+ .orElse(null);
}
public IAdapter getAdapter(String id) {
return getAllAdapters().stream()
- .filter(adapter -> adapter.getId().equals(id))
- .findAny()
- .orElse(null);
- }
-
- public void setPort(int port) {
- this.port = port;
+ .filter(adapter -> adapter.getId().equals(id))
+ .findAny()
+ .orElse(null);
}
public int getPort() {
return this.port;
}
+ public void setPort(int port) {
+ this.port = port;
+ }
+
public String getHostName() {
return this.hostName;
}
diff --git a/streampipes-container/src/main/java/org/apache/streampipes/container/init/PipelineElementServiceResourceProvider.java b/streampipes-container/src/main/java/org/apache/streampipes/container/init/PipelineElementServiceResourceProvider.java
index f6572ab5b..da7e09251 100644
--- a/streampipes-container/src/main/java/org/apache/streampipes/container/init/PipelineElementServiceResourceProvider.java
+++ b/streampipes-container/src/main/java/org/apache/streampipes/container/init/PipelineElementServiceResourceProvider.java
@@ -17,7 +17,11 @@
*/
package org.apache.streampipes.container.init;
-import org.apache.streampipes.container.api.*;
+import org.apache.streampipes.container.api.DataProcessorPipelineElementResource;
+import org.apache.streampipes.container.api.DataSinkPipelineElementResource;
+import org.apache.streampipes.container.api.DataStreamPipelineElementResource;
+import org.apache.streampipes.container.api.PipelineTemplateResource;
+import org.apache.streampipes.container.api.WelcomePage;
import java.util.Arrays;
import java.util.List;
@@ -26,10 +30,10 @@ public class PipelineElementServiceResourceProvider implements ExtensionsResourc
@Override
public List<Class<?>> getResourceClasses() {
return Arrays.asList(
- DataSinkPipelineElementResource.class,
- DataProcessorPipelineElementResource.class,
- DataStreamPipelineElementResource.class,
- WelcomePage.class,
- PipelineTemplateResource.class);
+ DataSinkPipelineElementResource.class,
+ DataProcessorPipelineElementResource.class,
+ DataStreamPipelineElementResource.class,
+ WelcomePage.class,
+ PipelineTemplateResource.class);
}
}
diff --git a/streampipes-container/src/main/java/org/apache/streampipes/container/init/RunningInstances.java b/streampipes-container/src/main/java/org/apache/streampipes/container/init/RunningInstances.java
index 6573256a3..8c0f9e946 100644
--- a/streampipes-container/src/main/java/org/apache/streampipes/container/init/RunningInstances.java
+++ b/streampipes-container/src/main/java/org/apache/streampipes/container/init/RunningInstances.java
@@ -28,49 +28,49 @@ import java.util.List;
import java.util.Map;
public enum RunningInstances {
- INSTANCE;
+ INSTANCE;
- private final Map<String, ElementInfo<NamedStreamPipesEntity, InvocableDeclarer>> runningInstances = new HashMap<>();
+ private final Map<String, ElementInfo<NamedStreamPipesEntity, InvocableDeclarer>> runningInstances = new HashMap<>();
- public void add(String id, NamedStreamPipesEntity description, InvocableDeclarer invocation) {
- runningInstances.put(id, new ElementInfo<>(description, invocation));
- }
+ public void add(String id, NamedStreamPipesEntity description, InvocableDeclarer invocation) {
+ runningInstances.put(id, new ElementInfo<>(description, invocation));
+ }
- public boolean exists(String runningInstanceId) {
- return runningInstances.containsKey(runningInstanceId);
- }
+ public boolean exists(String runningInstanceId) {
+ return runningInstances.containsKey(runningInstanceId);
+ }
- public InvocableDeclarer getInvocation(String id) {
- ElementInfo<NamedStreamPipesEntity, InvocableDeclarer> result = runningInstances.get(id);
- if (result != null) {
- return result.getInvocation();
- } else {
- return null;
- }
+ public InvocableDeclarer getInvocation(String id) {
+ ElementInfo<NamedStreamPipesEntity, InvocableDeclarer> result = runningInstances.get(id);
+ if (result != null) {
+ return result.getInvocation();
+ } else {
+ return null;
}
+ }
- public NamedStreamPipesEntity getDescription(String id) {
- return runningInstances.get(id).getDescription();
- }
+ public NamedStreamPipesEntity getDescription(String id) {
+ return runningInstances.get(id).getDescription();
+ }
- public void remove(String id) {
- runningInstances.remove(id);
- }
+ public void remove(String id) {
+ runningInstances.remove(id);
+ }
- public Integer getRunningInstancesCount() {
- return runningInstances.size();
- }
+ public Integer getRunningInstancesCount() {
+ return runningInstances.size();
+ }
- public List<String> getRunningInstanceIdsForElement(String appId) {
- // TODO change this to appId for STREAMPIPES-319
- List<String> instanceIds = new ArrayList<>();
- this.runningInstances.forEach((key, elementInfo) -> {
- if (elementInfo.getDescription().getAppId().equals(appId)) {
- instanceIds.add(key);
- }
- });
+ public List<String> getRunningInstanceIdsForElement(String appId) {
+ // TODO change this to appId for STREAMPIPES-319
+ List<String> instanceIds = new ArrayList<>();
+ this.runningInstances.forEach((key, elementInfo) -> {
+ if (elementInfo.getDescription().getAppId().equals(appId)) {
+ instanceIds.add(key);
+ }
+ });
- return instanceIds;
- }
+ return instanceIds;
+ }
}
diff --git a/streampipes-container/src/main/java/org/apache/streampipes/container/locales/LabelGenerator.java b/streampipes-container/src/main/java/org/apache/streampipes/container/locales/LabelGenerator.java
index 69e76fe55..99775ec89 100644
--- a/streampipes-container/src/main/java/org/apache/streampipes/container/locales/LabelGenerator.java
+++ b/streampipes-container/src/main/java/org/apache/streampipes/container/locales/LabelGenerator.java
@@ -17,8 +17,6 @@
*/
package org.apache.streampipes.container.locales;
-import static org.apache.streampipes.container.util.LocalesUtil.makePath;
-
import org.apache.streampipes.model.base.ConsumableStreamPipesEntity;
import org.apache.streampipes.model.base.NamedStreamPipesEntity;
import org.apache.streampipes.model.connect.adapter.AdapterDescription;
@@ -26,13 +24,19 @@ import org.apache.streampipes.model.connect.grounding.ProtocolDescription;
import org.apache.streampipes.model.graph.DataProcessorDescription;
import org.apache.streampipes.model.output.AppendOutputStrategy;
import org.apache.streampipes.model.output.FixedOutputStrategy;
-import org.apache.streampipes.model.staticproperty.*;
+import org.apache.streampipes.model.staticproperty.CollectionStaticProperty;
+import org.apache.streampipes.model.staticproperty.StaticProperty;
+import org.apache.streampipes.model.staticproperty.StaticPropertyAlternative;
+import org.apache.streampipes.model.staticproperty.StaticPropertyAlternatives;
+import org.apache.streampipes.model.staticproperty.StaticPropertyGroup;
import java.io.IOException;
import java.io.InputStream;
import java.util.List;
import java.util.Properties;
+import static org.apache.streampipes.container.util.LocalesUtil.makePath;
+
public class LabelGenerator {
private static final String Delimiter = ".";
@@ -52,23 +56,23 @@ public class LabelGenerator {
desc.setDescription(getDescription(props, desc.getAppId()));
if (isAdapter() || isProtocol()) {
- List<StaticProperty> properties;
- if (isAdapter()) {
- properties = ((AdapterDescription) desc).getConfig();
- } else {
- properties = ((ProtocolDescription) desc).getConfig();
- }
- if (properties != null) {
- properties.forEach(sp -> {
- generateLabels(props, sp);
- });
- }
+ List<StaticProperty> properties;
+ if (isAdapter()) {
+ properties = ((AdapterDescription) desc).getConfig();
+ } else {
+ properties = ((ProtocolDescription) desc).getConfig();
+ }
+ if (properties != null) {
+ properties.forEach(sp -> {
+ generateLabels(props, sp);
+ });
+ }
}
if (isConsumable()) {
((ConsumableStreamPipesEntity) desc).getStaticProperties().forEach(sp -> {
- generateLabels(props, sp);
+ generateLabels(props, sp);
});
}
@@ -97,14 +101,15 @@ public class LabelGenerator {
sp.setDescription(getDescription(props, sp.getInternalName()));
if (sp instanceof CollectionStaticProperty) {
- if (((CollectionStaticProperty) sp).getMembers() != null) {
+ if (((CollectionStaticProperty) sp).getMembers() != null) {
((CollectionStaticProperty) sp).getMembers().forEach(a -> {
generateLabels(props, a);
});
} else {
- ((StaticPropertyGroup) ((CollectionStaticProperty) sp).getStaticPropertyTemplate()).getStaticProperties().forEach(a -> {
- generateLabels(props, a);
- });
+ ((StaticPropertyGroup) ((CollectionStaticProperty) sp).getStaticPropertyTemplate()).getStaticProperties()
+ .forEach(a -> {
+ generateLabels(props, a);
+ });
}
} else if (sp instanceof StaticPropertyGroup) {
@@ -144,7 +149,7 @@ public class LabelGenerator {
private boolean existsLocalesFile() {
return this.getClass().getClassLoader().getResourceAsStream(makePath(desc,
- this.desc.getIncludedLocales().get(0))) != null;
+ this.desc.getIncludedLocales().get(0))) != null;
}
private boolean isConsumable() {
diff --git a/streampipes-container/src/main/java/org/apache/streampipes/container/model/ExtensionsConfig.java b/streampipes-container/src/main/java/org/apache/streampipes/container/model/ExtensionsConfig.java
index 56a6dc633..c646bcb3c 100644
--- a/streampipes-container/src/main/java/org/apache/streampipes/container/model/ExtensionsConfig.java
+++ b/streampipes-container/src/main/java/org/apache/streampipes/container/model/ExtensionsConfig.java
@@ -20,11 +20,16 @@ package org.apache.streampipes.container.model;
public interface ExtensionsConfig {
- String getId();
- String getHost();
- int getPort();
- String getName();
- String getBackendHost();
- int getBackendPort();
+ String getId();
+
+ String getHost();
+
+ int getPort();
+
+ String getName();
+
+ String getBackendHost();
+
+ int getBackendPort();
}
diff --git a/streampipes-container/src/main/java/org/apache/streampipes/container/model/PeConfig.java b/streampipes-container/src/main/java/org/apache/streampipes/container/model/PeConfig.java
index 125cf2584..a5e8dc637 100644
--- a/streampipes-container/src/main/java/org/apache/streampipes/container/model/PeConfig.java
+++ b/streampipes-container/src/main/java/org/apache/streampipes/container/model/PeConfig.java
@@ -20,9 +20,12 @@ package org.apache.streampipes.container.model;
public interface PeConfig {
- String getId();
- String getHost();
- int getPort();
- String getName();
+ String getId();
+
+ String getHost();
+
+ int getPort();
+
+ String getName();
}
diff --git a/streampipes-container/src/main/java/org/apache/streampipes/container/model/SpServiceDefinition.java b/streampipes-container/src/main/java/org/apache/streampipes/container/model/SpServiceDefinition.java
index 14e8e8394..f2ebe320a 100644
--- a/streampipes-container/src/main/java/org/apache/streampipes/container/model/SpServiceDefinition.java
+++ b/streampipes-container/src/main/java/org/apache/streampipes/container/model/SpServiceDefinition.java
@@ -25,7 +25,11 @@ import org.apache.streampipes.dataformat.SpDataFormatFactory;
import org.apache.streampipes.messaging.SpProtocolDefinitionFactory;
import org.apache.streampipes.svcdiscovery.api.model.ConfigItem;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
public class SpServiceDefinition {
diff --git a/streampipes-container/src/main/java/org/apache/streampipes/container/model/SpServiceDefinitionBuilder.java b/streampipes-container/src/main/java/org/apache/streampipes/container/model/SpServiceDefinitionBuilder.java
index d21f3e490..3e17a5f3d 100644
--- a/streampipes-container/src/main/java/org/apache/streampipes/container/model/SpServiceDefinitionBuilder.java
+++ b/streampipes-container/src/main/java/org/apache/streampipes/container/model/SpServiceDefinitionBuilder.java
@@ -25,6 +25,7 @@ import org.apache.streampipes.container.declarer.IStreamPipesFunctionDeclarer;
import org.apache.streampipes.dataformat.SpDataFormatFactory;
import org.apache.streampipes.messaging.SpProtocolDefinitionFactory;
import org.apache.streampipes.svcdiscovery.api.model.ConfigItem;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -38,13 +39,6 @@ public class SpServiceDefinitionBuilder {
private SpServiceDefinition serviceDefinition;
//private SpConfig config;
- public static SpServiceDefinitionBuilder create(String serviceGroup,
- String serviceName,
- String serviceDescription,
- Integer defaultPort) {
- return new SpServiceDefinitionBuilder(serviceGroup, serviceName, serviceDescription, defaultPort);
- }
-
private SpServiceDefinitionBuilder(String serviceGroup,
String serviceName,
String serviceDescription,
@@ -57,6 +51,13 @@ public class SpServiceDefinitionBuilder {
//this.config = new ConsulSpConfig(serviceGroup);
}
+ public static SpServiceDefinitionBuilder create(String serviceGroup,
+ String serviceName,
+ String serviceDescription,
+ Integer defaultPort) {
+ return new SpServiceDefinitionBuilder(serviceGroup, serviceName, serviceDescription, defaultPort);
+ }
+
public SpServiceDefinitionBuilder withHostname(String hostname) {
return this;
@@ -137,7 +138,8 @@ public class SpServiceDefinitionBuilder {
this.serviceDefinition.addSpecificAdapters(other.getSpecificAdapters());
other.getKvConfigs().values().forEach(value -> {
if (this.serviceDefinition.getKvConfigs().containsKey(value.getKey())) {
- LOG.warn("Config key {} already exists and will be overridden by merge, which might lead to strange results.", value.getKey());
+ LOG.warn("Config key {} already exists and will be overridden by merge, which might lead to strange results.",
+ value.getKey());
}
this.serviceDefinition.addConfig(value);
});
diff --git a/streampipes-container/src/main/java/org/apache/streampipes/container/util/AssetsUtil.java b/streampipes-container/src/main/java/org/apache/streampipes/container/util/AssetsUtil.java
index 3cd4ae581..f6679ea23 100644
--- a/streampipes-container/src/main/java/org/apache/streampipes/container/util/AssetsUtil.java
+++ b/streampipes-container/src/main/java/org/apache/streampipes/container/util/AssetsUtil.java
@@ -22,15 +22,15 @@ import org.apache.streampipes.commons.constants.GlobalStreamPipesConstants;
public class AssetsUtil {
- public static String makeIconPath(String elementId) {
- return makePath(elementId, GlobalStreamPipesConstants.STD_ICON_NAME);
- }
+ public static String makeIconPath(String elementId) {
+ return makePath(elementId, GlobalStreamPipesConstants.STD_ICON_NAME);
+ }
- public static String makeDocumentationPath(String elementId) {
- return makePath(elementId, GlobalStreamPipesConstants.STD_DOCUMENTATION_NAME);
- }
+ public static String makeDocumentationPath(String elementId) {
+ return makePath(elementId, GlobalStreamPipesConstants.STD_DOCUMENTATION_NAME);
+ }
- public static String makePath(String elementId, String assetAppendix) {
- return elementId + "/" + assetAppendix;
- }
+ public static String makePath(String elementId, String assetAppendix) {
+ return elementId + "/" + assetAppendix;
+ }
}
diff --git a/streampipes-container/src/main/java/org/apache/streampipes/container/util/ElementInfo.java b/streampipes-container/src/main/java/org/apache/streampipes/container/util/ElementInfo.java
index 6b1719dc5..c7059ea38 100644
--- a/streampipes-container/src/main/java/org/apache/streampipes/container/util/ElementInfo.java
+++ b/streampipes-container/src/main/java/org/apache/streampipes/container/util/ElementInfo.java
@@ -18,28 +18,28 @@
package org.apache.streampipes.container.util;
-public class ElementInfo<G, D> {
- private G description;
- private D invocation;
+public class ElementInfo<K, V> {
+ private K description;
+ private V invocation;
- public ElementInfo(G description, D invocation) {
- this.description = description;
- this.invocation = invocation;
- }
+ public ElementInfo(K description, V invocation) {
+ this.description = description;
+ this.invocation = invocation;
+ }
- public G getDescription() {
- return description;
- }
+ public K getDescription() {
+ return description;
+ }
- public void setDescription(G description) {
- this.description = description;
- }
+ public void setDescription(K description) {
+ this.description = description;
+ }
- public D getInvocation() {
- return invocation;
- }
+ public V getInvocation() {
+ return invocation;
+ }
- public void setInvocation(D invocation) {
- this.invocation = invocation;
- }
+ public void setInvocation(V invocation) {
+ this.invocation = invocation;
+ }
}
diff --git a/streampipes-container/src/main/java/org/apache/streampipes/container/util/LocalesUtil.java b/streampipes-container/src/main/java/org/apache/streampipes/container/util/LocalesUtil.java
index 4350f7fbe..063f0014f 100644
--- a/streampipes-container/src/main/java/org/apache/streampipes/container/util/LocalesUtil.java
+++ b/streampipes-container/src/main/java/org/apache/streampipes/container/util/LocalesUtil.java
@@ -23,7 +23,7 @@ public class LocalesUtil {
public static String makePath(NamedStreamPipesEntity desc, String assetAppendix) {
return desc.getAppId()
- + "/"
- + assetAppendix;
+ + "/"
+ + assetAppendix;
}
}
diff --git a/streampipes-container/src/main/java/org/apache/streampipes/container/util/ServiceDefinitionUtil.java b/streampipes-container/src/main/java/org/apache/streampipes/container/util/ServiceDefinitionUtil.java
index 83f93f5ca..be78f462e 100644
--- a/streampipes-container/src/main/java/org/apache/streampipes/container/util/ServiceDefinitionUtil.java
+++ b/streampipes-container/src/main/java/org/apache/streampipes/container/util/ServiceDefinitionUtil.java
@@ -35,9 +35,9 @@ public class ServiceDefinitionUtil {
public static List<SpServiceTag> extractAppIds(Collection<Declarer<?>> declarers) {
return declarers
- .stream()
- .map(d -> SpServiceTag.create(getPrefix(d.declareModel()), d.declareModel().getAppId()))
- .collect(Collectors.toList());
+ .stream()
+ .map(d -> SpServiceTag.create(getPrefix(d.declareModel()), d.declareModel().getAppId()))
+ .collect(Collectors.toList());
}
private static SpServiceTagPrefix getPrefix(NamedStreamPipesEntity entity) {
@@ -54,15 +54,15 @@ public class ServiceDefinitionUtil {
public static List<SpServiceTag> extractAppIdsFromAdapters(Collection<IAdapter> adapters) {
return adapters
- .stream()
- .map(d -> SpServiceTag.create(SpServiceTagPrefix.ADAPTER, d.declareModel().getAppId()))
- .collect(Collectors.toList());
+ .stream()
+ .map(d -> SpServiceTag.create(SpServiceTagPrefix.ADAPTER, d.declareModel().getAppId()))
+ .collect(Collectors.toList());
}
public static List<SpServiceTag> extractAppIdsFromProtocols(Collection<IProtocol> protocols) {
return protocols
- .stream()
- .map(p -> SpServiceTag.create(SpServiceTagPrefix.ADAPTER, p.declareModel().getAppId()))
- .collect(Collectors.toList());
+ .stream()
+ .map(p -> SpServiceTag.create(SpServiceTagPrefix.ADAPTER, p.declareModel().getAppId()))
+ .collect(Collectors.toList());
}
}
diff --git a/streampipes-container/src/main/java/org/apache/streampipes/container/util/StandardTransportFormat.java b/streampipes-container/src/main/java/org/apache/streampipes/container/util/StandardTransportFormat.java
index f3e370836..6db72fa81 100644
--- a/streampipes-container/src/main/java/org/apache/streampipes/container/util/StandardTransportFormat.java
+++ b/streampipes-container/src/main/java/org/apache/streampipes/container/util/StandardTransportFormat.java
@@ -30,28 +30,25 @@ import java.util.List;
public class StandardTransportFormat {
- public static List<TransportFormat> standardFormat()
- {
- List<TransportFormat> formats = new ArrayList<>();
- formats.add(new TransportFormat(MessageFormat.Json));
- formats.add(new TransportFormat(MessageFormat.Thrift));
- return formats;
- }
-
- public static List<TransportProtocol> standardProtocols()
- {
- List<TransportProtocol> protocols = new ArrayList<>();
- protocols.add(new JmsTransportProtocol());
- protocols.add(new KafkaTransportProtocol());
- return protocols;
- }
-
-
- public static EventGrounding getSupportedGrounding()
- {
- EventGrounding grounding = new EventGrounding();
- grounding.setTransportFormats(standardFormat());
- grounding.setTransportProtocols(standardProtocols());
- return grounding;
- }
+ public static List<TransportFormat> standardFormat() {
+ List<TransportFormat> formats = new ArrayList<>();
+ formats.add(new TransportFormat(MessageFormat.Json));
+ formats.add(new TransportFormat(MessageFormat.Thrift));
+ return formats;
+ }
+
+ public static List<TransportProtocol> standardProtocols() {
+ List<TransportProtocol> protocols = new ArrayList<>();
+ protocols.add(new JmsTransportProtocol());
+ protocols.add(new KafkaTransportProtocol());
+ return protocols;
+ }
+
+
+ public static EventGrounding getSupportedGrounding() {
+ EventGrounding grounding = new EventGrounding();
+ grounding.setTransportFormats(standardFormat());
+ grounding.setTransportProtocols(standardProtocols());
+ return grounding;
+ }
}
diff --git a/streampipes-container/src/main/java/org/apache/streampipes/container/util/Util.java b/streampipes-container/src/main/java/org/apache/streampipes/container/util/Util.java
index 0761f1243..afb8e3121 100644
--- a/streampipes-container/src/main/java/org/apache/streampipes/container/util/Util.java
+++ b/streampipes-container/src/main/java/org/apache/streampipes/container/util/Util.java
@@ -18,31 +18,32 @@
package org.apache.streampipes.container.util;
-import com.google.gson.Gson;
import org.apache.streampipes.container.init.DeclarersSingleton;
import org.apache.streampipes.model.Response;
-public class Util {
+import com.google.gson.Gson;
- private static final String Slash = "/";
+public class Util {
- public static String getInstanceId(String url, String type, String elemntId) {
- return url.replace(DeclarersSingleton.getInstance().getBaseUri()
- + type
- + Slash
- + elemntId
- + Slash, "");
- }
+ private static final String Slash = "/";
- public static Response fromResponseString(String s) {
- Gson gson = new Gson();
- Response result = gson.fromJson(s, Response.class);
+ public static String getInstanceId(String url, String type, String elemntId) {
+ return url.replace(DeclarersSingleton.getInstance().getBaseUri()
+ + type
+ + Slash
+ + elemntId
+ + Slash, "");
+ }
- if (result.getElementId() == null) {
- return null;
- } else {
- return result;
- }
+ public static Response fromResponseString(String s) {
+ Gson gson = new Gson();
+ Response result = gson.fromJson(s, Response.class);
+ if (result.getElementId() == null) {
+ return null;
+ } else {
+ return result;
}
+
+ }
}