You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2022/10/21 05:02:11 UTC

[camel] branch main updated: (chores) Sonar's issues cleanups (#8601)

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

davsclaus 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 dede9707d99 (chores) Sonar's issues cleanups (#8601)
dede9707d99 is described below

commit dede9707d9935a5f5595df9bde472e5105434a57
Author: Gilvan Filho <gi...@gmail.com>
AuthorDate: Fri Oct 21 02:02:04 2022 -0300

    (chores) Sonar's issues cleanups (#8601)
    
    * (chores) camel-file: 0 is a valid index, but is ignored by this check
    
    * (chores) camel-http: 0 is a valid index, but is ignored by this check
    
    * (chores) camel-jsch: 0 is a valid index, but is ignored by this check
    
    * (chores) camel-caffeine: 0 is a valid index, but is ignored by this check
    
    * (chores) camel-http-base: 0 is a valid index, but is ignored by this check
---
 .../camel/component/caffeine/DefaultCaffeineSendDynamicAware.java     | 2 +-
 .../java/org/apache/camel/component/file/GenericFileEndpoint.java     | 2 +-
 .../java/org/apache/camel/component/file/GenericFileOnCompletion.java | 2 +-
 .../main/java/org/apache/camel/http/base/HttpSendDynamicAware.java    | 4 ++--
 .../src/main/java/org/apache/camel/component/http/HttpProducer.java   | 2 +-
 .../src/main/java/org/apache/camel/component/scp/ScpOperations.java   | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/components/camel-caffeine/src/main/java/org/apache/camel/component/caffeine/DefaultCaffeineSendDynamicAware.java b/components/camel-caffeine/src/main/java/org/apache/camel/component/caffeine/DefaultCaffeineSendDynamicAware.java
index 58b78f4ef82..6a4a6ec41fc 100644
--- a/components/camel-caffeine/src/main/java/org/apache/camel/component/caffeine/DefaultCaffeineSendDynamicAware.java
+++ b/components/camel-caffeine/src/main/java/org/apache/camel/component/caffeine/DefaultCaffeineSendDynamicAware.java
@@ -54,7 +54,7 @@ abstract class DefaultCaffeineSendDynamicAware extends SendDynamicAwareSupport {
             // build static uri
             String u = entry.getUri();
             // remove query parameters
-            if (u.indexOf('?') > 0) {
+            if (u.contains("?")) {
                 u = StringHelper.before(u, "?");
             }
             String query = URISupport.createQueryString(copy);
diff --git a/components/camel-file/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java b/components/camel-file/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java
index 8a56dbb9799..71f29e59362 100644
--- a/components/camel-file/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java
+++ b/components/camel-file/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java
@@ -1716,7 +1716,7 @@ public abstract class GenericFileEndpoint<T> extends ScheduledPollEndpoint imple
 
         // the static part of the pattern, is that a prefix or suffix?
         // its a prefix if ${ start token is not at the start of the pattern
-        boolean prefix = pattern.indexOf("${") > 0;
+        boolean prefix = pattern.contains("${");
 
         // remove dynamic parts of the pattern so we only got the static part
         // left
diff --git a/components/camel-file/src/main/java/org/apache/camel/component/file/GenericFileOnCompletion.java b/components/camel-file/src/main/java/org/apache/camel/component/file/GenericFileOnCompletion.java
index 38c8d5b8dda..e6b6bfb6914 100644
--- a/components/camel-file/src/main/java/org/apache/camel/component/file/GenericFileOnCompletion.java
+++ b/components/camel-file/src/main/java/org/apache/camel/component/file/GenericFileOnCompletion.java
@@ -174,7 +174,7 @@ public class GenericFileOnCompletion<T> implements Synchronization {
             String doneFileName = endpoint.createDoneFileName(absoluteFileName);
             StringHelper.notEmpty(doneFileName, "doneFileName", endpoint);
             // we should delete the dynamic done file
-            if (endpoint.getDoneFileName().indexOf("{file:name") > 0 || complete) {
+            if (endpoint.getDoneFileName().contains("{file:name") || complete) {
                 try {
                     // delete done file
                     boolean deleted = operations.deleteFile(doneFileName);
diff --git a/components/camel-http-base/src/main/java/org/apache/camel/http/base/HttpSendDynamicAware.java b/components/camel-http-base/src/main/java/org/apache/camel/http/base/HttpSendDynamicAware.java
index 97efdc2934c..1daf9da402d 100644
--- a/components/camel-http-base/src/main/java/org/apache/camel/http/base/HttpSendDynamicAware.java
+++ b/components/camel-http-base/src/main/java/org/apache/camel/http/base/HttpSendDynamicAware.java
@@ -76,7 +76,7 @@ public class HttpSendDynamicAware extends SendDynamicAwareSupport {
 
             // build static url with the known parameters
             String url;
-            if (auth != null && auth.indexOf('@') != -1) {
+            if (auth != null && auth.contains("@")) {
                 // only use auth if there is a username:password@host
                 url = getScheme() + ":" + auth;
             } else {
@@ -141,7 +141,7 @@ public class HttpSendDynamicAware extends SendDynamicAwareSupport {
         }
 
         // remove query parameters
-        if (u.indexOf('?') > 0) {
+        if (u.contains("?")) {
             u = StringHelper.before(u, "?");
         }
 
diff --git a/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java
index 189a49e5016..a2a2f7ef7e4 100644
--- a/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java
+++ b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java
@@ -687,7 +687,7 @@ public class HttpProducer extends DefaultProducer {
                     //it removes "boundary" from Content-Type; I have to use contentType.create method.
                     if (contentTypeString != null) {
                         // using ContentType.parser for charset
-                        if (contentTypeString.indexOf("charset") > 0 || contentTypeString.indexOf(";") > 0) {
+                        if (contentTypeString.contains("charset") || contentTypeString.contains(";")) {
                             contentType = ContentType.parse(contentTypeString);
                         } else {
                             contentType = ContentType.create(contentTypeString);
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 eaf30f55bc0..1035e66dfb6 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
@@ -451,7 +451,7 @@ public class ScpOperations implements RemoteFileOperations<ScpFile> {
     }
 
     private static boolean isRecursiveScp(String name) {
-        return name.indexOf('/') > 0;
+        return name.contains("/");
     }
 
     private static String getScpCommand(ScpConfiguration config, String name) {