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/12/20 14:01:39 UTC

[camel] branch main updated: (chores) More of replace size() > 0 by !isEmpty() (#8931)

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 b4cc760eb11 (chores) More of replace size() > 0 by !isEmpty() (#8931)
b4cc760eb11 is described below

commit b4cc760eb1116926f9d435fde8716c15ae063166
Author: Gilvan Filho <gi...@gmail.com>
AuthorDate: Tue Dec 20 11:01:31 2022 -0300

    (chores) More of replace size() > 0 by !isEmpty() (#8931)
    
    * (chores) camel-google-drive: replace size() > 0 by !isEmpty()
    
    * (chores) camel-google-mail: replace size() > 0 by !isEmpty()
    
    * (chores) camel-google-sheets: replace size() > 0 by !isEmpty()
    
    * (chores) camel-olingo4-api: replace size() > 0 by !isEmpty()
    
    * (chores) camel-test-spring: replace size() > 0 by !isEmpty()
---
 .../camel/component/google/drive/BatchGoogleDriveClientFactory.java     | 2 +-
 .../camel/component/google/mail/BatchGoogleMailClientFactory.java       | 2 +-
 .../camel/component/google/sheets/BatchGoogleSheetsClientFactory.java   | 2 +-
 .../org/apache/camel/component/olingo4/api/impl/Olingo4AppImpl.java     | 2 +-
 .../main/java/org/apache/camel/test/spring/CamelAnnotationsHandler.java | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/components/camel-google/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/BatchGoogleDriveClientFactory.java b/components/camel-google/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/BatchGoogleDriveClientFactory.java
index 93b94ae95e7..fc98a021bc1 100644
--- a/components/camel-google/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/BatchGoogleDriveClientFactory.java
+++ b/components/camel-google/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/BatchGoogleDriveClientFactory.java
@@ -112,7 +112,7 @@ public class BatchGoogleDriveClientFactory implements GoogleDriveClientFactory {
                     .fromStream(ResourceHelper.resolveMandatoryResourceAsInputStream(camelContext, serviceAccountKey),
                             transport,
                             jsonFactory)
-                    .createScoped(scopes != null && scopes.size() != 0 ? scopes : null)
+                    .createScoped(scopes != null && !scopes.isEmpty() ? scopes : null)
                     .createDelegated(delegate);
             cred.refreshToken();
             return cred;
diff --git a/components/camel-google/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/BatchGoogleMailClientFactory.java b/components/camel-google/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/BatchGoogleMailClientFactory.java
index c78fa98a2ff..4d131a1bba3 100644
--- a/components/camel-google/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/BatchGoogleMailClientFactory.java
+++ b/components/camel-google/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/BatchGoogleMailClientFactory.java
@@ -92,7 +92,7 @@ public class BatchGoogleMailClientFactory implements GoogleMailClientFactory {
                     .fromStream(ResourceHelper.resolveMandatoryResourceAsInputStream(camelContext, serviceAccountKey),
                             transport,
                             jsonFactory)
-                    .createScoped(scopes != null && scopes.size() != 0 ? scopes : null)
+                    .createScoped(scopes != null && !scopes.isEmpty() ? scopes : null)
                     .createDelegated(delegate);
             cred.refreshToken();
             return cred;
diff --git a/components/camel-google/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/BatchGoogleSheetsClientFactory.java b/components/camel-google/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/BatchGoogleSheetsClientFactory.java
index 231933037a1..7e1bc3c004d 100644
--- a/components/camel-google/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/BatchGoogleSheetsClientFactory.java
+++ b/components/camel-google/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/BatchGoogleSheetsClientFactory.java
@@ -127,7 +127,7 @@ public class BatchGoogleSheetsClientFactory implements GoogleSheetsClientFactory
                     .fromStream(ResourceHelper.resolveMandatoryResourceAsInputStream(camelContext, serviceAccountKey),
                             transport,
                             jsonFactory)
-                    .createScoped(scopes != null && scopes.size() != 0 ? scopes : null)
+                    .createScoped(scopes != null && !scopes.isEmpty() ? scopes : null)
                     .createDelegated(delegate);
             cred.refreshToken();
             return cred;
diff --git a/components/camel-olingo4/camel-olingo4-api/src/main/java/org/apache/camel/component/olingo4/api/impl/Olingo4AppImpl.java b/components/camel-olingo4/camel-olingo4-api/src/main/java/org/apache/camel/component/olingo4/api/impl/Olingo4AppImpl.java
index 071d1e54b70..78d622f390a 100644
--- a/components/camel-olingo4/camel-olingo4-api/src/main/java/org/apache/camel/component/olingo4/api/impl/Olingo4AppImpl.java
+++ b/components/camel-olingo4/camel-olingo4-api/src/main/java/org/apache/camel/component/olingo4/api/impl/Olingo4AppImpl.java
@@ -515,7 +515,7 @@ public final class Olingo4AppImpl implements Olingo4App {
                         List<UriParameter> keyPredicates = uriResourceEntitySet.getKeyPredicates();
                         // Check result type: single Entity or EntitySet based
                         // on key predicate detection
-                        if (keyPredicates.size() >= 1) {
+                        if (!keyPredicates.isEmpty()) {
                             response = (T) odataReader.readEntity(content, getResourceContentType(uriInfo));
                         } else {
                             response = (T) odataReader.readEntitySet(content, getResourceContentType(uriInfo));
diff --git a/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelAnnotationsHandler.java b/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelAnnotationsHandler.java
index 4fb6d052fff..025a7008e57 100644
--- a/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelAnnotationsHandler.java
+++ b/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelAnnotationsHandler.java
@@ -203,7 +203,7 @@ public final class CamelAnnotationsHandler {
             }
         }
 
-        if (breakpoints.size() != 0) {
+        if (!breakpoints.isEmpty()) {
             CamelSpringTestHelper.doToSpringCamelContexts(context, new CamelSpringTestHelper.DoToSpringCamelContextsStrategy() {
 
                 public void execute(String contextName, SpringCamelContext camelContext)