You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2020/11/24 06:48:30 UTC
[camel-kafka-connector] 11/17: Prevent NPEs in the (unlikely) case
the record value is null
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch camel-master-align-and-rebase
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
commit ff2ab8439b872d450a26d0d1dbc96c6b6bcd896f
Author: Otavio Rodolfo Piske <op...@redhat.com>
AuthorDate: Fri Nov 20 12:31:18 2020 +0100
Prevent NPEs in the (unlikely) case the record value is null
---
.../kafkaconnector/ftp/transformers/FtpRemoteFileTransforms.java | 4 ++--
.../kafkaconnector/ftps/transformers/FtpsRemoteFileTransforms.java | 6 +++---
.../kafkaconnector/sftp/transformers/SftpRemoteFileTransforms.java | 6 +++---
.../camel/kafkaconnector/slack/transformers/SlackTransforms.java | 6 +++---
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/connectors/camel-ftp-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ftp/transformers/FtpRemoteFileTransforms.java b/connectors/camel-ftp-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ftp/transformers/FtpRemoteFileTransforms.java
index 89db9d1..55da442 100644
--- a/connectors/camel-ftp-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ftp/transformers/FtpRemoteFileTransforms.java
+++ b/connectors/camel-ftp-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ftp/transformers/FtpRemoteFileTransforms.java
@@ -40,7 +40,7 @@ public class FtpRemoteFileTransforms <R extends ConnectRecord<R>> implements Tra
if (r.value() instanceof RemoteFile) {
LOG.debug("Converting record from RemoteFile to text");
- RemoteFile message = (RemoteFile) r.value();
+ RemoteFile message = (RemoteFile) value;
LOG.debug("Received text: {}", message.getBody());
@@ -48,7 +48,7 @@ public class FtpRemoteFileTransforms <R extends ConnectRecord<R>> implements Tra
SchemaHelper.buildSchemaBuilderForType(message.getBody()), message.getBody(), r.timestamp());
} else {
- LOG.debug("Unexpected message type: {}", r.value().getClass());
+ LOG.debug("Unexpected message type: {}", value == null ? "null instance" : value.getClass());
return r;
}
diff --git a/connectors/camel-ftps-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ftps/transformers/FtpsRemoteFileTransforms.java b/connectors/camel-ftps-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ftps/transformers/FtpsRemoteFileTransforms.java
index 7d9d13c..dc97303 100644
--- a/connectors/camel-ftps-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ftps/transformers/FtpsRemoteFileTransforms.java
+++ b/connectors/camel-ftps-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ftps/transformers/FtpsRemoteFileTransforms.java
@@ -38,9 +38,9 @@ public class FtpsRemoteFileTransforms <R extends ConnectRecord<R>> implements Tr
public R apply(R r) {
Object value = r.value();
- if (r.value() instanceof RemoteFile) {
+ if (value instanceof RemoteFile) {
LOG.debug("Converting record from RemoteFile to text");
- RemoteFile message = (RemoteFile) r.value();
+ RemoteFile message = (RemoteFile) value;
LOG.debug("Received text: {}", message.getBody());
@@ -48,7 +48,7 @@ public class FtpsRemoteFileTransforms <R extends ConnectRecord<R>> implements Tr
SchemaHelper.buildSchemaBuilderForType(message.getBody()), message.getBody(), r.timestamp());
} else {
- LOG.debug("Unexpected message type: {}", r.value().getClass());
+ LOG.debug("Unexpected message type: {}", value == null ? "null instance" : value.getClass());
return r;
}
diff --git a/connectors/camel-sftp-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/sftp/transformers/SftpRemoteFileTransforms.java b/connectors/camel-sftp-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/sftp/transformers/SftpRemoteFileTransforms.java
index 4d3c98e..2c67f99 100644
--- a/connectors/camel-sftp-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/sftp/transformers/SftpRemoteFileTransforms.java
+++ b/connectors/camel-sftp-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/sftp/transformers/SftpRemoteFileTransforms.java
@@ -38,9 +38,9 @@ public class SftpRemoteFileTransforms <R extends ConnectRecord<R>> implements Tr
public R apply(R r) {
Object value = r.value();
- if (r.value() instanceof RemoteFile) {
+ if (value instanceof RemoteFile) {
LOG.debug("Converting record from RemoteFile to text");
- RemoteFile message = (RemoteFile) r.value();
+ RemoteFile message = (RemoteFile) value;
LOG.debug("Received text: {}", message.getBody());
@@ -48,7 +48,7 @@ public class SftpRemoteFileTransforms <R extends ConnectRecord<R>> implements Tr
SchemaHelper.buildSchemaBuilderForType(message.getBody()), message.getBody(), r.timestamp());
} else {
- LOG.debug("Unexpected message type: {}", r.value().getClass());
+ LOG.debug("Unexpected message type: {}", value == null ? "null instance" : value.getClass());
return r;
}
diff --git a/connectors/camel-slack-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/slack/transformers/SlackTransforms.java b/connectors/camel-slack-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/slack/transformers/SlackTransforms.java
index a0de8d2..b39a36e 100644
--- a/connectors/camel-slack-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/slack/transformers/SlackTransforms.java
+++ b/connectors/camel-slack-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/slack/transformers/SlackTransforms.java
@@ -39,9 +39,9 @@ public class SlackTransforms <R extends ConnectRecord<R>> implements Transformat
public R apply(R r) {
Object value = r.value();
- if (r.value() instanceof SlackMessage) {
+ if (value instanceof SlackMessage) {
LOG.debug("Converting record from SlackMessage to text");
- SlackMessage message = (SlackMessage) r.value();
+ SlackMessage message = (SlackMessage) value;
LOG.debug("Received text: {}", message.getText());
@@ -49,7 +49,7 @@ public class SlackTransforms <R extends ConnectRecord<R>> implements Transformat
SchemaHelper.buildSchemaBuilderForType(message.getText()), message.getText(), r.timestamp());
} else {
- LOG.debug("Unexpected message type: {}", r.value().getClass());
+ LOG.debug("Unexpected message type: {}", value == null ? "null instance" : value.getClass());
return r;
}