This is an automated email from the ASF dual-hosted git repository. bvahdat pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push: new a54c4c2 fix the failing source check validation a54c4c2 is described below commit a54c4c2d99b70d456cd366dae6472cc9470e7c73 Author: Babak Vahdat <bvah...@apache.org> AuthorDate: Sun Jun 20 22:08:53 2021 +0200 fix the failing source check validation --- camel-dependencies/pom.xml | 2 +- .../resources/org/apache/camel/catalog/schemas/camel-spring.xsd | 4 ++-- .../src/main/java/org/apache/camel/component/dataset/FileDataSet.java | 2 +- .../src/main/java/org/apache/camel/support/ObjectHelper.java | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml index 781f079..9d5031b 100644 --- a/camel-dependencies/pom.xml +++ b/camel-dependencies/pom.xml @@ -384,7 +384,7 @@ <maven-archetype-plugin-version>3.2.0</maven-archetype-plugin-version> <maven-assembly-plugin-version>3.0.0</maven-assembly-plugin-version> <maven-checkstyle-plugin-version>3.1.2</maven-checkstyle-plugin-version> - <maven-checkstyle-version>8.40</maven-checkstyle-version> + <maven-checkstyle-version>8.43</maven-checkstyle-version> <maven-jar-plugin-version>3.2.0</maven-jar-plugin-version> <maven-javadoc-plugin-version>3.2.0</maven-javadoc-plugin-version> <maven-jboss-as-maven-plugin-version>7.9.Final</maven-jboss-as-maven-plugin-version> diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd index 7abef59..4b2f0ae 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd @@ -3489,7 +3489,7 @@ instance is only called from the same request. When using prototype scope, then the bean will be looked up or created per call. However in case of lookup then this is delegated to the bean registry such as Spring or CDI (if in use), which depends on their configuration can act as either singleton or prototype scope. -So when using prototype scope then this depends on the bean registry +so when using prototype scope then this depends on the bean registry implementation. Default value: Singleton ]]></xs:documentation> </xs:annotation> @@ -13366,7 +13366,7 @@ instance is only called from the same request. When using prototype scope, then the bean will be looked up or created per call. However in case of lookup then this is delegated to the bean registry such as Spring or CDI (if in use), which depends on their configuration can act as either singleton or prototype scope. -So when using prototype scope then this depends on the bean registry +so when using prototype scope then this depends on the bean registry implementation. Default value: Singleton ]]></xs:documentation> </xs:annotation> diff --git a/components/camel-dataset/src/main/java/org/apache/camel/component/dataset/FileDataSet.java b/components/camel-dataset/src/main/java/org/apache/camel/component/dataset/FileDataSet.java index 4c973ec..eb3aa4f 100644 --- a/components/camel-dataset/src/main/java/org/apache/camel/component/dataset/FileDataSet.java +++ b/components/camel-dataset/src/main/java/org/apache/camel/component/dataset/FileDataSet.java @@ -80,7 +80,7 @@ public class FileDataSet extends ListDataSet { try (Scanner scanner = new Scanner(sourceFile, null, delimiter)) { while (scanner.hasNext()) { String nextPayload = scanner.next(); - if ((nextPayload != null) && (nextPayload.length() > 0)) { + if (nextPayload != null && nextPayload.length() > 0) { bodies.add(nextPayload); } } diff --git a/core/camel-support/src/main/java/org/apache/camel/support/ObjectHelper.java b/core/camel-support/src/main/java/org/apache/camel/support/ObjectHelper.java index 788bd73..ae62c3b 100644 --- a/core/camel-support/src/main/java/org/apache/camel/support/ObjectHelper.java +++ b/core/camel-support/src/main/java/org/apache/camel/support/ObjectHelper.java @@ -122,7 +122,7 @@ public final class ObjectHelper { return leftNum.compareTo(rightNum) == 0; } } else if (rightValue instanceof String && - ((leftValue instanceof Integer || leftValue instanceof Long) && isNumber((String) rightValue))) { + (leftValue instanceof Integer || leftValue instanceof Long) && isNumber((String) rightValue)) { if (leftValue instanceof Integer) { Integer leftNum = (Integer) leftValue; Integer rightNum = Integer.valueOf((String) rightValue); @@ -222,7 +222,7 @@ public final class ObjectHelper { return leftNum.compareTo(rightNum); } } else if (rightValue instanceof String && - ((leftValue instanceof Integer || leftValue instanceof Long) && isNumber((String) rightValue))) { + (leftValue instanceof Integer || leftValue instanceof Long) && isNumber((String) rightValue)) { if (leftValue instanceof Integer) { Integer leftNum = (Integer) leftValue; Integer rightNum = Integer.valueOf((String) rightValue);