You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2022/10/05 07:36:28 UTC
[camel] 02/02: (chores) camel-azure-key-value: prevent a NPE retrieving event data
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
commit 9a00f167557c0b3126c422dc73bb1092671f6737
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Tue Oct 4 16:51:26 2022 +0200
(chores) camel-azure-key-value: prevent a NPE retrieving event data
---
.../azure/key/vault/EventhubsReloadTriggerTask.java | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/components/camel-azure/camel-azure-key-vault/src/main/java/org/apache/camel/component/azure/key/vault/EventhubsReloadTriggerTask.java b/components/camel-azure/camel-azure-key-vault/src/main/java/org/apache/camel/component/azure/key/vault/EventhubsReloadTriggerTask.java
index 5c821111105..173e8b8b9a4 100644
--- a/components/camel-azure/camel-azure-key-vault/src/main/java/org/apache/camel/component/azure/key/vault/EventhubsReloadTriggerTask.java
+++ b/components/camel-azure/camel-azure-key-vault/src/main/java/org/apache/camel/component/azure/key/vault/EventhubsReloadTriggerTask.java
@@ -34,7 +34,6 @@ import com.azure.storage.blob.BlobContainerAsyncClient;
import com.azure.storage.blob.BlobContainerClientBuilder;
import com.azure.storage.common.StorageSharedKeyCredential;
import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.JsonMappingException;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.camel.CamelContext;
@@ -214,14 +213,8 @@ public class EventhubsReloadTriggerTask extends ServiceSupport implements CamelC
boolean triggerReloading = false;
ObjectMapper mapper = new ObjectMapper();
- JsonNode actualObj = null;
- try {
- actualObj = mapper.readTree(eventContext.getEventData().getBodyAsString());
- } catch (JsonMappingException e) {
- e.printStackTrace();
- } catch (JsonProcessingException e) {
- e.printStackTrace();
- }
+ final JsonNode actualObj = retrieveEventData(eventContext, mapper);
+
for (int i = 0; i < actualObj.size(); i++) {
String secret = actualObj.get(i).get("subject").textValue();
String eventType = actualObj.get(i).get("eventType").textValue();
@@ -249,6 +242,15 @@ public class EventhubsReloadTriggerTask extends ServiceSupport implements CamelC
}
}
+ private static JsonNode retrieveEventData(EventContext eventContext, ObjectMapper mapper) {
+ try {
+ return mapper.readTree(eventContext.getEventData().getBodyAsString());
+ } catch (JsonProcessingException e) {
+ LOG.warn("Unable to process event data body: {}", e.getMessage(), e);
+ throw new RuntimeCamelException(e);
+ }
+ }
+
public void onErrorListener(final ErrorContext errorContext) {
// NOOP
}