From 82ef671953a726bae2d4529df03f29fad401fb26 Mon Sep 17 00:00:00 2001
From: Sreeram Garlapati <Sree@Sree.guest.corp.microsoft.com>
Date: Thu, 1 Jun 2017 16:34:55 -0700
Subject: [PATCH] NIFI-4007 - Update azure EventHubs client to latest version

Signed-off-by: Pierre Villard <pierre.villard.fr@gmail.com>

This closes #1880.
---
 .../nifi-azure-bundle/nifi-azure-processors/pom.xml   |  7 +------
 .../processors/azure/eventhub/GetAzureEventHub.java   | 11 +++++------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/pom.xml b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/pom.xml
index 79198f04c7..cf0e7373ba 100644
--- a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/pom.xml
@@ -31,13 +31,8 @@
         <dependency>
             <groupId>com.microsoft.azure</groupId>
             <artifactId>azure-eventhubs</artifactId>
-            <version>0.9.0</version>
+            <version>0.14.2</version>
         </dependency>
-        <!--<dependency>
-            <groupId>com.microsoft.eventhubs.client</groupId>
-            <artifactId>eventhubs-client</artifactId>
-            <version>0.9.1</version>
-        </dependency>-->
         <dependency>
             <groupId>com.microsoft.azure</groupId>
             <artifactId>azure-storage</artifactId>
diff --git a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/eventhub/GetAzureEventHub.java b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/eventhub/GetAzureEventHub.java
index 69d558640b..c40707e8f4 100644
--- a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/eventhub/GetAzureEventHub.java
+++ b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/eventhub/GetAzureEventHub.java
@@ -338,12 +338,12 @@ public class GetAzureEventHub extends AbstractProcessor {
 
                     final Map<String, String> attributes = new HashMap<>();
                     FlowFile flowFile = session.create();
-                    EventData.SystemProperties systemProperties = eventData.getSystemProperties();
+                    final EventData.SystemProperties systemProperties = eventData.getSystemProperties();
 
                     if (null != systemProperties) {
-                        attributes.put("eventhub.enqueued.timestamp", String.valueOf(eventData.getSystemProperties().getEnqueuedTime()));
-                        attributes.put("eventhub.offset", eventData.getSystemProperties().getOffset());
-                        attributes.put("eventhub.sequence", String.valueOf(eventData.getSystemProperties().getSequenceNumber()));
+                        attributes.put("eventhub.enqueued.timestamp", String.valueOf(systemProperties.getEnqueuedTime()));
+                        attributes.put("eventhub.offset", systemProperties.getOffset());
+                        attributes.put("eventhub.sequence", String.valueOf(systemProperties.getSequenceNumber()));
                     }
 
                     attributes.put("eventhub.name", context.getProperty(EVENT_HUB_NAME).getValue());
@@ -352,10 +352,9 @@ public class GetAzureEventHub extends AbstractProcessor {
 
                     flowFile = session.putAllAttributes(flowFile, attributes);
                     flowFile = session.write(flowFile, out -> {
-                        out.write(eventData.getBody());
+                        out.write(eventData.getBytes());
                     });
 
-
                     session.transfer(flowFile, REL_SUCCESS);
 
                     final String namespace = context.getProperty(NAMESPACE).getValue();