[nifi] branch master updated: NIFI-6172 Fixed a bug that caused ElasticSearchStringLookupService to always return a value even when it should return Optional.empty().

[mattyb149]

This is an automated email from the ASF dual-hosted git repository.

mattyb149 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/master by this push:
     new 4810f6d  NIFI-6172 Fixed a bug that caused 
ElasticSearchStringLookupService to always return a value even when it should 
return Optional.empty().
4810f6d is described below

commit 4810f6d32e7f30763b22c704a65603120e4b3c54
Author: Mike Thomsen <mikerthom...@gmail.com>
AuthorDate: Tue Apr 2 10:32:36 2019 -0400

    NIFI-6172 Fixed a bug that caused ElasticSearchStringLookupService to 
always return a value even when it should return Optional.empty().
    
    NIFI-6172 Fixed broken integration test.
    
    Signed-off-by: Matthew Burgess <mattyb...@apache.org>
    
    This closes #3399
---
 .../apache/nifi/elasticsearch/ElasticSearchStringLookupService.java | 6 +++++-
 .../elasticsearch/integration/ElasticSearchLookupService_IT.groovy  | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git 
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/src/main/java/org/apache/nifi/elasticsearch/ElasticSearchStringLookupService.java
 
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/src/main/java/org/apache/nifi/elasticsearch/ElasticSearchStringLookupService.java
index 0ff9672..b833e79 100644
--- 
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/src/main/java/org/apache/nifi/elasticsearch/ElasticSearchStringLookupService.java
+++ 
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/src/main/java/org/apache/nifi/elasticsearch/ElasticSearchStringLookupService.java
@@ -88,7 +88,11 @@ public class ElasticSearchStringLookupService extends 
AbstractControllerService
         try {
             final String id = (String) coordinates.get(ID);
             final Map<String, Object> enums = esClient.get(index, type, id);
-            return Optional.of(mapper.writeValueAsString(enums));
+            if (enums == null) {
+                return Optional.empty();
+            } else {
+                return Optional.ofNullable(mapper.writeValueAsString(enums));
+            }
         } catch (IOException e) {
             throw new LookupFailureException(e);
         }
diff --git 
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/src/test/groovy/org/apache/nifi/elasticsearch/integration/ElasticSearchLookupService_IT.groovy
 
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/src/test/groovy/org/apache/nifi/elasticsearch/integration/ElasticSearchLookupService_IT.groovy
index b255836..2ce9573 100644
--- 
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/src/test/groovy/org/apache/nifi/elasticsearch/integration/ElasticSearchLookupService_IT.groovy
+++ 
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/src/test/groovy/org/apache/nifi/elasticsearch/integration/ElasticSearchLookupService_IT.groovy
@@ -203,7 +203,7 @@ class ElasticSearchLookupService_IT {
         def result = lookupService.lookup(coordinates)
         Assert.assertTrue(result.isPresent())
         def rec = result.get()
-        ["dateField": "2018-08-14T10:08:00Z", "longField": 150000L].each { 
field ->
+        ["dateField2": "2018-08-14T10:08:00Z", "longField2": 150000L].each { 
field ->
             def value = rec.getValue(field.key)
             Assert.assertEquals(field.value, value)
         }