PMD (#424)

* code quality: add PMD profile (not enabled by default) * code quality: fix PMD findings
apache · Aug 17, 2020 · f82ef43 · f82ef43
1 parent def39b9
commit f82ef43
Show file tree

Hide file tree

Showing 49 changed files with 1,202 additions and 337 deletions.
diff --git a/...camel/k/loader/groovy/dsl/Components.java → ...mel/k/loader/groovy/dsl/Components.groovy b/...camel/k/loader/groovy/dsl/Components.java → ...mel/k/loader/groovy/dsl/Components.groovy
@@ -14,33 +14,33 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.k.loader.groovy.dsl;
+package org.apache.camel.k.loader.groovy.dsl
 
-import org.apache.camel.CamelContext;
-import org.apache.camel.Component;
+import org.apache.camel.CamelContext
+import org.apache.camel.Component
 
-public class Components {
-    private CamelContext context;
+class Components {
+    private final CamelContext context
 
-    public Components(CamelContext context) {
-        this.context = context;
+    Components(CamelContext context) {
+        this.context = context
     }
 
-    public Component get(String scheme) {
-        return context.getComponent(scheme, true);
+    Component get(String scheme) {
+        return context.getComponent(scheme, true)
     }
 
-    public Component put(String scheme, Component instance) {
-        context.addComponent(scheme, instance);
+    Component put(String scheme, Component instance) {
+        context.addComponent(scheme, instance)
 
         return instance;
     }
 
-    public Component make(String scheme, String type) {
-        final Class<?> clazz = context.getClassResolver().resolveClass(type);
-        final Component instance = (Component)context.getInjector().newInstance(clazz);
+    Component make(String scheme, String type) {
+        final Class<?> clazz = context.getClassResolver().resolveClass(type)
+        final Component instance = (Component)context.getInjector().newInstance(clazz)
 
-        context.addComponent(scheme, instance);
+        context.addComponent(scheme, instance)
 
         return instance;
     }

diff --git a/camel-k-loader-js/src/main/java/org/apache/camel/k/loader/js/JavaScriptSourceLoader.java b/camel-k-loader-js/src/main/java/org/apache/camel/k/loader/js/JavaScriptSourceLoader.java
@@ -61,8 +61,9 @@ private static void doLoad(Reader reader, EndpointRouteBuilder builder) {
         //
         // Expose IntegrationConfiguration methods to global scope.
         //
-        context.eval(LANGUAGE_ID, ""
-            + "Object.setPrototypeOf(globalThis, new Proxy(Object.prototype, {"
+        context.eval(
+            LANGUAGE_ID,
+            "Object.setPrototypeOf(globalThis, new Proxy(Object.prototype, {"
             + "    has(target, key) {"
             + "        return key in __dsl || key in target;"
             + "    },"

diff --git a/camel-k-loader-js/src/main/java/org/apache/camel/k/loader/js/dsl/Components.java b/camel-k-loader-js/src/main/java/org/apache/camel/k/loader/js/dsl/Components.java
@@ -20,7 +20,7 @@
 import org.apache.camel.Component;
 
 public class Components {
-    private CamelContext context;
+    private final CamelContext context;
 
     public Components(CamelContext context) {
         this.context = context;

diff --git a/camel-k-loader-xml/src/main/java/org/apache/camel/k/loader/xml/XmlSourceLoader.java b/camel-k-loader-xml/src/main/java/org/apache/camel/k/loader/xml/XmlSourceLoader.java
@@ -58,7 +58,7 @@ public void configure() throws Exception {
                             LOGGER.debug("Loaded {} routes from {}", definitions.getRoutes().size(), source);
                             setRouteCollection(definitions);
                         }
-                    } catch (IllegalArgumentException e) {
+                    } catch (IllegalArgumentException ignored) {
                         // ignore
                     } catch (XmlPullParserException e) {
                         LOGGER.debug("Unable to load RoutesDefinition: {}", e.getMessage());
@@ -73,7 +73,7 @@ public void configure() throws Exception {
                             LOGGER.debug("Loaded {} rests from {}", definitions.getRests().size(), source);
                             setRestCollection(definitions);
                         }
-                    } catch (IllegalArgumentException e) {
+                    } catch (IllegalArgumentException ignored) {
                         // ignore
                     } catch (XmlPullParserException e) {
                         LOGGER.debug("Unable to load RestsDefinition: {}", e.getMessage());

diff --git a/...der-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/spi/StepParserException.java b/...der-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/spi/StepParserException.java
@@ -39,6 +39,10 @@ public StepParserException(String message, String... properties) {
         this.properties = Arrays.asList(properties);
     }
 
+    public String getProcessor() {
+        return processor;
+    }
+
     public List<String> getProperties() {
         return properties;
     }

diff --git a/camel-k-main/camel-k-runtime-main/pom.xml b/camel-k-main/camel-k-runtime-main/pom.xml
@@ -148,6 +148,11 @@
             <artifactId>camel-k-runtime-knative</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.camel.k</groupId>
+            <artifactId>camel-knative-test</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/...k-main/camel-k-runtime-main/src/main/java/org/apache/camel/k/main/ApplicationRuntime.java b/...k-main/camel-k-runtime-main/src/main/java/org/apache/camel/k/main/ApplicationRuntime.java
@@ -149,6 +149,7 @@ public void afterConfigure(BaseMainSupport main) {
 
         @Override
         public void configure(CamelContext context) {
+            // no-op
         }
 
         @Override

diff --git a/camel-k-main/camel-k-runtime-main/src/test/java/org/apache/camel/k/main/RuntimeTest.java b/camel-k-main/camel-k-runtime-main/src/test/java/org/apache/camel/k/main/RuntimeTest.java
@@ -23,6 +23,7 @@
 import org.apache.camel.component.knative.KnativeComponent;
 import org.apache.camel.component.knative.spi.Knative;
 import org.apache.camel.component.knative.spi.KnativeEnvironment;
+import org.apache.camel.component.knative.test.KnativeEnvironmentSupport;
 import org.apache.camel.k.Runtime;
 import org.apache.camel.k.http.PlatformHttpServiceContextCustomizer;
 import org.apache.camel.k.listener.ContextConfigurer;
@@ -115,7 +116,7 @@ public void testLoadJavaSource() throws Exception {
     public void testLoadJavaSourceWrap() throws Exception {
         KnativeComponent component = new KnativeComponent();
         component.setEnvironment(KnativeEnvironment.on(
-            KnativeEnvironment.endpoint(Knative.EndpointKind.sink, "sink", "localhost", AvailablePortFinder.getNextAvailable())
+            KnativeEnvironmentSupport.endpoint(Knative.EndpointKind.sink, "sink", "localhost", AvailablePortFinder.getNextAvailable())
         ));
 
         PlatformHttpServiceContextCustomizer phsc = new PlatformHttpServiceContextCustomizer();

diff --git a/...ests-knative/src/main/java/org/apache/camel/k/quarkus/knative/deployment/Application.java b/...ests-knative/src/main/java/org/apache/camel/k/quarkus/knative/deployment/Application.java
@@ -16,6 +16,7 @@
  */
 package org.apache.camel.k.quarkus.knative.deployment;
 
+import java.util.Locale;
 import java.util.Map;
 
 import javax.enterprise.context.ApplicationScoped;
@@ -64,7 +65,7 @@ public RouteBuilder routes() {
             @Override
             public void configure() throws Exception {
                 from("knative:endpoint/from")
-                    .transform().body(String.class, b -> b.toUpperCase());
+                    .transform().body(String.class, b -> b.toUpperCase(Locale.US));
             }
         };
     }

diff --git a/...s/deployment/src/main/java/org/apache/camel/k/quarkus/deployment/DeploymentProcessor.java b/...s/deployment/src/main/java/org/apache/camel/k/quarkus/deployment/DeploymentProcessor.java
@@ -26,8 +26,6 @@
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
 import org.apache.camel.k.Runtime;
 import org.apache.camel.k.quarkus.ApplicationRecorder;
-import org.apache.camel.quarkus.core.deployment.spi.CamelServiceDestination;
-import org.apache.camel.quarkus.core.deployment.spi.CamelServicePatternBuildItem;
 import org.apache.camel.quarkus.main.CamelMainApplication;
 import org.apache.camel.quarkus.main.deployment.spi.CamelMainListenerBuildItem;
 import org.apache.camel.spi.HasId;

diff --git a/...-quarkus/runtime/src/main/java/org/apache/camel/k/quarkus/ApplicationListenerAdapter.java b/...-quarkus/runtime/src/main/java/org/apache/camel/k/quarkus/ApplicationListenerAdapter.java
@@ -65,6 +65,7 @@ public void afterConfigure(BaseMainSupport main) {
 
     @Override
     public void configure(CamelContext context) {
+        // no-op
     }
 
     @Override
@@ -103,20 +104,6 @@ private static void invokeListeners(List<Runtime.Listener> listeners, Runtime ru
             });
     }
 
-    private static Runtime on(CamelContext context) {
-        return new Runtime() {
-            @Override
-            public CamelContext getCamelContext() {
-                return context;
-            }
-
-            @Override
-            public void stop() throws Exception {
-                Quarkus.asyncExit();
-            }
-        };
-    }
-
     private static Runtime on(BaseMainSupport main) {
         return new Runtime() {
             @Override

diff --git a/...time/src/main/java/org/apache/camel/k/quarkus/ApplicationRuntimeConfigSourceProvider.java b/...time/src/main/java/org/apache/camel/k/quarkus/ApplicationRuntimeConfigSourceProvider.java
@@ -23,12 +23,8 @@
 import org.apache.camel.k.support.PropertiesSupport;
 import org.eclipse.microprofile.config.spi.ConfigSource;
 import org.eclipse.microprofile.config.spi.ConfigSourceProvider;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 public class ApplicationRuntimeConfigSourceProvider implements ConfigSourceProvider {
-    private static final Logger LOGGER = LoggerFactory.getLogger(ApplicationRuntimeConfigSourceProvider.class);
-
     @Override
     public Iterable<ConfigSource> getConfigSources(ClassLoader forClassLoader) {
         final Properties applicationProperties = PropertiesSupport.loadProperties();

diff --git a/camel-k-runtime-bom/pom.xml b/camel-k-runtime-bom/pom.xml
@@ -129,6 +129,11 @@
                 <artifactId>camel-knative-http</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.camel.k</groupId>
+                <artifactId>camel-knative-test</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.apache.camel.k</groupId>
                 <artifactId>camel-k-maven-plugin</artifactId>

diff --git a/camel-k-runtime-core/src/main/java/org/apache/camel/k/CompositeClassloader.java b/camel-k-runtime-core/src/main/java/org/apache/camel/k/CompositeClassloader.java
@@ -23,6 +23,7 @@ public class CompositeClassloader extends ClassLoader {
     private final List<ClassLoader> loaders = new CopyOnWriteArrayList<>();
 
     public CompositeClassloader() {
+        // no parent
     }
 
     public CompositeClassloader(ClassLoader parent) {
@@ -38,8 +39,8 @@ public Class<?> loadClass(String name) throws ClassNotFoundException {
         for (ClassLoader loader: loaders) {
             try {
                 return loader.loadClass(name);
-            } catch (ClassNotFoundException e) {
-                // ignore
+            } catch (ClassNotFoundException ignored) {
+                // ignored
             }
         }
 

diff --git a/camel-k-runtime-core/src/main/java/org/apache/camel/k/Sources.java b/camel-k-runtime-core/src/main/java/org/apache/camel/k/Sources.java
@@ -67,15 +67,15 @@ public InMemory(String name, String language, String loader, byte[] content) {
             this.language = language;
             this.loader = loader;
             this.interceptors = Collections.emptyList();
-            this.content = content;
+            this.content = Arrays.copyOf(content, content.length);
         }
 
         public InMemory(String name, String language, String loader, List<String> interceptors, byte[] content) {
             this.name = name;
             this.language = language;
             this.loader = loader;
             this.interceptors = new ArrayList<>(interceptors);
-            this.content = content;
+            this.content = Arrays.copyOf(content, content.length);
         }
 
         @Override
@@ -113,7 +113,7 @@ private static final class URI implements Source {
         private final String name;
         private final String language;
         private final String loader;
-        private final List<String> interceptors;
+        private final String interceptors;
         private final boolean compressed;
 
         private URI(String uri) throws Exception {
@@ -125,12 +125,8 @@ private URI(String uri) throws Exception {
 
             final String query = StringSupport.substringAfter(uri, "?");
             final Map<String, Object> params = URISupport.parseQuery(query);
-            final String languageName = (String) params.get("language");
-            final String compression = (String) params.get("compression");
-            final String loader = (String) params.get("loader");
-            final String interceptors = (String) params.get("interceptors");
 
-            String language = languageName;
+            String language = (String) params.get("language");
             if (ObjectHelper.isEmpty(language)) {
                 language = StringSupport.substringAfterLast(location, ":");
                 language = StringSupport.substringAfterLast(language, ".");
@@ -152,9 +148,9 @@ private URI(String uri) throws Exception {
             this.location = location;
             this.name = name;
             this.language = language;
-            this.loader = loader;
-            this.interceptors = interceptors != null ? Arrays.asList(interceptors.split(",", -1)) : Collections.emptyList();
-            this.compressed = Boolean.parseBoolean(compression);
+            this.loader = (String) params.get("loader");
+            this.interceptors = (String) params.get("interceptors");
+            this.compressed = Boolean.parseBoolean((String) params.get("compression"));
         }
 
         @Override
@@ -174,7 +170,7 @@ public Optional<String> getLoader() {
 
         @Override
         public List<String> getInterceptors() {
-            return interceptors;
+            return interceptors != null ? Arrays.asList(interceptors.split(",", -1)) : Collections.emptyList();
         }
 
         @Override

diff --git a/camel-k-runtime-core/src/main/java/org/apache/camel/k/listener/RoutesConfigurer.java b/camel-k-runtime-core/src/main/java/org/apache/camel/k/listener/RoutesConfigurer.java
@@ -53,7 +53,7 @@ protected void accept(Runtime runtime) {
         load(runtime, routes.split(",", -1));
     }
 
-    protected void load(Runtime runtime, String[] routes) {
+    protected void load(Runtime runtime, String... routes) {
         for (String route: routes) {
             if (ObjectHelper.isEmpty(route)) {
                 continue;

diff --git a/...k-runtime-core/src/main/java/org/apache/camel/k/support/KubernetesPropertiesFunction.java b/...k-runtime-core/src/main/java/org/apache/camel/k/support/KubernetesPropertiesFunction.java
@@ -21,6 +21,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.Locale;
 
 import org.apache.camel.spi.PropertiesFunction;
 import org.apache.camel.util.StringHelper;
@@ -54,7 +55,7 @@ public String apply(String remainder) {
             return defaultValue;
         }
 
-        Path file = this.root.resolve(name.toLowerCase()).resolve(property);
+        Path file = this.root.resolve(name.toLowerCase(Locale.US)).resolve(property);
         if (Files.exists(file) && !Files.isDirectory(file)) {
             try {
                 return Files.readString(file, StandardCharsets.UTF_8);

diff --git a/camel-k-runtime-cron/src/main/java/org/apache/camel/k/cron/CronSourceLoaderInterceptor.java b/camel-k-runtime-cron/src/main/java/org/apache/camel/k/cron/CronSourceLoaderInterceptor.java
@@ -73,6 +73,7 @@ public Runtime getRuntime() {
 
     @Override
     public void beforeLoad(SourceLoader loader, Source source) {
+        // no-op
     }
 
     @Override
@@ -111,7 +112,7 @@ public Optional<Object> configuration() {
         };
     }
 
-    private static boolean shouldBeOverridden(String uri, String[] components) {
+    private static boolean shouldBeOverridden(String uri, String... components) {
         if (uri == null) {
             return false;
         }

diff --git a/...time-http/src/main/java/org/apache/camel/k/http/PlatformHttpServiceContextCustomizer.java b/...time-http/src/main/java/org/apache/camel/k/http/PlatformHttpServiceContextCustomizer.java
@@ -29,9 +29,6 @@
 
 @Customizer("platform-http")
 public class PlatformHttpServiceContextCustomizer extends VertxPlatformHttpServerConfiguration implements ContextCustomizer {
-    public PlatformHttpServiceContextCustomizer() {
-    }
-
     @Override
     public int getOrder() {
         return Ordered.HIGHEST;

diff --git a/camel-k-runtime-knative/pom.xml b/camel-k-runtime-knative/pom.xml
@@ -65,6 +65,11 @@
             <artifactId>camel-k-test</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.camel.k</groupId>
+            <artifactId>camel-knative-test</artifactId>
+            <scope>test</scope>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.camel.k</groupId>

diff --git a/...ative/src/main/java/org/apache/camel/k/loader/knative/KnativeSourceLoaderInterceptor.java b/...ative/src/main/java/org/apache/camel/k/loader/knative/KnativeSourceLoaderInterceptor.java
@@ -36,6 +36,7 @@ public class KnativeSourceLoaderInterceptor implements SourceLoader.Interceptor
 
     @Override
     public void beforeLoad(SourceLoader loader, Source source) {
+        // no-op
     }
 
     @Override