diff --git a/nifi-assembly/pom.xml b/nifi-assembly/pom.xml
index e6a321bee1dd..2141897a9b82 100644
--- a/nifi-assembly/pom.xml
+++ b/nifi-assembly/pom.xml
@@ -407,7 +407,7 @@ language governing permissions and limitations under the License. -->
org.apache.nifi
nifi-geohash-nar
- 1.15.0-SNAPSHOT
+ 1.16.0-SNAPSHOT
nar
diff --git a/nifi-nar-bundles/nifi-geohash-bundle/nifi-geohash-nar/pom.xml b/nifi-nar-bundles/nifi-geohash-bundle/nifi-geohash-nar/pom.xml
index 186eac009ec4..a2783951ae3e 100644
--- a/nifi-nar-bundles/nifi-geohash-bundle/nifi-geohash-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-geohash-bundle/nifi-geohash-nar/pom.xml
@@ -19,7 +19,7 @@
org.apache.nifi
nifi-geohash-bundle
- 1.15.0-SNAPSHOT
+ 1.16.0-SNAPSHOT
nifi-geohash-nar
@@ -39,7 +39,7 @@
org.apache.nifi
nifi-geohash-processors
- 1.15.0-SNAPSHOT
+ 1.16.0-SNAPSHOT
diff --git a/nifi-nar-bundles/nifi-geohash-bundle/nifi-geohash-processors/pom.xml b/nifi-nar-bundles/nifi-geohash-bundle/nifi-geohash-processors/pom.xml
index fc1d76020dd2..ab45af8e2a2e 100644
--- a/nifi-nar-bundles/nifi-geohash-bundle/nifi-geohash-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-geohash-bundle/nifi-geohash-processors/pom.xml
@@ -19,7 +19,7 @@
org.apache.nifi
nifi-geohash-bundle
- 1.15.0-SNAPSHOT
+ 1.16.0-SNAPSHOT
nifi-geohash-processors
@@ -33,7 +33,7 @@
org.apache.nifi
nifi-utils
- 1.15.0-SNAPSHOT
+ 1.16.0-SNAPSHOT
ch.hsr
@@ -48,7 +48,7 @@
org.apache.nifi
nifi-record-path
- 1.15.0-SNAPSHOT
+ 1.16.0-SNAPSHOT
compile
@@ -60,19 +60,19 @@
org.apache.nifi
nifi-mock
- 1.15.0-SNAPSHOT
+ 1.16.0-SNAPSHOT
test
org.apache.nifi
nifi-mock-record-utils
- 1.15.0-SNAPSHOT
+ 1.16.0-SNAPSHOT
test
org.apache.nifi
nifi-record-serialization-services
- 1.15.0-SNAPSHOT
+ 1.16.0-SNAPSHOT
test
diff --git a/nifi-nar-bundles/nifi-geohash-bundle/nifi-geohash-processors/src/main/java/org/apache/nifi/processors/geohash/GeohashRecord.java b/nifi-nar-bundles/nifi-geohash-bundle/nifi-geohash-processors/src/main/java/org/apache/nifi/processors/geohash/GeohashRecord.java
index ab611167aeca..c2bed961b04c 100644
--- a/nifi-nar-bundles/nifi-geohash-bundle/nifi-geohash-processors/src/main/java/org/apache/nifi/processors/geohash/GeohashRecord.java
+++ b/nifi-nar-bundles/nifi-geohash-bundle/nifi-geohash-processors/src/main/java/org/apache/nifi/processors/geohash/GeohashRecord.java
@@ -334,7 +334,6 @@ public void onTrigger(final ProcessContext context, final ProcessSession session
output = session.putAllAttributes(output, buildAttributes(foundCount, writer.getMimeType(), writeResult));
if (routingStrategy != RoutingStrategy.SPLIT) {
session.transfer(output, targetRelationship);
- session.remove(input);
} else {
if (notFoundCount > 0) {
notFound = session.putAllAttributes(notFound, buildAttributes(notFoundCount, writer.getMimeType(), notFoundWriterResult));
@@ -342,9 +341,13 @@ public void onTrigger(final ProcessContext context, final ProcessSession session
} else {
session.remove(notFound);
}
- session.transfer(output, REL_SUCCESS);
- session.transfer(input, REL_ORIGINAL);
+ if (foundCount > 0) {
+ session.transfer(output, REL_SUCCESS);
+ } else {
+ session.remove(output);
+ }
}
+ session.transfer(input, REL_ORIGINAL);
} catch (Exception ex) {
getLogger().error("Failed to {} due to {}", encode ? "encode" : "decode", ex.getLocalizedMessage(), ex);
diff --git a/nifi-nar-bundles/nifi-geohash-bundle/nifi-geohash-processors/src/test/java/org/apache/nifi/processors/geohash/GeohashRecordTest.java b/nifi-nar-bundles/nifi-geohash-bundle/nifi-geohash-processors/src/test/java/org/apache/nifi/processors/geohash/GeohashRecordTest.java
index 20fc33c7e8f4..fca353e176aa 100644
--- a/nifi-nar-bundles/nifi-geohash-bundle/nifi-geohash-processors/src/test/java/org/apache/nifi/processors/geohash/GeohashRecordTest.java
+++ b/nifi-nar-bundles/nifi-geohash-bundle/nifi-geohash-processors/src/test/java/org/apache/nifi/processors/geohash/GeohashRecordTest.java
@@ -98,7 +98,7 @@ public void testEncodeSendToSuccessDefault() throws Exception {
runner.setProperty(GeohashRecord.ROUTING_STRATEGY, GeohashRecord.RoutingStrategy.SKIP_UNENRICHED.toString());
runner.assertValid();
- assertTransfers("/record_encode.json", 0, 1, 0);
+ assertTransfers("/record_encode.json", 0, 1, 1);
MockFlowFile ff = runner.getFlowFilesForRelationship(GeohashRecord.REL_SUCCESS).get(0);
byte[] raw = runner.getContentAsByteArray(ff);
@@ -120,7 +120,7 @@ public void testEncodeSendToFailureDefault() {
runner.setProperty(GeohashRecord.ROUTING_STRATEGY, GeohashRecord.RoutingStrategy.SKIP_UNENRICHED.toString());
runner.assertValid();
- assertTransfers("/record_decode.json", 1, 0, 0);
+ assertTransfers("/record_decode.json", 1, 0, 1);
}
@Test
@@ -138,7 +138,7 @@ public void testRequireAllEnrichedSendToFailure() {
runner.setProperty(GeohashRecord.ROUTING_STRATEGY, GeohashRecord.RoutingStrategy.REQUIRE_ALL_ENRICHED.toString());
runner.assertValid();
- assertTransfers("/record_encode.json", 1, 0, 0);
+ assertTransfers("/record_encode.json", 1, 0, 1);
}
@Test
@@ -147,6 +147,6 @@ public void testRequireAllEnrichedSendToSuccess() {
runner.setProperty(GeohashRecord.ROUTING_STRATEGY, GeohashRecord.RoutingStrategy.REQUIRE_ALL_ENRICHED.toString());
runner.assertValid();
- assertTransfers("/record_decode.json", 0, 1, 0);
+ assertTransfers("/record_decode.json", 0, 1, 1);
}
}
diff --git a/nifi-nar-bundles/nifi-geohash-bundle/pom.xml b/nifi-nar-bundles/nifi-geohash-bundle/pom.xml
index e825ffdc9c15..b4f35274645a 100644
--- a/nifi-nar-bundles/nifi-geohash-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-geohash-bundle/pom.xml
@@ -19,7 +19,7 @@
org.apache.nifi
nifi-nar-bundles
- 1.15.0-SNAPSHOT
+ 1.16.0-SNAPSHOT
nifi-geohash-bundle