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/03 19:34:13 UTC
[streampipes] branch 838-streampipes-container-extensions updated: [#838] enable checkstyle for streampipes-container-extensions
This is an automated email from the ASF dual-hosted git repository.
bossenti pushed a commit to branch 838-streampipes-container-extensions
in repository https://gitbox.apache.org/repos/asf/streampipes.git
The following commit(s) were added to refs/heads/838-streampipes-container-extensions by this push:
new f0013164b [#838] enable checkstyle for streampipes-container-extensions
f0013164b is described below
commit f0013164bc0745aabbb560f299ee8416f10e4af6
Author: bossenti <bo...@posteo.de>
AuthorDate: Sat Dec 3 20:34:04 2022 +0100
[#838] enable checkstyle for streampipes-container-extensions
---
streampipes-container-extensions/pom.xml | 21 +++++++++++
.../extensions/ExtensionsModelSubmitter.java | 43 +++++++++++-----------
.../extensions/ExtensionsResourceConfig.java | 9 ++---
.../function/FunctionDeregistrationHandler.java | 1 +
.../function/FunctionRegistrationHandler.java | 1 +
.../extensions/function/RegistrationHandler.java | 1 +
6 files changed, 50 insertions(+), 26 deletions(-)
diff --git a/streampipes-container-extensions/pom.xml b/streampipes-container-extensions/pom.xml
index 55c0192a3..bbcf5b5dd 100644
--- a/streampipes-container-extensions/pom.xml
+++ b/streampipes-container-extensions/pom.xml
@@ -52,4 +52,25 @@
</dependency>
<!-- Test dependencies -->
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>validate</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <logViolationsToConsole>true</logViolationsToConsole>
+ <failOnViolation>true</failOnViolation>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/streampipes-container-extensions/src/main/java/org/apache/streampipes/container/extensions/ExtensionsModelSubmitter.java b/streampipes-container-extensions/src/main/java/org/apache/streampipes/container/extensions/ExtensionsModelSubmitter.java
index a11fa8a9d..bbbaac230 100644
--- a/streampipes-container-extensions/src/main/java/org/apache/streampipes/container/extensions/ExtensionsModelSubmitter.java
+++ b/streampipes-container-extensions/src/main/java/org/apache/streampipes/container/extensions/ExtensionsModelSubmitter.java
@@ -27,6 +27,7 @@ import org.apache.streampipes.container.standalone.init.PipelineElementServiceTa
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;
@@ -34,34 +35,34 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import javax.annotation.PreDestroy;
+
import java.util.List;
@Configuration
@EnableAutoConfiguration
-@Import({ ExtensionsResourceConfig.class, WebSecurityConfig.class})
+@Import({ExtensionsResourceConfig.class, WebSecurityConfig.class})
public abstract class ExtensionsModelSubmitter extends StreamPipesExtensionsServiceBase {
+ private static final Logger LOG =
+ LoggerFactory.getLogger(ExtensionsModelSubmitter.class.getCanonicalName());
- private static final Logger LOG =
- LoggerFactory.getLogger(ExtensionsModelSubmitter.class.getCanonicalName());
-
- @PreDestroy
- public void onExit() {
- new PipelineElementServiceShutdownHandler().onShutdown();
- StreamPipesFunctionHandler.INSTANCE.cleanupFunctions();
- deregisterService(DeclarersSingleton.getInstance().getServiceId());
- }
+ @PreDestroy
+ public void onExit() {
+ new PipelineElementServiceShutdownHandler().onShutdown();
+ StreamPipesFunctionHandler.INSTANCE.cleanupFunctions();
+ deregisterService(DeclarersSingleton.getInstance().getServiceId());
+ }
- @Override
- public void afterServiceRegistered(SpServiceDefinition serviceDef) {
- new ConnectWorkerRegistrationService().registerWorker(serviceDef);
- StreamPipesFunctionHandler.INSTANCE.initializeFunctions(serviceDef.getServiceGroup());
- }
+ @Override
+ public void afterServiceRegistered(SpServiceDefinition serviceDef) {
+ new ConnectWorkerRegistrationService().registerWorker(serviceDef);
+ StreamPipesFunctionHandler.INSTANCE.initializeFunctions(serviceDef.getServiceGroup());
+ }
- @Override
- protected List<SpServiceTag> getExtensionsServiceTags() {
- List<SpServiceTag> serviceTags = new PipelineElementServiceTagProvider().extractServiceTags();
- serviceTags.addAll(new ConnectWorkerTagProvider().extractServiceTags());
+ @Override
+ protected List<SpServiceTag> getExtensionsServiceTags() {
+ List<SpServiceTag> serviceTags = new PipelineElementServiceTagProvider().extractServiceTags();
+ serviceTags.addAll(new ConnectWorkerTagProvider().extractServiceTags());
- return serviceTags;
- }
+ return serviceTags;
+ }
}
diff --git a/streampipes-container-extensions/src/main/java/org/apache/streampipes/container/extensions/ExtensionsResourceConfig.java b/streampipes-container-extensions/src/main/java/org/apache/streampipes/container/extensions/ExtensionsResourceConfig.java
index 840482aa1..a75b0feac 100644
--- a/streampipes-container-extensions/src/main/java/org/apache/streampipes/container/extensions/ExtensionsResourceConfig.java
+++ b/streampipes-container-extensions/src/main/java/org/apache/streampipes/container/extensions/ExtensionsResourceConfig.java
@@ -21,11 +21,10 @@ import org.apache.streampipes.connect.container.worker.init.AdapterServiceResour
import org.apache.streampipes.container.init.BaseExtensionsServiceResourceProvider;
import org.apache.streampipes.container.init.PipelineElementServiceResourceProvider;
import org.apache.streampipes.service.base.rest.BaseResourceConfig;
-import org.apache.streampipes.service.base.rest.ServiceHealthResource;
+
import org.springframework.stereotype.Component;
import java.util.Arrays;
-import java.util.Collections;
import java.util.List;
@Component
@@ -34,8 +33,8 @@ public class ExtensionsResourceConfig extends BaseResourceConfig {
@Override
public List<List<Class<?>>> getClassesToRegister() {
return Arrays.asList(
- new BaseExtensionsServiceResourceProvider().getResourceClasses(),
- new AdapterServiceResourceProvider().getResourceClasses(),
- new PipelineElementServiceResourceProvider().getResourceClasses());
+ new BaseExtensionsServiceResourceProvider().getResourceClasses(),
+ new AdapterServiceResourceProvider().getResourceClasses(),
+ new PipelineElementServiceResourceProvider().getResourceClasses());
}
}
diff --git a/streampipes-container-extensions/src/main/java/org/apache/streampipes/container/extensions/function/FunctionDeregistrationHandler.java b/streampipes-container-extensions/src/main/java/org/apache/streampipes/container/extensions/function/FunctionDeregistrationHandler.java
index 394beeea7..c56480db9 100644
--- a/streampipes-container-extensions/src/main/java/org/apache/streampipes/container/extensions/function/FunctionDeregistrationHandler.java
+++ b/streampipes-container-extensions/src/main/java/org/apache/streampipes/container/extensions/function/FunctionDeregistrationHandler.java
@@ -20,6 +20,7 @@ package org.apache.streampipes.container.extensions.function;
import org.apache.streampipes.client.StreamPipesClient;
import org.apache.streampipes.model.function.FunctionDefinition;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/streampipes-container-extensions/src/main/java/org/apache/streampipes/container/extensions/function/FunctionRegistrationHandler.java b/streampipes-container-extensions/src/main/java/org/apache/streampipes/container/extensions/function/FunctionRegistrationHandler.java
index 9ef99f958..722143480 100644
--- a/streampipes-container-extensions/src/main/java/org/apache/streampipes/container/extensions/function/FunctionRegistrationHandler.java
+++ b/streampipes-container-extensions/src/main/java/org/apache/streampipes/container/extensions/function/FunctionRegistrationHandler.java
@@ -20,6 +20,7 @@ package org.apache.streampipes.container.extensions.function;
import org.apache.streampipes.client.StreamPipesClient;
import org.apache.streampipes.model.function.FunctionDefinition;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/streampipes-container-extensions/src/main/java/org/apache/streampipes/container/extensions/function/RegistrationHandler.java b/streampipes-container-extensions/src/main/java/org/apache/streampipes/container/extensions/function/RegistrationHandler.java
index f3abf50b2..1b55be854 100644
--- a/streampipes-container-extensions/src/main/java/org/apache/streampipes/container/extensions/function/RegistrationHandler.java
+++ b/streampipes-container-extensions/src/main/java/org/apache/streampipes/container/extensions/function/RegistrationHandler.java
@@ -21,6 +21,7 @@ package org.apache.streampipes.container.extensions.function;
import org.apache.streampipes.client.StreamPipesClient;
import org.apache.streampipes.model.function.FunctionDefinition;
import org.apache.streampipes.service.extensions.base.client.StreamPipesClientResolver;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;