You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pa...@apache.org on 2019/12/22 15:28:10 UTC
[camel] branch master updated: Remove useless null checks
identified by lgtm.com.
This is an automated email from the ASF dual-hosted git repository.
pascalschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new e40192d Remove useless null checks identified by lgtm.com.
e40192d is described below
commit e40192dbd41dc0b9caa56d36506b694f624a43a4
Author: Pascal Schumacher <pa...@gmx.net>
AuthorDate: Sun Dec 22 16:27:13 2019 +0100
Remove useless null checks identified by lgtm.com.
---
.../java/org/apache/camel/component/atmos/core/AtmosAPIFacade.java | 4 ++--
.../src/main/java/org/apache/camel/component/aws/s3/S3Producer.java | 2 +-
.../crypto/cms/crypt/EnvelopedDataEncryptorConfiguration.java | 2 +-
.../camel/component/google/drive/GoogleDriveFilesConverter.java | 6 ++----
.../camel/component/milo/client/internal/SubscriptionManager.java | 6 ++----
.../camel/component/ribbon/cloud/RibbonServiceLoadBalancer.java | 3 +--
.../camel/model/loadbalancer/WeightedLoadBalancerDefinition.java | 2 +-
7 files changed, 10 insertions(+), 15 deletions(-)
diff --git a/components/camel-atmos/src/main/java/org/apache/camel/component/atmos/core/AtmosAPIFacade.java b/components/camel-atmos/src/main/java/org/apache/camel/component/atmos/core/AtmosAPIFacade.java
index 6084ca2..ff75c03 100644
--- a/components/camel-atmos/src/main/java/org/apache/camel/component/atmos/core/AtmosAPIFacade.java
+++ b/components/camel-atmos/src/main/java/org/apache/camel/component/atmos/core/AtmosAPIFacade.java
@@ -99,7 +99,7 @@ public final class AtmosAPIFacade {
//verify uploading of a single file
if (fileLocalPath.isFile()) {
//check if atmos file exists
- if (atmosEntry != null && !atmosEntry.isDirectory()) {
+ if (!atmosEntry.isDirectory()) {
throw new AtmosException(atmosPath + " exists on atmos and is not a folder!");
}
atmosPath = atmosPath + fileLocalPath.getName();
@@ -121,7 +121,7 @@ public final class AtmosAPIFacade {
} else { //verify uploading of a list of files inside a dir
LOG.info("uploading a dir...");
//check if atmos folder exists
- if (atmosEntry != null && !atmosEntry.isDirectory()) {
+ if (!atmosEntry.isDirectory()) {
throw new AtmosException(atmosPath + " exists on atmos and is not a folder!");
}
//revert to old path
diff --git a/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3Producer.java b/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3Producer.java
index 99cb772..1e06752 100644
--- a/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3Producer.java
+++ b/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3Producer.java
@@ -208,7 +208,7 @@ public class S3Producer extends DefaultProducer {
message.setHeader(S3Constants.VERSION_ID, uploadResult.getVersionId());
}
- if (getConfiguration().isDeleteAfterWrite() && filePayload != null) {
+ if (getConfiguration().isDeleteAfterWrite()) {
FileUtil.deleteFile(filePayload);
}
}
diff --git a/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/crypt/EnvelopedDataEncryptorConfiguration.java b/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/crypt/EnvelopedDataEncryptorConfiguration.java
index 1222363..0740066 100644
--- a/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/crypt/EnvelopedDataEncryptorConfiguration.java
+++ b/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/crypt/EnvelopedDataEncryptorConfiguration.java
@@ -124,7 +124,7 @@ public class EnvelopedDataEncryptorConfiguration extends CryptoCmsMarshallerConf
if (recipientOb instanceof String) {
String recipientName = (String)recipientOb;
String valueNoHash = recipientName.replaceAll("#", "");
- if (getContext() != null && recipientName != null) {
+ if (getContext() != null) {
RecipientInfo recipient = getContext().getRegistry().lookupByNameAndType(valueNoHash, RecipientInfo.class);
if (recipient != null) {
setRecipient(recipient);
diff --git a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveFilesConverter.java b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveFilesConverter.java
index 0765c13..2b773bb 100644
--- a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveFilesConverter.java
+++ b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveFilesConverter.java
@@ -59,10 +59,8 @@ public final class GoogleDriveFilesConverter {
com.google.api.services.drive.model.File fileMetadata = new com.google.api.services.drive.model.File();
fileMetadata.setTitle(file.getFileName());
InputStreamContent mediaContent = new InputStreamContent(null, is);
- if (exchange != null) {
- exchange.getIn().setHeader("CamelGoogleDrive.content", fileMetadata);
- exchange.getIn().setHeader("CamelGoogleDrive.mediaContent", mediaContent);
- }
+ exchange.getIn().setHeader("CamelGoogleDrive.content", fileMetadata);
+ exchange.getIn().setHeader("CamelGoogleDrive.mediaContent", mediaContent);
return fileMetadata;
}
diff --git a/components/camel-milo/src/main/java/org/apache/camel/component/milo/client/internal/SubscriptionManager.java b/components/camel-milo/src/main/java/org/apache/camel/component/milo/client/internal/SubscriptionManager.java
index 8a057f6..0a13dbd 100644
--- a/components/camel-milo/src/main/java/org/apache/camel/component/milo/client/internal/SubscriptionManager.java
+++ b/components/camel-milo/src/main/java/org/apache/camel/component/milo/client/internal/SubscriptionManager.java
@@ -479,10 +479,8 @@ public class SubscriptionManager {
return new Connected(client, manager);
} catch (final Throwable e) {
- if (client != null) {
- // clean up
- client.disconnect();
- }
+ // clean up
+ client.disconnect();
throw e;
}
}
diff --git a/components/camel-ribbon/src/main/java/org/apache/camel/component/ribbon/cloud/RibbonServiceLoadBalancer.java b/components/camel-ribbon/src/main/java/org/apache/camel/component/ribbon/cloud/RibbonServiceLoadBalancer.java
index 60c1184..5ea8532 100644
--- a/components/camel-ribbon/src/main/java/org/apache/camel/component/ribbon/cloud/RibbonServiceLoadBalancer.java
+++ b/components/camel-ribbon/src/main/java/org/apache/camel/component/ribbon/cloud/RibbonServiceLoadBalancer.java
@@ -107,8 +107,7 @@ public class RibbonServiceLoadBalancer
if (serviceDiscovery != null) {
LOGGER.info("ServiceCall is using ribbon load balancer with service discovery type: {} and service filter: {}",
- serviceDiscovery.getClass(),
- serviceDiscovery != null ? serviceFilter.getClass() : "none");
+ serviceDiscovery.getClass(), serviceFilter.getClass());
} else {
LOGGER.info("ServiceCall is using ribbon load balancer");
}
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/loadbalancer/WeightedLoadBalancerDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/loadbalancer/WeightedLoadBalancerDefinition.java
index 575035e..968635a 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/model/loadbalancer/WeightedLoadBalancerDefinition.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/model/loadbalancer/WeightedLoadBalancerDefinition.java
@@ -90,7 +90,7 @@ public class WeightedLoadBalancerDefinition extends LoadBalancerDefinition {
public String toString() {
if (roundRobin == null || Boolean.FALSE.toString().equals(roundRobin)) {
return "WeightedRandomLoadBalancer[" + distributionRatio + "]";
- } else if (roundRobin != null && Boolean.TRUE.toString().equals(roundRobin)) {
+ } else if (Boolean.TRUE.toString().equals(roundRobin)) {
return "WeightedRoundRobinLoadBalancer[" + distributionRatio + "]";
} else {
return "WeightedLoadBalancer[roundRobin=" + roundRobin + "," + distributionRatio + "]";