This is an automated email from the ASF dual-hosted git repository.
orpiske 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 48824bb (chores) Avoid NPE in autoboxing (#4851)
48824bb is described below
commit 48824bbb4ed2be387711131b5a2f544c68a8f21e
Author: Otavio Rodolfo Piske <[email protected]>
AuthorDate: Fri Jan 8 17:52:58 2021 +0100
(chores) Avoid NPE in autoboxing (#4851)
Components: camel-aws-s3, camel-bean, camel-crypto-cms, camel-docker,
camel-dozer, camel-fhir
---
.../main/java/org/apache/camel/component/aws/s3/S3Component.java | 2 +-
.../org/apache/camel/component/aws/s3/client/S3ClientFactory.java | 2 +-
.../main/java/org/apache/camel/component/bean/BeanComponent.java | 2 +-
.../src/main/java/org/apache/camel/component/bean/BeanEndpoint.java | 2 +-
.../component/crypto/cms/common/CryptoCmsMarshallerAbstract.java | 2 +-
.../apache/camel/component/crypto/cms/sig/SignedDataCreator.java | 2 +-
.../java/org/apache/camel/component/docker/DockerClientFactory.java | 2 +-
.../main/java/org/apache/camel/converter/dozer/MapperFactory.java | 2 +-
.../java/org/apache/camel/component/fhir/api/ExtraParameters.java | 6 +++---
9 files changed, 11 insertions(+), 11 deletions(-)
diff --git
a/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3Component.java
b/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3Component.java
index 50eaa45..78216ee 100644
---
a/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3Component.java
+++
b/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3Component.java
@@ -58,7 +58,7 @@ public class S3Component extends DefaultComponent {
if (endpoint.getConfiguration().isAutoDiscoverClient()) {
checkAndSetRegistryClient(configuration);
}
- if (!configuration.isUseIAMCredentials() &&
configuration.getAmazonS3Client() == null
+ if (Boolean.FALSE.equals(configuration.isUseIAMCredentials()) &&
configuration.getAmazonS3Client() == null
&& (configuration.getAccessKey() == null ||
configuration.getSecretKey() == null)) {
throw new IllegalArgumentException(
"useIAMCredentials is set to false, AmazonS3Client or
accessKey and secretKey must be specified");
diff --git
a/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/client/S3ClientFactory.java
b/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/client/S3ClientFactory.java
index e3c7710..b396d7b 100644
---
a/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/client/S3ClientFactory.java
+++
b/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/client/S3ClientFactory.java
@@ -39,7 +39,7 @@ public final class S3ClientFactory {
* @return AWSS3Client
*/
public static S3Client getAWSS3Client(S3Configuration configuration, int
maxConnections) {
- return configuration.isUseIAMCredentials()
+ return Boolean.TRUE.equals(configuration.isUseIAMCredentials())
? new S3ClientIAMOptimizedImpl(configuration, maxConnections)
: new S3ClientStandardImpl(configuration, maxConnections);
}
diff --git
a/components/camel-bean/src/main/java/org/apache/camel/component/bean/BeanComponent.java
b/components/camel-bean/src/main/java/org/apache/camel/component/bean/BeanComponent.java
index 5a5a76c..1c588e2 100644
---
a/components/camel-bean/src/main/java/org/apache/camel/component/bean/BeanComponent.java
+++
b/components/camel-bean/src/main/java/org/apache/camel/component/bean/BeanComponent.java
@@ -101,7 +101,7 @@ public class BeanComponent extends DefaultComponent {
@Deprecated
public void setCache(Boolean cache) {
- if (cache) {
+ if (Boolean.TRUE.equals(cache)) {
scope = BeanScope.Singleton;
} else {
scope = BeanScope.Prototype;
diff --git
a/components/camel-bean/src/main/java/org/apache/camel/component/bean/BeanEndpoint.java
b/components/camel-bean/src/main/java/org/apache/camel/component/bean/BeanEndpoint.java
index b1aa422..4d822cb 100644
---
a/components/camel-bean/src/main/java/org/apache/camel/component/bean/BeanEndpoint.java
+++
b/components/camel-bean/src/main/java/org/apache/camel/component/bean/BeanEndpoint.java
@@ -148,7 +148,7 @@ public class BeanEndpoint extends DefaultEndpoint {
@Deprecated
public void setCache(Boolean cache) {
- if (cache) {
+ if (Boolean.TRUE.equals(cache)) {
scope = BeanScope.Singleton;
} else {
scope = BeanScope.Prototype;
diff --git
a/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/common/CryptoCmsMarshallerAbstract.java
b/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/common/CryptoCmsMarshallerAbstract.java
index ca280f1..9d8fbdd 100644
---
a/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/common/CryptoCmsMarshallerAbstract.java
+++
b/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/common/CryptoCmsMarshallerAbstract.java
@@ -46,7 +46,7 @@ public abstract class CryptoCmsMarshallerAbstract implements
Processor {
OutputStreamBuilder output =
OutputStreamBuilder.withExchange(exchange);
OutputStream outStream;
- if (config.getToBase64()) {
+ if (Boolean.TRUE.equals(config.getToBase64())) {
outStream = new Base64OutputStream(output);
} else {
outStream = output;
diff --git
a/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/sig/SignedDataCreator.java
b/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/sig/SignedDataCreator.java
index 0a5a0e8..8a5b6ca 100644
---
a/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/sig/SignedDataCreator.java
+++
b/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/sig/SignedDataCreator.java
@@ -54,7 +54,7 @@ public class SignedDataCreator extends
CryptoCmsMarshallerAbstract {
@Override
protected void setBodyAndHeader(Message out, Object encodedSignedData) {
- if (config.getIncludeContent()) {
+ if (Boolean.TRUE.equals(config.getIncludeContent())) {
/*
* The encodedSignedData object contains the signer infos including
* the message content.
diff --git
a/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerClientFactory.java
b/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerClientFactory.java
index af91836..3333039 100644
---
a/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerClientFactory.java
+++
b/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerClientFactory.java
@@ -99,7 +99,7 @@ public final class DockerClientFactory {
clientProfile.setSocket(socket);
clientProfile.setCmdExecFactory(cmdExecFactory);
- if (!socket) {
+ if (Boolean.FALSE.equals(socket)) {
clientProfile.setPort(port);
}
diff --git
a/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/MapperFactory.java
b/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/MapperFactory.java
index c46a3cc..16c02eb 100644
---
a/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/MapperFactory.java
+++
b/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/MapperFactory.java
@@ -83,7 +83,7 @@ public class MapperFactory {
ClassLoader appcl = camelContext.getApplicationContextClassLoader();
ClassLoader auxcl = appcl == null ?
DozerEndpoint.class.getClassLoader() : appcl;
- if (ELExpressionFactory.isSupported(auxcl)) {
+ if (Boolean.TRUE.equals(ELExpressionFactory.isSupported(auxcl))) {
if (RuntimeUtils.isOSGi()) {
answer = new
TcclELEngine(ELExpressionFactory.newInstance(auxcl), auxcl);
} else {
diff --git
a/components/camel-fhir/camel-fhir-api/src/main/java/org/apache/camel/component/fhir/api/ExtraParameters.java
b/components/camel-fhir/camel-fhir-api/src/main/java/org/apache/camel/component/fhir/api/ExtraParameters.java
index 0f2dba9..76a7a9f 100644
---
a/components/camel-fhir/camel-fhir-api/src/main/java/org/apache/camel/component/fhir/api/ExtraParameters.java
+++
b/components/camel-fhir/camel-fhir-api/src/main/java/org/apache/camel/component/fhir/api/ExtraParameters.java
@@ -111,13 +111,13 @@ public enum ExtraParameters {
switch (entry.getKey()) {
case ENCODE_JSON:
Boolean encode = (Boolean)
extraParameters.get(ENCODE_JSON);
- if (encode) {
+ if (Boolean.TRUE.equals(encode)) {
clientExecutable.encodedJson();
}
break;
case ENCODE_XML:
Boolean encodeXml = (Boolean)
extraParameters.get(ENCODE_XML);
- if (encodeXml) {
+ if (Boolean.TRUE.equals(encodeXml)) {
clientExecutable.encodedXml();
}
break;
@@ -146,7 +146,7 @@ public enum ExtraParameters {
break;
case PRETTY_PRINT:
Boolean prettyPrint = (Boolean)
extraParameters.get(PRETTY_PRINT);
- if (prettyPrint) {
+ if (Boolean.TRUE.equals(prettyPrint)) {
clientExecutable.prettyPrint();
}
break;
