[camel] branch master updated (1e77852 -> c46cf31)

classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

[camel] branch master updated (1e77852 -> c46cf31)

aldettinger
This is an automated email from the ASF dual-hosted git repository.

aldettinger pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.


    from 1e77852  Upgrade Mockito to version 2.21.0
     new 50fb304  fix some log messages
     new c46cf31  CAMEL-12726: Fix FindBugs warnings: Invocation of toString on an array

The 2 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.


Summary of changes:
 .../java/org/apache/camel/management/mbean/ManagedRemoveHeaders.java  | 4 +++-
 .../org/apache/camel/management/mbean/ManagedRemoveProperties.java    | 4 +++-
 .../java/org/apache/camel/component/box/api/BoxFoldersManager.java    | 2 +-
 .../apache/camel/component/docker/producer/AsyncDockerProducer.java   | 2 +-
 .../org/apache/camel/component/file/remote/RemoteFileConsumer.java    | 2 +-
 .../src/main/java/org/apache/camel/component/scp/ScpOperations.java   | 3 ++-
 6 files changed, 11 insertions(+), 6 deletions(-)

Reply | Threaded
Open this post in threaded view
|

[camel] 01/02: fix some log messages

aldettinger
This is an automated email from the ASF dual-hosted git repository.

aldettinger pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 50fb304cc7a4a56353b8e6ab34b2ae6918952b80
Author: zhenhaoli <[hidden email]>
AuthorDate: Fri Aug 10 16:14:48 2018 -0400

    fix some log messages
---
 .../org/apache/camel/component/docker/producer/AsyncDockerProducer.java | 2 +-
 .../java/org/apache/camel/component/file/remote/RemoteFileConsumer.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/camel-docker/src/main/java/org/apache/camel/component/docker/producer/AsyncDockerProducer.java b/components/camel-docker/src/main/java/org/apache/camel/component/docker/producer/AsyncDockerProducer.java
index 4298742..00aeb96 100644
--- a/components/camel-docker/src/main/java/org/apache/camel/component/docker/producer/AsyncDockerProducer.java
+++ b/components/camel-docker/src/main/java/org/apache/camel/component/docker/producer/AsyncDockerProducer.java
@@ -487,7 +487,7 @@ public class AsyncDockerProducer extends DefaultAsyncProducer {
      */
     private ExecStartCmd executeExecStartRequest(DockerClient client, Message message) {
 
-        LOGGER.debug("Executing Docker Exec Create Request");
+        LOGGER.debug("Executing Docker Exec Start Request");
 
         String execId = DockerHelper.getProperty(DockerConstants.DOCKER_EXEC_ID, configuration, message, String.class);
 
diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConsumer.java b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConsumer.java
index b1ae6d7..4f3b0fe 100644
--- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConsumer.java
+++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConsumer.java
@@ -113,7 +113,7 @@ public abstract class RemoteFileConsumer<T> extends GenericFileConsumer<T> {
             exchange.addOnCompletion(new SynchronizationAdapter() {
                 @Override
                 public void onDone(Exchange exchange) {
-                    log.trace("postPollCheck disconnect from: {}", getEndpoint());
+                    log.trace("processExchange disconnect from: {}", getEndpoint());
                     disconnect();
                 }
 

Reply | Threaded
Open this post in threaded view
|

[camel] 02/02: CAMEL-12726: Fix FindBugs warnings: Invocation of toString on an array

aldettinger
In reply to this post by aldettinger
This is an automated email from the ASF dual-hosted git repository.

aldettinger pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit c46cf31aae0cda6cd0a2e951aa88a5238e14efc3
Author: Hiroaki Yoshida <[hidden email]>
AuthorDate: Fri Aug 10 18:33:09 2018 -0700

    CAMEL-12726: Fix FindBugs warnings: Invocation of toString on an array
---
 .../java/org/apache/camel/management/mbean/ManagedRemoveHeaders.java  | 4 +++-
 .../org/apache/camel/management/mbean/ManagedRemoveProperties.java    | 4 +++-
 .../java/org/apache/camel/component/box/api/BoxFoldersManager.java    | 2 +-
 .../src/main/java/org/apache/camel/component/scp/ScpOperations.java   | 3 ++-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRemoveHeaders.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRemoveHeaders.java
index 723e4d7..ae5d333 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRemoveHeaders.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRemoveHeaders.java
@@ -16,6 +16,8 @@
  */
 package org.apache.camel.management.mbean;
 
+import java.util.Arrays;
+
 import org.apache.camel.CamelContext;
 import org.apache.camel.api.management.ManagedResource;
 import org.apache.camel.api.management.mbean.ManagedRemoveHeadersMBean;
@@ -34,7 +36,7 @@ public class ManagedRemoveHeaders extends ManagedProcessor implements ManagedRem
         super(context, processor, definition);
         this.processor = processor;
         if (processor.getExcludePattern() != null) {
-            exclude = processor.getExcludePattern().toString();
+            exclude = Arrays.toString(processor.getExcludePattern());
         } else {
             exclude = null;
         }
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRemoveProperties.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRemoveProperties.java
index f01a0a8..f843b77 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRemoveProperties.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRemoveProperties.java
@@ -16,6 +16,8 @@
  */
 package org.apache.camel.management.mbean;
 
+import java.util.Arrays;
+
 import org.apache.camel.CamelContext;
 import org.apache.camel.api.management.ManagedResource;
 import org.apache.camel.api.management.mbean.ManagedRemovePropertiesMBean;
@@ -34,7 +36,7 @@ public class ManagedRemoveProperties extends ManagedProcessor implements Managed
         super(context, processor, definition);
         this.processor = processor;
         if (processor.getExcludePattern() != null) {
-            exclude = processor.getExcludePattern().toString();
+            exclude = Arrays.toString(processor.getExcludePattern());
         } else {
             exclude = null;
         }
diff --git a/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxFoldersManager.java b/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxFoldersManager.java
index 1fe7d99..eb2ed55 100644
--- a/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxFoldersManager.java
+++ b/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxFoldersManager.java
@@ -201,7 +201,7 @@ public class BoxFoldersManager {
      */
     public BoxFolder createFolder(String parentFolderId, String... path) {
         try {
-            LOG.debug("Creating folder with path '" + path + "' in parent_folder(id=" + parentFolderId + ")");
+            LOG.debug("Creating folder with path '" + Arrays.toString(path) + "' in parent_folder(id=" + parentFolderId + ")");
             if (parentFolderId == null) {
                 throw new IllegalArgumentException("Parameter 'parentFolderId' can not be null");
             }
diff --git a/components/camel-jsch/src/main/java/org/apache/camel/component/scp/ScpOperations.java b/components/camel-jsch/src/main/java/org/apache/camel/component/scp/ScpOperations.java
index d0efd14..a9ea300 100644
--- a/components/camel-jsch/src/main/java/org/apache/camel/component/scp/ScpOperations.java
+++ b/components/camel-jsch/src/main/java/org/apache/camel/component/scp/ScpOperations.java
@@ -22,6 +22,7 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.util.Arrays;
 import java.util.Hashtable;
 import java.util.List;
 
@@ -259,7 +260,7 @@ public class ScpOperations implements RemoteFileOperations<ScpFile> {
                 try {
                     jsch.addIdentity("camel-jsch", data, null, pkfp != null ? pkfp.getBytes() : null);
                 } catch (Exception e) {
-                    throw new GenericFileOperationFailedException("Cannot load private key bytes: " + config.getPrivateKeyBytes(), e);
+                    throw new GenericFileOperationFailedException("Cannot load private key bytes: " + Arrays.toString(config.getPrivateKeyBytes()), e);
                 }                
             }