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/25 20:00:32 UTC
[streampipes] branch chore/add-checkstyle created (now d9c16b15a)
This is an automated email from the ASF dual-hosted git repository.
bossenti pushed a change to branch chore/add-checkstyle
in repository https://gitbox.apache.org/repos/asf/streampipes.git
at d9c16b15a add checkstyle to streampipes-performance-tests
This branch includes the following new commits:
new f876a4c06 add checkstyle to streampipes-connect-container-worker
new 3e4759270 add checkstyle to streampipes-container-standalone
new 8c56830fb add checkstyle to streampipes-maven-plugin
new 79b2d2af6 add checkstyle to streampipes-sdk-bundle
new 5e199c777 add checkstyle to streampipes-sources
new d9c16b15a add checkstyle to streampipes-performance-tests
The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[streampipes] 05/06: add checkstyle to streampipes-sources
Posted by bo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bossenti pushed a commit to branch chore/add-checkstyle
in repository https://gitbox.apache.org/repos/asf/streampipes.git
commit 5e199c7776650cb1300da91f6a46ba126afc3990
Author: bossenti <bo...@posteo.de>
AuthorDate: Sun Dec 25 20:58:43 2022 +0100
add checkstyle to streampipes-sources
---
streampipes-sources/pom.xml | 41 +++++++++++++---------
.../sources/AbstractAlreadyExistingStream.java | 26 +++++++-------
2 files changed, 38 insertions(+), 29 deletions(-)
diff --git a/streampipes-sources/pom.xml b/streampipes-sources/pom.xml
index 1887601b3..e36fba102 100644
--- a/streampipes-sources/pom.xml
+++ b/streampipes-sources/pom.xml
@@ -16,22 +16,31 @@
~
-->
-<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-sources</artifactId>
+ <artifactId>streampipes-sources</artifactId>
- <dependencies>
- <!-- StreamPipes dependencies -->
- <dependency>
- <groupId>org.apache.streampipes</groupId>
- <artifactId>streampipes-container</artifactId>
- <version>0.91.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
+ <dependencies>
+ <!-- StreamPipes dependencies -->
+ <dependency>
+ <groupId>org.apache.streampipes</groupId>
+ <artifactId>streampipes-container</artifactId>
+ <version>0.91.0-SNAPSHOT</version>
+ </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-sources/src/main/java/org/apache/streampipes/sources/AbstractAlreadyExistingStream.java b/streampipes-sources/src/main/java/org/apache/streampipes/sources/AbstractAlreadyExistingStream.java
index 6538ee380..0b05cc3d7 100644
--- a/streampipes-sources/src/main/java/org/apache/streampipes/sources/AbstractAlreadyExistingStream.java
+++ b/streampipes-sources/src/main/java/org/apache/streampipes/sources/AbstractAlreadyExistingStream.java
@@ -25,17 +25,17 @@ import org.apache.streampipes.container.init.DeclarersSingleton;
public abstract class AbstractAlreadyExistingStream implements DataStreamDeclarer {
- @Override
- public void executeStream() {
-
- }
-
- @Override
- public boolean isExecutable() {
- return false;
- }
-
- public ConfigExtractor configExtractor() {
- return ConfigExtractor.from(DeclarersSingleton.getInstance().getServiceDefinition().getServiceGroup());
- }
+ @Override
+ public void executeStream() {
+
+ }
+
+ @Override
+ public boolean isExecutable() {
+ return false;
+ }
+
+ public ConfigExtractor configExtractor() {
+ return ConfigExtractor.from(DeclarersSingleton.getInstance().getServiceDefinition().getServiceGroup());
+ }
}
[streampipes] 04/06: add checkstyle to streampipes-sdk-bundle
Posted by bo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bossenti pushed a commit to branch chore/add-checkstyle
in repository https://gitbox.apache.org/repos/asf/streampipes.git
commit 79b2d2af614358c4407d2fde45c0dd43dd8b4bb1
Author: bossenti <bo...@posteo.de>
AuthorDate: Sun Dec 25 20:57:53 2022 +0100
add checkstyle to streampipes-sdk-bundle
---
streampipes-sdk-bundle/pom.xml | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/streampipes-sdk-bundle/pom.xml b/streampipes-sdk-bundle/pom.xml
index f41c382e4..74c2eabfc 100644
--- a/streampipes-sdk-bundle/pom.xml
+++ b/streampipes-sdk-bundle/pom.xml
@@ -16,7 +16,8 @@
~ limitations under the License.
~
-->
-<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>
@@ -78,5 +79,12 @@
<version>0.91.0-SNAPSHOT</version>
</dependency>
</dependencies>
-
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
</project>
[streampipes] 06/06: add checkstyle to streampipes-performance-tests
Posted by bo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bossenti pushed a commit to branch chore/add-checkstyle
in repository https://gitbox.apache.org/repos/asf/streampipes.git
commit d9c16b15ac905dd8d6571b564a045e27c200913c
Author: bossenti <bo...@posteo.de>
AuthorDate: Sun Dec 25 21:00:04 2022 +0100
add checkstyle to streampipes-performance-tests
---
streampipes-performance-tests/pom.xml | 13 +++++++++++--
.../performance/PipelinePerformanceTest.java | 8 +++-----
.../performance/dataprovider/JsonDataProvider.java | 9 +++++----
.../dataprovider/SimpleSchemaProvider.java | 7 ++++---
.../performance/model/PerformanceTestSettings.java | 4 +++-
.../performance/simulation/SimulationManager.java | 17 +++++++++--------
.../tests/serializer/JsonSerializerTest.java | 19 ++++++++++---------
.../streampipes/performance/util/ParameterTool.java | 2 +-
8 files changed, 46 insertions(+), 33 deletions(-)
diff --git a/streampipes-performance-tests/pom.xml b/streampipes-performance-tests/pom.xml
index da9539a77..49c1271c8 100644
--- a/streampipes-performance-tests/pom.xml
+++ b/streampipes-performance-tests/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>
@@ -52,4 +53,12 @@
<!-- External dependencies -->
</dependencies>
-</project>
\ No newline at end of file
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/streampipes-performance-tests/src/main/java/org/apache/streampipes/performance/PipelinePerformanceTest.java b/streampipes-performance-tests/src/main/java/org/apache/streampipes/performance/PipelinePerformanceTest.java
index 0f6422a5c..703b6e299 100644
--- a/streampipes-performance-tests/src/main/java/org/apache/streampipes/performance/PipelinePerformanceTest.java
+++ b/streampipes-performance-tests/src/main/java/org/apache/streampipes/performance/PipelinePerformanceTest.java
@@ -35,9 +35,9 @@ public class PipelinePerformanceTest {
public static void main(String[] args) {
if (args.length < 6) {
- System.out.println("Usage: java -jar streampipes-performance-tests.jar [NUMBER OF TIMESTAMP ENRICH EPAS] " +
- "[PARALELLISM OF ENRICHMENT EPAS], [PARALELLISM OF ELASTIC EPAs], [TOTAL NUMBER OF EVENTS], [WAIT TIME " +
- "BETWEEN EVENTS], [NUMBER OF PRODUCER THREADS]");
+ System.out.println("Usage: java -jar streampipes-performance-tests.jar [NUMBER OF TIMESTAMP ENRICH EPAS] "
+ + "[PARALELLISM OF ENRICHMENT EPAS], [PARALELLISM OF ELASTIC EPAs], [TOTAL NUMBER OF EVENTS], [WAIT TIME "
+ + "BETWEEN EVENTS], [NUMBER OF PRODUCER THREADS]");
} else {
PerformanceTestSettings settings = ParameterTool.fromArgs(args);
@@ -54,6 +54,4 @@ public class PipelinePerformanceTest {
//Kafka Publisher
-
-
}
diff --git a/streampipes-performance-tests/src/main/java/org/apache/streampipes/performance/dataprovider/JsonDataProvider.java b/streampipes-performance-tests/src/main/java/org/apache/streampipes/performance/dataprovider/JsonDataProvider.java
index 677bdc5b6..3dbd81111 100644
--- a/streampipes-performance-tests/src/main/java/org/apache/streampipes/performance/dataprovider/JsonDataProvider.java
+++ b/streampipes-performance-tests/src/main/java/org/apache/streampipes/performance/dataprovider/JsonDataProvider.java
@@ -18,13 +18,14 @@
package org.apache.streampipes.performance.dataprovider;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import org.apache.commons.lang3.RandomStringUtils;
-import org.apache.streampipes.model.schema.EventSchema;
import org.apache.streampipes.model.schema.EventProperty;
import org.apache.streampipes.model.schema.EventPropertyList;
import org.apache.streampipes.model.schema.EventPropertyPrimitive;
+import org.apache.streampipes.model.schema.EventSchema;
+
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import org.apache.commons.lang3.RandomStringUtils;
import java.util.ArrayList;
import java.util.List;
diff --git a/streampipes-performance-tests/src/main/java/org/apache/streampipes/performance/dataprovider/SimpleSchemaProvider.java b/streampipes-performance-tests/src/main/java/org/apache/streampipes/performance/dataprovider/SimpleSchemaProvider.java
index 3c604fe70..df060d59c 100644
--- a/streampipes-performance-tests/src/main/java/org/apache/streampipes/performance/dataprovider/SimpleSchemaProvider.java
+++ b/streampipes-performance-tests/src/main/java/org/apache/streampipes/performance/dataprovider/SimpleSchemaProvider.java
@@ -18,10 +18,11 @@
package org.apache.streampipes.performance.dataprovider;
-import org.apache.commons.lang3.RandomStringUtils;
-import org.apache.streampipes.model.schema.EventSchema;
import org.apache.streampipes.model.schema.EventProperty;
import org.apache.streampipes.model.schema.EventPropertyPrimitive;
+import org.apache.streampipes.model.schema.EventSchema;
+
+import org.apache.commons.lang3.RandomStringUtils;
import java.util.ArrayList;
import java.util.List;
@@ -34,7 +35,7 @@ public class SimpleSchemaProvider {
public EventSchema getSchema() {
EventSchema schema = new EventSchema();
List<EventProperty> properties = new ArrayList<>();
- for(int i = 0; i < 5; i++) {
+ for (int i = 0; i < 5; i++) {
properties.add(makeRandomProperty());
}
diff --git a/streampipes-performance-tests/src/main/java/org/apache/streampipes/performance/model/PerformanceTestSettings.java b/streampipes-performance-tests/src/main/java/org/apache/streampipes/performance/model/PerformanceTestSettings.java
index 63e814bbe..d06836d21 100644
--- a/streampipes-performance-tests/src/main/java/org/apache/streampipes/performance/model/PerformanceTestSettings.java
+++ b/streampipes-performance-tests/src/main/java/org/apache/streampipes/performance/model/PerformanceTestSettings.java
@@ -37,7 +37,9 @@ public class PerformanceTestSettings {
private Integer numProducerThreads;
private String elasticUrl;
- public PerformanceTestSettings(Integer numberOfTimestampEnrichmentEpas, Integer parallelismOfEnrichmentEpas, Integer parallelismOfElasticEpas, Long totalNumberofEvents, Long waitTimeBetweenEventsInMs, Integer numProducerThreads, String elasticUrl) {
+ public PerformanceTestSettings(Integer numberOfTimestampEnrichmentEpas, Integer parallelismOfEnrichmentEpas,
+ Integer parallelismOfElasticEpas, Long totalNumberofEvents,
+ Long waitTimeBetweenEventsInMs, Integer numProducerThreads, String elasticUrl) {
this.numberOfTimestampEnrichmentEpas = numberOfTimestampEnrichmentEpas;
this.parallelismOfEnrichmentEpas = parallelismOfEnrichmentEpas;
this.parallelismOfElasticEpas = parallelismOfElasticEpas;
diff --git a/streampipes-performance-tests/src/main/java/org/apache/streampipes/performance/simulation/SimulationManager.java b/streampipes-performance-tests/src/main/java/org/apache/streampipes/performance/simulation/SimulationManager.java
index 0380ff183..bc68c9942 100644
--- a/streampipes-performance-tests/src/main/java/org/apache/streampipes/performance/simulation/SimulationManager.java
+++ b/streampipes-performance-tests/src/main/java/org/apache/streampipes/performance/simulation/SimulationManager.java
@@ -17,10 +17,11 @@
*/
package org.apache.streampipes.performance.simulation;
-import org.apache.commons.lang3.RandomStringUtils;
import org.apache.streampipes.performance.model.PerformanceTestSettings;
import org.apache.streampipes.performance.producer.DataSimulator;
+import org.apache.commons.lang3.RandomStringUtils;
+
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -45,24 +46,24 @@ public class SimulationManager {
List<Thread> threads = new ArrayList<>();
- for(Integer i = 0; i < settings.getNumProducerThreads(); i++) {
+ for (Integer i = 0; i < settings.getNumProducerThreads(); i++) {
String threadId = RandomStringUtils.randomAlphanumeric(6);
statusMap.put(threadId, false);
threads.add(new Thread(new DataSimulator(kafkaUrl, settings.getTotalNumberofEvents(), settings
- .getWaitTimeBetweenEventsInMs(), threadId, threadId1 -> {
- statusMap.put(threadId1, true);
- checkFinished();
- })));
+ .getWaitTimeBetweenEventsInMs(), threadId, threadId1 -> {
+ statusMap.put(threadId1, true);
+ checkFinished();
+ })));
}
- for(Thread thread : threads) {
+ for (Thread thread : threads) {
thread.start();
}
}
private void checkFinished() {
if (statusMap.keySet().stream().allMatch(key -> statusMap.get(key))) {
- notifier.onFinished();
+ notifier.onFinished();
}
}
}
diff --git a/streampipes-performance-tests/src/main/java/org/apache/streampipes/performance/tests/serializer/JsonSerializerTest.java b/streampipes-performance-tests/src/main/java/org/apache/streampipes/performance/tests/serializer/JsonSerializerTest.java
index 39782dd1b..8f6b67bbe 100644
--- a/streampipes-performance-tests/src/main/java/org/apache/streampipes/performance/tests/serializer/JsonSerializerTest.java
+++ b/streampipes-performance-tests/src/main/java/org/apache/streampipes/performance/tests/serializer/JsonSerializerTest.java
@@ -18,13 +18,14 @@
package org.apache.streampipes.performance.tests.serializer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.apache.streampipes.commons.exceptions.SpRuntimeException;
import org.apache.streampipes.dataformat.json.JsonDataFormatDefinition;
import org.apache.streampipes.performance.dataprovider.JsonDataProvider;
import org.apache.streampipes.performance.dataprovider.SimpleSchemaProvider;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -38,10 +39,10 @@ public class JsonSerializerTest {
List<Map<String, Object>> events = new ArrayList<>();
JsonDataFormatDefinition formatter = new JsonDataFormatDefinition();
- LOG.info("Total events: " +data.size());
+ LOG.info("Total events: " + data.size());
LOG.info("Starting deserializer test");
Long startTime = System.currentTimeMillis();
- for(String item : data) {
+ for (String item : data) {
try {
events.add(formatter.toMap(item.getBytes()));
} catch (SpRuntimeException e) {
@@ -50,12 +51,12 @@ public class JsonSerializerTest {
}
Long endTime = System.currentTimeMillis();
- LOG.info("Total time: " +String.valueOf(endTime - startTime));
- LOG.info("Per event: " +String.valueOf((endTime - startTime)/data.size()));
+ LOG.info("Total time: " + String.valueOf(endTime - startTime));
+ LOG.info("Per event: " + String.valueOf((endTime - startTime) / data.size()));
LOG.info("Starting serializer test");
startTime = System.currentTimeMillis();
- for(Map<String, Object> event : events) {
+ for (Map<String, Object> event : events) {
try {
formatter.fromMap(event);
} catch (SpRuntimeException e) {
@@ -64,7 +65,7 @@ public class JsonSerializerTest {
}
endTime = System.currentTimeMillis();
- LOG.info("Total time: " +String.valueOf(endTime - startTime));
- LOG.info("Per event: " +String.valueOf((endTime - startTime)/data.size()));
+ LOG.info("Total time: " + String.valueOf(endTime - startTime));
+ LOG.info("Per event: " + String.valueOf((endTime - startTime) / data.size()));
}
}
diff --git a/streampipes-performance-tests/src/main/java/org/apache/streampipes/performance/util/ParameterTool.java b/streampipes-performance-tests/src/main/java/org/apache/streampipes/performance/util/ParameterTool.java
index 4c8976189..bca098b63 100644
--- a/streampipes-performance-tests/src/main/java/org/apache/streampipes/performance/util/ParameterTool.java
+++ b/streampipes-performance-tests/src/main/java/org/apache/streampipes/performance/util/ParameterTool.java
@@ -23,7 +23,7 @@ public class ParameterTool {
public static PerformanceTestSettings fromArgs(String[] args) {
return new PerformanceTestSettings(toInt(args[0]), toInt(args[1]), toInt(args[2]), toLong(args[3]), toLong
- (args[4]), toInt(args[5]), args[6]);
+ (args[4]), toInt(args[5]), args[6]);
}
private static Long toLong(String arg) {
[streampipes] 03/06: add checkstyle to streampipes-maven-plugin
Posted by bo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bossenti pushed a commit to branch chore/add-checkstyle
in repository https://gitbox.apache.org/repos/asf/streampipes.git
commit 8c56830fb77569100a58919f26a01db672110853
Author: bossenti <bo...@posteo.de>
AuthorDate: Sun Dec 25 20:56:30 2022 +0100
add checkstyle to streampipes-maven-plugin
---
streampipes-container-standalone/pom.xml | 1 -
streampipes-maven-plugin/pom.xml | 7 +-
.../apache/streampipes/smp/CreateAssetMojo.java | 32 +++--
.../streampipes/smp/ExtractDocumentationMojo.java | 70 ++++++-----
.../streampipes/smp/constants/PeGridConst.java | 4 +-
.../smp/extractor/AssetModelItemExtractor.java | 16 +--
.../smp/extractor/ControllerExtractor.java | 9 +-
.../smp/extractor/ControllerFileFinder.java | 6 +-
.../smp/extractor/DockerImageExtractor.java | 10 +-
.../streampipes/smp/extractor/ElementFinder.java | 3 +-
.../streampipes/smp/extractor/FieldReplacer.java | 17 ++-
.../smp/extractor/LocalesExtractor.java | 5 +-
.../extractor/PipelineElementTypeExtractor.java | 2 +-
.../extractor/ResourceDirectoryElementFinder.java | 7 +-
.../streampipes/smp/generator/AssetGenerator.java | 14 +--
.../smp/generator/DataJsonGenerator.java | 7 +-
.../smp/generator/MarkdownHeaderGenerator.java | 24 ++--
.../generator/PipelineElementGridGenerator.java | 30 +++--
.../PipelineElementOverviewGenerator.java | 7 +-
.../smp/generator/SidebarConfigGenerator.java | 5 +-
.../apache/streampipes/smp/model/AssetModel.java | 12 +-
.../smp/parser/DocumentationParser.java | 4 +-
.../parser/PipelineElementDescriptionReplacer.java | 2 +-
.../smp/parser/PipelineElementNameReplacer.java | 2 +-
.../streampipes/smp/util/DuplicateRemover.java | 8 +-
.../org/apache/streampipes/smp/util/Utils.java | 16 +--
.../src/main/resources/docker-compose.yml | 4 +-
.../src/main/resources/documentation.md | 2 -
.../src/main/resources/expected.documentation.md | 2 -
.../smp/extractor/TestAssetModelExtractor.java | 15 ++-
.../smp/generator/TestMarkdownTitleRemover.java | 140 ++++++++++-----------
.../TestPipelineElementOverviewGenerator.java | 3 +-
.../smp/parser/TestDocumentationParser.java | 9 +-
33 files changed, 260 insertions(+), 235 deletions(-)
diff --git a/streampipes-container-standalone/pom.xml b/streampipes-container-standalone/pom.xml
index 3b1a44b3b..c6de4457f 100644
--- a/streampipes-container-standalone/pom.xml
+++ b/streampipes-container-standalone/pom.xml
@@ -50,7 +50,6 @@
<!-- Test dependencies -->
</dependencies>
<build>
- <finalName>streampipes-connect-container-master</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/streampipes-maven-plugin/pom.xml b/streampipes-maven-plugin/pom.xml
index 7fba39f4f..9f6f36872 100644
--- a/streampipes-maven-plugin/pom.xml
+++ b/streampipes-maven-plugin/pom.xml
@@ -16,7 +16,8 @@
~ limitations under the License.
~
-->
-<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>
@@ -222,6 +223,10 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ </plugin>
</plugins>
</build>
</project>
diff --git a/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/CreateAssetMojo.java b/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/CreateAssetMojo.java
index e8af443d3..d5567453d 100644
--- a/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/CreateAssetMojo.java
+++ b/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/CreateAssetMojo.java
@@ -19,6 +19,11 @@
package org.apache.streampipes.smp;
+import org.apache.streampipes.smp.extractor.ControllerFileFinder;
+import org.apache.streampipes.smp.generator.AssetGenerator;
+import org.apache.streampipes.smp.model.AssetModel;
+import org.apache.streampipes.smp.util.DuplicateRemover;
+
import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
@@ -27,10 +32,6 @@ import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
-import org.apache.streampipes.smp.extractor.ControllerFileFinder;
-import org.apache.streampipes.smp.generator.AssetGenerator;
-import org.apache.streampipes.smp.model.AssetModel;
-import org.apache.streampipes.smp.util.DuplicateRemover;
import org.codehaus.plexus.components.interactivity.Prompter;
import org.codehaus.plexus.components.interactivity.PrompterException;
@@ -42,20 +43,17 @@ import java.util.List;
*/
@Mojo(name = "create-assets", defaultPhase = LifecyclePhase.NONE)
public class CreateAssetMojo
- extends AbstractMojo {
+ extends AbstractMojo {
+ private static final String APP_ID_PROPERTY = "appId";
+ private static final String GENERATE_ALL_PROPERTY = "all";
@Parameter(defaultValue = "${session}")
private MavenSession session;
-
@Parameter(defaultValue = "${project}", readonly = true)
private MavenProject project;
-
@Component
private Prompter prompter;
- private static final String APP_ID_PROPERTY = "appId";
- private static final String GENERATE_ALL_PROPERTY = "all";
-
public void execute() throws MojoExecutionException {
String appId = this.session.getExecutionProperties().getProperty(APP_ID_PROPERTY);
@@ -64,8 +62,8 @@ public class CreateAssetMojo
if (appId != null) {
getLog().info("Generating asset directory for element " + appId);
- AssetModel assetModel = new AssetModel(appId, "Pipeline Element Name", "Pipeline Element " +
- "Description");
+ AssetModel assetModel = new AssetModel(appId, "Pipeline Element Name", "Pipeline Element "
+ + "Description");
new AssetGenerator(baseDir.getAbsolutePath(), assetModel);
}
@@ -74,20 +72,20 @@ public class CreateAssetMojo
getLog().info("Generating asset directories for source root " + sourceRoots.get(0));
getLog().info("Finding controllers...");
- List<AssetModel> allAssetModels = new ControllerFileFinder(getLog(), baseDir.getAbsolutePath(),
- sourceRoots.get(0),
- "**/*Controller.java").makeAssetModels();
+ List<AssetModel> allAssetModels = new ControllerFileFinder(getLog(), baseDir.getAbsolutePath(),
+ sourceRoots.get(0),
+ "**/*Controller.java").makeAssetModels();
getLog().info("Checking for already existing asset directories...");
List<AssetModel> filteredModels =
- new DuplicateRemover(baseDir.getAbsolutePath(), allAssetModels).removeAlreadyExisting();
+ new DuplicateRemover(baseDir.getAbsolutePath(), allAssetModels).removeAlreadyExisting();
try {
String proceed = prompter.prompt(makeProceedText(filteredModels));
if (proceed.equals("Y")) {
filteredModels.forEach(am -> new AssetGenerator(baseDir.getAbsolutePath(), am)
- .genreateAssetDirectoryAndContents());
+ .genreateAssetDirectoryAndContents());
}
} catch (PrompterException e) {
e.printStackTrace();
diff --git a/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/ExtractDocumentationMojo.java b/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/ExtractDocumentationMojo.java
index 3d095db4d..1942bec18 100644
--- a/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/ExtractDocumentationMojo.java
+++ b/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/ExtractDocumentationMojo.java
@@ -18,6 +18,18 @@
package org.apache.streampipes.smp;
+import org.apache.streampipes.smp.extractor.ControllerFileFinder;
+import org.apache.streampipes.smp.extractor.ResourceDirectoryElementFinder;
+import org.apache.streampipes.smp.generator.DataJsonGenerator;
+import org.apache.streampipes.smp.generator.ImagePathReplacer;
+import org.apache.streampipes.smp.generator.MarkdownHeaderGenerator;
+import org.apache.streampipes.smp.generator.MarkdownTitleRemover;
+import org.apache.streampipes.smp.generator.PipelineElementOverviewGenerator;
+import org.apache.streampipes.smp.generator.SidebarConfigGenerator;
+import org.apache.streampipes.smp.model.AssetModel;
+import org.apache.streampipes.smp.util.DirectoryManager;
+import org.apache.streampipes.smp.util.Utils;
+
import org.apache.commons.io.FileUtils;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.AbstractMojo;
@@ -27,12 +39,6 @@ import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
-import org.apache.streampipes.smp.extractor.ControllerFileFinder;
-import org.apache.streampipes.smp.extractor.ResourceDirectoryElementFinder;
-import org.apache.streampipes.smp.generator.*;
-import org.apache.streampipes.smp.model.AssetModel;
-import org.apache.streampipes.smp.util.DirectoryManager;
-import org.apache.streampipes.smp.util.Utils;
import java.io.File;
import java.io.IOException;
@@ -68,7 +74,7 @@ public class ExtractDocumentationMojo extends AbstractMojo {
public void execute() throws MojoExecutionException, MojoFailureException {
String targetDir = this.session.getExecutionRootDirectory() + File.separator + "target";
String spIgnoreFile =
- this.session.getExecutionRootDirectory() + File.separator + SP_IGNORE_FILENAME;
+ this.session.getExecutionRootDirectory() + File.separator + SP_IGNORE_FILENAME;
Path docsBasePath = Paths.get(targetDir, DOCS_ROOT_FOLDER);
List<MavenProject> projects = session.getProjects();
@@ -95,12 +101,12 @@ public class ExtractDocumentationMojo extends AbstractMojo {
if (currentModule.getName().equals("streampipes-connect-adapters")) {
System.out.println("Opening adapters");
allAssetModels = new ResourceDirectoryElementFinder(sourceRoots.get(0), getLog(), baseDir.getAbsolutePath())
- .makeAssetModels();
+ .makeAssetModels();
allAssetModels.forEach(am -> System.out.println(am.getAppId()));
} else {
allAssetModels = new ControllerFileFinder(getLog(),
- baseDir.getAbsolutePath(), sourceRoots.get(0),
- "**/*Controller.java").makeAssetModels();
+ baseDir.getAbsolutePath(), sourceRoots.get(0),
+ "**/*Controller.java").makeAssetModels();
}
allAssetModels.forEach(am -> {
@@ -111,32 +117,33 @@ public class ExtractDocumentationMojo extends AbstractMojo {
List<String> finalPipelineElementsToExclude = pipelineElementsToExclude;
documentedPipelineElements.addAll(
- allAssetModels
- .stream()
- .filter(am -> finalPipelineElementsToExclude.stream().noneMatch(pe -> pe.equals(am.getAppId())))
- .collect(Collectors.toList()));
+ allAssetModels
+ .stream()
+ .filter(am -> finalPipelineElementsToExclude.stream().noneMatch(pe -> pe.equals(am.getAppId())))
+ .collect(Collectors.toList()));
}
try {
Collections.sort(documentedPipelineElements);
- documentedPipelineElements.forEach(am -> System.out.println(am.getAppId() + ", " + am.getPipelineElementName() + ", " + am.getPipelineElementDescription()));
+ documentedPipelineElements.forEach(am -> System.out.println(
+ am.getAppId() + ", " + am.getPipelineElementName() + ", " + am.getPipelineElementDescription()));
for (AssetModel assetModel : documentedPipelineElements) {
Path docsPath = Paths.get(targetDir, DOCS_ROOT_FOLDER, DOCS_FOLDER,
- "pe");
+ "pe");
Path docsWebsitePath = Paths.get(targetDir, DOCS_ROOT_FOLDER, DOCS_WEBSITE_FOLDER,
- assetModel.getAppId());
+ assetModel.getAppId());
Path imgPath = Paths.get(targetDir, DOCS_ROOT_FOLDER, IMG_FOLDER,
- assetModel.getAppId());
+ assetModel.getAppId());
DirectoryManager.createIfNotExists(docsPath);
DirectoryManager.createIfNotExists(imgPath);
Boolean iconExists = Files.exists(Utils.makeResourcePath(assetModel.getBaseDir(),
- assetModel.getAppId()).resolve("icon.png"));
+ assetModel.getAppId()).resolve("icon.png"));
if (iconExists) {
Files.copy(Utils.makeResourcePath(assetModel.getBaseDir(),
assetModel.getAppId()).resolve("icon.png")
- , imgPath.resolve("icon.png"));
+ , imgPath.resolve("icon.png"));
} else {
ClassLoader classLoader = this.getClass().getClassLoader();
InputStream inputStream = classLoader.getResourceAsStream("placeholder-icon.png");
@@ -144,21 +151,21 @@ public class ExtractDocumentationMojo extends AbstractMojo {
}
String originalDocumentationFileContents =
- FileUtils.readFileToString(Utils.makeResourcePath(assetModel.getBaseDir(),
- assetModel.getAppId()).resolve("documentation.md").toFile());
+ FileUtils.readFileToString(Utils.makeResourcePath(assetModel.getBaseDir(),
+ assetModel.getAppId()).resolve("documentation.md").toFile());
// modify docs for documentation page
String documentationFileContents =
- new MarkdownTitleRemover(originalDocumentationFileContents).removeTitle();
+ new MarkdownTitleRemover(originalDocumentationFileContents).removeTitle();
documentationFileContents =
- new MarkdownHeaderGenerator(assetModel, documentationFileContents).createHeaders();
+ new MarkdownHeaderGenerator(assetModel, documentationFileContents).createHeaders();
documentationFileContents = new ImagePathReplacer(documentationFileContents,
- assetModel.getAppId()).replaceContentForDocs();
+ assetModel.getAppId()).replaceContentForDocs();
- FileUtils.writeStringToFile(docsPath.resolve(assetModel.getAppId() +".md").toFile(),
- documentationFileContents);
+ FileUtils.writeStringToFile(docsPath.resolve(assetModel.getAppId() + ".md").toFile(),
+ documentationFileContents);
}
@@ -169,16 +176,17 @@ public class ExtractDocumentationMojo extends AbstractMojo {
FileUtils.writeStringToFile(docsBasePath.resolve("pipeline-elements.md").toFile(), header);
}
- String pipelineElementOverviewContent = new PipelineElementOverviewGenerator(documentedPipelineElements).generate();
+ String pipelineElementOverviewContent =
+ new PipelineElementOverviewGenerator(documentedPipelineElements).generate();
FileUtils.writeStringToFile(docsBasePath.resolve("pipeline-elements.md").toFile(),
- pipelineElementOverviewContent, true);
+ pipelineElementOverviewContent, true);
FileUtils.writeStringToFile(docsBasePath.resolve("sidebars.json").toFile(),
- new SidebarConfigGenerator(documentedPipelineElements).generate());
+ new SidebarConfigGenerator(documentedPipelineElements).generate());
FileUtils.writeStringToFile(docsBasePath.resolve("_data.json").toFile(),
- new DataJsonGenerator(documentedPipelineElements).generate());
+ new DataJsonGenerator(documentedPipelineElements).generate());
} catch (IOException e) {
diff --git a/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/constants/PeGridConst.java b/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/constants/PeGridConst.java
index 79185613e..50e361eea 100644
--- a/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/constants/PeGridConst.java
+++ b/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/constants/PeGridConst.java
@@ -36,8 +36,8 @@ public class PeGridConst {
public static final String PE_CONTAINER_ITEM_HEADER_PE = "pe-container-item-header-pe";
public static final String PE_CONTAINER_ITEM_LABEL = "pe-container-item-label";
- public static final String PE_CONTAINER_ITEM_LABEL_PROCESSOR = "pe-container-item-label" +
- "-processor";
+ public static final String PE_CONTAINER_ITEM_LABEL_PROCESSOR = "pe-container-item-label"
+ + "-processor";
public static final String PE_CONTAINER_ITEM_LABEL_SINK = "pe-container-item-label-sink";
public static final String PE_CONTAINER_ITEM_LABEL_NAME = "pe-container-item-label-name";
diff --git a/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/extractor/AssetModelItemExtractor.java b/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/extractor/AssetModelItemExtractor.java
index 60d0c1022..74c6873dd 100644
--- a/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/extractor/AssetModelItemExtractor.java
+++ b/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/extractor/AssetModelItemExtractor.java
@@ -26,12 +26,12 @@ import java.util.regex.Pattern;
public class AssetModelItemExtractor {
- private static final String REGEX = "(DataSinkBuilder|ProcessingElementBuilder)\\.create\\" +
- "((\".*?\"),.*?(\".*?\"),.*?(\".*?\")\\)";
+ private static final String REGEX = "(DataSinkBuilder|ProcessingElementBuilder)\\.create\\"
+ + "((\".*?\"),.*?(\".*?\"),.*?(\".*?\")\\)";
- private static final String ONLY_APP_ID_REGEX = "(DataSinkBuilder|ProcessingElementBuilder)\\" +
- ".create\\" +
- "((\".*?\")\\)";
+ private static final String ONLY_APP_ID_REGEX = "(DataSinkBuilder|ProcessingElementBuilder)\\"
+ + ".create\\"
+ + "((\".*?\")\\)";
private static final Pattern pattern = Pattern.compile(REGEX);
private static final Pattern onlyAppIdPattern = Pattern.compile(ONLY_APP_ID_REGEX);
@@ -40,7 +40,7 @@ public class AssetModelItemExtractor {
public AssetModelItemExtractor(String declareModelContent) {
this.declareModelContent = declareModelContent
- .replaceAll("\n", "");
+ .replaceAll("\n", "");
}
@@ -84,7 +84,7 @@ public class AssetModelItemExtractor {
private String removeQuotes(String text) {
return text
- .replaceAll("\" \\+ \"", "")
- .replaceAll("\"", "");
+ .replaceAll("\" \\+ \"", "")
+ .replaceAll("\"", "");
}
}
diff --git a/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/extractor/ControllerExtractor.java b/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/extractor/ControllerExtractor.java
index a7700f3fb..7f2c0436a 100644
--- a/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/extractor/ControllerExtractor.java
+++ b/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/extractor/ControllerExtractor.java
@@ -19,6 +19,7 @@
package org.apache.streampipes.smp.extractor;
import org.apache.streampipes.smp.model.AssetModel;
+
import org.jboss.forge.roaster.Roaster;
import org.jboss.forge.roaster.model.source.JavaClassSource;
@@ -27,9 +28,9 @@ import java.nio.file.Paths;
public class ControllerExtractor {
+ private static String declareModelMethod = "declareModel";
private String filename;
private String baseDir;
- private static String DECLARE_MODEL_METHOD = "declareModel";
public ControllerExtractor(String baseDir, String filename) {
this.filename = filename;
@@ -39,10 +40,10 @@ public class ControllerExtractor {
public AssetModel extractControllerDetails() throws Exception {
String fileContents = new String(Files.readAllBytes(Paths.get(filename)));
JavaClassSource clazz = Roaster.parse(JavaClassSource.class, fileContents);
- if (clazz.hasMethodSignature(DECLARE_MODEL_METHOD)) {
- String declareMethodContent = (clazz.getMethod(DECLARE_MODEL_METHOD).getBody());
+ if (clazz.hasMethodSignature(declareModelMethod)) {
+ String declareMethodContent = (clazz.getMethod(declareModelMethod).getBody());
declareMethodContent =
- new FieldReplacer(clazz, declareMethodContent).replaceDeclareModelContent();
+ new FieldReplacer(clazz, declareMethodContent).replaceDeclareModelContent();
AssetModel assetModel = new AssetModelItemExtractor(declareMethodContent).extractAssetItem();
if (assetModel.getPipelineElementName() == null) {
assetModel = new LocalesExtractor(baseDir, assetModel).extract();
diff --git a/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/extractor/ControllerFileFinder.java b/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/extractor/ControllerFileFinder.java
index 53bb64579..d6d5dae10 100644
--- a/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/extractor/ControllerFileFinder.java
+++ b/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/extractor/ControllerFileFinder.java
@@ -18,10 +18,11 @@
package org.apache.streampipes.smp.extractor;
+import org.apache.streampipes.smp.model.AssetModel;
+
import org.apache.maven.plugin.logging.Log;
import org.apache.maven.shared.model.fileset.FileSet;
import org.apache.maven.shared.model.fileset.util.FileSetManager;
-import org.apache.streampipes.smp.model.AssetModel;
import java.io.File;
import java.util.ArrayList;
@@ -50,7 +51,8 @@ public class ControllerFileFinder extends ElementFinder {
List<AssetModel> allAssetModels = new ArrayList<>();
for (String file : findFiles()) {
try {
- allAssetModels.add(new ControllerExtractor(baseDir, sourceRoot + File.separator + file).extractControllerDetails());
+ allAssetModels.add(
+ new ControllerExtractor(baseDir, sourceRoot + File.separator + file).extractControllerDetails());
} catch (Exception e) {
log.error(e.getMessage());
log.info("Could not parse file " + file + ", skipping...");
diff --git a/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/extractor/DockerImageExtractor.java b/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/extractor/DockerImageExtractor.java
index 3a9d357e5..a62d70795 100644
--- a/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/extractor/DockerImageExtractor.java
+++ b/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/extractor/DockerImageExtractor.java
@@ -34,9 +34,9 @@ public class DockerImageExtractor {
private static final String Image = "image";
private static final String Services = "services";
private static final String Colon = ":";
- private static final String ImagePrefix = "${SP_PE_DOCKER_REGISTRY}/streampipes" +
- "/streampipes" +
- "-pipeline-elements/";
+ private static final String ImagePrefix = "${SP_PE_DOCKER_REGISTRY}/streampipes"
+ + "/streampipes"
+ + "-pipeline-elements/";
private String baseDir;
@@ -50,7 +50,7 @@ public class DockerImageExtractor {
Yaml yaml = new Yaml();
try {
Map<String, Object> fileContents =
- yaml.load(new String(Files.readAllBytes(dockerComposePath)));
+ yaml.load(new String(Files.readAllBytes(dockerComposePath)));
return extractNameFromYaml(fileContents);
@@ -65,7 +65,7 @@ public class DockerImageExtractor {
AtomicReference<String> imageName = new AtomicReference<>("");
if (services.size() > 0) {
services.forEach((key, value) -> imageName.set(parseValue(((Map<String,
- Object>) value).get(Image).toString())));
+ Object>) value).get(Image).toString())));
}
return imageName.get();
diff --git a/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/extractor/ElementFinder.java b/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/extractor/ElementFinder.java
index 9c5bc8519..55818c8d1 100644
--- a/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/extractor/ElementFinder.java
+++ b/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/extractor/ElementFinder.java
@@ -17,9 +17,10 @@
*/
package org.apache.streampipes.smp.extractor;
-import org.apache.maven.plugin.logging.Log;
import org.apache.streampipes.smp.model.AssetModel;
+import org.apache.maven.plugin.logging.Log;
+
import java.util.List;
public abstract class ElementFinder {
diff --git a/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/extractor/FieldReplacer.java b/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/extractor/FieldReplacer.java
index 081e514c9..a66182032 100644
--- a/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/extractor/FieldReplacer.java
+++ b/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/extractor/FieldReplacer.java
@@ -25,14 +25,13 @@ import java.util.regex.Pattern;
public class FieldReplacer {
+ private static final String CHECK_FIELD_REGEX = "(DataSinkBuilder|ProcessingElementBuilder)\\"
+ + ".create\\"
+ + "((.*?),(.*?)\\)";
+ private static final Pattern checkFieldPattern = Pattern.compile(CHECK_FIELD_REGEX);
private String declareModelContent;
private JavaClassSource source;
- private static final String CHECK_FIELD_REGEX = "(DataSinkBuilder|ProcessingElementBuilder)\\" +
- ".create\\" +
- "((.*?),(.*?)\\)";
- private static final Pattern checkFieldPattern = Pattern.compile(CHECK_FIELD_REGEX);
-
public FieldReplacer(JavaClassSource source, String declareModelContent) {
this.source = source;
@@ -41,11 +40,11 @@ public class FieldReplacer {
public String replaceDeclareModelContent() {
Matcher matcher = checkFieldPattern.matcher(this.declareModelContent);
- while(matcher.find()) {
+ while (matcher.find()) {
String match = matcher.group(2);
if (!match.startsWith("\"")) {
declareModelContent = declareModelContent.replaceFirst(match,
- getFieldValue(match));
+ getFieldValue(match));
}
}
return declareModelContent;
@@ -53,7 +52,7 @@ public class FieldReplacer {
private String getFieldValue(String fieldName) {
return "\""
- + source.getField(fieldName).getStringInitializer()
- + "\"";
+ + source.getField(fieldName).getStringInitializer()
+ + "\"";
}
}
diff --git a/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/extractor/LocalesExtractor.java b/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/extractor/LocalesExtractor.java
index 3c46a272b..ec50554f7 100644
--- a/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/extractor/LocalesExtractor.java
+++ b/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/extractor/LocalesExtractor.java
@@ -27,11 +27,10 @@ import java.util.Properties;
public class LocalesExtractor {
- private AssetModel assetModel;
- private String baseDir;
-
private static final String TITLE = ".title";
private static final String DESCRIPTION = ".description";
+ private AssetModel assetModel;
+ private String baseDir;
public LocalesExtractor(String baseDir, AssetModel assetModel) {
this.baseDir = baseDir;
diff --git a/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/extractor/PipelineElementTypeExtractor.java b/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/extractor/PipelineElementTypeExtractor.java
index 462a72f31..df5322fba 100644
--- a/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/extractor/PipelineElementTypeExtractor.java
+++ b/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/extractor/PipelineElementTypeExtractor.java
@@ -37,7 +37,7 @@ public class PipelineElementTypeExtractor {
} else if (typeString.equals(SinkString)) {
return PeType.SINK;
} else {
- throw new IllegalArgumentException("Unknown pipeline element type " +typeString);
+ throw new IllegalArgumentException("Unknown pipeline element type " + typeString);
}
}
}
diff --git a/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/extractor/ResourceDirectoryElementFinder.java b/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/extractor/ResourceDirectoryElementFinder.java
index 66e5ce192..1151b78f5 100644
--- a/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/extractor/ResourceDirectoryElementFinder.java
+++ b/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/extractor/ResourceDirectoryElementFinder.java
@@ -17,11 +17,12 @@
*/
package org.apache.streampipes.smp.extractor;
-import org.apache.maven.plugin.logging.Log;
import org.apache.streampipes.smp.constants.PeType;
import org.apache.streampipes.smp.model.AssetModel;
import org.apache.streampipes.smp.util.Utils;
+import org.apache.maven.plugin.logging.Log;
+
import java.io.File;
import java.io.IOException;
import java.nio.file.Path;
@@ -46,8 +47,8 @@ public class ResourceDirectoryElementFinder extends ElementFinder {
File[] resourceDirs = resourceDirPath.toFile().listFiles(File::isDirectory);
if (resourceDirs != null) {
List<File> appDirs = Arrays.stream(resourceDirs)
- .filter(rd -> rd.getName().startsWith("org.apache.streampipes"))
- .collect(Collectors.toList());
+ .filter(rd -> rd.getName().startsWith("org.apache.streampipes"))
+ .collect(Collectors.toList());
appDirs.forEach(ap -> {
try {
diff --git a/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/generator/AssetGenerator.java b/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/generator/AssetGenerator.java
index 664f64095..7f6bd8c1b 100644
--- a/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/generator/AssetGenerator.java
+++ b/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/generator/AssetGenerator.java
@@ -18,23 +18,23 @@
package org.apache.streampipes.smp.generator;
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.IOUtils;
import org.apache.streampipes.smp.model.AssetModel;
import org.apache.streampipes.smp.parser.DocumentationParser;
import org.apache.streampipes.smp.util.Utils;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
+
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
public class AssetGenerator {
+ private static final String DOCUMENTATION_FILE = "documentation.md";
private AssetModel assetModel;
private String baseDir;
- private static final String DOCUMENTATION_FILE = "documentation.md";
-
public AssetGenerator(String baseDir, AssetModel assetModel) {
this.assetModel = assetModel;
this.baseDir = baseDir;
@@ -48,10 +48,10 @@ public class AssetGenerator {
InputStream inputStream = classLoader.getResourceAsStream(DOCUMENTATION_FILE);
try {
String content =
- new DocumentationParser(assetModel)
- .parseAndStoreDocumentation(IOUtils.toString(inputStream));
+ new DocumentationParser(assetModel)
+ .parseAndStoreDocumentation(IOUtils.toString(inputStream));
FileUtils.writeStringToFile(new File(resourcePath + File.separator + DOCUMENTATION_FILE),
- content);
+ content);
} catch (IOException e) {
e.printStackTrace();
}
diff --git a/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/generator/DataJsonGenerator.java b/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/generator/DataJsonGenerator.java
index 4d1dc3ceb..f99239841 100644
--- a/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/generator/DataJsonGenerator.java
+++ b/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/generator/DataJsonGenerator.java
@@ -18,11 +18,12 @@
package org.apache.streampipes.smp.generator;
-import com.google.gson.JsonArray;
-import com.google.gson.JsonObject;
import org.apache.streampipes.smp.constants.PeType;
import org.apache.streampipes.smp.model.AssetModel;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
+
import java.util.List;
public class DataJsonGenerator extends OutputGenerator {
@@ -63,7 +64,7 @@ public class DataJsonGenerator extends OutputGenerator {
private String makeDockerHubLink(PeType peType, String moduleName) {
String dockerHubRepoName = peType == PeType.ADAPTER ? "connect-worker" : moduleName.replace("streampipes-", "");
- return "https://hub.docker.com/r/apachestreampipes/" +dockerHubRepoName;
+ return "https://hub.docker.com/r/apachestreampipes/" + dockerHubRepoName;
}
private String makeGithubLink(String moduleName) {
diff --git a/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/generator/MarkdownHeaderGenerator.java b/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/generator/MarkdownHeaderGenerator.java
index c81062061..b78835da3 100644
--- a/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/generator/MarkdownHeaderGenerator.java
+++ b/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/generator/MarkdownHeaderGenerator.java
@@ -33,18 +33,18 @@ public class MarkdownHeaderGenerator {
public String createHeaders() {
StringBuilder builder = new StringBuilder();
builder
- .append("---\n")
- .append("id: ")
- .append(assetModel.getAppId())
- .append("\n")
- .append("title: ")
- .append(assetModel.getPipelineElementName())
- .append("\n")
- .append("sidebar_label: ")
- .append(assetModel.getPipelineElementName())
- .append("\n")
- .append("---\n\n")
- .append(markdown);
+ .append("---\n")
+ .append("id: ")
+ .append(assetModel.getAppId())
+ .append("\n")
+ .append("title: ")
+ .append(assetModel.getPipelineElementName())
+ .append("\n")
+ .append("sidebar_label: ")
+ .append(assetModel.getPipelineElementName())
+ .append("\n")
+ .append("---\n\n")
+ .append(markdown);
return builder.toString();
}
diff --git a/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/generator/PipelineElementGridGenerator.java b/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/generator/PipelineElementGridGenerator.java
index 1e3bfb268..42a08b50c 100644
--- a/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/generator/PipelineElementGridGenerator.java
+++ b/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/generator/PipelineElementGridGenerator.java
@@ -18,12 +18,17 @@
package org.apache.streampipes.smp.generator;
-import j2html.tags.DomContent;
import org.apache.streampipes.smp.constants.PeGridConst;
import org.apache.streampipes.smp.constants.PeType;
import org.apache.streampipes.smp.model.AssetModel;
-import static j2html.TagCreator.*;
+import j2html.tags.DomContent;
+
+import static j2html.TagCreator.a;
+import static j2html.TagCreator.div;
+import static j2html.TagCreator.i;
+import static j2html.TagCreator.img;
+import static j2html.TagCreator.text;
public class PipelineElementGridGenerator {
@@ -34,8 +39,8 @@ public class PipelineElementGridGenerator {
private static final String GITHUB = "Code on Github";
private static final String DOCKER_HUB = "Docker Container";
- private static final String STREAMPIPES_GITHUB_URL = "https://www.github" +
- ".com/apache/incubator-streampipes-extensions/tree/dev/";
+ private static final String STREAMPIPES_GITHUB_URL = "https://www.github"
+ + ".com/apache/incubator-streampipes-extensions/tree/dev/";
private static final String DOCKER_HUB_URL = "https://hub.docker.com/r/streampipes/";
@@ -51,9 +56,9 @@ public class PipelineElementGridGenerator {
private DomContent makeContainerItem() {
return div(makeContainerItemHeader(),
- makeContainerItemBody(),
- makeContainerItemFooter()).withClasses(PeGridConst.PE_CONTAINER_ITEM,
- getContainerItemType());
+ makeContainerItemBody(),
+ makeContainerItemFooter()).withClasses(PeGridConst.PE_CONTAINER_ITEM,
+ getContainerItemType());
}
private DomContent makeContainerItemFooter() {
@@ -106,11 +111,12 @@ public class PipelineElementGridGenerator {
private DomContent makeContainerItemHeader() {
return div(makeContainerItemIconWrapper(),
- makeContainerItemHeaderPe()).withClass(PeGridConst.PE_CONTAINER_ITEM_HEADER);
+ makeContainerItemHeaderPe()).withClass(PeGridConst.PE_CONTAINER_ITEM_HEADER);
}
private DomContent makeContainerItemHeaderPe() {
- return div(makeContainerItemLabel(), makeContainerItemLabelName()).withClass(PeGridConst.PE_CONTAINER_ITEM_HEADER_PE);
+ return div(makeContainerItemLabel(), makeContainerItemLabelName()).withClass(
+ PeGridConst.PE_CONTAINER_ITEM_HEADER_PE);
}
private DomContent makeContainerItemLabelName() {
@@ -127,7 +133,7 @@ public class PipelineElementGridGenerator {
private String makeLabelType() {
return assetModel.getPeType().equals(PeType.PROCESSOR) ? PeGridConst.PE_CONTAINER_ITEM_LABEL_PROCESSOR :
- PeGridConst.PE_CONTAINER_ITEM_LABEL_SINK;
+ PeGridConst.PE_CONTAINER_ITEM_LABEL_SINK;
}
private DomContent makeContainerItemIconWrapper() {
@@ -140,12 +146,12 @@ public class PipelineElementGridGenerator {
private String makeIconType() {
return assetModel.getPeType().equals(PeType.PROCESSOR) ? PeGridConst.PE_ITEM_ICON_PROCESSOR :
- PeGridConst.PE_ITEM_ICON_SINK;
+ PeGridConst.PE_ITEM_ICON_SINK;
}
private String getContainerItemType() {
return assetModel.getPeType().equals(PeType.PROCESSOR) ? PeGridConst.PE_CONTAINER_ITEM_PROCESSOR :
- PeGridConst.PE_CONTAINER_ITEM_SINK;
+ PeGridConst.PE_CONTAINER_ITEM_SINK;
}
}
\ No newline at end of file
diff --git a/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/generator/PipelineElementOverviewGenerator.java b/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/generator/PipelineElementOverviewGenerator.java
index af5f0c682..75277ffbe 100644
--- a/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/generator/PipelineElementOverviewGenerator.java
+++ b/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/generator/PipelineElementOverviewGenerator.java
@@ -18,11 +18,12 @@
package org.apache.streampipes.smp.generator;
-import j2html.tags.ContainerTag;
-import j2html.tags.DomContent;
import org.apache.streampipes.smp.constants.PeGridConst;
import org.apache.streampipes.smp.model.AssetModel;
+import j2html.tags.ContainerTag;
+import j2html.tags.DomContent;
+
import java.util.List;
import static j2html.TagCreator.div;
@@ -36,7 +37,7 @@ public class PipelineElementOverviewGenerator extends OutputGenerator {
public String generate() {
ContainerTag gridContent = div().withClass(PeGridConst.PE_GRID_CONTAINER);
- for(AssetModel am : assetModels) {
+ for (AssetModel am : assetModels) {
gridContent.with(makeGrid(am));
}
String markdownContent = gridContent.render();
diff --git a/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/generator/SidebarConfigGenerator.java b/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/generator/SidebarConfigGenerator.java
index 9a1d560ce..3c492e66d 100644
--- a/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/generator/SidebarConfigGenerator.java
+++ b/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/generator/SidebarConfigGenerator.java
@@ -18,9 +18,10 @@
package org.apache.streampipes.smp.generator;
+import org.apache.streampipes.smp.model.AssetModel;
+
import com.google.gson.JsonArray;
import com.google.gson.JsonObject;
-import org.apache.streampipes.smp.model.AssetModel;
import java.util.List;
@@ -33,7 +34,7 @@ public class SidebarConfigGenerator extends OutputGenerator {
public String generate() {
JsonArray pipelineElements = new JsonArray();
- assetModels.forEach(pe -> pipelineElements.add("pe/" +pe.getAppId()));
+ assetModels.forEach(pe -> pipelineElements.add("pe/" + pe.getAppId()));
JsonObject pipelineElementObject = new JsonObject();
pipelineElementObject.add("Pipeline Elements", pipelineElements);
diff --git a/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/model/AssetModel.java b/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/model/AssetModel.java
index 5446da380..60447217d 100644
--- a/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/model/AssetModel.java
+++ b/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/model/AssetModel.java
@@ -76,14 +76,14 @@ public class AssetModel implements Comparable<AssetModel> {
return moduleName;
}
- public String getContainerName() {
- return containerName;
- }
-
public void setModuleName(String moduleName) {
this.moduleName = moduleName;
}
+ public String getContainerName() {
+ return containerName;
+ }
+
public void setContainerName(String containerName) {
this.containerName = containerName;
}
@@ -98,8 +98,8 @@ public class AssetModel implements Comparable<AssetModel> {
@Override
public String toString() {
- return pipelineElementName + " (" + peType.toString() + ", " + appId + "): " +
- pipelineElementDescription + "\n";
+ return pipelineElementName + " (" + peType.toString() + ", " + appId + "): "
+ + pipelineElementDescription + "\n";
}
public int compareTo(AssetModel other) {
diff --git a/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/parser/DocumentationParser.java b/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/parser/DocumentationParser.java
index bb2773d51..9c8bcb00d 100644
--- a/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/parser/DocumentationParser.java
+++ b/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/parser/DocumentationParser.java
@@ -31,9 +31,9 @@ public class DocumentationParser {
public String parseAndStoreDocumentation(String markdown) {
markdown = new PipelineElementNameReplacer(assetModel.getPipelineElementName(),
- markdown).replace();
+ markdown).replace();
markdown = new PipelineElementDescriptionReplacer(assetModel.getPipelineElementDescription(),
- markdown).replace();
+ markdown).replace();
return markdown;
diff --git a/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/parser/PipelineElementDescriptionReplacer.java b/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/parser/PipelineElementDescriptionReplacer.java
index b2e4dffe8..47bc54c27 100644
--- a/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/parser/PipelineElementDescriptionReplacer.java
+++ b/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/parser/PipelineElementDescriptionReplacer.java
@@ -23,7 +23,7 @@ import java.util.regex.Pattern;
public class PipelineElementDescriptionReplacer extends PlaceholderReplacer {
private static final String PLACEHOLDER = "pipelineElementDescription";
- private static final String REGEX = "(\\$\\{" +PLACEHOLDER + ")(.*)(})";
+ private static final String REGEX = "(\\$\\{" + PLACEHOLDER + ")(.*)(})";
private static final Pattern pattern = Pattern.compile(REGEX);
public PipelineElementDescriptionReplacer(String newContent, String markdown) {
diff --git a/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/parser/PipelineElementNameReplacer.java b/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/parser/PipelineElementNameReplacer.java
index cd049633f..bd5ef204d 100644
--- a/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/parser/PipelineElementNameReplacer.java
+++ b/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/parser/PipelineElementNameReplacer.java
@@ -23,7 +23,7 @@ import java.util.regex.Pattern;
public class PipelineElementNameReplacer extends PlaceholderReplacer {
private static final String PLACEHOLDER = "pipelineElementName";
- private static final String REGEX = "(\\$\\{" +PLACEHOLDER + ")(.*)(})";
+ private static final String REGEX = "(\\$\\{" + PLACEHOLDER + ")(.*)(})";
private static final Pattern pattern = Pattern.compile(REGEX);
public PipelineElementNameReplacer(String pipelineElementName, String markdown) {
diff --git a/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/util/DuplicateRemover.java b/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/util/DuplicateRemover.java
index f157a2ca9..5dc380eff 100644
--- a/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/util/DuplicateRemover.java
+++ b/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/util/DuplicateRemover.java
@@ -37,9 +37,9 @@ public class DuplicateRemover {
public List<AssetModel> removeAlreadyExisting() {
return assetModels
- .stream()
- .filter(am -> !(new File(Utils.makePath(sourceDir, am.getAppId() + File.separator +
- "documentation.md")).exists()))
- .collect(Collectors.toList());
+ .stream()
+ .filter(am -> !(new File(Utils.makePath(sourceDir, am.getAppId() + File.separator
+ + "documentation.md")).exists()))
+ .collect(Collectors.toList());
}
}
diff --git a/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/util/Utils.java b/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/util/Utils.java
index 92ed17997..d412986a4 100644
--- a/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/util/Utils.java
+++ b/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/util/Utils.java
@@ -26,14 +26,14 @@ public class Utils {
public static String makePath(String sourceRoot, String appId) {
return sourceRoot
- + File.separator
- + "src"
- + File.separator
- + "main"
- + File.separator
- + "resources"
- + File.separator
- + appId;
+ + File.separator
+ + "src"
+ + File.separator
+ + "main"
+ + File.separator
+ + "resources"
+ + File.separator
+ + appId;
}
public static Path makeResourcePath(String sourcePath) {
diff --git a/streampipes-maven-plugin/src/main/resources/docker-compose.yml b/streampipes-maven-plugin/src/main/resources/docker-compose.yml
index 6fa91543d..b7f4c2a7a 100644
--- a/streampipes-maven-plugin/src/main/resources/docker-compose.yml
+++ b/streampipes-maven-plugin/src/main/resources/docker-compose.yml
@@ -19,8 +19,8 @@ services:
image: ${SP_DOCKER_REGISTRY}/streampipes/streampipes-pipeline-elements/processors-text-mining-flink:${SP_PE_VERSION}
depends_on:
- "consul"
-# ports:
-# - "8098:8090"
+ # ports:
+ # - "8098:8090"
environment:
- SP_ICON_HOST=${SP_ICON_HOST}
networks:
diff --git a/streampipes-maven-plugin/src/main/resources/documentation.md b/streampipes-maven-plugin/src/main/resources/documentation.md
index a0b07caf7..bd5da361f 100644
--- a/streampipes-maven-plugin/src/main/resources/documentation.md
+++ b/streampipes-maven-plugin/src/main/resources/documentation.md
@@ -33,7 +33,6 @@ Add a detailed description here
## Required input
-
***
## Configuration
@@ -42,7 +41,6 @@ Describe the configuration parameters here
### 1st parameter
-
### 2nd parameter
## Output
\ No newline at end of file
diff --git a/streampipes-maven-plugin/src/main/resources/expected.documentation.md b/streampipes-maven-plugin/src/main/resources/expected.documentation.md
index 4f9efeae1..5b3d257a9 100644
--- a/streampipes-maven-plugin/src/main/resources/expected.documentation.md
+++ b/streampipes-maven-plugin/src/main/resources/expected.documentation.md
@@ -33,7 +33,6 @@ Add a detailed description here
## Required input
-
***
## Configuration
@@ -42,7 +41,6 @@ Describe the configuration parameters here
### 1st parameter
-
### 2nd parameter
## Output
\ No newline at end of file
diff --git a/streampipes-maven-plugin/src/test/java/org/apache/streampipes/smp/extractor/TestAssetModelExtractor.java b/streampipes-maven-plugin/src/test/java/org/apache/streampipes/smp/extractor/TestAssetModelExtractor.java
index 87dd9b28c..d9dff31ba 100644
--- a/streampipes-maven-plugin/src/test/java/org/apache/streampipes/smp/extractor/TestAssetModelExtractor.java
+++ b/streampipes-maven-plugin/src/test/java/org/apache/streampipes/smp/extractor/TestAssetModelExtractor.java
@@ -20,6 +20,7 @@ package org.apache.streampipes.smp.extractor;
import org.apache.streampipes.smp.constants.PeType;
import org.apache.streampipes.smp.model.AssetModel;
+
import org.junit.Test;
import static org.junit.Assert.assertEquals;
@@ -27,7 +28,8 @@ import static org.junit.Assert.assertNull;
public class TestAssetModelExtractor {
- private String declareModelContent = "return ProcessingElementBuilder.create(\"org.apache.streampipes.processors.filters.jvm.numericalfilter\", \"Numerical Filter\", \"Numerical Filter Description\")\n" +
+ private String declareModelContent =
+ "return ProcessingElementBuilder.create(\"org.apache.streampipes.processors.filters.jvm.numericalfilter\", \"Numerical Filter\", \"Numerical Filter Description\")\n" +
" .category(DataProcessorType.FILTER)\n" +
" .providesAssets(Assets.DOCUMENTATION, Assets.ICON)\n" +
" .requiredStream(StreamRequirementsBuilder\n" +
@@ -44,7 +46,8 @@ public class TestAssetModelExtractor {
" .supportedFormats(SupportedFormats.jsonFormat())\n" +
" .build();";
- private String declareModelContent2 = "return ProcessingElementBuilder.create(\"org.apache.streampipes.processors.filters.jvm.processor.mergestartandend\",\n" +
+ private String declareModelContent2 =
+ "return ProcessingElementBuilder.create(\"org.apache.streampipes.processors.filters.jvm.processor.mergestartandend\",\n" +
" \"MergeStartAndEnd\", \"Merges two event streams if there is a start and an end\")\n" +
" .category(DataProcessorType.TRANSFORM)\n" +
" .iconUrl(FiltersJvmConfig.getIconUrl(\"projection\"))\n" +
@@ -61,7 +64,8 @@ public class TestAssetModelExtractor {
" .supportedProtocols(SupportedProtocols.jms(), SupportedProtocols.kafka())\n" +
" .build();";
- private String getDeclareModelContent3 = "return DataSinkBuilder.create(\"org.apache.streampipes.sinks.brokers.jvm.jms\")\n" +
+ private String getDeclareModelContent3 =
+ "return DataSinkBuilder.create(\"org.apache.streampipes.sinks.brokers.jvm.jms\")\n" +
" .withLocales(Locales.EN)\n" +
" .withAssets(Assets.DOCUMENTATION, Assets.ICON)\n" +
" .requiredStream(StreamRequirementsBuilder\n" +
@@ -76,7 +80,8 @@ public class TestAssetModelExtractor {
" .supportedProtocols(SupportedProtocols.kafka(), SupportedProtocols.jms())\n" +
" .build();";
- private String getGetDeclareModelContent4 = "return ProcessingElementBuilder.create(\"org.apache.streampipes.processors.filters.jvm.numericalfilter\")\n" +
+ private String getGetDeclareModelContent4 =
+ "return ProcessingElementBuilder.create(\"org.apache.streampipes.processors.filters.jvm.numericalfilter\")\n" +
" .category(DataProcessorType.FILTER)\n" +
" .withAssets(Assets.DOCUMENTATION, Assets.ICON)\n" +
" .withLocales(Locales.EN)\n" +
@@ -92,7 +97,7 @@ public class TestAssetModelExtractor {
" .supportedProtocols(SupportedProtocols.kafka(), SupportedProtocols.jms())\n" +
" .supportedFormats(SupportedFormats.jsonFormat())\n" +
" .build();";
-
+
@Test
public void testAssetExtraction4() {
diff --git a/streampipes-maven-plugin/src/test/java/org/apache/streampipes/smp/generator/TestMarkdownTitleRemover.java b/streampipes-maven-plugin/src/test/java/org/apache/streampipes/smp/generator/TestMarkdownTitleRemover.java
index d1a2f96b1..3bcbaeb99 100644
--- a/streampipes-maven-plugin/src/test/java/org/apache/streampipes/smp/generator/TestMarkdownTitleRemover.java
+++ b/streampipes-maven-plugin/src/test/java/org/apache/streampipes/smp/generator/TestMarkdownTitleRemover.java
@@ -25,78 +25,78 @@ import static org.junit.Assert.assertEquals;
public class TestMarkdownTitleRemover {
private String content = "---\n" +
- "id: org.apache.streampipes.processor.imageclassification.image-rectifier\n" +
- "title: Image Rectifier\n" +
- "sidebar_label: Image Rectifier\n" +
- "---\n" +
- "\n" +
- "## Image Rectifier\n" +
- "\n" +
- "<p align=\"center\"> \n" +
- " <img src=\"/img/pipeline-elements/org.apache.streampipes.processor.imageclassification.image-rectifier/icon.png\" width=\"150px;\"/>\n" +
- "</p>\n" +
- "\n" +
- "***\n" +
- "\n" +
- "## Description\n" +
- "\n" +
- "Image Rectification: Rectifies + an image\n" +
- "Add a detailed description here\n" +
- "\n" +
- "***\n" +
- "\n" +
- "## Required input\n" +
- "\n" +
- "\n" +
- "***\n" +
- "\n" +
- "## Configuration\n" +
- "\n" +
- "Describe the configuration parameters here\n" +
- "\n" +
- "### 1st parameter\n" +
- "\n" +
- "\n" +
- "### 2nd parameter\n" +
- "\n" +
- "## Output";
+ "id: org.apache.streampipes.processor.imageclassification.image-rectifier\n" +
+ "title: Image Rectifier\n" +
+ "sidebar_label: Image Rectifier\n" +
+ "---\n" +
+ "\n" +
+ "## Image Rectifier\n" +
+ "\n" +
+ "<p align=\"center\"> \n" +
+ " <img src=\"/img/pipeline-elements/org.apache.streampipes.processor.imageclassification.image-rectifier/icon.png\" width=\"150px;\"/>\n" +
+ "</p>\n" +
+ "\n" +
+ "***\n" +
+ "\n" +
+ "## Description\n" +
+ "\n" +
+ "Image Rectification: Rectifies + an image\n" +
+ "Add a detailed description here\n" +
+ "\n" +
+ "***\n" +
+ "\n" +
+ "## Required input\n" +
+ "\n" +
+ "\n" +
+ "***\n" +
+ "\n" +
+ "## Configuration\n" +
+ "\n" +
+ "Describe the configuration parameters here\n" +
+ "\n" +
+ "### 1st parameter\n" +
+ "\n" +
+ "\n" +
+ "### 2nd parameter\n" +
+ "\n" +
+ "## Output";
private String expected = "---\n" +
- "id: org.apache.streampipes.processor.imageclassification.image-rectifier\n" +
- "title: Image Rectifier\n" +
- "sidebar_label: Image Rectifier\n" +
- "---\n" +
- "\n" +
- "\n" +
- "\n" +
- "<p align=\"center\"> \n" +
- " <img src=\"/img/pipeline-elements/org.apache.streampipes.processor.imageclassification.image-rectifier/icon.png\" width=\"150px;\"/>\n" +
- "</p>\n" +
- "\n" +
- "***\n" +
- "\n" +
- "## Description\n" +
- "\n" +
- "Image Rectification: Rectifies + an image\n" +
- "Add a detailed description here\n" +
- "\n" +
- "***\n" +
- "\n" +
- "## Required input\n" +
- "\n" +
- "\n" +
- "***\n" +
- "\n" +
- "## Configuration\n" +
- "\n" +
- "Describe the configuration parameters here\n" +
- "\n" +
- "### 1st parameter\n" +
- "\n" +
- "\n" +
- "### 2nd parameter\n" +
- "\n" +
- "## Output";
+ "id: org.apache.streampipes.processor.imageclassification.image-rectifier\n" +
+ "title: Image Rectifier\n" +
+ "sidebar_label: Image Rectifier\n" +
+ "---\n" +
+ "\n" +
+ "\n" +
+ "\n" +
+ "<p align=\"center\"> \n" +
+ " <img src=\"/img/pipeline-elements/org.apache.streampipes.processor.imageclassification.image-rectifier/icon.png\" width=\"150px;\"/>\n" +
+ "</p>\n" +
+ "\n" +
+ "***\n" +
+ "\n" +
+ "## Description\n" +
+ "\n" +
+ "Image Rectification: Rectifies + an image\n" +
+ "Add a detailed description here\n" +
+ "\n" +
+ "***\n" +
+ "\n" +
+ "## Required input\n" +
+ "\n" +
+ "\n" +
+ "***\n" +
+ "\n" +
+ "## Configuration\n" +
+ "\n" +
+ "Describe the configuration parameters here\n" +
+ "\n" +
+ "### 1st parameter\n" +
+ "\n" +
+ "\n" +
+ "### 2nd parameter\n" +
+ "\n" +
+ "## Output";
@Test
public void testTitleRemover() {
diff --git a/streampipes-maven-plugin/src/test/java/org/apache/streampipes/smp/generator/TestPipelineElementOverviewGenerator.java b/streampipes-maven-plugin/src/test/java/org/apache/streampipes/smp/generator/TestPipelineElementOverviewGenerator.java
index cb77c85bc..87e60b975 100644
--- a/streampipes-maven-plugin/src/test/java/org/apache/streampipes/smp/generator/TestPipelineElementOverviewGenerator.java
+++ b/streampipes-maven-plugin/src/test/java/org/apache/streampipes/smp/generator/TestPipelineElementOverviewGenerator.java
@@ -20,6 +20,7 @@ package org.apache.streampipes.smp.generator;
import org.apache.streampipes.smp.constants.PeType;
import org.apache.streampipes.smp.model.AssetModel;
+
import org.junit.Test;
import java.util.Arrays;
@@ -34,7 +35,7 @@ public class TestPipelineElementOverviewGenerator {
public void testHtmlGenerator() {
am.setPeType(PeType.PROCESSOR);
String html =
- new PipelineElementOverviewGenerator(Arrays.asList(am)).generate();
+ new PipelineElementOverviewGenerator(Arrays.asList(am)).generate();
System.out.println(html);
diff --git a/streampipes-maven-plugin/src/test/java/org/apache/streampipes/smp/parser/TestDocumentationParser.java b/streampipes-maven-plugin/src/test/java/org/apache/streampipes/smp/parser/TestDocumentationParser.java
index 24dbbfc9f..aeca03005 100644
--- a/streampipes-maven-plugin/src/test/java/org/apache/streampipes/smp/parser/TestDocumentationParser.java
+++ b/streampipes-maven-plugin/src/test/java/org/apache/streampipes/smp/parser/TestDocumentationParser.java
@@ -18,8 +18,9 @@
package org.apache.streampipes.smp.parser;
-import org.apache.commons.io.IOUtils;
import org.apache.streampipes.smp.model.AssetModel;
+
+import org.apache.commons.io.IOUtils;
import org.junit.Test;
import java.io.IOException;
@@ -33,13 +34,13 @@ public class TestDocumentationParser {
public void testPipelineElementNameReplacement() throws IOException {
ClassLoader classLoader = this.getClass().getClassLoader();
AssetModel assetModel = new AssetModel("abc", "Numerical Filter", "Numerical Filter " +
- "Description");
+ "Description");
String originalContent = IOUtils.toString(classLoader.getResourceAsStream("documentation.md"));
String expectedContent = IOUtils.toString(classLoader.getResourceAsStream("expected.documentation.md"));
String content =
- new DocumentationParser(assetModel)
- .parseAndStoreDocumentation(originalContent);
+ new DocumentationParser(assetModel)
+ .parseAndStoreDocumentation(originalContent);
assertEquals(expectedContent, content);
}
[streampipes] 01/06: add checkstyle to streampipes-connect-container-worker
Posted by bo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bossenti pushed a commit to branch chore/add-checkstyle
in repository https://gitbox.apache.org/repos/asf/streampipes.git
commit f876a4c0693bde5383a25ab2c943834da80db3b2
Author: bossenti <bo...@posteo.de>
AuthorDate: Sun Dec 25 20:49:58 2022 +0100
add checkstyle to streampipes-connect-container-worker
---
streampipes-connect-container-worker/pom.xml | 12 +-
.../init/AdapterServiceResourceProvider.java | 19 ++-
.../init/AdapterWorkerContainerResourceConfig.java | 33 ++--
.../init/ConnectWorkerDescriptionProvider.java | 7 +-
.../init/ConnectWorkerRegistrationService.java | 1 +
.../worker/management/AdapterWorkerManagement.java | 80 ++++-----
.../worker/management/GuessManagement.java | 51 +++---
.../worker/management/MasterRestClient.java | 21 +--
.../worker/management/RuntimeResovable.java | 44 ++---
.../worker/rest/AdapterAssetResource.java | 99 +++++------
.../worker/rest/AdapterWorkerResource.java | 190 +++++++++++----------
.../container/worker/rest/GuessResource.java | 22 +--
.../worker/rest/RuntimeResolvableResource.java | 59 ++++---
.../container/worker/utils/AdapterUtils.java | 52 +++---
.../management/AdapterWorkerManagementTest.java | 113 ++++++------
.../connect/container/worker/management/Mock.java | 4 +-
.../connect/container/worker/utils/Utils.java | 32 ++--
17 files changed, 442 insertions(+), 397 deletions(-)
diff --git a/streampipes-connect-container-worker/pom.xml b/streampipes-connect-container-worker/pom.xml
index a2703bf82..9355d5100 100644
--- a/streampipes-connect-container-worker/pom.xml
+++ b/streampipes-connect-container-worker/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>
@@ -100,4 +101,13 @@
<scope>test</scope>
</dependency>
</dependencies>
+ <build>
+ <finalName>streampipes-connect-container-master</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/streampipes-connect-container-worker/src/main/java/org/apache/streampipes/connect/container/worker/init/AdapterServiceResourceProvider.java b/streampipes-connect-container-worker/src/main/java/org/apache/streampipes/connect/container/worker/init/AdapterServiceResourceProvider.java
index 5450f0eb1..1a3971d9c 100644
--- a/streampipes-connect-container-worker/src/main/java/org/apache/streampipes/connect/container/worker/init/AdapterServiceResourceProvider.java
+++ b/streampipes-connect-container-worker/src/main/java/org/apache/streampipes/connect/container/worker/init/AdapterServiceResourceProvider.java
@@ -17,8 +17,13 @@
*/
package org.apache.streampipes.connect.container.worker.init;
-import org.apache.streampipes.connect.container.worker.rest.*;
+import org.apache.streampipes.connect.container.worker.rest.AdapterAssetResource;
+import org.apache.streampipes.connect.container.worker.rest.AdapterWorkerResource;
+import org.apache.streampipes.connect.container.worker.rest.GuessResource;
+import org.apache.streampipes.connect.container.worker.rest.HttpServerAdapterResource;
+import org.apache.streampipes.connect.container.worker.rest.RuntimeResolvableResource;
import org.apache.streampipes.container.init.ExtensionsResourceProvider;
+
import org.glassfish.jersey.media.multipart.MultiPartFeature;
import java.util.Arrays;
@@ -29,11 +34,11 @@ public class AdapterServiceResourceProvider implements ExtensionsResourceProvide
@Override
public List<Class<?>> getResourceClasses() {
return Arrays.asList(
- GuessResource.class,
- RuntimeResolvableResource.class,
- AdapterWorkerResource.class,
- MultiPartFeature.class,
- AdapterAssetResource.class,
- HttpServerAdapterResource.class);
+ GuessResource.class,
+ RuntimeResolvableResource.class,
+ AdapterWorkerResource.class,
+ MultiPartFeature.class,
+ AdapterAssetResource.class,
+ HttpServerAdapterResource.class);
}
}
diff --git a/streampipes-connect-container-worker/src/main/java/org/apache/streampipes/connect/container/worker/init/AdapterWorkerContainerResourceConfig.java b/streampipes-connect-container-worker/src/main/java/org/apache/streampipes/connect/container/worker/init/AdapterWorkerContainerResourceConfig.java
index 2de1ebb93..97e7f12e5 100644
--- a/streampipes-connect-container-worker/src/main/java/org/apache/streampipes/connect/container/worker/init/AdapterWorkerContainerResourceConfig.java
+++ b/streampipes-connect-container-worker/src/main/java/org/apache/streampipes/connect/container/worker/init/AdapterWorkerContainerResourceConfig.java
@@ -1,23 +1,26 @@
/*
- * 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.connect.container.worker.init;
-import org.apache.streampipes.service.base.rest.BaseResourceConfig;
import org.apache.streampipes.container.init.BaseExtensionsServiceResourceProvider;
+import org.apache.streampipes.service.base.rest.BaseResourceConfig;
+
import org.springframework.stereotype.Component;
import java.util.Arrays;
@@ -29,7 +32,7 @@ public class AdapterWorkerContainerResourceConfig extends BaseResourceConfig {
@Override
public List<List<Class<?>>> getClassesToRegister() {
return Arrays.asList(
- new BaseExtensionsServiceResourceProvider().getResourceClasses(),
- new AdapterServiceResourceProvider().getResourceClasses());
+ new BaseExtensionsServiceResourceProvider().getResourceClasses(),
+ new AdapterServiceResourceProvider().getResourceClasses());
}
}
diff --git a/streampipes-connect-container-worker/src/main/java/org/apache/streampipes/connect/container/worker/init/ConnectWorkerDescriptionProvider.java b/streampipes-connect-container-worker/src/main/java/org/apache/streampipes/connect/container/worker/init/ConnectWorkerDescriptionProvider.java
index 0c9789dd5..b9444a96e 100644
--- a/streampipes-connect-container-worker/src/main/java/org/apache/streampipes/connect/container/worker/init/ConnectWorkerDescriptionProvider.java
+++ b/streampipes-connect-container-worker/src/main/java/org/apache/streampipes/connect/container/worker/init/ConnectWorkerDescriptionProvider.java
@@ -27,6 +27,7 @@ import org.apache.streampipes.model.connect.adapter.GenericAdapterSetDescription
import org.apache.streampipes.model.connect.adapter.GenericAdapterStreamDescription;
import org.apache.streampipes.model.connect.grounding.ProtocolDescription;
import org.apache.streampipes.sdk.helpers.AdapterSourceType;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -52,9 +53,9 @@ public class ConnectWorkerDescriptionProvider {
public Optional<AdapterDescription> getAdapterDescription(String appId) {
List<AdapterDescription> allAdapterDescriptions = getContainerDescription("");
return allAdapterDescriptions
- .stream()
- .filter(ad -> ad.getAppId().equals(appId))
- .findFirst();
+ .stream()
+ .filter(ad -> ad.getAppId().equals(appId))
+ .findFirst();
}
private NamedStreamPipesEntity rewrite(NamedStreamPipesEntity entity) {
diff --git a/streampipes-connect-container-worker/src/main/java/org/apache/streampipes/connect/container/worker/init/ConnectWorkerRegistrationService.java b/streampipes-connect-container-worker/src/main/java/org/apache/streampipes/connect/container/worker/init/ConnectWorkerRegistrationService.java
index aec9e07a8..6acf460d1 100644
--- a/streampipes-connect-container-worker/src/main/java/org/apache/streampipes/connect/container/worker/init/ConnectWorkerRegistrationService.java
+++ b/streampipes-connect-container-worker/src/main/java/org/apache/streampipes/connect/container/worker/init/ConnectWorkerRegistrationService.java
@@ -19,6 +19,7 @@ package org.apache.streampipes.connect.container.worker.init;
import org.apache.streampipes.connect.container.worker.management.MasterRestClient;
import org.apache.streampipes.container.model.SpServiceDefinition;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/streampipes-connect-container-worker/src/main/java/org/apache/streampipes/connect/container/worker/management/AdapterWorkerManagement.java b/streampipes-connect-container-worker/src/main/java/org/apache/streampipes/connect/container/worker/management/AdapterWorkerManagement.java
index 2162e516c..bd1faedcf 100644
--- a/streampipes-connect-container-worker/src/main/java/org/apache/streampipes/connect/container/worker/management/AdapterWorkerManagement.java
+++ b/streampipes-connect-container-worker/src/main/java/org/apache/streampipes/connect/container/worker/management/AdapterWorkerManagement.java
@@ -26,6 +26,7 @@ import org.apache.streampipes.container.monitoring.SpMonitoringManager;
import org.apache.streampipes.model.connect.adapter.AdapterDescription;
import org.apache.streampipes.model.connect.adapter.AdapterSetDescription;
import org.apache.streampipes.model.connect.adapter.AdapterStreamDescription;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -33,62 +34,63 @@ import java.util.Collection;
public class AdapterWorkerManagement {
- private static final Logger logger = LoggerFactory.getLogger(AdapterWorkerManagement.class);
+ private static final Logger logger = LoggerFactory.getLogger(AdapterWorkerManagement.class);
- public Collection<AdapterDescription> getAllRunningAdapterInstances() {
- return RunningAdapterInstances.INSTANCE.getAllRunningAdapterDescriptions();
- }
+ public Collection<AdapterDescription> getAllRunningAdapterInstances() {
+ return RunningAdapterInstances.INSTANCE.getAllRunningAdapterDescriptions();
+ }
- public void invokeStreamAdapter(AdapterStreamDescription adapterStreamDescription) throws AdapterException {
+ public void invokeStreamAdapter(AdapterStreamDescription adapterStreamDescription) throws AdapterException {
- IAdapter<?> adapter = AdapterUtils.setAdapter(adapterStreamDescription);
+ IAdapter<?> adapter = AdapterUtils.setAdapter(adapterStreamDescription);
- RunningAdapterInstances.INSTANCE.addAdapter(adapterStreamDescription.getElementId(), adapter, adapterStreamDescription);
- adapter.startAdapter();
- }
+ RunningAdapterInstances.INSTANCE.addAdapter(adapterStreamDescription.getElementId(), adapter,
+ adapterStreamDescription);
+ adapter.startAdapter();
+ }
- public void stopStreamAdapter(AdapterStreamDescription adapterStreamDescription) throws AdapterException {
- stopAdapter(adapterStreamDescription);
- }
+ public void stopStreamAdapter(AdapterStreamDescription adapterStreamDescription) throws AdapterException {
+ stopAdapter(adapterStreamDescription);
+ }
- public void invokeSetAdapter(AdapterSetDescription adapterSetDescription) throws AdapterException {
+ public void invokeSetAdapter(AdapterSetDescription adapterSetDescription) throws AdapterException {
- IAdapter<?> adapter = AdapterUtils.setAdapter(adapterSetDescription);
+ IAdapter<?> adapter = AdapterUtils.setAdapter(adapterSetDescription);
- RunningAdapterInstances.INSTANCE.addAdapter(adapterSetDescription.getElementId(), adapter, adapterSetDescription);
+ RunningAdapterInstances.INSTANCE.addAdapter(adapterSetDescription.getElementId(), adapter, adapterSetDescription);
- adapter.changeEventGrounding(adapterSetDescription.getDataSet().getEventGrounding().getTransportProtocol());
+ adapter.changeEventGrounding(adapterSetDescription.getDataSet().getEventGrounding().getTransportProtocol());
- // Start a thread to start a set adapter
- Runnable r = () -> {
- try {
- adapter.startAdapter();
- } catch (AdapterException e) {
- e.printStackTrace();
- }
- };
+ // Start a thread to start a set adapter
+ Runnable r = () -> {
+ try {
+ adapter.startAdapter();
+ } catch (AdapterException e) {
+ e.printStackTrace();
+ }
+ };
- new Thread(r).start();
- }
+ new Thread(r).start();
+ }
- public void stopSetAdapter(AdapterSetDescription adapterSetDescription) throws AdapterException {
- stopAdapter(adapterSetDescription);
- }
+ public void stopSetAdapter(AdapterSetDescription adapterSetDescription) throws AdapterException {
+ stopAdapter(adapterSetDescription);
+ }
- private void stopAdapter(AdapterDescription adapterDescription) throws AdapterException {
+ private void stopAdapter(AdapterDescription adapterDescription) throws AdapterException {
- String elementId = adapterDescription.getElementId();
+ String elementId = adapterDescription.getElementId();
- IAdapter<?> adapter = RunningAdapterInstances.INSTANCE.removeAdapter(elementId);
+ IAdapter<?> adapter = RunningAdapterInstances.INSTANCE.removeAdapter(elementId);
- if (adapter != null) {
- adapter.stopAdapter();
- }
- resetMonitoring(elementId);
+ if (adapter != null) {
+ adapter.stopAdapter();
}
+ resetMonitoring(elementId);
+ }
- private void resetMonitoring(String elementId) {
- SpMonitoringManager.INSTANCE.reset(elementId);
- }
+ private void resetMonitoring(String elementId) {
+ SpMonitoringManager.INSTANCE.reset(elementId);
+ }
}
diff --git a/streampipes-connect-container-worker/src/main/java/org/apache/streampipes/connect/container/worker/management/GuessManagement.java b/streampipes-connect-container-worker/src/main/java/org/apache/streampipes/connect/container/worker/management/GuessManagement.java
index 362c63a42..863770fc5 100644
--- a/streampipes-connect-container-worker/src/main/java/org/apache/streampipes/connect/container/worker/management/GuessManagement.java
+++ b/streampipes-connect-container-worker/src/main/java/org/apache/streampipes/connect/container/worker/management/GuessManagement.java
@@ -24,6 +24,7 @@ import org.apache.streampipes.connect.api.exception.ParseException;
import org.apache.streampipes.connect.container.worker.utils.AdapterUtils;
import org.apache.streampipes.model.connect.adapter.AdapterDescription;
import org.apache.streampipes.model.connect.guess.GuessSchema;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -32,39 +33,39 @@ import java.util.Optional;
public class GuessManagement {
- private static Logger LOG = LoggerFactory.getLogger(GuessManagement.class);
+ private static Logger logger = LoggerFactory.getLogger(GuessManagement.class);
- public GuessSchema guessSchema(AdapterDescription adapterDescription) throws AdapterException, ParseException {
+ public GuessSchema guessSchema(AdapterDescription adapterDescription) throws AdapterException, ParseException {
- LOG.info("Start guessing schema for: " + adapterDescription.getAppId());
- IAdapter adapter = AdapterUtils.setAdapter(adapterDescription);
+ logger.info("Start guessing schema for: " + adapterDescription.getAppId());
+ IAdapter adapter = AdapterUtils.setAdapter(adapterDescription);
- GuessSchema guessSchema;
- try {
- guessSchema = adapter.getSchema(adapterDescription);
+ GuessSchema guessSchema;
+ try {
+ guessSchema = adapter.getSchema(adapterDescription);
- for (int i = 0; i < guessSchema.getEventSchema().getEventProperties().size(); i++) {
- guessSchema.getEventSchema().getEventProperties().get(i).setIndex(i);
- }
+ for (int i = 0; i < guessSchema.getEventSchema().getEventProperties().size(); i++) {
+ guessSchema.getEventSchema().getEventProperties().get(i).setIndex(i);
+ }
- LOG.info("Successfully guessed schema for: " + adapterDescription.getAppId());
- } catch (ParseException e) {
- LOG.error(e.toString());
+ logger.info("Successfully guessed schema for: " + adapterDescription.getAppId());
+ } catch (ParseException e) {
+ logger.error(e.toString());
- String errorClass = "";
- Optional<StackTraceElement> stackTraceElement = Arrays.stream(e.getStackTrace()).findFirst();
- if(stackTraceElement.isPresent()) {
- String[] errorClassLong = stackTraceElement.get().getClassName().split("\\.");
- errorClass = errorClassLong[errorClassLong.length - 1] + ": ";
- }
+ String errorClass = "";
+ Optional<StackTraceElement> stackTraceElement = Arrays.stream(e.getStackTrace()).findFirst();
+ if (stackTraceElement.isPresent()) {
+ String[] errorClassLong = stackTraceElement.get().getClassName().split("\\.");
+ errorClass = errorClassLong[errorClassLong.length - 1] + ": ";
+ }
- throw new ParseException(errorClass + e.getMessage());
- } catch (Exception e) {
- throw new AdapterException(e.getMessage(), e);
- }
+ throw new ParseException(errorClass + e.getMessage());
+ } catch (Exception e) {
+ throw new AdapterException(e.getMessage(), e);
+ }
- return guessSchema;
+ return guessSchema;
- }
+ }
}
diff --git a/streampipes-connect-container-worker/src/main/java/org/apache/streampipes/connect/container/worker/management/MasterRestClient.java b/streampipes-connect-container-worker/src/main/java/org/apache/streampipes/connect/container/worker/management/MasterRestClient.java
index 5c4e4b1e4..a800054b2 100644
--- a/streampipes-connect-container-worker/src/main/java/org/apache/streampipes/connect/container/worker/management/MasterRestClient.java
+++ b/streampipes-connect-container-worker/src/main/java/org/apache/streampipes/connect/container/worker/management/MasterRestClient.java
@@ -21,6 +21,7 @@ package org.apache.streampipes.connect.container.worker.management;
import org.apache.streampipes.client.StreamPipesClient;
import org.apache.streampipes.model.connect.adapter.AdapterDescription;
import org.apache.streampipes.service.extensions.base.client.StreamPipesClientResolver;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -28,18 +29,18 @@ import java.util.List;
public class MasterRestClient {
- private static final Logger LOG = LoggerFactory.getLogger(MasterRestClient.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MasterRestClient.class);
- public static boolean register(List<AdapterDescription> allAvailableAdapters) {
+ public static boolean register(List<AdapterDescription> allAvailableAdapters) {
- try {
- StreamPipesClient client = new StreamPipesClientResolver().makeStreamPipesClientInstance();
- client.adminApi().registerAdapters(allAvailableAdapters);
- return true;
- } catch (Exception e) {
- LOG.error("Could not register adapter at url - is a 'StreamPipes Core' service running?" , e);
- return false;
- }
+ try {
+ StreamPipesClient client = new StreamPipesClientResolver().makeStreamPipesClientInstance();
+ client.adminApi().registerAdapters(allAvailableAdapters);
+ return true;
+ } catch (Exception e) {
+ LOG.error("Could not register adapter at url - is a 'StreamPipes Core' service running?", e);
+ return false;
}
+ }
}
diff --git a/streampipes-connect-container-worker/src/main/java/org/apache/streampipes/connect/container/worker/management/RuntimeResovable.java b/streampipes-connect-container-worker/src/main/java/org/apache/streampipes/connect/container/worker/management/RuntimeResovable.java
index fe4b003ea..3a1c96596 100644
--- a/streampipes-connect-container-worker/src/main/java/org/apache/streampipes/connect/container/worker/management/RuntimeResovable.java
+++ b/streampipes-connect-container-worker/src/main/java/org/apache/streampipes/connect/container/worker/management/RuntimeResovable.java
@@ -29,31 +29,31 @@ import org.apache.streampipes.container.init.DeclarersSingleton;
import java.util.Map;
public class RuntimeResovable {
- private static final String SP_NS = "https://streampipes.org/vocabulary/v1/";
+ private static final String SP_NS = "https://streampipes.org/vocabulary/v1/";
- public static ResolvesContainerProvidedOptions getRuntimeResolvableFormat(String id) throws IllegalArgumentException {
- id = id.replaceAll("sp:", SP_NS);
- Map<String, IFormat> allFormats = AdapterRegistry.getAllFormats();
+ public static ResolvesContainerProvidedOptions getRuntimeResolvableFormat(String id) throws IllegalArgumentException {
+ id = id.replaceAll("sp:", SP_NS);
+ Map<String, IFormat> allFormats = AdapterRegistry.getAllFormats();
- if (allFormats.containsKey(id)) {
- return (ResolvesContainerProvidedOptions) allFormats.get(id);
- } else {
- return null;
- }
+ if (allFormats.containsKey(id)) {
+ return (ResolvesContainerProvidedOptions) allFormats.get(id);
+ } else {
+ return null;
}
-
- public static Connector getAdapterOrProtocol(String id) {
- id = id.replaceAll("sp:", SP_NS);
- Map<String, IAdapter> allAdapters = DeclarersSingleton.getInstance().getAllAdaptersMap();
- Map<String, IProtocol> allProtocols = DeclarersSingleton.getInstance().getAllProtocolsMap();
-
- if (allAdapters.containsKey(id)) {
- return allAdapters.get(id);
- } else if (allProtocols.containsKey(id)) {
- return allProtocols.get(id);
- } else {
- throw new IllegalArgumentException("Could not find adapter with id " + id);
- }
+ }
+
+ public static Connector getAdapterOrProtocol(String id) {
+ id = id.replaceAll("sp:", SP_NS);
+ Map<String, IAdapter> allAdapters = DeclarersSingleton.getInstance().getAllAdaptersMap();
+ Map<String, IProtocol> allProtocols = DeclarersSingleton.getInstance().getAllProtocolsMap();
+
+ if (allAdapters.containsKey(id)) {
+ return allAdapters.get(id);
+ } else if (allProtocols.containsKey(id)) {
+ return allProtocols.get(id);
+ } else {
+ throw new IllegalArgumentException("Could not find adapter with id " + id);
}
+ }
}
diff --git a/streampipes-connect-container-worker/src/main/java/org/apache/streampipes/connect/container/worker/rest/AdapterAssetResource.java b/streampipes-connect-container-worker/src/main/java/org/apache/streampipes/connect/container/worker/rest/AdapterAssetResource.java
index 2a5bcf44f..5c7d448bb 100644
--- a/streampipes-connect-container-worker/src/main/java/org/apache/streampipes/connect/container/worker/rest/AdapterAssetResource.java
+++ b/streampipes-connect-container-worker/src/main/java/org/apache/streampipes/connect/container/worker/rest/AdapterAssetResource.java
@@ -1,36 +1,39 @@
/*
- * 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.connect.container.worker.rest;
-import com.google.common.base.Charsets;
-import com.google.common.io.Resources;
import org.apache.streampipes.connect.container.worker.init.ConnectWorkerDescriptionProvider;
import org.apache.streampipes.container.assets.AssetZipGenerator;
import org.apache.streampipes.container.util.AssetsUtil;
import org.apache.streampipes.model.connect.adapter.AdapterDescription;
import org.apache.streampipes.rest.shared.impl.AbstractSharedRestInterface;
+import com.google.common.base.Charsets;
+import com.google.common.io.Resources;
+
import javax.ws.rs.GET;
import javax.ws.rs.Path;
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.Optional;
@@ -38,44 +41,44 @@ import java.util.Optional;
@Path("/api/v1/worker/adapters")
public class AdapterAssetResource extends AbstractSharedRestInterface {
- private ConnectWorkerDescriptionProvider connectWorkerDescriptionProvider;
-
- public AdapterAssetResource() {
- this.connectWorkerDescriptionProvider = new ConnectWorkerDescriptionProvider();
- }
+ private ConnectWorkerDescriptionProvider connectWorkerDescriptionProvider;
+ public AdapterAssetResource() {
+ this.connectWorkerDescriptionProvider = new ConnectWorkerDescriptionProvider();
+ }
- @GET
- @Path("/{id}/assets")
- @Produces("application/zip")
- public Response getAssets(@PathParam("id") String id) {
- Optional<AdapterDescription> adapterDescription = this.connectWorkerDescriptionProvider.getAdapterDescription(id);
- if (adapterDescription.isPresent()) {
- try {
- return ok(new AssetZipGenerator(id, adapterDescription.get().getIncludedAssets()).makeZip());
- } catch (IOException e) {
- e.printStackTrace();
- return fail();
- }
- } else {
- return fail();
- }
+ @GET
+ @Path("/{id}/assets")
+ @Produces("application/zip")
+ public Response getAssets(@PathParam("id") String id) {
+ Optional<AdapterDescription> adapterDescription = this.connectWorkerDescriptionProvider.getAdapterDescription(id);
+ if (adapterDescription.isPresent()) {
+ try {
+ return ok(new AssetZipGenerator(id, adapterDescription.get().getIncludedAssets()).makeZip());
+ } catch (IOException e) {
+ e.printStackTrace();
+ return fail();
+ }
+ } else {
+ return fail();
}
- @GET
- @Path("/{id}/assets/icon")
- @Produces("image/png")
- public Response getIconAsset(@PathParam("id") String elementId) throws IOException {
- URL iconUrl = Resources.getResource(AssetsUtil.makeIconPath(elementId));
- return ok(Resources.toByteArray(iconUrl));
- }
+ }
- @GET
- @Path("/{id}/assets/documentation")
- @Produces(MediaType.TEXT_PLAIN)
- public String getDocumentationAsset(@PathParam("id") String elementId) throws IOException {
- URL documentationUrl = Resources.getResource(AssetsUtil.makeDocumentationPath(elementId));
- return Resources.toString(documentationUrl, Charsets.UTF_8);
- }
+ @GET
+ @Path("/{id}/assets/icon")
+ @Produces("image/png")
+ public Response getIconAsset(@PathParam("id") String elementId) throws IOException {
+ URL iconUrl = Resources.getResource(AssetsUtil.makeIconPath(elementId));
+ return ok(Resources.toByteArray(iconUrl));
+ }
+
+ @GET
+ @Path("/{id}/assets/documentation")
+ @Produces(MediaType.TEXT_PLAIN)
+ public String getDocumentationAsset(@PathParam("id") String elementId) throws IOException {
+ URL documentationUrl = Resources.getResource(AssetsUtil.makeDocumentationPath(elementId));
+ return Resources.toString(documentationUrl, Charsets.UTF_8);
+ }
}
diff --git a/streampipes-connect-container-worker/src/main/java/org/apache/streampipes/connect/container/worker/rest/AdapterWorkerResource.java b/streampipes-connect-container-worker/src/main/java/org/apache/streampipes/connect/container/worker/rest/AdapterWorkerResource.java
index 9aa69c8a2..c000f8d52 100644
--- a/streampipes-connect-container-worker/src/main/java/org/apache/streampipes/connect/container/worker/rest/AdapterWorkerResource.java
+++ b/streampipes-connect-container-worker/src/main/java/org/apache/streampipes/connect/container/worker/rest/AdapterWorkerResource.java
@@ -26,115 +26,121 @@ import org.apache.streampipes.model.connect.adapter.AdapterStreamDescription;
import org.apache.streampipes.model.message.Notifications;
import org.apache.streampipes.rest.shared.annotation.JacksonSerialized;
import org.apache.streampipes.rest.shared.impl.AbstractSharedRestInterface;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.ws.rs.*;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
@Path("/api/v1/worker")
public class AdapterWorkerResource extends AbstractSharedRestInterface {
- private static final Logger logger = LoggerFactory.getLogger(AdapterWorkerResource.class);
-
- private AdapterWorkerManagement adapterManagement;
-
- public AdapterWorkerResource() {
- adapterManagement = new AdapterWorkerManagement();
+ private static final Logger logger = LoggerFactory.getLogger(AdapterWorkerResource.class);
+
+ private AdapterWorkerManagement adapterManagement;
+
+ public AdapterWorkerResource() {
+ adapterManagement = new AdapterWorkerManagement();
+ }
+
+ public AdapterWorkerResource(AdapterWorkerManagement adapterManagement) {
+ this.adapterManagement = adapterManagement;
+ }
+
+ @GET
+ @JacksonSerialized
+ @Path("/running")
+ @Produces(MediaType.APPLICATION_JSON)
+ public Response getRunningAdapterInstances() {
+ return ok(adapterManagement.getAllRunningAdapterInstances());
+ }
+
+
+ @POST
+ @JacksonSerialized
+ @Path("/stream/invoke")
+ @Consumes(MediaType.APPLICATION_JSON)
+ @Produces(MediaType.APPLICATION_JSON)
+ public Response invokeStreamAdapter(AdapterStreamDescription adapterStreamDescription) {
+
+ try {
+ adapterManagement.invokeStreamAdapter(adapterStreamDescription);
+ String responseMessage = "Stream adapter with id " + adapterStreamDescription.getUri() + " successfully started";
+ logger.info(responseMessage);
+ return ok(Notifications.success(responseMessage));
+ } catch (AdapterException e) {
+ logger.error("Error while starting adapter with id " + adapterStreamDescription.getUri(), e);
+ return serverError(StreamPipesErrorMessage.from(e));
}
-
- public AdapterWorkerResource(AdapterWorkerManagement adapterManagement) {
- this.adapterManagement = adapterManagement;
+ }
+
+ @POST
+ @JacksonSerialized
+ @Path("/stream/stop")
+ @Consumes(MediaType.APPLICATION_JSON)
+ @Produces(MediaType.APPLICATION_JSON)
+ public Response stopStreamAdapter(AdapterStreamDescription adapterStreamDescription) {
+
+ String responseMessage;
+ try {
+ if (adapterStreamDescription.isRunning()) {
+ adapterManagement.stopStreamAdapter(adapterStreamDescription);
+ responseMessage = "Stream adapter with id " + adapterStreamDescription.getElementId() + " successfully stopped";
+ } else {
+ responseMessage =
+ "Stream adapter with id " + adapterStreamDescription.getElementId() + " seems not to be running";
+ }
+ logger.info(responseMessage);
+ return ok(Notifications.success(responseMessage));
+ } catch (AdapterException e) {
+ logger.error("Error while stopping adapter with id " + adapterStreamDescription.getElementId(), e);
+ return serverError(StreamPipesErrorMessage.from(e));
}
-
- @GET
- @JacksonSerialized
- @Path("/running")
- @Produces(MediaType.APPLICATION_JSON)
- public Response getRunningAdapterInstances() {
- return ok(adapterManagement.getAllRunningAdapterInstances());
+ }
+
+ @POST
+ @JacksonSerialized
+ @Path("/set/invoke")
+ @Consumes(MediaType.APPLICATION_JSON)
+ @Produces(MediaType.APPLICATION_JSON)
+ public Response invokeSetAdapter(AdapterSetDescription adapterSetDescription) {
+
+ try {
+ adapterManagement.invokeSetAdapter(adapterSetDescription);
+ } catch (AdapterException e) {
+ logger.error("Error while starting adapter with id " + adapterSetDescription.getElementId(), e);
+ return ok(Notifications.error(e.getMessage()));
}
+ String responseMessage = "Set adapter with id " + adapterSetDescription.getElementId() + " successfully started";
- @POST
- @JacksonSerialized
- @Path("/stream/invoke")
- @Consumes(MediaType.APPLICATION_JSON)
- @Produces(MediaType.APPLICATION_JSON)
- public Response invokeStreamAdapter(AdapterStreamDescription adapterStreamDescription) {
-
- try {
- adapterManagement.invokeStreamAdapter(adapterStreamDescription);
- String responseMessage = "Stream adapter with id " + adapterStreamDescription.getUri() + " successfully started";
- logger.info(responseMessage);
- return ok(Notifications.success(responseMessage));
- } catch (AdapterException e) {
- logger.error("Error while starting adapter with id " + adapterStreamDescription.getUri(), e);
- return serverError(StreamPipesErrorMessage.from(e));
- }
- }
+ logger.info(responseMessage);
+ return ok(Notifications.success(responseMessage));
+ }
- @POST
- @JacksonSerialized
- @Path("/stream/stop")
- @Consumes(MediaType.APPLICATION_JSON)
- @Produces(MediaType.APPLICATION_JSON)
- public Response stopStreamAdapter(AdapterStreamDescription adapterStreamDescription) {
-
- String responseMessage;
- try {
- if (adapterStreamDescription.isRunning()) {
- adapterManagement.stopStreamAdapter(adapterStreamDescription);
- responseMessage = "Stream adapter with id " + adapterStreamDescription.getElementId() + " successfully stopped";
- } else {
- responseMessage = "Stream adapter with id " + adapterStreamDescription.getElementId() + " seems not to be running";
- }
- logger.info(responseMessage);
- return ok(Notifications.success(responseMessage));
- } catch (AdapterException e) {
- logger.error("Error while stopping adapter with id " + adapterStreamDescription.getElementId(), e);
- return serverError(StreamPipesErrorMessage.from(e));
- }
- }
+ @POST
+ @JacksonSerialized
+ @Path("/set/stop")
+ @Consumes(MediaType.APPLICATION_JSON)
+ @Produces(MediaType.APPLICATION_JSON)
+ public Response stopSetAdapter(AdapterSetDescription adapterSetDescription) {
- @POST
- @JacksonSerialized
- @Path("/set/invoke")
- @Consumes(MediaType.APPLICATION_JSON)
- @Produces(MediaType.APPLICATION_JSON)
- public Response invokeSetAdapter(AdapterSetDescription adapterSetDescription) {
-
- try {
- adapterManagement.invokeSetAdapter(adapterSetDescription);
- } catch (AdapterException e) {
- logger.error("Error while starting adapter with id " + adapterSetDescription.getElementId(), e);
- return ok(Notifications.error(e.getMessage()));
- }
-
- String responseMessage = "Set adapter with id " + adapterSetDescription.getElementId() + " successfully started";
-
- logger.info(responseMessage);
- return ok(Notifications.success(responseMessage));
+ try {
+ adapterManagement.stopSetAdapter(adapterSetDescription);
+ } catch (AdapterException e) {
+ logger.error("Error while stopping adapter with id " + adapterSetDescription.getElementId(), e);
+ return ok(Notifications.error(e.getMessage()));
}
- @POST
- @JacksonSerialized
- @Path("/set/stop")
- @Consumes(MediaType.APPLICATION_JSON)
- @Produces(MediaType.APPLICATION_JSON)
- public Response stopSetAdapter(AdapterSetDescription adapterSetDescription){
+ String responseMessage = "Set adapter with id " + adapterSetDescription.getElementId() + " successfully stopped";
- try {
- adapterManagement.stopSetAdapter(adapterSetDescription);
- } catch (AdapterException e) {
- logger.error("Error while stopping adapter with id " + adapterSetDescription.getElementId(), e);
- return ok(Notifications.error(e.getMessage()));
- }
-
- String responseMessage = "Set adapter with id " + adapterSetDescription.getElementId() + " successfully stopped";
-
- logger.info(responseMessage);
- return ok(Notifications.success(responseMessage));
- }
+ logger.info(responseMessage);
+ return ok(Notifications.success(responseMessage));
+ }
}
diff --git a/streampipes-connect-container-worker/src/main/java/org/apache/streampipes/connect/container/worker/rest/GuessResource.java b/streampipes-connect-container-worker/src/main/java/org/apache/streampipes/connect/container/worker/rest/GuessResource.java
index c357a5493..dd2e4d7fc 100644
--- a/streampipes-connect-container-worker/src/main/java/org/apache/streampipes/connect/container/worker/rest/GuessResource.java
+++ b/streampipes-connect-container-worker/src/main/java/org/apache/streampipes/connect/container/worker/rest/GuessResource.java
@@ -25,6 +25,7 @@ import org.apache.streampipes.model.connect.adapter.AdapterDescription;
import org.apache.streampipes.model.connect.guess.GuessSchema;
import org.apache.streampipes.rest.shared.annotation.JacksonSerialized;
import org.apache.streampipes.rest.shared.impl.AbstractSharedRestInterface;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -56,17 +57,18 @@ public class GuessResource extends AbstractSharedRestInterface {
@Produces(MediaType.APPLICATION_JSON)
public Response guessSchema(AdapterDescription adapterDescription) {
- try {
- GuessSchema result = guessManagement.guessSchema(adapterDescription);
+ try {
+ GuessSchema result = guessManagement.guessSchema(adapterDescription);
- return ok(result);
- } catch (ParseException e) {
- logger.error("Error while parsing events: ", e);
- return serverError(e);
- } catch (AdapterException e) {
- logger.error("Error while guessing schema for AdapterDescription: {}, {}", adapterDescription.getElementId(), e.getMessage());
- return serverError(e);
- }
+ return ok(result);
+ } catch (ParseException e) {
+ logger.error("Error while parsing events: ", e);
+ return serverError(e);
+ } catch (AdapterException e) {
+ logger.error("Error while guessing schema for AdapterDescription: {}, {}", adapterDescription.getElementId(),
+ e.getMessage());
+ return serverError(e);
+ }
}
}
diff --git a/streampipes-connect-container-worker/src/main/java/org/apache/streampipes/connect/container/worker/rest/RuntimeResolvableResource.java b/streampipes-connect-container-worker/src/main/java/org/apache/streampipes/connect/container/worker/rest/RuntimeResolvableResource.java
index 72a209462..1d485eec0 100644
--- a/streampipes-connect-container-worker/src/main/java/org/apache/streampipes/connect/container/worker/rest/RuntimeResolvableResource.java
+++ b/streampipes-connect-container-worker/src/main/java/org/apache/streampipes/connect/container/worker/rest/RuntimeResolvableResource.java
@@ -30,40 +30,45 @@ import org.apache.streampipes.model.runtime.RuntimeOptionsResponse;
import org.apache.streampipes.rest.shared.annotation.JacksonSerialized;
import org.apache.streampipes.rest.shared.impl.AbstractSharedRestInterface;
-import javax.ws.rs.*;
+import javax.ws.rs.Consumes;
+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 javax.ws.rs.core.Response;
@Path("/api/v1/worker/resolvable")
public class RuntimeResolvableResource extends AbstractSharedRestInterface {
- @POST
- @Path("{id}/configurations")
- @JacksonSerialized
- @Produces(MediaType.APPLICATION_JSON)
- @Consumes(MediaType.APPLICATION_JSON)
- public Response fetchConfigurations(@PathParam("id") String elementId,
- RuntimeOptionsRequest runtimeOptionsRequest) {
+ @POST
+ @Path("{id}/configurations")
+ @JacksonSerialized
+ @Produces(MediaType.APPLICATION_JSON)
+ @Consumes(MediaType.APPLICATION_JSON)
+ public Response fetchConfigurations(@PathParam("id") String elementId,
+ RuntimeOptionsRequest runtimeOptionsRequest) {
- Connector connector = RuntimeResovable.getAdapterOrProtocol(elementId);
- RuntimeOptionsResponse response;
- RuntimeResolvableRequestHandler handler = new RuntimeResolvableRequestHandler();
+ Connector connector = RuntimeResovable.getAdapterOrProtocol(elementId);
+ RuntimeOptionsResponse response;
+ RuntimeResolvableRequestHandler handler = new RuntimeResolvableRequestHandler();
- try {
- if (connector instanceof ResolvesContainerProvidedOptions) {
- response = handler.handleRuntimeResponse((ResolvesContainerProvidedOptions) connector, runtimeOptionsRequest);
- return ok(response);
- } else if (connector instanceof SupportsRuntimeConfig) {
- response = handler.handleRuntimeResponse((SupportsRuntimeConfig) connector, runtimeOptionsRequest);
- return ok(response);
- } else {
- throw new SpRuntimeException("This element does not support dynamic options - is the pipeline element description up to date?");
- }
- } catch (SpConfigurationException e) {
- return javax.ws.rs.core.Response
- .status(400)
- .entity(e)
- .build();
- }
+ try {
+ if (connector instanceof ResolvesContainerProvidedOptions) {
+ response = handler.handleRuntimeResponse((ResolvesContainerProvidedOptions) connector, runtimeOptionsRequest);
+ return ok(response);
+ } else if (connector instanceof SupportsRuntimeConfig) {
+ response = handler.handleRuntimeResponse((SupportsRuntimeConfig) connector, runtimeOptionsRequest);
+ return ok(response);
+ } else {
+ throw new SpRuntimeException(
+ "This element does not support dynamic options - is the pipeline element description up to date?");
+ }
+ } catch (SpConfigurationException e) {
+ return javax.ws.rs.core.Response
+ .status(400)
+ .entity(e)
+ .build();
}
+ }
}
diff --git a/streampipes-connect-container-worker/src/main/java/org/apache/streampipes/connect/container/worker/utils/AdapterUtils.java b/streampipes-connect-container-worker/src/main/java/org/apache/streampipes/connect/container/worker/utils/AdapterUtils.java
index 026b8a792..fecf93e79 100644
--- a/streampipes-connect-container-worker/src/main/java/org/apache/streampipes/connect/container/worker/utils/AdapterUtils.java
+++ b/streampipes-connect-container-worker/src/main/java/org/apache/streampipes/connect/container/worker/utils/AdapterUtils.java
@@ -27,40 +27,44 @@ import org.apache.streampipes.container.init.DeclarersSingleton;
import org.apache.streampipes.model.connect.adapter.AdapterDescription;
import org.apache.streampipes.model.connect.adapter.GenericAdapterSetDescription;
import org.apache.streampipes.model.connect.adapter.GenericAdapterStreamDescription;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class AdapterUtils {
- private static final Logger logger = LoggerFactory.getLogger(AdapterUtils .class);
-
- public static IAdapter setAdapter(AdapterDescription adapterDescription) {
- IAdapter adapter = null;
+ private static final Logger logger = LoggerFactory.getLogger(AdapterUtils.class);
- if (adapterDescription instanceof GenericAdapterStreamDescription) {
- adapter = (IAdapter<?>) new GenericDataStreamAdapter().getInstance((GenericAdapterStreamDescription) adapterDescription);
- } else if (adapterDescription instanceof GenericAdapterSetDescription) {
- adapter = new GenericDataSetAdapter().getInstance((GenericAdapterSetDescription) adapterDescription);
- }
+ public static IAdapter setAdapter(AdapterDescription adapterDescription) {
+ IAdapter adapter = null;
- IProtocol protocol = null;
- if (adapterDescription instanceof GenericAdapterSetDescription) {
- protocol = DeclarersSingleton.getInstance().getProtocol(((GenericAdapterSetDescription) adapterDescription).getProtocolDescription().getAppId());
- ((GenericAdapter) adapter).setProtocol(protocol);
- }
+ if (adapterDescription instanceof GenericAdapterStreamDescription) {
+ adapter = (IAdapter<?>) new GenericDataStreamAdapter().getInstance(
+ (GenericAdapterStreamDescription) adapterDescription);
+ } else if (adapterDescription instanceof GenericAdapterSetDescription) {
+ adapter = new GenericDataSetAdapter().getInstance((GenericAdapterSetDescription) adapterDescription);
+ }
- if (adapterDescription instanceof GenericAdapterStreamDescription) {
- protocol = DeclarersSingleton.getInstance().getProtocol(((GenericAdapterStreamDescription) adapterDescription).getProtocolDescription().getAppId());
- ((GenericAdapter) adapter).setProtocol(protocol);
- }
+ IProtocol protocol = null;
+ if (adapterDescription instanceof GenericAdapterSetDescription) {
+ protocol = DeclarersSingleton.getInstance()
+ .getProtocol(((GenericAdapterSetDescription) adapterDescription).getProtocolDescription().getAppId());
+ ((GenericAdapter) adapter).setProtocol(protocol);
+ }
- if (adapter == null) {
- adapter = DeclarersSingleton
- .getInstance()
- .getAdapter(adapterDescription.getAppId()).getInstance(adapterDescription);
- }
+ if (adapterDescription instanceof GenericAdapterStreamDescription) {
+ protocol = DeclarersSingleton.getInstance()
+ .getProtocol(((GenericAdapterStreamDescription) adapterDescription).getProtocolDescription().getAppId());
+ ((GenericAdapter) adapter).setProtocol(protocol);
+ }
- return adapter;
+ if (adapter == null) {
+ adapter = DeclarersSingleton
+ .getInstance()
+ .getAdapter(adapterDescription.getAppId()).getInstance(adapterDescription);
}
+ return adapter;
+ }
+
}
diff --git a/streampipes-connect-container-worker/src/test/java/org/apache/streampipes/connect/container/worker/management/AdapterWorkerManagementTest.java b/streampipes-connect-container-worker/src/test/java/org/apache/streampipes/connect/container/worker/management/AdapterWorkerManagementTest.java
index f16a2e7c1..bfe2ac257 100644
--- a/streampipes-connect-container-worker/src/test/java/org/apache/streampipes/connect/container/worker/management/AdapterWorkerManagementTest.java
+++ b/streampipes-connect-container-worker/src/test/java/org/apache/streampipes/connect/container/worker/management/AdapterWorkerManagementTest.java
@@ -24,8 +24,9 @@ import org.apache.streampipes.connect.adapter.AdapterRegistry;
import org.apache.streampipes.connect.adapter.model.specific.SpecificDataSetAdapter;
import org.apache.streampipes.connect.api.exception.AdapterException;
import org.apache.streampipes.connect.container.worker.utils.Utils;
-import org.apache.streampipes.model.connect.adapter.*;
+import org.apache.streampipes.model.connect.adapter.SpecificAdapterSetDescription;
import org.apache.streampipes.model.connect.guess.GuessSchema;
+
import org.junit.Test;
import org.junit.runner.RunWith;
import org.powermock.core.classloader.annotations.PowerMockIgnore;
@@ -34,81 +35,81 @@ import org.powermock.modules.junit4.PowerMockRunner;
import java.util.ArrayList;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertTrue;
@RunWith(PowerMockRunner.class)
-@PrepareForTest({ AdapterRegistry.class })
+@PrepareForTest({AdapterRegistry.class})
@PowerMockIgnore({"com.sun.org.apache.xerces.*", "javax.xml.*", "org.xml.*", "javax.management.*"})
public class AdapterWorkerManagementTest {
- @Test
- public void stopStreamAdapterSuccess() throws AdapterException {
- TestAdapter testAdapter = getTestAdapterInstance();
- RunningAdapterInstances.INSTANCE.addAdapter("http://t.de/", testAdapter, null);
- AdapterWorkerManagement adapterWorkerManagement = new AdapterWorkerManagement();
- adapterWorkerManagement.stopStreamAdapter(Utils.getMinimalStreamAdapter());
-
- assertTrue(testAdapter.calledStop);
+ @Test
+ public void stopStreamAdapterSuccess() throws AdapterException {
+ TestAdapter testAdapter = getTestAdapterInstance();
+ RunningAdapterInstances.INSTANCE.addAdapter("http://t.de/", testAdapter, null);
+ AdapterWorkerManagement adapterWorkerManagement = new AdapterWorkerManagement();
+ adapterWorkerManagement.stopStreamAdapter(Utils.getMinimalStreamAdapter());
- }
+ assertTrue(testAdapter.calledStop);
- @Test
- public void stopSetAdapterSuccess() throws AdapterException {
- TestAdapter testAdapter = getTestAdapterInstance();
+ }
- RunningAdapterInstances.INSTANCE.addAdapter("http://t.de/", testAdapter, null);
- AdapterWorkerManagement adapterWorkerManagement = new AdapterWorkerManagement();
- adapterWorkerManagement.stopSetAdapter(Utils.getMinimalSetAdapter());
+ @Test
+ public void stopSetAdapterSuccess() throws AdapterException {
+ TestAdapter testAdapter = getTestAdapterInstance();
- assertTrue(testAdapter.calledStop);
- }
+ RunningAdapterInstances.INSTANCE.addAdapter("http://t.de/", testAdapter, null);
+ AdapterWorkerManagement adapterWorkerManagement = new AdapterWorkerManagement();
+ adapterWorkerManagement.stopSetAdapter(Utils.getMinimalSetAdapter());
- private TestAdapter getTestAdapterInstance() {
- SpecificAdapterSetDescription description = new SpecificAdapterSetDescription();
- description.setRules(new ArrayList<>());
- TestAdapter testAdapter = new TestAdapter(description);
+ assertTrue(testAdapter.calledStop);
+ }
- return testAdapter;
- }
+ private TestAdapter getTestAdapterInstance() {
+ SpecificAdapterSetDescription description = new SpecificAdapterSetDescription();
+ description.setRules(new ArrayList<>());
+ TestAdapter testAdapter = new TestAdapter(description);
- private class TestAdapter extends SpecificDataSetAdapter {
+ return testAdapter;
+ }
- public boolean calledStart = false;
- public boolean calledStop = false;
+ private class TestAdapter extends SpecificDataSetAdapter {
- public TestAdapter(SpecificAdapterSetDescription description) {
- super(description);
- }
+ public boolean calledStart = false;
+ public boolean calledStop = false;
- @Override
- public SpecificAdapterSetDescription declareModel() {
- return null;
- }
+ public TestAdapter(SpecificAdapterSetDescription description) {
+ super(description);
+ }
- @Override
- public void startAdapter() throws AdapterException {
- calledStart = true;
- }
+ @Override
+ public SpecificAdapterSetDescription declareModel() {
+ return null;
+ }
- @Override
- public void stopAdapter() throws AdapterException {
- calledStop = true;
- }
+ @Override
+ public void startAdapter() throws AdapterException {
+ calledStart = true;
+ }
- @Override
- public Adapter getInstance(SpecificAdapterSetDescription adapterDescription) {
- return null;
- }
+ @Override
+ public void stopAdapter() throws AdapterException {
+ calledStop = true;
+ }
- @Override
- public GuessSchema getSchema(SpecificAdapterSetDescription adapterDescription) {
- return null;
- }
+ @Override
+ public Adapter getInstance(SpecificAdapterSetDescription adapterDescription) {
+ return null;
+ }
- @Override
- public String getId() {
- return null;
- }
+ @Override
+ public GuessSchema getSchema(SpecificAdapterSetDescription adapterDescription) {
+ return null;
+ }
+ @Override
+ public String getId() {
+ return null;
}
+
+ }
}
diff --git a/streampipes-connect-container-worker/src/test/java/org/apache/streampipes/connect/container/worker/management/Mock.java b/streampipes-connect-container-worker/src/test/java/org/apache/streampipes/connect/container/worker/management/Mock.java
index e387d6697..502746877 100644
--- a/streampipes-connect-container-worker/src/test/java/org/apache/streampipes/connect/container/worker/management/Mock.java
+++ b/streampipes-connect-container-worker/src/test/java/org/apache/streampipes/connect/container/worker/management/Mock.java
@@ -19,8 +19,8 @@
package org.apache.streampipes.connect.container.worker.management;
public class Mock {
- public static int PORT = 8042;
+ public static int PORT = 8042;
- public static String HOST = "http://localhost:" + PORT;
+ public static String HOST = "http://localhost:" + PORT;
}
diff --git a/streampipes-connect-container-worker/src/test/java/org/apache/streampipes/connect/container/worker/utils/Utils.java b/streampipes-connect-container-worker/src/test/java/org/apache/streampipes/connect/container/worker/utils/Utils.java
index 40665f80f..f63c811fc 100644
--- a/streampipes-connect-container-worker/src/test/java/org/apache/streampipes/connect/container/worker/utils/Utils.java
+++ b/streampipes-connect-container-worker/src/test/java/org/apache/streampipes/connect/container/worker/utils/Utils.java
@@ -27,20 +27,20 @@ import java.util.ArrayList;
public class Utils {
- public static AdapterStreamDescription getMinimalStreamAdapter() {
- AdapterStreamDescription result = new GenericAdapterStreamDescription();
- String id = "http://t.de/";
- result.setElementId(id);
- result.setRules(new ArrayList<>());
-
- return result;
- }
-
- public static AdapterSetDescription getMinimalSetAdapter() {
- AdapterSetDescription result = new GenericAdapterSetDescription();
- String id = "http://t.de/";
- result.setElementId(id);
-
- return result;
- }
+ public static AdapterStreamDescription getMinimalStreamAdapter() {
+ AdapterStreamDescription result = new GenericAdapterStreamDescription();
+ String id = "http://t.de/";
+ result.setElementId(id);
+ result.setRules(new ArrayList<>());
+
+ return result;
+ }
+
+ public static AdapterSetDescription getMinimalSetAdapter() {
+ AdapterSetDescription result = new GenericAdapterSetDescription();
+ String id = "http://t.de/";
+ result.setElementId(id);
+
+ return result;
+ }
}
[streampipes] 02/06: add checkstyle to streampipes-container-standalone
Posted by bo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bossenti pushed a commit to branch chore/add-checkstyle
in repository https://gitbox.apache.org/repos/asf/streampipes.git
commit 3e47592704f9c7ad1edc449f0256e5efe467ce8a
Author: bossenti <bo...@posteo.de>
AuthorDate: Sun Dec 25 20:53:07 2022 +0100
add checkstyle to streampipes-container-standalone
---
streampipes-container-standalone/pom.xml | 14 ++++-
.../PipelineElementContainerResourceConfig.java | 7 +--
.../PipelineElementServiceShutdownHandler.java | 1 +
.../standalone/init/StandaloneModelSubmitter.java | 59 +++++++++++-----------
4 files changed, 47 insertions(+), 34 deletions(-)
diff --git a/streampipes-container-standalone/pom.xml b/streampipes-container-standalone/pom.xml
index 1649fb035..3b1a44b3b 100644
--- a/streampipes-container-standalone/pom.xml
+++ b/streampipes-container-standalone/pom.xml
@@ -17,10 +17,11 @@
~
-->
-<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>
<groupId>org.apache.streampipes</groupId>
- <artifactId>streampipes-parent</artifactId>
+ <artifactId>streampipes-parent</artifactId>
<version>0.91.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -48,4 +49,13 @@
<!-- Test dependencies -->
</dependencies>
+ <build>
+ <finalName>streampipes-connect-container-master</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/streampipes-container-standalone/src/main/java/org/apache/streampipes/container/standalone/init/PipelineElementContainerResourceConfig.java b/streampipes-container-standalone/src/main/java/org/apache/streampipes/container/standalone/init/PipelineElementContainerResourceConfig.java
index 291337520..b639766e1 100644
--- a/streampipes-container-standalone/src/main/java/org/apache/streampipes/container/standalone/init/PipelineElementContainerResourceConfig.java
+++ b/streampipes-container-standalone/src/main/java/org/apache/streampipes/container/standalone/init/PipelineElementContainerResourceConfig.java
@@ -17,9 +17,10 @@
*/
package org.apache.streampipes.container.standalone.init;
-import org.apache.streampipes.service.base.rest.BaseResourceConfig;
import org.apache.streampipes.container.init.BaseExtensionsServiceResourceProvider;
import org.apache.streampipes.container.init.PipelineElementServiceResourceProvider;
+import org.apache.streampipes.service.base.rest.BaseResourceConfig;
+
import org.springframework.stereotype.Component;
import java.util.Arrays;
@@ -31,8 +32,8 @@ public class PipelineElementContainerResourceConfig extends BaseResourceConfig {
@Override
public List<List<Class<?>>> getClassesToRegister() {
return Arrays.asList(
- new BaseExtensionsServiceResourceProvider().getResourceClasses(),
- new PipelineElementServiceResourceProvider().getResourceClasses()
+ new BaseExtensionsServiceResourceProvider().getResourceClasses(),
+ new PipelineElementServiceResourceProvider().getResourceClasses()
);
}
}
diff --git a/streampipes-container-standalone/src/main/java/org/apache/streampipes/container/standalone/init/PipelineElementServiceShutdownHandler.java b/streampipes-container-standalone/src/main/java/org/apache/streampipes/container/standalone/init/PipelineElementServiceShutdownHandler.java
index 6b3522d5e..1b9cf5512 100644
--- a/streampipes-container-standalone/src/main/java/org/apache/streampipes/container/standalone/init/PipelineElementServiceShutdownHandler.java
+++ b/streampipes-container-standalone/src/main/java/org/apache/streampipes/container/standalone/init/PipelineElementServiceShutdownHandler.java
@@ -18,6 +18,7 @@
package org.apache.streampipes.container.standalone.init;
import org.apache.streampipes.container.init.RunningInstances;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/streampipes-container-standalone/src/main/java/org/apache/streampipes/container/standalone/init/StandaloneModelSubmitter.java b/streampipes-container-standalone/src/main/java/org/apache/streampipes/container/standalone/init/StandaloneModelSubmitter.java
index 037a6fbd5..bf9dc8024 100644
--- a/streampipes-container-standalone/src/main/java/org/apache/streampipes/container/standalone/init/StandaloneModelSubmitter.java
+++ b/streampipes-container-standalone/src/main/java/org/apache/streampipes/container/standalone/init/StandaloneModelSubmitter.java
@@ -19,13 +19,14 @@
package org.apache.streampipes.container.standalone.init;
-import org.apache.streampipes.service.base.BaseNetworkingConfig;
import org.apache.streampipes.container.init.DeclarersSingleton;
import org.apache.streampipes.container.model.PeConfig;
import org.apache.streampipes.container.model.SpServiceDefinition;
+import org.apache.streampipes.service.base.BaseNetworkingConfig;
import org.apache.streampipes.service.extensions.base.StreamPipesExtensionsServiceBase;
import org.apache.streampipes.service.extensions.base.WebSecurityConfig;
import org.apache.streampipes.svcdiscovery.api.model.SpServiceTag;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -38,43 +39,43 @@ import java.util.List;
@Deprecated
@Configuration
@EnableAutoConfiguration
-@Import({ PipelineElementContainerResourceConfig.class, WebSecurityConfig.class})
+@Import({PipelineElementContainerResourceConfig.class, WebSecurityConfig.class})
public abstract class StandaloneModelSubmitter extends StreamPipesExtensionsServiceBase {
- private static final Logger LOG =
- LoggerFactory.getLogger(StandaloneModelSubmitter.class.getCanonicalName());
+ private static final Logger LOG =
+ LoggerFactory.getLogger(StandaloneModelSubmitter.class.getCanonicalName());
- @Deprecated
- public void init(PeConfig peConfig) {
- DeclarersSingleton.getInstance()
- .setHostName(peConfig.getHost());
- DeclarersSingleton.getInstance()
- .setPort(peConfig.getPort());
+ @Deprecated
+ public void init(PeConfig peConfig) {
+ DeclarersSingleton.getInstance()
+ .setHostName(peConfig.getHost());
+ DeclarersSingleton.getInstance()
+ .setPort(peConfig.getPort());
- BaseNetworkingConfig networkingConfig = new BaseNetworkingConfig(peConfig.getHost(), peConfig.getPort());
- SpServiceDefinition serviceDef = DeclarersSingleton.getInstance().toServiceDefinition(peConfig.getId());
+ BaseNetworkingConfig networkingConfig = new BaseNetworkingConfig(peConfig.getHost(), peConfig.getPort());
+ SpServiceDefinition serviceDef = DeclarersSingleton.getInstance().toServiceDefinition(peConfig.getId());
- try {
- startExtensionsService(this.getClass(), serviceDef, networkingConfig);
- } catch (UnknownHostException e) {
- e.printStackTrace();
- }
+ try {
+ startExtensionsService(this.getClass(), serviceDef, networkingConfig);
+ } catch (UnknownHostException e) {
+ e.printStackTrace();
}
+ }
- @Override
- public void onExit() {
- new PipelineElementServiceShutdownHandler().onShutdown();
- deregisterService(DeclarersSingleton.getInstance().getServiceId());
- }
+ @Override
+ public void onExit() {
+ new PipelineElementServiceShutdownHandler().onShutdown();
+ deregisterService(DeclarersSingleton.getInstance().getServiceId());
+ }
- @Override
- protected List<SpServiceTag> getExtensionsServiceTags() {
- return new PipelineElementServiceTagProvider().extractServiceTags();
- }
+ @Override
+ protected List<SpServiceTag> getExtensionsServiceTags() {
+ return new PipelineElementServiceTagProvider().extractServiceTags();
+ }
- @Override
- public void afterServiceRegistered(SpServiceDefinition serviceDef) {
+ @Override
+ public void afterServiceRegistered(SpServiceDefinition serviceDef) {
- }
+ }
}