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
commit 3ef7223c9013cb617813c9136a81862eb636ac34 Author: lburgazzoli <lburgazz...@gmail.com> AuthorDate: Tue Jun 25 13:51:59 2019 +0200 checkstyle: fix camel-k-runtime-jvm violations --- .../src/main/java/org/apache/camel/k/jvm/Application.java | 5 ++++- .../src/main/java/org/apache/camel/k/jvm/ApplicationSupport.java | 4 ++-- .../main/java/org/apache/camel/k/jvm/loader/JavaSourceLoader.java | 2 +- .../src/main/java/org/apache/camel/k/jvm/loader/XmlLoader.java | 2 +- .../src/test/java/org/apache/camel/k/jvm/PropertiesTest.java | 4 ++-- .../test/java/org/apache/camel/k/jvm/RoutesLoadersCommonTest.java | 2 +- .../src/test/java/org/apache/camel/k/jvm/RuntimeTest.java | 4 ++-- pom.xml | 1 + 8 files changed, 14 insertions(+), 10 deletions(-) diff --git a/camel-k-runtime-jvm/src/main/java/org/apache/camel/k/jvm/Application.java b/camel-k-runtime-jvm/src/main/java/org/apache/camel/k/jvm/Application.java index d8bdce1..615a775 100644 --- a/camel-k-runtime-jvm/src/main/java/org/apache/camel/k/jvm/Application.java +++ b/camel-k-runtime-jvm/src/main/java/org/apache/camel/k/jvm/Application.java @@ -21,7 +21,7 @@ import java.util.ServiceLoader; import org.apache.camel.k.Runtime; import org.apache.camel.k.support.PropertiesSupport; -public class Application { +public final class Application { static { // // Configure the logging subsystem log4j2 using a subset of spring boot @@ -34,6 +34,9 @@ public class Application { ApplicationSupport.configureLogging(); } + private Application() { + } + public static void main(String[] args) throws Exception { ApplicationRuntime runtime = new ApplicationRuntime(); runtime.setProperties(PropertiesSupport.loadProperties()); diff --git a/camel-k-runtime-jvm/src/main/java/org/apache/camel/k/jvm/ApplicationSupport.java b/camel-k-runtime-jvm/src/main/java/org/apache/camel/k/jvm/ApplicationSupport.java index 5b260d4..05612d5 100644 --- a/camel-k-runtime-jvm/src/main/java/org/apache/camel/k/jvm/ApplicationSupport.java +++ b/camel-k-runtime-jvm/src/main/java/org/apache/camel/k/jvm/ApplicationSupport.java @@ -39,8 +39,8 @@ public final class ApplicationSupport { .filter(entry -> entry.getValue() instanceof String) .filter(entry -> ((String)entry.getKey()).startsWith(Constants.LOGGING_LEVEL_PREFIX)) .forEach(entry -> { - String key = ((String)entry.getKey()); - String val = ((String)entry.getValue()); + String key = (String)entry.getKey(); + String val = (String)entry.getValue(); String logger = key.substring(Constants.LOGGING_LEVEL_PREFIX.length()); Level level = Level.getLevel(val); diff --git a/camel-k-runtime-jvm/src/main/java/org/apache/camel/k/jvm/loader/JavaSourceLoader.java b/camel-k-runtime-jvm/src/main/java/org/apache/camel/k/jvm/loader/JavaSourceLoader.java index f049466..d040257 100644 --- a/camel-k-runtime-jvm/src/main/java/org/apache/camel/k/jvm/loader/JavaSourceLoader.java +++ b/camel-k-runtime-jvm/src/main/java/org/apache/camel/k/jvm/loader/JavaSourceLoader.java @@ -59,7 +59,7 @@ public class JavaSourceLoader implements RoutesLoader { RoutesBuilder builder = compiled.create().get(); if (builder instanceof RouteBuilder) { - RouteBuilder rb = ((RouteBuilder) builder); + RouteBuilder rb = (RouteBuilder) builder; rb.setContext(context); rb.configure(); diff --git a/camel-k-runtime-jvm/src/main/java/org/apache/camel/k/jvm/loader/XmlLoader.java b/camel-k-runtime-jvm/src/main/java/org/apache/camel/k/jvm/loader/XmlLoader.java index d1ddd46..e6be1a8 100644 --- a/camel-k-runtime-jvm/src/main/java/org/apache/camel/k/jvm/loader/XmlLoader.java +++ b/camel-k-runtime-jvm/src/main/java/org/apache/camel/k/jvm/loader/XmlLoader.java @@ -64,7 +64,7 @@ public class XmlLoader implements RoutesLoader { LOGGER.debug("Loaded {} rests from {}", definition.getRests().size(), source); setRestCollection(definition); - } catch(IllegalArgumentException e) { + } catch (IllegalArgumentException e) { // ignore } catch (UnmarshalException e) { LOGGER.debug("Unable to load RestsDefinition: {}", e.getMessage()); diff --git a/camel-k-runtime-jvm/src/test/java/org/apache/camel/k/jvm/PropertiesTest.java b/camel-k-runtime-jvm/src/test/java/org/apache/camel/k/jvm/PropertiesTest.java index db3f36d..43cbed8 100644 --- a/camel-k-runtime-jvm/src/test/java/org/apache/camel/k/jvm/PropertiesTest.java +++ b/camel-k-runtime-jvm/src/test/java/org/apache/camel/k/jvm/PropertiesTest.java @@ -16,8 +16,6 @@ */ package org.apache.camel.k.jvm; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Properties; import java.util.concurrent.ThreadLocalRandom; @@ -29,6 +27,8 @@ import org.apache.camel.k.listener.ContextConfigurer; import org.apache.camel.k.support.PropertiesSupport; import org.junit.jupiter.api.Test; +import static org.assertj.core.api.Assertions.assertThat; + public class PropertiesTest { @Test diff --git a/camel-k-runtime-jvm/src/test/java/org/apache/camel/k/jvm/RoutesLoadersCommonTest.java b/camel-k-runtime-jvm/src/test/java/org/apache/camel/k/jvm/RoutesLoadersCommonTest.java index 3672d1e..443f096 100644 --- a/camel-k-runtime-jvm/src/test/java/org/apache/camel/k/jvm/RoutesLoadersCommonTest.java +++ b/camel-k-runtime-jvm/src/test/java/org/apache/camel/k/jvm/RoutesLoadersCommonTest.java @@ -39,7 +39,7 @@ import static org.assertj.core.api.Assertions.assertThat; public class RoutesLoadersCommonTest { @ParameterizedTest @MethodSource("parameters") - void testLoaders(String location, Class<? extends RoutesLoader> type) throws Exception{ + public void testLoaders(String location, Class<? extends RoutesLoader> type) throws Exception { Source source = Source.create(location); RoutesLoader loader = RuntimeSupport.loaderFor(new DefaultCamelContext(), source); RouteBuilder builder = loader.load(new DefaultCamelContext(), source); diff --git a/camel-k-runtime-jvm/src/test/java/org/apache/camel/k/jvm/RuntimeTest.java b/camel-k-runtime-jvm/src/test/java/org/apache/camel/k/jvm/RuntimeTest.java index d3586ce..671f3ad 100644 --- a/camel-k-runtime-jvm/src/test/java/org/apache/camel/k/jvm/RuntimeTest.java +++ b/camel-k-runtime-jvm/src/test/java/org/apache/camel/k/jvm/RuntimeTest.java @@ -16,8 +16,6 @@ */ package org.apache.camel.k.jvm; -import static org.assertj.core.api.Java6Assertions.assertThat; - import java.util.List; import org.apache.camel.CamelContext; @@ -29,6 +27,8 @@ import org.apache.camel.model.ModelCamelContext; import org.apache.camel.util.ObjectHelper; import org.junit.jupiter.api.Test; +import static org.assertj.core.api.Java6Assertions.assertThat; + public class RuntimeTest { @Test diff --git a/pom.xml b/pom.xml index a919d47..b25b512 100644 --- a/pom.xml +++ b/pom.xml @@ -170,6 +170,7 @@ </sourceDirectories> <headerLocation>header-java.txt</headerLocation> <includes>**/*.java,**/*.groovy,**/*.scala,**/*.properties,**/*.xml,**/*.xsd</includes> + <excludes>**/MyRoutes*.java</excludes> </configuration> <goals> <goal>checkstyle</goal>