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 65f79fd (chores) Formatting fixes for camel-jta and camel-kubernetes
(#5722)
65f79fd is described below
commit 65f79fdd20a159d4f6df70b4a29a68cce3bc98d4
Author: Otavio Rodolfo Piske <[email protected]>
AuthorDate: Mon Jun 21 15:22:34 2021 +0200
(chores) Formatting fixes for camel-jta and camel-kubernetes (#5722)
---
.../org/apache/camel/jta/JtaTransactionErrorHandlerReifier.java | 2 +-
.../src/main/java/org/apache/camel/jta/JtaTransactionPolicy.java | 2 +-
.../kubernetes/cloud/KubernetesClientServiceDiscovery.java | 7 +++++--
.../kubernetes/cluster/KubernetesClusterServiceTest.java | 8 ++++++--
4 files changed, 13 insertions(+), 6 deletions(-)
diff --git
a/components/camel-jta/src/main/java/org/apache/camel/jta/JtaTransactionErrorHandlerReifier.java
b/components/camel-jta/src/main/java/org/apache/camel/jta/JtaTransactionErrorHandlerReifier.java
index 4667235..d41edb7 100644
---
a/components/camel-jta/src/main/java/org/apache/camel/jta/JtaTransactionErrorHandlerReifier.java
+++
b/components/camel-jta/src/main/java/org/apache/camel/jta/JtaTransactionErrorHandlerReifier.java
@@ -100,7 +100,7 @@ public class JtaTransactionErrorHandlerReifier extends
ErrorHandlerReifier<JtaTr
final Map<String, String> properties = camelContext.getGlobalOptions();
LoggingLevel rollbackLoggingLevel =
definition.getRollbackLoggingLevel();
- if ((properties != null) &&
properties.containsKey(ROLLBACK_LOGGING_LEVEL_PROPERTY)) {
+ if (properties != null &&
properties.containsKey(ROLLBACK_LOGGING_LEVEL_PROPERTY)) {
rollbackLoggingLevel =
LoggingLevel.valueOf(properties.get(ROLLBACK_LOGGING_LEVEL_PROPERTY));
}
diff --git
a/components/camel-jta/src/main/java/org/apache/camel/jta/JtaTransactionPolicy.java
b/components/camel-jta/src/main/java/org/apache/camel/jta/JtaTransactionPolicy.java
index b7f38c0..20d75c1 100644
---
a/components/camel-jta/src/main/java/org/apache/camel/jta/JtaTransactionPolicy.java
+++
b/components/camel-jta/src/main/java/org/apache/camel/jta/JtaTransactionPolicy.java
@@ -86,7 +86,7 @@ public abstract class JtaTransactionPolicy implements
TransactedPolicy {
}
JtaTransactionErrorHandlerBuilder txBuilder;
- if ((builder != null) && builder.supportTransacted()) {
+ if (builder != null && builder.supportTransacted()) {
if (!(builder instanceof JtaTransactionErrorHandlerBuilder)) {
throw new RuntimeCamelException(
"The given transactional error handler builder '" +
builder
diff --git
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cloud/KubernetesClientServiceDiscovery.java
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cloud/KubernetesClientServiceDiscovery.java
index db29c5d..e92a169 100644
---
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cloud/KubernetesClientServiceDiscovery.java
+++
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cloud/KubernetesClientServiceDiscovery.java
@@ -99,8 +99,7 @@ public class KubernetesClientServiceDiscovery extends
KubernetesServiceDiscovery
ConfigBuilder builder = new ConfigBuilder();
builder.withMasterUrl(configuration.getMasterUrl());
- if ((ObjectHelper.isNotEmpty(configuration.getUsername()) &&
ObjectHelper.isNotEmpty(configuration.getPassword()))
- && ObjectHelper.isEmpty(configuration.getOauthToken())) {
+ if (hasUsernameAndPassword(configuration) &&
ObjectHelper.isEmpty(configuration.getOauthToken())) {
builder.withUsername(configuration.getUsername());
builder.withPassword(configuration.getPassword());
} else {
@@ -140,6 +139,10 @@ public class KubernetesClientServiceDiscovery extends
KubernetesServiceDiscovery
client = new AutoAdaptableKubernetesClient(builder.build());
}
+ private boolean hasUsernameAndPassword(KubernetesConfiguration
configuration) {
+ return ObjectHelper.isNotEmpty(configuration.getUsername()) &&
ObjectHelper.isNotEmpty(configuration.getPassword());
+ }
+
@Override
protected void doStop() throws Exception {
if (client != null) {
diff --git
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cluster/KubernetesClusterServiceTest.java
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cluster/KubernetesClusterServiceTest.java
index cdaedc9..d862fce 100644
---
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cluster/KubernetesClusterServiceTest.java
+++
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cluster/KubernetesClusterServiceTest.java
@@ -314,7 +314,7 @@ public class KubernetesClusterServiceTest extends
CamelTestSupport {
String leader = null;
for (LeaderRecorder recorder :
partitionRecorders.get(partition)) {
String partitionLeader = recorder.getCurrentLeader();
- if (partitionLeader == null || (leader != null &&
!leader.equals(partitionLeader))) {
+ if (partitionLeader == null || isCurrentLeader(leader,
partitionLeader)) {
return false;
}
leader = partitionLeader;
@@ -328,6 +328,10 @@ public class KubernetesClusterServiceTest extends
CamelTestSupport {
});
}
+ private boolean isCurrentLeader(String leader, String partitionLeader) {
+ return leader != null && !leader.equals(partitionLeader);
+ }
+
private void withLockServer(String pod, Consumer<LockTestServer<?>>
consumer) {
consumer.accept(this.lockServers.get(pod));
}
@@ -374,7 +378,7 @@ public class KubernetesClusterServiceTest extends
CamelTestSupport {
} else {
if (Objects.equals(info.getLeader(),
currentLeaderLastSeen.getLeader())) {
currentLeaderLastSeen = info;
- } else if (info.getLeader() != null &&
!info.getLeader().equals(currentLeaderLastSeen.getLeader())) {
+ } else if (isCurrentLeader(info.getLeader(),
currentLeaderLastSeen.getLeader())) {
// switch
long delay = info.getChangeTimestamp() -
currentLeaderLastSeen.getChangeTimestamp();
assertTrue(delay >= TimeUnit.MILLISECONDS.convert(minimum,
unit),
