This is an automated email from the ASF dual-hosted git repository.
exceptionfactory pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/support/nifi-1.x by this push:
new 634d2bd7d3 NIFI-13156 Replaced JsonParser deprecated getCurrentName()
with currentName()
634d2bd7d3 is described below
commit 634d2bd7d33add828bab66bdeb148b1b1bc021cd
Author: dan-s1 <dsti...@gmail.com>
AuthorDate: Fri May 10 14:36:25 2024 +0000
NIFI-13156 Replaced JsonParser deprecated getCurrentName() with
currentName()
This closes #8807
Signed-off-by: David Handermann <exceptionfact...@apache.org>
(cherry picked from commit 811a491ba51c3fa18cb6b6cd2fa93e5f69602909)
---
.../main/java/org/apache/nifi/json/AbstractJsonRowRecordReader.java | 4 ++--
.../main/java/org/apache/nifi/processors/hubspot/GetHubSpot.java | 6 +++---
.../apache/nifi/processors/salesforce/QuerySalesforceObject.java | 2 +-
.../main/java/org/apache/nifi/processors/shopify/GetShopify.java | 2 +-
.../main/java/org/apache/nifi/processors/zendesk/GetZendesk.java | 2 +-
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-json-record-utils/src/main/java/org/apache/nifi/json/AbstractJsonRowRecordReader.java
b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-json-record-utils/src/main/java/org/apache/nifi/json/AbstractJsonRowRecordReader.java
index de524853ca..4d993b6029 100644
---
a/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-json-record-utils/src/main/java/org/apache/nifi/json/AbstractJsonRowRecordReader.java
+++
b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-json-record-utils/src/main/java/org/apache/nifi/json/AbstractJsonRowRecordReader.java
@@ -149,7 +149,7 @@ public abstract class AbstractJsonRowRecordReader
implements RecordReader {
if (strategy == StartingFieldStrategy.NESTED_FIELD) {
while (jsonParser.nextToken() != null) {
- if (nestedFieldName.equals(jsonParser.getCurrentName())) {
+ if (nestedFieldName.equals(jsonParser.currentName())) {
logger.debug("Parsing starting at nested field [{}]",
nestedFieldName);
break;
}
@@ -311,7 +311,7 @@ public abstract class AbstractJsonRowRecordReader
implements RecordReader {
if (jsonParser.getCurrentToken() == JsonToken.FIELD_NAME) {
jsonParser.nextToken();
- final String fieldName = jsonParser.getCurrentName();
+ final String fieldName = jsonParser.currentName();
final String fieldValue = jsonParser.getValueAsString();
if (captureFieldPredicate.test(fieldName, fieldValue)) {
diff --git
a/nifi-nar-bundles/nifi-hubspot-bundle/nifi-hubspot-processors/src/main/java/org/apache/nifi/processors/hubspot/GetHubSpot.java
b/nifi-nar-bundles/nifi-hubspot-bundle/nifi-hubspot-processors/src/main/java/org/apache/nifi/processors/hubspot/GetHubSpot.java
index d624b58afe..98f378f199 100644
---
a/nifi-nar-bundles/nifi-hubspot-bundle/nifi-hubspot-processors/src/main/java/org/apache/nifi/processors/hubspot/GetHubSpot.java
+++
b/nifi-nar-bundles/nifi-hubspot-bundle/nifi-hubspot-processors/src/main/java/org/apache/nifi/processors/hubspot/GetHubSpot.java
@@ -271,17 +271,17 @@ public class GetHubSpot extends AbstractProcessor {
final JsonGenerator jsonGenerator =
JSON_FACTORY.createGenerator(out, JsonEncoding.UTF8)) {
boolean isCursorAvailable = false;
while (jsonParser.nextToken() != null) {
- if (jsonParser.getCurrentToken() == JsonToken.FIELD_NAME
&& jsonParser.getCurrentName()
+ if (jsonParser.getCurrentToken() == JsonToken.FIELD_NAME
&& jsonParser.currentName()
.equals("total")) {
jsonParser.nextToken();
total.set(jsonParser.getIntValue());
}
- if (jsonParser.getCurrentToken() == JsonToken.FIELD_NAME
&& jsonParser.getCurrentName()
+ if (jsonParser.getCurrentToken() == JsonToken.FIELD_NAME
&& jsonParser.currentName()
.equals("results")) {
jsonParser.nextToken();
jsonGenerator.copyCurrentStructure(jsonParser);
}
- final String fieldName = jsonParser.getCurrentName();
+ final String fieldName = jsonParser.currentName();
if (PAGING_CURSOR.equals(fieldName)) {
isCursorAvailable = true;
jsonParser.nextToken();
diff --git
a/nifi-nar-bundles/nifi-salesforce-bundle/nifi-salesforce-processors/src/main/java/org/apache/nifi/processors/salesforce/QuerySalesforceObject.java
b/nifi-nar-bundles/nifi-salesforce-bundle/nifi-salesforce-processors/src/main/java/org/apache/nifi/processors/salesforce/QuerySalesforceObject.java
index 5387340511..3f89cda043 100644
---
a/nifi-nar-bundles/nifi-salesforce-bundle/nifi-salesforce-processors/src/main/java/org/apache/nifi/processors/salesforce/QuerySalesforceObject.java
+++
b/nifi-nar-bundles/nifi-salesforce-bundle/nifi-salesforce-processors/src/main/java/org/apache/nifi/processors/salesforce/QuerySalesforceObject.java
@@ -570,7 +570,7 @@ public class QuerySalesforceObject extends
AbstractProcessor {
}
private boolean nextTokenIs(JsonParser jsonParser, String value) throws
IOException {
- return jsonParser.getCurrentToken() == JsonToken.FIELD_NAME &&
jsonParser.getCurrentName()
+ return jsonParser.getCurrentToken() == JsonToken.FIELD_NAME &&
jsonParser.currentName()
.equals(value) && jsonParser.nextToken() != null;
}
diff --git
a/nifi-nar-bundles/nifi-shopify-bundle/nifi-shopify-processors/src/main/java/org/apache/nifi/processors/shopify/GetShopify.java
b/nifi-nar-bundles/nifi-shopify-bundle/nifi-shopify-processors/src/main/java/org/apache/nifi/processors/shopify/GetShopify.java
index f0aee1514d..634dc4f161 100644
---
a/nifi-nar-bundles/nifi-shopify-bundle/nifi-shopify-processors/src/main/java/org/apache/nifi/processors/shopify/GetShopify.java
+++
b/nifi-nar-bundles/nifi-shopify-bundle/nifi-shopify-processors/src/main/java/org/apache/nifi/processors/shopify/GetShopify.java
@@ -376,7 +376,7 @@ public class GetShopify extends AbstractProcessor {
try (JsonParser jsonParser =
JSON_FACTORY.createParser(response.body());
final JsonGenerator jsonGenerator =
JSON_FACTORY.createGenerator(out, JsonEncoding.UTF8)) {
while (jsonParser.nextToken() != null) {
- if (jsonParser.getCurrentToken() == JsonToken.FIELD_NAME
&& jsonParser.getCurrentName()
+ if (jsonParser.getCurrentToken() == JsonToken.FIELD_NAME
&& jsonParser.currentName()
.equals(resourceName)) {
jsonParser.nextToken();
jsonGenerator.writeStartArray();
diff --git
a/nifi-nar-bundles/nifi-zendesk-bundle/nifi-zendesk-processors/src/main/java/org/apache/nifi/processors/zendesk/GetZendesk.java
b/nifi-nar-bundles/nifi-zendesk-bundle/nifi-zendesk-processors/src/main/java/org/apache/nifi/processors/zendesk/GetZendesk.java
index 5e455a2483..5c3622f7d0 100644
---
a/nifi-nar-bundles/nifi-zendesk-bundle/nifi-zendesk-processors/src/main/java/org/apache/nifi/processors/zendesk/GetZendesk.java
+++
b/nifi-nar-bundles/nifi-zendesk-bundle/nifi-zendesk-processors/src/main/java/org/apache/nifi/processors/zendesk/GetZendesk.java
@@ -222,7 +222,7 @@ public class GetZendesk extends AbstractZendesk {
JsonGenerator generator = JSON_FACTORY.createGenerator(out,
UTF8)) {
while (parser.nextToken() != null) {
if (parser.getCurrentToken() == FIELD_NAME) {
- String fieldName = parser.getCurrentName();
+ String fieldName = parser.currentName();
parser.nextToken();
if
(zendeskResource.getResponseFieldName().equals(fieldName)) {
int numberOfExtractedRecords =
extractZendeskResourceData(parser, generator);
