This is an automated email from the ASF dual-hosted git repository.
pvillard 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 f5c1351343 NIFI-12395 Upgraded Jackson JSON from 2.15.3 to 2.16.1
f5c1351343 is described below
commit f5c1351343ecb76cda108336065afd97c34f2d52
Author: exceptionfactory <[email protected]>
AuthorDate: Tue Jan 2 18:17:23 2024 -0600
NIFI-12395 Upgraded Jackson JSON from 2.15.3 to 2.16.1
Signed-off-by: Pierre Villard <[email protected]>
This closes #8201.
---
.../AbstractByQueryElasticsearchTest.java | 26 ++-------------
.../AbstractJsonQueryElasticsearchTest.java | 38 ++--------------------
.../elasticsearch/PutElasticsearchJsonTest.java | 5 ++-
.../nifi/json/TestJsonTreeRowRecordReader.java | 4 +--
pom.xml | 2 +-
5 files changed, 9 insertions(+), 66 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/test/java/org/apache/nifi/processors/elasticsearch/AbstractByQueryElasticsearchTest.java
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/test/java/org/apache/nifi/processors/elasticsearch/AbstractByQueryElasticsearchTest.java
index 746376f99a..28bcc8793c 100644
---
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/test/java/org/apache/nifi/processors/elasticsearch/AbstractByQueryElasticsearchTest.java
+++
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/test/java/org/apache/nifi/processors/elasticsearch/AbstractByQueryElasticsearchTest.java
@@ -135,12 +135,7 @@ public abstract class AbstractByQueryElasticsearchTest {
runner.setProperty(ElasticsearchRestProcessor.QUERY, "not-json");
final AssertionError assertionError =
assertThrows(AssertionError.class, runner::run);
- final String expected = String.format("Processor has 1 validation
failures:\n" +
- "'%s' validated against 'not-json' is invalid because
%s is not a valid JSON representation due to Unrecognized token 'not': was
expecting" +
- " (JSON String, Number, Array, Object or token 'null',
'true' or 'false')\n" +
- " at [Source: (String)\"not-json\"; line: 1, column:
4]\n",
- ElasticsearchRestProcessor.QUERY.getName(),
ElasticsearchRestProcessor.QUERY.getName());
- assertEquals(expected, assertionError.getMessage());
+ assertTrue(assertionError.getMessage().contains("not-json"));
}
@Test
@@ -151,24 +146,7 @@ public abstract class AbstractByQueryElasticsearchTest {
runner.setProperty(ElasticsearchRestProcessor.SCRIPT,
"not-json-script");
final AssertionError assertionError =
assertThrows(AssertionError.class, runner::run);
- String expected;
- if (getTestProcessor() instanceof DeleteByQueryElasticsearch) {
- // no SCRIPT in Query Builder
- expected = "Processor has 1 validation failures:\n";
- } else {
- expected = "Processor has 2 validation failures:\n";
- }
- expected += String.format("'%s' validated against 'not-json' is
invalid because %s is not a valid JSON representation due to Unrecognized token
'not': was expecting" +
- " (JSON String, Number, Array, Object or token 'null',
'true' or 'false')\n" +
- " at [Source: (String)\"not-json\"; line: 1, column:
4]\n",
- ElasticsearchRestProcessor.QUERY_CLAUSE.getName(),
ElasticsearchRestProcessor.QUERY_CLAUSE.getName());
- if (getTestProcessor() instanceof UpdateByQueryElasticsearch) {
- expected += String.format("'%s' validated against
'not-json-script' is invalid because %s is not a valid JSON representation due
to Unrecognized token 'not': was expecting " +
- "(JSON String, Number, Array, Object or token
'null', 'true' or 'false')\n" +
- " at [Source: (String)\"not-json-script\"; line:
1, column: 4]\n",
- ElasticsearchRestProcessor.SCRIPT.getName(),
ElasticsearchRestProcessor.SCRIPT.getName());
- }
- assertEquals(expected, assertionError.getMessage());
+ assertTrue(assertionError.getMessage().contains("not-json"));
}
@Test
diff --git
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/test/java/org/apache/nifi/processors/elasticsearch/AbstractJsonQueryElasticsearchTest.java
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/test/java/org/apache/nifi/processors/elasticsearch/AbstractJsonQueryElasticsearchTest.java
index 8fa3d49bdc..cf5c79d765 100644
---
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/test/java/org/apache/nifi/processors/elasticsearch/AbstractJsonQueryElasticsearchTest.java
+++
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/test/java/org/apache/nifi/processors/elasticsearch/AbstractJsonQueryElasticsearchTest.java
@@ -169,12 +169,7 @@ public abstract class AbstractJsonQueryElasticsearchTest<P
extends AbstractJsonQ
runner.assertValid();
} else {
final AssertionError assertionError =
assertThrows(AssertionError.class, runner::run);
- final String expected = String.format("Processor has 1 validation
failures:\n" +
- "'%s' validated against 'not-json' is invalid
because %s is not a valid JSON representation due to Unrecognized token 'not':
was expecting" +
- " (JSON String, Number, Array, Object or token
'null', 'true' or 'false')\n" +
- " at [Source: (String)\"not-json\"; line: 1,
column: 4]\n",
- queryPropertyDescriptor.getName(),
queryPropertyDescriptor.getName());
- assertEquals(expected, assertionError.getMessage());
+ assertTrue(assertionError.getMessage().contains("not-json"));
}
}
@@ -190,36 +185,7 @@ public abstract class AbstractJsonQueryElasticsearchTest<P
extends AbstractJsonQ
runner.setProperty(ElasticsearchRestProcessor.SCRIPT_FIELDS,
"not-json-script_fields");
final AssertionError assertionError =
assertThrows(AssertionError.class, runner::run);
- String expected;
- if (runner.getProcessor() instanceof ConsumeElasticsearch) {
- // ConsumeElasticsearch doesn't use QUERY_CLAUSE
- expected = "Processor has 5 validation failures:\n";
- } else {
- expected = String.format("Processor has 6 validation failures:\n" +
- "'%s' validated against 'not-json' is invalid
because %s is not a valid JSON representation due to Unrecognized token 'not':
was expecting" +
- " (JSON String, Number, Array, Object or token
'null', 'true' or 'false')\n" +
- " at [Source: (String)\"not-json\"; line: 1,
column: 4]\n",
- ElasticsearchRestProcessor.QUERY_CLAUSE.getName(),
ElasticsearchRestProcessor.QUERY_CLAUSE.getName());
- }
- expected += String.format("'%s' validated against '-1' is invalid
because not a positive value\n" +
- "'%s' validated against 'not-json-sort' is invalid
because %s is not a valid JSON representation due to Unrecognized token 'not':
was expecting" +
- " (JSON String, Number, Array, Object or token 'null',
'true' or 'false')\n" +
- " at [Source: (String)\"not-json-sort\"; line: 1,
column: 4]\n" +
- "'%s' validated against 'not-json-aggs' is invalid
because %s is not a valid JSON representation due to Unrecognized token 'not':
was expecting" +
- " (JSON String, Number, Array, Object or token 'null',
'true' or 'false')\n" +
- " at [Source: (String)\"not-json-aggs\"; line: 1,
column: 4]\n" +
- "'%s' validated against 'not-json-fields' is invalid
because %s is not a valid JSON representation due to Unrecognized token 'not':
was expecting" +
- " (JSON String, Number, Array, Object or token 'null',
'true' or 'false')\n" +
- " at [Source: (String)\"not-json-fields\"; line: 1,
column: 4]\n" +
- "'%s' validated against 'not-json-script_fields' is
invalid because %s is not a valid JSON representation due to Unrecognized token
'not': was expecting" +
- " (JSON String, Number, Array, Object or token 'null',
'true' or 'false')\n" +
- " at [Source: (String)\"not-json-script_fields\";
line: 1, column: 4]\n",
- ElasticsearchRestProcessor.SIZE.getName(),
- ElasticsearchRestProcessor.SORT.getName(),
ElasticsearchRestProcessor.SORT.getName(),
- ElasticsearchRestProcessor.AGGREGATIONS.getName(),
ElasticsearchRestProcessor.AGGREGATIONS.getName(),
- ElasticsearchRestProcessor.FIELDS.getName(),
ElasticsearchRestProcessor.FIELDS.getName(),
- ElasticsearchRestProcessor.SCRIPT_FIELDS.getName(),
ElasticsearchRestProcessor.SCRIPT_FIELDS.getName());
- assertEquals(expected, assertionError.getMessage());
+ assertTrue(assertionError.getMessage().contains("not-json"));
}
@Test
diff --git
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/test/java/org/apache/nifi/processors/elasticsearch/PutElasticsearchJsonTest.java
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/test/java/org/apache/nifi/processors/elasticsearch/PutElasticsearchJsonTest.java
index e8a885ecc2..88404455b4 100644
---
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/test/java/org/apache/nifi/processors/elasticsearch/PutElasticsearchJsonTest.java
+++
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/test/java/org/apache/nifi/processors/elasticsearch/PutElasticsearchJsonTest.java
@@ -440,8 +440,7 @@ public class PutElasticsearchJsonTest extends
AbstractPutElasticsearchTest<PutEl
runner.assertTransferCount(PutElasticsearchJson.REL_FAILED_DOCUMENTS,
0);
runner.assertTransferCount(PutElasticsearchRecord.REL_ERROR_RESPONSES,
0);
-
runner.getFlowFilesForRelationship(PutElasticsearchJson.REL_FAILURE).get(0).assertAttributeEquals("elasticsearch.put.error",
- "Unrecognized token 'not': was expecting (JSON String, Number,
Array, Object or token 'null', 'true' or 'false')\n" +
- " at [Source: (String)\"not-json\"; line: 1, column:
4]");
+ final MockFlowFile flowFile =
runner.getFlowFilesForRelationship(PutElasticsearchJson.REL_FAILURE).get(0);
+
assertTrue(flowFile.getAttribute("elasticsearch.put.error").contains("not"));
}
}
diff --git
a/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/test/java/org/apache/nifi/json/TestJsonTreeRowRecordReader.java
b/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/test/java/org/apache/nifi/json/TestJsonTreeRowRecordReader.java
index 5f9e01ce12..9a4daccbb1 100644
---
a/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/test/java/org/apache/nifi/json/TestJsonTreeRowRecordReader.java
+++
b/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/test/java/org/apache/nifi/json/TestJsonTreeRowRecordReader.java
@@ -305,8 +305,8 @@ class TestJsonTreeRowRecordReader {
void testReadJSONStringTooLong() {
final StreamConstraintsException mre =
assertThrows(StreamConstraintsException.class, () ->
testReadAccountJson("src/test/resources/json/bank-account-multiline.json",
false, StreamReadConstraints.builder().maxStringLength(2).build()));
- assertTrue(mre.getMessage().contains("maximum length"));
- assertTrue(mre.getMessage().contains("(2)"));
+ assertTrue(mre.getMessage().contains("maximum"));
+ assertTrue(mre.getMessage().contains("2"));
}
@Test
diff --git a/pom.xml b/pom.xml
index 30070e4eed..4bfd115153 100644
--- a/pom.xml
+++ b/pom.xml
@@ -125,7 +125,7 @@
<org.slf4j.version>2.0.9</org.slf4j.version>
<ranger.version>2.4.0</ranger.version>
<jetty.version>9.4.53.v20231009</jetty.version>
- <jackson.bom.version>2.15.3</jackson.bom.version>
+ <jackson.bom.version>2.16.1</jackson.bom.version>
<avro.version>1.11.3</avro.version>
<jaxb.runtime.version>2.3.9</jaxb.runtime.version>
<javax.annotation-api.version>1.3.2</javax.annotation-api.version>
