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 7eb372ad5f6 Do not use Optional as parameters or fields (#14067)
7eb372ad5f6 is described below
commit 7eb372ad5f64d5cd0c24545fb449f614f8577362
Author: Guillaume Nodet <[email protected]>
AuthorDate: Wed May 8 13:21:06 2024 +0200
Do not use Optional as parameters or fields (#14067)
---
.../consul/cluster/ConsulClusterView.java | 4 +--
.../file/cluster/FileLockClusterView.java | 6 ++--
.../infinispan/cluster/InfinispanClusterView.java | 5 ++-
.../raft/cluster/ClusterRoleChangeListener.java | 7 ++--
.../raft/cluster/JGroupsRaftClusterView.java | 8 ++---
.../jgroups/cluster/JGroupsLockClusterView.java | 6 ++--
.../kubernetes/cluster/KubernetesClusterView.java | 8 ++---
.../kubernetes/cluster/utils/LeaderRecorder.java | 5 +--
.../camel/service/lra/LRASagaCoordinatorTest.java | 3 +-
.../camel/component/master/MasterConsumer.java | 4 +--
.../zookeeper/cluster/ZooKeeperClusterView.java | 6 ++--
.../camel/cluster/CamelClusterEventListener.java | 4 +--
.../camel/impl/cluster/ClusteredRoutePolicy.java | 3 +-
.../ServiceCallServiceDiscoveryConfiguration.java | 8 ++---
.../java/org/apache/camel/reifier/SagaReifier.java | 12 ++++---
.../camel/cluster/ClusterServiceViewTest.java | 2 +-
.../cluster/ClusteredRoutePolicyFactoryTest.java | 2 +-
.../ClusteredRoutePolicyLeaderChangeTest.java | 2 +-
.../camel/cluster/ClusteredRoutePolicyTest.java | 2 +-
...eredRoutePolicyUnmanagedClusterServiceTest.java | 2 +-
.../extension/verifier/ResultBuilder.java | 42 +++++++++++-----------
.../java/org/apache/camel/saga/CamelSagaStep.java | 27 +++++++-------
.../support/cluster/AbstractCamelClusterView.java | 9 ++++-
23 files changed, 90 insertions(+), 87 deletions(-)
diff --git
a/components/camel-consul/src/main/java/org/apache/camel/component/consul/cluster/ConsulClusterView.java
b/components/camel-consul/src/main/java/org/apache/camel/component/consul/cluster/ConsulClusterView.java
index a4688bbf6e1..eea1972290f 100644
---
a/components/camel-consul/src/main/java/org/apache/camel/component/consul/cluster/ConsulClusterView.java
+++
b/components/camel-consul/src/main/java/org/apache/camel/component/consul/cluster/ConsulClusterView.java
@@ -141,12 +141,12 @@ final class ConsulClusterView extends
AbstractCamelClusterView {
void setMaster(boolean master) {
if (master && this.master.compareAndSet(false, true)) {
LOGGER.debug("Leadership taken for session id {}",
sessionId.get());
- fireLeadershipChangedEvent(Optional.of(this));
+ fireLeadershipChangedEvent(this);
return;
}
if (!master && this.master.compareAndSet(true, false)) {
LOGGER.debug("Leadership lost for session id {}",
sessionId.get());
- fireLeadershipChangedEvent(getLeader());
+ fireLeadershipChangedEvent(getLeader().orElse(null));
return;
}
}
diff --git
a/components/camel-file/src/main/java/org/apache/camel/component/file/cluster/FileLockClusterView.java
b/components/camel-file/src/main/java/org/apache/camel/component/file/cluster/FileLockClusterView.java
index c5838417a0a..6c679a657e7 100644
---
a/components/camel-file/src/main/java/org/apache/camel/component/file/cluster/FileLockClusterView.java
+++
b/components/camel-file/src/main/java/org/apache/camel/component/file/cluster/FileLockClusterView.java
@@ -76,7 +76,7 @@ public class FileLockClusterView extends
AbstractCamelClusterView {
if (lockFile != null) {
closeInternal();
- fireLeadershipChangedEvent(Optional.empty());
+ fireLeadershipChangedEvent((CamelClusterMember) null);
}
if (!Files.exists(path.getParent())) {
@@ -137,7 +137,7 @@ public class FileLockClusterView extends
AbstractCamelClusterView {
synchronized (FileLockClusterView.this) {
if (lock != null) {
LOGGER.info("Lock on file {} lost (lock={})", path,
lock);
- fireLeadershipChangedEvent(Optional.empty());
+ fireLeadershipChangedEvent((CamelClusterMember) null);
}
LOGGER.debug("Try to acquire a lock on {}", path);
@@ -148,7 +148,7 @@ public class FileLockClusterView extends
AbstractCamelClusterView {
if (lock != null) {
LOGGER.info("Lock on file {} acquired (lock={})",
path, lock);
- fireLeadershipChangedEvent(Optional.of(localMember));
+ fireLeadershipChangedEvent(localMember);
} else {
LOGGER.debug("Lock on file {} not acquired ", path);
}
diff --git
a/components/camel-infinispan/camel-infinispan-common/src/main/java/org/apache/camel/component/infinispan/cluster/InfinispanClusterView.java
b/components/camel-infinispan/camel-infinispan-common/src/main/java/org/apache/camel/component/infinispan/cluster/InfinispanClusterView.java
index 3a4b8805740..e7e9e7eb3e5 100644
---
a/components/camel-infinispan/camel-infinispan-common/src/main/java/org/apache/camel/component/infinispan/cluster/InfinispanClusterView.java
+++
b/components/camel-infinispan/camel-infinispan-common/src/main/java/org/apache/camel/component/infinispan/cluster/InfinispanClusterView.java
@@ -17,7 +17,6 @@
package org.apache.camel.component.infinispan.cluster;
import java.util.Objects;
-import java.util.Optional;
import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.camel.cluster.CamelClusterMember;
@@ -51,13 +50,13 @@ public abstract class InfinispanClusterView extends
AbstractCamelClusterView {
if (master && this.leader.compareAndSet(false, true)) {
LOGGER.debug("Leadership taken for id: {}", id);
- fireLeadershipChangedEvent(Optional.of(this));
+ fireLeadershipChangedEvent(this);
return;
}
if (!master && this.leader.compareAndSet(true, false)) {
LOGGER.debug("Leadership lost for id: {}", id);
- fireLeadershipChangedEvent(getLeader());
+ fireLeadershipChangedEvent(getLeader().orElse(null));
return;
}
}
diff --git
a/components/camel-jgroups-raft/src/main/java/org/apache/camel/component/jgroups/raft/cluster/ClusterRoleChangeListener.java
b/components/camel-jgroups-raft/src/main/java/org/apache/camel/component/jgroups/raft/cluster/ClusterRoleChangeListener.java
index a4362234915..90eaf624904 100644
---
a/components/camel-jgroups-raft/src/main/java/org/apache/camel/component/jgroups/raft/cluster/ClusterRoleChangeListener.java
+++
b/components/camel-jgroups-raft/src/main/java/org/apache/camel/component/jgroups/raft/cluster/ClusterRoleChangeListener.java
@@ -16,8 +16,7 @@
*/
package org.apache.camel.component.jgroups.raft.cluster;
-import java.util.Optional;
-
+import org.apache.camel.cluster.CamelClusterMember;
import org.apache.camel.util.ObjectHelper;
import org.jgroups.protocols.raft.RAFT;
import org.jgroups.protocols.raft.Role;
@@ -43,13 +42,13 @@ public class ClusterRoleChangeListener implements
RAFT.RoleChange {
if (!jgroupsRaftClusterView.isMaster()) {
jgroupsRaftClusterView.setMaster(true);
jgroupsRaftClusterView
-
.fireLeadershipChangedEvent(Optional.ofNullable(jgroupsRaftClusterView.getLocalMember()));
+
.fireLeadershipChangedEvent(jgroupsRaftClusterView.getLocalMember());
}
break;
case Follower:
if (jgroupsRaftClusterView.isMaster()) {
jgroupsRaftClusterView.setMaster(false);
-
jgroupsRaftClusterView.fireLeadershipChangedEvent(Optional.empty());
+
jgroupsRaftClusterView.fireLeadershipChangedEvent((CamelClusterMember) null);
}
break;
default:
diff --git
a/components/camel-jgroups-raft/src/main/java/org/apache/camel/component/jgroups/raft/cluster/JGroupsRaftClusterView.java
b/components/camel-jgroups-raft/src/main/java/org/apache/camel/component/jgroups/raft/cluster/JGroupsRaftClusterView.java
index 1de9c0a51e2..52e08b7a643 100644
---
a/components/camel-jgroups-raft/src/main/java/org/apache/camel/component/jgroups/raft/cluster/JGroupsRaftClusterView.java
+++
b/components/camel-jgroups-raft/src/main/java/org/apache/camel/component/jgroups/raft/cluster/JGroupsRaftClusterView.java
@@ -81,7 +81,7 @@ public class JGroupsRaftClusterView extends
AbstractCamelClusterView {
raftHandle = new RaftHandle(new
JChannel(JGroupsRaftConstants.DEFAULT_JGROUPSRAFT_CONFIG), new
NopStateMachine())
.raftId(raftId);
}
- fireLeadershipChangedEvent(Optional.empty());
+ fireLeadershipChangedEvent((CamelClusterMember) null);
raftHandle.addRoleListener(new ClusterRoleChangeListener(this));
raftHandle.channel().connect(jgroupsClusterName);
}
@@ -89,7 +89,7 @@ public class JGroupsRaftClusterView extends
AbstractCamelClusterView {
@Override
protected void doStop() throws Exception {
isMaster = false;
- fireLeadershipChangedEvent(Optional.empty());
+ fireLeadershipChangedEvent((CamelClusterMember) null);
LOG.info("Disconnecting JGroupsraft Channel for JGroupsRaftClusterView
with Id {}", raftId);
raftHandle.channel().disconnect();
if (raftHandle != null && raftHandle.log() != null) {
@@ -101,7 +101,7 @@ public class JGroupsRaftClusterView extends
AbstractCamelClusterView {
@Override
protected void doShutdown() throws Exception {
isMaster = false;
- fireLeadershipChangedEvent(Optional.empty());
+ fireLeadershipChangedEvent((CamelClusterMember) null);
if (raftHandle != null) {
if (raftHandle.channel() != null) {
@@ -129,7 +129,7 @@ public class JGroupsRaftClusterView extends
AbstractCamelClusterView {
}
@Override
- protected void fireLeadershipChangedEvent(Optional<CamelClusterMember>
leader) {
+ protected void fireLeadershipChangedEvent(CamelClusterMember leader) {
super.fireLeadershipChangedEvent(leader);
}
diff --git
a/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/cluster/JGroupsLockClusterView.java
b/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/cluster/JGroupsLockClusterView.java
index e9e8ca230b6..519429cd585 100644
---
a/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/cluster/JGroupsLockClusterView.java
+++
b/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/cluster/JGroupsLockClusterView.java
@@ -99,7 +99,7 @@ public class JGroupsLockClusterView extends
AbstractCamelClusterView {
lockName, jgroupsClusterName, jgroupsConfig);
lock.lock();
isMaster = true;
- fireLeadershipChangedEvent(Optional.ofNullable(localMember));
+ fireLeadershipChangedEvent(localMember);
LOG.info("Became master by acquiring the lock for group: {} in
JGroups cluster {} with configuration: {}",
lockName, jgroupsClusterName, jgroupsConfig);
});
@@ -109,7 +109,7 @@ public class JGroupsLockClusterView extends
AbstractCamelClusterView {
protected void doStop() throws Exception {
shutdownExecutor();
isMaster = false;
- fireLeadershipChangedEvent(Optional.empty());
+ fireLeadershipChangedEvent((CamelClusterMember) null);
clearLock();
channel.disconnect();
}
@@ -118,7 +118,7 @@ public class JGroupsLockClusterView extends
AbstractCamelClusterView {
protected void doShutdown() throws Exception {
shutdownExecutor();
isMaster = false;
- fireLeadershipChangedEvent(Optional.empty());
+ fireLeadershipChangedEvent((CamelClusterMember) null);
clearLock();
if (channel != null) {
channel.close();
diff --git
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/KubernetesClusterView.java
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/KubernetesClusterView.java
index f684110979f..8acb70af269 100644
---
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/KubernetesClusterView.java
+++
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/KubernetesClusterView.java
@@ -55,7 +55,7 @@ public class KubernetesClusterView extends
AbstractCamelClusterView implements C
private Map<String, KubernetesClusterMember> memberCache;
- private volatile Optional<CamelClusterMember> currentLeader =
Optional.empty();
+ private volatile CamelClusterMember currentLeader = null;
private volatile List<CamelClusterMember> currentMembers =
Collections.emptyList();
@@ -77,7 +77,7 @@ public class KubernetesClusterView extends
AbstractCamelClusterView implements C
@Override
public Optional<CamelClusterMember> getLeader() {
- return currentLeader;
+ return Optional.ofNullable(currentLeader);
}
@Override
@@ -111,7 +111,7 @@ public class KubernetesClusterView extends
AbstractCamelClusterView implements C
// New leader
Optional<String> leader
=
KubernetesClusterEvent.KubernetesClusterLeaderChangedEvent.class.cast(event).getData();
- currentLeader = leader.map(this::toMember);
+ currentLeader = leader.map(this::toMember).orElse(null);
fireLeadershipChangedEvent(currentLeader);
} else if (event instanceof
KubernetesClusterEvent.KubernetesClusterMemberListChangedEvent) {
Set<String> members
@@ -168,7 +168,7 @@ public class KubernetesClusterView extends
AbstractCamelClusterView implements C
@Override
public boolean isLeader() {
- return currentLeader.isPresent() &&
currentLeader.get().getId().equals(podName);
+ return currentLeader != null &&
currentLeader.getId().equals(podName);
}
@Override
diff --git
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cluster/utils/LeaderRecorder.java
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cluster/utils/LeaderRecorder.java
index ce0c2d6ca6d..f1a4c9c46e6 100644
---
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cluster/utils/LeaderRecorder.java
+++
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cluster/utils/LeaderRecorder.java
@@ -45,10 +45,11 @@ public class LeaderRecorder implements
CamelClusterEventListener.Leadership {
private List<LeadershipInfo> leaderships = new CopyOnWriteArrayList<>();
@Override
- public void leadershipChanged(CamelClusterView view,
Optional<CamelClusterMember> leader) {
+ public void leadershipChanged(CamelClusterView view, CamelClusterMember
leader) {
LOG.info("Cluster view {} - leader changed to: {}",
view.getLocalMember(), leader);
this.leaderships
- .add(new
LeadershipInfo(leader.map(CamelClusterMember::getId).orElse(null),
System.currentTimeMillis()));
+ .add(new LeadershipInfo(
+
Optional.ofNullable(leader).map(CamelClusterMember::getId).orElse(null),
System.currentTimeMillis()));
}
public List<LeadershipInfo> getLeadershipInfo() {
diff --git
a/components/camel-lra/src/test/java/org/apache/camel/service/lra/LRASagaCoordinatorTest.java
b/components/camel-lra/src/test/java/org/apache/camel/service/lra/LRASagaCoordinatorTest.java
index 66a41d61bfc..10fd205ad22 100644
---
a/components/camel-lra/src/test/java/org/apache/camel/service/lra/LRASagaCoordinatorTest.java
+++
b/components/camel-lra/src/test/java/org/apache/camel/service/lra/LRASagaCoordinatorTest.java
@@ -18,7 +18,6 @@ package org.apache.camel.service.lra;
import java.net.URL;
import java.util.Collections;
-import java.util.Optional;
import java.util.concurrent.CompletableFuture;
import org.apache.camel.Exchange;
@@ -72,7 +71,7 @@ public class LRASagaCoordinatorTest extends CamelTestSupport {
@DisplayName("Tests whether join is called on LRAClient")
@Test
void testBeginStep() throws Exception {
- CamelSagaStep step = new CamelSagaStep(Optional.empty(),
Optional.empty(), Collections.emptyMap(), Optional.empty());
+ CamelSagaStep step = new CamelSagaStep(null, null,
Collections.emptyMap(), null);
CompletableFuture<Void> expected =
CompletableFuture.completedFuture(null);
Mockito.when(client.join(Mockito.eq(url),
Mockito.any(LRASagaStep.class), Mockito.eq(exchange))).thenReturn(expected);
diff --git
a/components/camel-master/src/main/java/org/apache/camel/component/master/MasterConsumer.java
b/components/camel-master/src/main/java/org/apache/camel/component/master/MasterConsumer.java
index 96ddd273390..e6d884efbbd 100644
---
a/components/camel-master/src/main/java/org/apache/camel/component/master/MasterConsumer.java
+++
b/components/camel-master/src/main/java/org/apache/camel/component/master/MasterConsumer.java
@@ -16,8 +16,6 @@
*/
package org.apache.camel.component.master;
-import java.util.Optional;
-
import org.apache.camel.Consumer;
import org.apache.camel.Endpoint;
import org.apache.camel.Processor;
@@ -169,7 +167,7 @@ public class MasterConsumer extends DefaultConsumer
implements ResumeAware {
private final class LeadershipListener implements
CamelClusterEventListener.Leadership {
@Override
- public void leadershipChanged(CamelClusterView view,
Optional<CamelClusterMember> leader) {
+ public void leadershipChanged(CamelClusterView view,
CamelClusterMember leader) {
if (!isRunAllowed()) {
return;
}
diff --git
a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperClusterView.java
b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperClusterView.java
index e7a4b794e2a..12b6114491a 100644
---
a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperClusterView.java
+++
b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperClusterView.java
@@ -120,7 +120,7 @@ final class ZooKeeperClusterView extends
AbstractCamelClusterView {
protected void doStop() throws Exception {
if (leaderSelector != null) {
leaderSelector.interruptLeadership();
- fireLeadershipChangedEvent(getLeader());
+ fireLeadershipChangedEvent(getLeader().orElse(null));
}
}
@@ -142,7 +142,7 @@ final class ZooKeeperClusterView extends
AbstractCamelClusterView {
private final class CamelLeaderElectionListener extends
LeaderSelectorListenerAdapter {
@Override
public void takeLeadership(CuratorFramework curatorFramework) throws
Exception {
- fireLeadershipChangedEvent(Optional.of(localMember));
+ fireLeadershipChangedEvent(localMember);
BlockingTask task =
Tasks.foregroundTask().withBudget(Budgets.iterationBudget()
.withMaxIterations(IterationBoundedBudget.UNLIMITED_ITERATIONS)
@@ -152,7 +152,7 @@ final class ZooKeeperClusterView extends
AbstractCamelClusterView {
task.run(() -> !isRunAllowed());
- fireLeadershipChangedEvent(getLeader());
+ fireLeadershipChangedEvent(getLeader().orElse(null));
}
}
diff --git
a/core/camel-api/src/main/java/org/apache/camel/cluster/CamelClusterEventListener.java
b/core/camel-api/src/main/java/org/apache/camel/cluster/CamelClusterEventListener.java
index 29322eec06d..750012bef75 100644
---
a/core/camel-api/src/main/java/org/apache/camel/cluster/CamelClusterEventListener.java
+++
b/core/camel-api/src/main/java/org/apache/camel/cluster/CamelClusterEventListener.java
@@ -16,8 +16,6 @@
*/
package org.apache.camel.cluster;
-import java.util.Optional;
-
/**
* Marker interface for cluster events
*/
@@ -31,7 +29,7 @@ public interface CamelClusterEventListener {
* @param view the cluster view
* @param leader the optional new leader
*/
- void leadershipChanged(CamelClusterView view,
Optional<CamelClusterMember> leader);
+ void leadershipChanged(CamelClusterView view, CamelClusterMember
leader);
}
diff --git
a/core/camel-cluster/src/main/java/org/apache/camel/impl/cluster/ClusteredRoutePolicy.java
b/core/camel-cluster/src/main/java/org/apache/camel/impl/cluster/ClusteredRoutePolicy.java
index 90a7b5fb6b5..7a82060acf8 100644
---
a/core/camel-cluster/src/main/java/org/apache/camel/impl/cluster/ClusteredRoutePolicy.java
+++
b/core/camel-cluster/src/main/java/org/apache/camel/impl/cluster/ClusteredRoutePolicy.java
@@ -18,7 +18,6 @@ package org.apache.camel.impl.cluster;
import java.time.Duration;
import java.util.HashSet;
-import java.util.Optional;
import java.util.Set;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
@@ -356,7 +355,7 @@ public final class ClusteredRoutePolicy extends
RoutePolicySupport implements Ca
private class CamelClusterLeadershipListener implements
CamelClusterEventListener.Leadership {
@Override
- public void leadershipChanged(CamelClusterView view,
Optional<CamelClusterMember> leader) {
+ public void leadershipChanged(CamelClusterView view,
CamelClusterMember leader) {
setLeader(clusterView.getLocalMember().isLeader());
}
}
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceDiscoveryConfiguration.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceDiscoveryConfiguration.java
index d0c04ac6129..455927733b0 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceDiscoveryConfiguration.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceDiscoveryConfiguration.java
@@ -42,7 +42,7 @@ import org.apache.camel.util.ObjectHelper;
@Deprecated(since = "3.19.0")
public class ServiceCallServiceDiscoveryConfiguration extends
ServiceCallConfiguration implements ServiceDiscoveryFactory {
@XmlTransient
- private final Optional<ServiceCallDefinition> parent;
+ private final ServiceCallDefinition parent;
@XmlTransient
private final String factoryKey;
@@ -51,16 +51,16 @@ public class ServiceCallServiceDiscoveryConfiguration
extends ServiceCallConfigu
}
public ServiceCallServiceDiscoveryConfiguration(ServiceCallDefinition
parent, String factoryKey) {
- this.parent = Optional.ofNullable(parent);
+ this.parent = parent;
this.factoryKey = factoryKey;
}
public ServiceCallDefinition end() {
- return this.parent.orElseThrow(() -> new IllegalStateException("Parent
definition is not set"));
+ return Optional.ofNullable(parent).orElseThrow(() -> new
IllegalStateException("Parent definition is not set"));
}
public ProcessorDefinition<?> endParent() {
- return this.parent.map(ServiceCallDefinition::end)
+ return Optional.ofNullable(parent).map(ServiceCallDefinition::end)
.orElseThrow(() -> new IllegalStateException("Parent
definition is not set"));
}
diff --git
a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/SagaReifier.java
b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/SagaReifier.java
index 4900658ae54..e124144e74c 100644
---
a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/SagaReifier.java
+++
b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/SagaReifier.java
@@ -42,13 +42,15 @@ public class SagaReifier extends
ProcessorReifier<SagaDefinition> {
@Override
public Processor createProcessor() throws Exception {
- Optional<Endpoint> compensationEndpoint =
Optional.ofNullable(definition.getCompensation())
+ Endpoint compensationEndpoint =
Optional.ofNullable(definition.getCompensation())
.map(SagaActionUriDefinition::getUri)
- .map(this::resolveEndpoint);
+ .map(this::resolveEndpoint)
+ .orElse(null);
- Optional<Endpoint> completionEndpoint =
Optional.ofNullable(definition.getCompletion())
+ Endpoint completionEndpoint =
Optional.ofNullable(definition.getCompletion())
.map(SagaActionUriDefinition::getUri)
- .map(this::resolveEndpoint);
+ .map(this::resolveEndpoint)
+ .orElse(null);
Map<String, Expression> optionsMap = new TreeMap<>();
if (definition.getOptions() != null) {
@@ -62,7 +64,7 @@ public class SagaReifier extends
ProcessorReifier<SagaDefinition> {
String timeout = definition.getTimeout();
CamelSagaStep step = new CamelSagaStep(
compensationEndpoint, completionEndpoint, optionsMap,
- Optional.ofNullable(parseDuration(timeout)));
+ parseDuration(timeout));
SagaPropagation propagation = parse(SagaPropagation.class,
definition.getPropagation());
if (propagation == null) {
diff --git
a/core/camel-core/src/test/java/org/apache/camel/cluster/ClusterServiceViewTest.java
b/core/camel-core/src/test/java/org/apache/camel/cluster/ClusterServiceViewTest.java
index d8f589ee9f7..ea890dad9f1 100644
---
a/core/camel-core/src/test/java/org/apache/camel/cluster/ClusterServiceViewTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/cluster/ClusterServiceViewTest.java
@@ -226,7 +226,7 @@ public class ClusterServiceViewTest {
this.leader = leader;
if (isRunAllowed()) {
- fireLeadershipChangedEvent(getLeader());
+ fireLeadershipChangedEvent(getLeader().orElse(null));
}
}
}
diff --git
a/core/camel-core/src/test/java/org/apache/camel/cluster/ClusteredRoutePolicyFactoryTest.java
b/core/camel-core/src/test/java/org/apache/camel/cluster/ClusteredRoutePolicyFactoryTest.java
index 288f011947a..9680b9fbb56 100644
---
a/core/camel-core/src/test/java/org/apache/camel/cluster/ClusteredRoutePolicyFactoryTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/cluster/ClusteredRoutePolicyFactoryTest.java
@@ -182,7 +182,7 @@ public class ClusteredRoutePolicyFactoryTest extends
ContextTestSupport {
this.leader = leader;
if (isRunAllowed()) {
- fireLeadershipChangedEvent(getLeader());
+ fireLeadershipChangedEvent(getLeader().orElse(null));
}
}
}
diff --git
a/core/camel-core/src/test/java/org/apache/camel/cluster/ClusteredRoutePolicyLeaderChangeTest.java
b/core/camel-core/src/test/java/org/apache/camel/cluster/ClusteredRoutePolicyLeaderChangeTest.java
index 2e3891e4c79..5a6ea92c831 100644
---
a/core/camel-core/src/test/java/org/apache/camel/cluster/ClusteredRoutePolicyLeaderChangeTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/cluster/ClusteredRoutePolicyLeaderChangeTest.java
@@ -130,7 +130,7 @@ public class ClusteredRoutePolicyLeaderChangeTest extends
ContextTestSupport {
this.leader = leader;
if (isRunAllowed()) {
- fireLeadershipChangedEvent(getLeader());
+ fireLeadershipChangedEvent(getLeader().orElse(null));
}
}
diff --git
a/core/camel-core/src/test/java/org/apache/camel/cluster/ClusteredRoutePolicyTest.java
b/core/camel-core/src/test/java/org/apache/camel/cluster/ClusteredRoutePolicyTest.java
index 887f334362d..6997590032e 100644
---
a/core/camel-core/src/test/java/org/apache/camel/cluster/ClusteredRoutePolicyTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/cluster/ClusteredRoutePolicyTest.java
@@ -214,7 +214,7 @@ public class ClusteredRoutePolicyTest extends
ContextTestSupport {
this.leader = leader;
if (isRunAllowed()) {
- fireLeadershipChangedEvent(getLeader());
+ fireLeadershipChangedEvent(getLeader().orElse(null));
}
}
diff --git
a/core/camel-core/src/test/java/org/apache/camel/cluster/ClusteredRoutePolicyUnmanagedClusterServiceTest.java
b/core/camel-core/src/test/java/org/apache/camel/cluster/ClusteredRoutePolicyUnmanagedClusterServiceTest.java
index 47e668e1c1b..8239d12697e 100644
---
a/core/camel-core/src/test/java/org/apache/camel/cluster/ClusteredRoutePolicyUnmanagedClusterServiceTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/cluster/ClusteredRoutePolicyUnmanagedClusterServiceTest.java
@@ -129,7 +129,7 @@ public class
ClusteredRoutePolicyUnmanagedClusterServiceTest extends ContextTest
this.leader = leader;
if (isRunAllowed()) {
- fireLeadershipChangedEvent(getLeader());
+ fireLeadershipChangedEvent(getLeader().orElse(null));
}
}
diff --git
a/core/camel-support/src/main/java/org/apache/camel/component/extension/verifier/ResultBuilder.java
b/core/camel-support/src/main/java/org/apache/camel/component/extension/verifier/ResultBuilder.java
index a908b399ae5..515192e7b08 100644
---
a/core/camel-support/src/main/java/org/apache/camel/component/extension/verifier/ResultBuilder.java
+++
b/core/camel-support/src/main/java/org/apache/camel/component/extension/verifier/ResultBuilder.java
@@ -27,13 +27,13 @@ import org.apache.camel.util.function.ThrowingBiConsumer;
import org.apache.camel.util.function.ThrowingConsumer;
public final class ResultBuilder {
- private Optional<ComponentVerifierExtension.Scope> scope;
- private Optional<ComponentVerifierExtension.Result.Status> status;
+ private ComponentVerifierExtension.Scope scope;
+ private ComponentVerifierExtension.Result.Status status;
private List<ComponentVerifierExtension.VerificationError>
verificationErrors;
public ResultBuilder() {
- this.scope = Optional.empty();
- this.status = Optional.empty();
+ this.scope = null;
+ this.status = null;
}
// **********************************
@@ -41,32 +41,34 @@ public final class ResultBuilder {
// **********************************
public ResultBuilder scope(ComponentVerifierExtension.Scope scope) {
- this.scope = Optional.of(scope);
+ this.scope = scope;
return this;
}
public ResultBuilder status(ComponentVerifierExtension.Result.Status
status) {
- this.status = Optional.of(status);
+ this.status = status;
return this;
}
- public ResultBuilder error(ComponentVerifierExtension.VerificationError
verificationError) {
- if (this.verificationErrors == null) {
- this.verificationErrors = new ArrayList<>();
- }
-
- this.verificationErrors.add(verificationError);
- this.status =
Optional.of(ComponentVerifierExtension.Result.Status.ERROR);
-
- return this;
+ @SuppressWarnings("OptionalUsedAsFieldOrParameterType")
+ @Deprecated
+ public ResultBuilder
error(Optional<ComponentVerifierExtension.VerificationError> verificationError)
{
+ return error(verificationError.orElse(null));
}
- public ResultBuilder
error(Optional<ComponentVerifierExtension.VerificationError> error) {
- error.ifPresent(e -> error(e));
+ public ResultBuilder error(ComponentVerifierExtension.VerificationError
verificationError) {
+ if (verificationError != null) {
+ if (this.verificationErrors == null) {
+ this.verificationErrors = new ArrayList<>();
+ }
+
+ this.verificationErrors.add(verificationError);
+ this.status = ComponentVerifierExtension.Result.Status.ERROR;
+ }
return this;
}
- public ResultBuilder
error(Supplier<Optional<ComponentVerifierExtension.VerificationError>>
supplier) {
+ public ResultBuilder
error(Supplier<ComponentVerifierExtension.VerificationError> supplier) {
return error(supplier.get());
}
@@ -109,8 +111,8 @@ public final class ResultBuilder {
public ComponentVerifierExtension.Result build() {
return new DefaultResult(
- scope.orElse(ComponentVerifierExtension.Scope.PARAMETERS),
-
status.orElse(ComponentVerifierExtension.Result.Status.UNSUPPORTED),
+ scope != null ? scope :
ComponentVerifierExtension.Scope.PARAMETERS,
+ status != null ? status :
ComponentVerifierExtension.Result.Status.UNSUPPORTED,
verificationErrors != null ?
Collections.unmodifiableList(verificationErrors) : Collections.emptyList());
}
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 59597d27293..2fdd83847bd 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
@@ -21,35 +21,34 @@ import java.util.Optional;
import org.apache.camel.Endpoint;
import org.apache.camel.Expression;
-import org.apache.camel.util.ObjectHelper;
/**
* Defines the configuration of a saga step.
*/
public class CamelSagaStep {
- private final Optional<Endpoint> compensation;
+ private final Endpoint compensation;
- private final Optional<Endpoint> completion;
+ private final Endpoint completion;
private final Map<String, Expression> options;
- private final Optional<Long> timeoutInMilliseconds;
+ private final Long timeoutInMilliseconds;
- public CamelSagaStep(Optional<Endpoint> compensation, Optional<Endpoint>
completion,
- Map<String, Expression> options, Optional<Long>
timeoutInMilliseconds) {
- this.compensation = ObjectHelper.notNull(compensation, "compensation");
- this.completion = ObjectHelper.notNull(completion,
"completionCallbacks");
- this.options = ObjectHelper.notNull(options, "options");
- this.timeoutInMilliseconds =
ObjectHelper.notNull(timeoutInMilliseconds, "timeoutInMilliseconds");
+ public CamelSagaStep(Endpoint compensation, Endpoint completion,
+ Map<String, Expression> options, Long
timeoutInMilliseconds) {
+ this.compensation = compensation;
+ this.completion = completion;
+ this.options = options;
+ this.timeoutInMilliseconds = timeoutInMilliseconds;
}
public Optional<Endpoint> getCompensation() {
- return compensation;
+ return Optional.ofNullable(compensation);
}
public Optional<Endpoint> getCompletion() {
- return completion;
+ return Optional.ofNullable(completion);
}
public Map<String, Expression> getOptions() {
@@ -57,10 +56,10 @@ public class CamelSagaStep {
}
public Optional<Long> getTimeoutInMilliseconds() {
- return timeoutInMilliseconds;
+ return Optional.ofNullable(timeoutInMilliseconds);
}
public boolean isEmpty() {
- return compensation.isEmpty() && completion.isEmpty() &&
options.isEmpty() && timeoutInMilliseconds.isEmpty();
+ return compensation == null && completion == null && options.isEmpty()
&& timeoutInMilliseconds == null;
}
}
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/cluster/AbstractCamelClusterView.java
b/core/camel-support/src/main/java/org/apache/camel/support/cluster/AbstractCamelClusterView.java
index 9cf75bb2c25..d91bab45d24 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/cluster/AbstractCamelClusterView.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/cluster/AbstractCamelClusterView.java
@@ -80,7 +80,8 @@ public abstract class AbstractCamelClusterView extends
ServiceSupport implements
// the consumer can catch up.
if
(CamelClusterEventListener.Leadership.class.isInstance(listener)) {
-
CamelClusterEventListener.Leadership.class.cast(listener).leadershipChanged(this,
getLeader());
+
CamelClusterEventListener.Leadership.class.cast(listener).leadershipChanged(this,
+ getLeader().orElse(null));
}
if
(CamelClusterEventListener.Membership.class.isInstance(listener)) {
@@ -121,7 +122,13 @@ public abstract class AbstractCamelClusterView extends
ServiceSupport implements
});
}
+ @SuppressWarnings("OptionalUsedAsFieldOrParameterType")
+ @Deprecated
protected void fireLeadershipChangedEvent(Optional<CamelClusterMember>
leader) {
+ fireLeadershipChangedEvent(leader.orElse(null));
+ }
+
+ protected void fireLeadershipChangedEvent(CamelClusterMember leader) {
doWithListener(
CamelClusterEventListener.Leadership.class,
listener -> listener.leadershipChanged(this, leader));
