You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by lb...@apache.org on 2020/09/14 13:51:43 UTC
[camel-k-runtime] branch master updated: Fix PMD and checkstyle
violations
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
The following commit(s) were added to refs/heads/master by this push:
new 0631726 Fix PMD and checkstyle violations
0631726 is described below
commit 0631726cc239429a161eae93218d2b3715c02aa5
Author: lburgazzoli <lb...@gmail.com>
AuthorDate: Mon Sep 14 15:23:38 2020 +0200
Fix PMD and checkstyle violations
---
.github/workflows/pr-validate.yml | 3 +--
.../java/org/apache/camel/k/main/support/RuntimeTestSupport.java | 2 +-
.../org/apache/camel/k/quarkus/kamelet/deployment/Application.java | 3 ++-
.../org/apache/camel/k/quarkus/kamelet/deployment/KameletTest.java | 1 +
.../src/main/java/org/apache/camel/k/support/SourcesSupport.java | 4 ++--
.../resources/org/apache/camel/component/kamelet/kamelet.json | 2 --
.../src/main/java/org/apache/camel/component/kamelet/Kamelet.java | 6 +++---
.../java/org/apache/camel/component/kamelet/KameletEndpoint.java | 2 --
.../resources/org/apache/camel/component/knative/knative.json | 2 --
pom.xml | 2 +-
10 files changed, 11 insertions(+), 16 deletions(-)
diff --git a/.github/workflows/pr-validate.yml b/.github/workflows/pr-validate.yml
index b712db2..58ce713 100644
--- a/.github/workflows/pr-validate.yml
+++ b/.github/workflows/pr-validate.yml
@@ -35,9 +35,8 @@ jobs:
with:
version: '11'
- name: mvn package
- if: contains( github.event.pull_request.labels.*.name, 'depends-on/camel/master') == 'false' && contains( github.event.pull_request.labels.*.name, 'depends-on/quarkus/master') == 'false'
run: |
- ./mvnw -fae -B -ntp clean verify \
+ ./mvnw -ntp clean verify \
-Dcheckstyle.failOnViolation=true \
-DskipTests \
-Psourcecheck,license
diff --git a/camel-k-main/camel-k-runtime-main/src/test/java/org/apache/camel/k/main/support/RuntimeTestSupport.java b/camel-k-main/camel-k-runtime-main/src/test/java/org/apache/camel/k/main/support/RuntimeTestSupport.java
index a753821..03d0a28 100644
--- a/camel-k-main/camel-k-runtime-main/src/test/java/org/apache/camel/k/main/support/RuntimeTestSupport.java
+++ b/camel-k-main/camel-k-runtime-main/src/test/java/org/apache/camel/k/main/support/RuntimeTestSupport.java
@@ -23,7 +23,7 @@ import org.apache.camel.k.listener.SourcesConfigurer;
import org.apache.camel.k.main.ApplicationRuntime;
import org.junit.jupiter.api.function.ThrowingConsumer;
-public class RuntimeTestSupport {
+public final class RuntimeTestSupport {
private RuntimeTestSupport() {
}
diff --git a/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-kamelet/src/main/java/org/apache/camel/k/quarkus/kamelet/deployment/Application.java b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-kamelet/src/main/java/org/apache/camel/k/quarkus/kamelet/deployment/Application.java
index b9fd023..a45053e 100644
--- a/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-kamelet/src/main/java/org/apache/camel/k/quarkus/kamelet/deployment/Application.java
+++ b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-kamelet/src/main/java/org/apache/camel/k/quarkus/kamelet/deployment/Application.java
@@ -18,6 +18,7 @@ package org.apache.camel.k.quarkus.kamelet.deployment;
import java.util.Locale;
import java.util.stream.Collectors;
+
import javax.enterprise.context.ApplicationScoped;
import javax.inject.Inject;
import javax.json.Json;
@@ -40,7 +41,7 @@ import org.apache.camel.model.RouteTemplateDefinition;
@Path("/test")
@ApplicationScoped
public class Application {
- public static String TEMPLATE_ID = "to-upper";
+ public static final String TEMPLATE_ID = "to-upper";
@Inject
CamelContext context;
diff --git a/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-kamelet/src/test/java/org/apache/camel/k/quarkus/kamelet/deployment/KameletTest.java b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-kamelet/src/test/java/org/apache/camel/k/quarkus/kamelet/deployment/KameletTest.java
index 726ca37..fbb2c02 100644
--- a/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-kamelet/src/test/java/org/apache/camel/k/quarkus/kamelet/deployment/KameletTest.java
+++ b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-kamelet/src/test/java/org/apache/camel/k/quarkus/kamelet/deployment/KameletTest.java
@@ -17,6 +17,7 @@
package org.apache.camel.k.quarkus.kamelet.deployment;
import java.util.Locale;
+
import javax.ws.rs.core.MediaType;
import io.quarkus.test.junit.QuarkusTest;
diff --git a/camel-k-runtime-core/src/main/java/org/apache/camel/k/support/SourcesSupport.java b/camel-k-runtime-core/src/main/java/org/apache/camel/k/support/SourcesSupport.java
index 8432a54..3a87ef2 100644
--- a/camel-k-runtime-core/src/main/java/org/apache/camel/k/support/SourcesSupport.java
+++ b/camel-k-runtime-core/src/main/java/org/apache/camel/k/support/SourcesSupport.java
@@ -88,7 +88,7 @@ public final class SourcesSupport {
final SourceLoader loader = RuntimeSupport.loaderFor(runtime.getCamelContext(), source);
final List<SourceLoader.Interceptor> interceptors = source.getType() == SourceType.source
? sourceInterceptors(runtime, source)
- : templateInterceptors(runtime, source);
+ : templateInterceptors(source);
try {
for (SourceLoader.Interceptor interceptor: interceptors) {
@@ -118,7 +118,7 @@ public final class SourcesSupport {
return RuntimeSupport.loadInterceptors(runtime.getCamelContext(), source);
}
- private static List<SourceLoader.Interceptor> templateInterceptors(Runtime runtime, Source source) {
+ private static List<SourceLoader.Interceptor> templateInterceptors(Source source) {
if (!source.getInterceptors().isEmpty()) {
LOGGER.warn("Interceptors associated to the route template {} will be ignored", source.getName());
}
diff --git a/camel-kamelet/src/generated/resources/org/apache/camel/component/kamelet/kamelet.json b/camel-kamelet/src/generated/resources/org/apache/camel/component/kamelet/kamelet.json
index 4242b7f..2da7754 100644
--- a/camel-kamelet/src/generated/resources/org/apache/camel/component/kamelet/kamelet.json
+++ b/camel-kamelet/src/generated/resources/org/apache/camel/component/kamelet/kamelet.json
@@ -16,8 +16,6 @@
"extendsScheme": "",
"syntax": "kamelet:templateId\/routeId",
"async": false,
- "api": false,
- "apiPropertyQualifier": "",
"consumerOnly": false,
"producerOnly": false,
"lenientProperties": true
diff --git a/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/Kamelet.java b/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/Kamelet.java
index 099c687..d9ac81b 100644
--- a/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/Kamelet.java
+++ b/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/Kamelet.java
@@ -31,10 +31,10 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public final class Kamelet {
- private static final Logger LOGGER = LoggerFactory.getLogger(Kamelet.class);
-
- public static final String SCHEME = "kamelet";
public static final String PROPERTIES_PREFIX = "camel.kamelet.";
+ public static final String SCHEME = "kamelet";
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(Kamelet.class);
private Kamelet() {
}
diff --git a/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/KameletEndpoint.java b/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/KameletEndpoint.java
index d8a98ec..29ae5d0 100644
--- a/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/KameletEndpoint.java
+++ b/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/KameletEndpoint.java
@@ -53,8 +53,6 @@ public class KameletEndpoint extends DefaultEndpoint {
private final Map<String, Object> kameletProperties;
private final String kameletUri;
- private Producer producer;
- private Consumer consumer;
public KameletEndpoint(
String uri,
diff --git a/camel-knative/camel-knative/src/generated/resources/org/apache/camel/component/knative/knative.json b/camel-knative/camel-knative/src/generated/resources/org/apache/camel/component/knative/knative.json
index c22a328..c1c562a 100644
--- a/camel-knative/camel-knative/src/generated/resources/org/apache/camel/component/knative/knative.json
+++ b/camel-knative/camel-knative/src/generated/resources/org/apache/camel/component/knative/knative.json
@@ -16,8 +16,6 @@
"extendsScheme": "",
"syntax": "knative:type\/name",
"async": false,
- "api": false,
- "apiPropertyQualifier": "",
"consumerOnly": false,
"producerOnly": false,
"lenientProperties": false
diff --git a/pom.xml b/pom.xml
index 5943cd0..8788418 100644
--- a/pom.xml
+++ b/pom.xml
@@ -862,7 +862,7 @@
</sourceDirectories>
<headerLocation>header-java.txt</headerLocation>
<includes>**/*.java,**/*.groovy,**/*.scala,**/*.properties,**/*.xml,**/*.xsd</includes>
- <excludes>**/MyRoutes*.java,**/routes*.java,**/verify.groovy</excludes>
+ <excludes>**/MyRoutes*.java,**/routes*.java,**/verify.groovy,**/MyRouteTemplate*.java</excludes>
</configuration>
<goals>
<goal>checkstyle</goal>