[camel] branch main updated: (chores) camel-support: removed redundant conditions

[orpiske]

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

orpiske 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 640ff56edc4 (chores) camel-support: removed redundant conditions
640ff56edc4 is described below

commit 640ff56edc491d4d4ea3c3b4e76db7de837ab096
Author: Otavio Rodolfo Piske <angusyo...@gmail.com>
AuthorDate: Tue Jul 5 09:07:11 2022 +0200

    (chores) camel-support: removed redundant conditions
---
 .../src/main/java/org/apache/camel/support/ObjectHelper.java      | 8 +++-----
 .../apache/camel/support/builder/TokenXMLExpressionIterator.java  | 2 +-
 .../apache/camel/support/management/MixinRequiredModelMBean.java  | 2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)

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 4b19be8ad81..120b2af6a95 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
@@ -813,11 +813,10 @@ public final class ObjectHelper {
     @Deprecated
     public static boolean contains(Object collectionOrArray, Object value) {
         // favor String types
-        if (collectionOrArray != null
-                && (collectionOrArray instanceof StringBuffer || 
collectionOrArray instanceof StringBuilder)) {
+        if (collectionOrArray instanceof StringBuffer || collectionOrArray 
instanceof StringBuilder) {
             collectionOrArray = collectionOrArray.toString();
         }
-        if (value != null && (value instanceof StringBuffer || value 
instanceof StringBuilder)) {
+        if (value instanceof StringBuffer || value instanceof StringBuilder) {
             value = value.toString();
         }
 
@@ -845,8 +844,7 @@ public final class ObjectHelper {
     public static boolean typeCoerceContains(
             TypeConverter typeConverter, Object collectionOrArray, Object 
value, boolean ignoreCase) {
         // favor String types
-        if (collectionOrArray != null
-                && (collectionOrArray instanceof StringBuffer || 
collectionOrArray instanceof StringBuilder)) {
+        if (collectionOrArray instanceof StringBuffer || collectionOrArray 
instanceof StringBuilder) {
             collectionOrArray = collectionOrArray.toString();
         }
         if (value instanceof StringBuffer || value instanceof StringBuilder) {
diff --git 
a/core/camel-support/src/main/java/org/apache/camel/support/builder/TokenXMLExpressionIterator.java
 
b/core/camel-support/src/main/java/org/apache/camel/support/builder/TokenXMLExpressionIterator.java
index 0428ebfa7ef..ec0e5baff75 100644
--- 
a/core/camel-support/src/main/java/org/apache/camel/support/builder/TokenXMLExpressionIterator.java
+++ 
b/core/camel-support/src/main/java/org/apache/camel/support/builder/TokenXMLExpressionIterator.java
@@ -179,7 +179,7 @@ public class TokenXMLExpressionIterator extends 
ExpressionAdapter {
                     Pattern.MULTILINE | Pattern.DOTALL);
 
             this.inheritNamespaceToken = inheritNamespaceToken;
-            if (inheritNamespaceToken != null && 
OPTION_WRAP_TOKEN.equals(inheritNamespaceToken)) {
+            if (OPTION_WRAP_TOKEN.equals(inheritNamespaceToken)) {
                 this.wrapToken = true;
                 this.in = new RecordableInputStream(in, charset);
             } else {
diff --git 
a/core/camel-support/src/main/java/org/apache/camel/support/management/MixinRequiredModelMBean.java
 
b/core/camel-support/src/main/java/org/apache/camel/support/management/MixinRequiredModelMBean.java
index e9a5b95b4f1..f78e13162e2 100644
--- 
a/core/camel-support/src/main/java/org/apache/camel/support/management/MixinRequiredModelMBean.java
+++ 
b/core/camel-support/src/main/java/org/apache/camel/support/management/MixinRequiredModelMBean.java
@@ -93,7 +93,7 @@ public class MixinRequiredModelMBean extends 
RequiredModelMBean {
                 Descriptor desc = info.getDescriptor();
                 if (desc != null) {
                     Object val = desc.getFieldValue("mask");
-                    return val != null && "true".equals(val);
+                    return "true".equals(val);
                 }
             }
         }