You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pa...@apache.org on 2020/02/09 09:58:10 UTC
[camel] branch master updated (600db27 -> 24303ed)
This is an automated email from the ASF dual-hosted git repository.
pascalschumacher pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 600db27 Copy over a work doc for camel-yammer to get CI build further
new 583435b AssignableToPackageScanFilter: Remove unnecessary null check.
new c5c7f2a Add missing format specifiers for unused String/Logger format arguments.
new 24303ed Upgrade JSoup to version 1.12.2
The 3 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/component/mllp/internal/MllpSocketBuffer.java | 2 +-
.../java/org/apache/camel/component/workday/WorkdayConfiguration.java | 2 +-
.../java/org/apache/camel/impl/scan/AssignableToPackageScanFilter.java | 2 +-
parent/pom.xml | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
[camel] 02/03: Add missing format specifiers for unused
String/Logger format arguments.
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pascalschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit c5c7f2aac0e95c85fcf71a52b4149bb055e2c88a
Author: Pascal Schumacher <pa...@gmx.net>
AuthorDate: Sun Feb 9 10:54:53 2020 +0100
Add missing format specifiers for unused String/Logger format arguments.
---
.../java/org/apache/camel/component/mllp/internal/MllpSocketBuffer.java | 2 +-
.../java/org/apache/camel/component/workday/WorkdayConfiguration.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/internal/MllpSocketBuffer.java b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/internal/MllpSocketBuffer.java
index aba576d..9ce5475 100644
--- a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/internal/MllpSocketBuffer.java
+++ b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/internal/MllpSocketBuffer.java
@@ -626,7 +626,7 @@ public class MllpSocketBuffer {
if (hasStartOfBlock()) {
log.trace("readSocketInputStream(socketInputStream, {}) - read {} bytes for a total of {} bytes", socket, readCount, availableByteCount);
} else {
- log.warn("readSocketInputStream(socketInputStream, {}) - ignoring {} bytes received before START_OF_BLOCK", socket, size(), toPrintFriendlyStringAndReset());
+ log.warn("readSocketInputStream(socketInputStream, {}) - ignoring {} bytes received before START_OF_BLOCK: {}", socket, size(), toPrintFriendlyStringAndReset());
}
}
} catch (SocketTimeoutException timeoutEx) {
diff --git a/components/camel-workday/src/main/java/org/apache/camel/component/workday/WorkdayConfiguration.java b/components/camel-workday/src/main/java/org/apache/camel/component/workday/WorkdayConfiguration.java
index a2b4671..55fc369 100644
--- a/components/camel-workday/src/main/java/org/apache/camel/component/workday/WorkdayConfiguration.java
+++ b/components/camel-workday/src/main/java/org/apache/camel/component/workday/WorkdayConfiguration.java
@@ -159,7 +159,7 @@ public class WorkdayConfiguration {
entity = u.getScheme();
path = u.getPath();
} catch (Exception e) {
- throw new MalformedURLException(String.format("An invalid workday remaining uri: '%s' was provided. Error: ", remaining, e.getMessage()));
+ throw new MalformedURLException(String.format("An invalid workday remaining uri: '%s' was provided. Error: '%s'", remaining, e.getMessage()));
}
ObjectHelper.notNull(entity, "Entity");
[camel] 03/03: Upgrade JSoup to version 1.12.2
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pascalschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 24303ede8a04afc1ee137bc1117a7625d4c8c1a3
Author: Pascal Schumacher <pa...@gmx.net>
AuthorDate: Sun Feb 9 10:57:41 2020 +0100
Upgrade JSoup to version 1.12.2
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 3d440fa..d846d1c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -389,7 +389,7 @@
<json-path-version>2.4.0</json-path-version>
<json-simple-version>1.1.1</json-simple-version>
<json-smart-version>2.3</json-smart-version>
- <jsoup-version>1.12.1</jsoup-version>
+ <jsoup-version>1.12.2</jsoup-version>
<jt400-version>10.2</jt400-version>
<jt400-bundle-version>10.2_1</jt400-bundle-version>
<juel-bundle-version>2.1.3_1</juel-bundle-version>
[camel] 01/03: AssignableToPackageScanFilter: Remove unnecessary
null check.
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pascalschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 583435b775907cfa50d86e4282476671ee60d061
Author: Pascal Schumacher <pa...@gmx.net>
AuthorDate: Sun Feb 9 10:42:28 2020 +0100
AssignableToPackageScanFilter: Remove unnecessary null check.
---
.../java/org/apache/camel/impl/scan/AssignableToPackageScanFilter.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/scan/AssignableToPackageScanFilter.java b/core/camel-base/src/main/java/org/apache/camel/impl/scan/AssignableToPackageScanFilter.java
index 56b3c2a..7c0379b 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/scan/AssignableToPackageScanFilter.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/scan/AssignableToPackageScanFilter.java
@@ -44,7 +44,7 @@ public class AssignableToPackageScanFilter implements PackageScanFilter {
@Override
public boolean matches(Class<?> type) {
- if (parents != null && parents.size() > 0) {
+ if (parents.size() > 0) {
for (Class<?> parent : parents) {
if (parent.isAssignableFrom(type)) {
return true;