You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2023/05/28 13:55:52 UTC

[camel] 04/04: (chores) camel-support: simplify Optional presence evaluation

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

commit 9cd8418b935b364455c58d6608fa7c056a6b6e1f
Author: Otavio R. Piske <an...@gmail.com>
AuthorDate: Sun May 28 13:49:23 2023 +0200

    (chores) camel-support: simplify Optional presence evaluation
    
    Signed-off-by: Otavio R. Piske <an...@gmail.com>
---
 .../src/main/java/org/apache/camel/saga/CamelSagaStep.java              | 2 +-
 .../src/main/java/org/apache/camel/support/resume/AdapterHelper.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/camel-support/src/main/java/org/apache/camel/saga/CamelSagaStep.java b/core/camel-support/src/main/java/org/apache/camel/saga/CamelSagaStep.java
index d0be6ab34af..59597d27293 100644
--- a/core/camel-support/src/main/java/org/apache/camel/saga/CamelSagaStep.java
+++ b/core/camel-support/src/main/java/org/apache/camel/saga/CamelSagaStep.java
@@ -61,6 +61,6 @@ public class CamelSagaStep {
     }
 
     public boolean isEmpty() {
-        return !compensation.isPresent() && !completion.isPresent() && options.isEmpty() && !timeoutInMilliseconds.isPresent();
+        return compensation.isEmpty() && completion.isEmpty() && options.isEmpty() && timeoutInMilliseconds.isEmpty();
     }
 }
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/resume/AdapterHelper.java b/core/camel-support/src/main/java/org/apache/camel/support/resume/AdapterHelper.java
index a31b6d772b3..7a6284372f8 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/resume/AdapterHelper.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/resume/AdapterHelper.java
@@ -52,7 +52,7 @@ public final class AdapterHelper {
         Optional<ResumeAdapter> adapterOptional
                 = factoryFinder.newInstance(resumeAware.adapterFactoryService(), ResumeAdapter.class);
 
-        if (!adapterOptional.isPresent()) {
+        if (adapterOptional.isEmpty()) {
             throw new RuntimeCamelException("Cannot find a resume adapter class in the consumer classpath or in the registry");
         }