diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-json-record-utils/pom.xml b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-json-record-utils/pom.xml new file mode 100755 index 0000000000..685e534904 --- /dev/null +++ b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-json-record-utils/pom.xml @@ -0,0 +1,61 @@ + + + + 4.0.0 + + org.apache.nifi + nifi-record-utils + 1.18.0-SNAPSHOT + + + nifi-json-record-utils + + + + org.apache.nifi + nifi-standard-record-utils + 1.18.0-SNAPSHOT + + + com.jayway.jsonpath + json-path + 2.6.0 + + + com.fasterxml.jackson.core + jackson-databind + + + + org.apache.nifi + nifi-schema-registry-service-api + + + org.apache.nifi + nifi-record-serialization-service-api + + + org.apache.nifi + nifi-record + + + org.apache.nifi + nifi-mock + 1.18.0-SNAPSHOT + test + + + diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/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 similarity index 100% rename from nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/json/AbstractJsonRowRecordReader.java rename to nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-json-record-utils/src/main/java/org/apache/nifi/json/AbstractJsonRowRecordReader.java diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/json/JsonPathRowRecordReader.java b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-json-record-utils/src/main/java/org/apache/nifi/json/JsonPathRowRecordReader.java similarity index 100% rename from nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/json/JsonPathRowRecordReader.java rename to nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-json-record-utils/src/main/java/org/apache/nifi/json/JsonPathRowRecordReader.java diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/json/JsonTreeRowRecordReader.java b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-json-record-utils/src/main/java/org/apache/nifi/json/JsonTreeRowRecordReader.java similarity index 100% rename from nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/json/JsonTreeRowRecordReader.java rename to nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-json-record-utils/src/main/java/org/apache/nifi/json/JsonTreeRowRecordReader.java diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/json/SchemaApplicationStrategy.java b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-json-record-utils/src/main/java/org/apache/nifi/json/SchemaApplicationStrategy.java similarity index 100% rename from nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/json/SchemaApplicationStrategy.java rename to nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-json-record-utils/src/main/java/org/apache/nifi/json/SchemaApplicationStrategy.java diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/json/StartingFieldStrategy.java b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-json-record-utils/src/main/java/org/apache/nifi/json/StartingFieldStrategy.java similarity index 100% rename from nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/json/StartingFieldStrategy.java rename to nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-json-record-utils/src/main/java/org/apache/nifi/json/StartingFieldStrategy.java diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/pom.xml b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/pom.xml index 109d4f50e3..228100dcc2 100644 --- a/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/pom.xml +++ b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/pom.xml @@ -26,8 +26,9 @@ nifi-avro-record-utils nifi-standard-record-utils - nifi-hadoop-record-utils - nifi-mock-record-utils + nifi-hadoop-record-utils + nifi-json-record-utils + nifi-mock-record-utils diff --git a/nifi-nar-bundles/nifi-salesforce-bundle/nifi-salesforce-nar/pom.xml b/nifi-nar-bundles/nifi-salesforce-bundle/nifi-salesforce-nar/pom.xml index 4b5f538538..82563f41a0 100644 --- a/nifi-nar-bundles/nifi-salesforce-bundle/nifi-salesforce-nar/pom.xml +++ b/nifi-nar-bundles/nifi-salesforce-bundle/nifi-salesforce-nar/pom.xml @@ -36,7 +36,7 @@ org.apache.nifi - nifi-record-serialization-services-nar + nifi-standard-services-api-nar 1.18.0-SNAPSHOT nar diff --git a/nifi-nar-bundles/nifi-salesforce-bundle/nifi-salesforce-processors/pom.xml b/nifi-nar-bundles/nifi-salesforce-bundle/nifi-salesforce-processors/pom.xml index 62a2149ab4..d8f4d31ec6 100644 --- a/nifi-nar-bundles/nifi-salesforce-bundle/nifi-salesforce-processors/pom.xml +++ b/nifi-nar-bundles/nifi-salesforce-bundle/nifi-salesforce-processors/pom.xml @@ -34,14 +34,13 @@ org.apache.nifi - nifi-oauth2-provider-api - 1.18.0-SNAPSHOT + nifi-record compile org.apache.nifi - nifi-record - compile + nifi-json-record-utils + 1.18.0-SNAPSHOT org.apache.camel @@ -66,19 +65,10 @@ org.apache.nifi nifi-record-serialization-service-api - 1.18.0-SNAPSHOT - provided org.apache.nifi - nifi-record-serialization-services - 1.18.0-SNAPSHOT - provided - - - com.squareup.okhttp3 - mockwebserver - test + nifi-oauth2-provider-api @@ -99,6 +89,11 @@ 1.18.0-SNAPSHOT test + + com.squareup.okhttp3 + mockwebserver + test + diff --git a/nifi-nar-bundles/nifi-salesforce-bundle/nifi-salesforce-processors/src/test/java/org/apache/nifi/processors/salesforce/util/SalesforceToRecordSchemaConverterTest.java b/nifi-nar-bundles/nifi-salesforce-bundle/nifi-salesforce-processors/src/test/java/org/apache/nifi/processors/salesforce/util/SalesforceToRecordSchemaConverterTest.java index f65506a0aa..805b89496b 100644 --- a/nifi-nar-bundles/nifi-salesforce-bundle/nifi-salesforce-processors/src/test/java/org/apache/nifi/processors/salesforce/util/SalesforceToRecordSchemaConverterTest.java +++ b/nifi-nar-bundles/nifi-salesforce-bundle/nifi-salesforce-processors/src/test/java/org/apache/nifi/processors/salesforce/util/SalesforceToRecordSchemaConverterTest.java @@ -17,17 +17,17 @@ package org.apache.nifi.processors.salesforce.util; import com.fasterxml.jackson.databind.exc.MismatchedInputException; -import org.apache.commons.io.IOUtils; import org.apache.nifi.serialization.SimpleRecordSchema; import org.apache.nifi.serialization.record.RecordField; import org.apache.nifi.serialization.record.RecordFieldType; import org.apache.nifi.serialization.record.RecordSchema; import org.junit.jupiter.api.Test; +import java.io.ByteArrayInputStream; import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; -import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import java.util.Arrays; import java.util.Collections; @@ -141,7 +141,7 @@ class SalesforceToRecordSchemaConverterTest { @Test void testConvertEmptySchema() throws IOException { - try (final InputStream sfSchema = IOUtils.toInputStream("", Charset.defaultCharset())) { + try (final InputStream sfSchema = new ByteArrayInputStream("".getBytes(StandardCharsets.UTF_8))) { assertThrows(MismatchedInputException.class, () -> converter.convertSchema(sfSchema, "ExampleField")); } } diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml index 0ad4952d62..3ea60c1647 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml @@ -418,7 +418,6 @@ org.apache.nifi nifi-oauth2-provider-api - 1.18.0-SNAPSHOT org.apache.sshd diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-oauth2-provider-bundle/nifi-oauth2-provider-service/pom.xml b/nifi-nar-bundles/nifi-standard-services/nifi-oauth2-provider-bundle/nifi-oauth2-provider-service/pom.xml index 5d25241884..a48e97a05b 100644 --- a/nifi-nar-bundles/nifi-standard-services/nifi-oauth2-provider-bundle/nifi-oauth2-provider-service/pom.xml +++ b/nifi-nar-bundles/nifi-standard-services/nifi-oauth2-provider-bundle/nifi-oauth2-provider-service/pom.xml @@ -29,8 +29,6 @@ org.apache.nifi nifi-oauth2-provider-api - 1.18.0-SNAPSHOT - provided org.apache.nifi diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/pom.xml b/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/pom.xml index 82082456ed..674a072f7f 100755 --- a/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/pom.xml +++ b/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/pom.xml @@ -57,13 +57,9 @@ 1.18.0-SNAPSHOT - com.jayway.jsonpath - json-path - 2.6.0 - - - com.fasterxml.jackson.core - jackson-databind + org.apache.nifi + nifi-json-record-utils + 1.18.0-SNAPSHOT org.apache.commons diff --git a/nifi-nar-bundles/pom.xml b/nifi-nar-bundles/pom.xml index c6e743ab75..90406bb8cb 100755 --- a/nifi-nar-bundles/pom.xml +++ b/nifi-nar-bundles/pom.xml @@ -298,6 +298,12 @@ 1.18.0-SNAPSHOT provided + + org.apache.nifi + nifi-oauth2-provider-api + 1.18.0-SNAPSHOT + provided + org.apache.nifi nifi-distributed-cache-protocol