From 34413b987dd92c4d892966524023f239a37c7abb Mon Sep 17 00:00:00 2001 From: joewitt Date: Tue, 15 Nov 2016 15:48:36 -0500 Subject: [PATCH 1/3] NIFI-2991 removed usage of json lib and components still using it --- nifi-assembly/pom.xml | 2 ++ .../nifi-flume-bundle/nifi-flume-processors/pom.xml | 5 ----- .../nifi-social-media-nar/pom.xml | 12 +++++++++++- .../nifi-standard-processors/pom.xml | 8 ++++---- 4 files changed, 17 insertions(+), 10 deletions(-) diff --git a/nifi-assembly/pom.xml b/nifi-assembly/pom.xml index 5eef82f891cd..aa12f8504378 100755 --- a/nifi-assembly/pom.xml +++ b/nifi-assembly/pom.xml @@ -243,11 +243,13 @@ language governing permissions and limitations under the License. --> nifi-solr-nar nar + org.apache.nifi nifi-hl7-nar diff --git a/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-processors/pom.xml b/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-processors/pom.xml index 1a49f51d540d..c069eb571022 100644 --- a/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-processors/pom.xml +++ b/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-processors/pom.xml @@ -78,11 +78,6 @@ flume-scribe-source ${flume.version} - - org.apache.flume.flume-ng-sources - flume-twitter-source - ${flume.version} - diff --git a/nifi-nar-bundles/nifi-social-media-bundle/nifi-social-media-nar/pom.xml b/nifi-nar-bundles/nifi-social-media-bundle/nifi-social-media-nar/pom.xml index ad4f1d263110..add42d4c451a 100644 --- a/nifi-nar-bundles/nifi-social-media-bundle/nifi-social-media-nar/pom.xml +++ b/nifi-nar-bundles/nifi-social-media-bundle/nifi-social-media-nar/pom.xml @@ -36,5 +36,15 @@ 1.1.0-SNAPSHOT - + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + 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 cce9c57b15ce..77cf95075186 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 @@ -169,10 +169,10 @@ language governing permissions and limitations under the License. --> org.apache.nifi nifi-dbcp-service-api - - org.codehaus.jackson - jackson-mapper-asl - + + org.codehaus.jackson + jackson-mapper-asl + com.squareup.okhttp okhttp From 748ce79a7d64a73c20d2fd5dc863e524700fe434 Mon Sep 17 00:00:00 2001 From: joewitt Date: Tue, 15 Nov 2016 15:52:17 -0500 Subject: [PATCH 2/3] Revert "NIFI-1893 Add processor for validating JSON" This reverts commit f11682202b57edab585967e033839800d4159f4e. --- .../nifi-standard-processors/pom.xml | 8 - .../processors/standard/ValidateJson.java | 202 ------------------ .../org.apache.nifi.processor.Processor | 1 - .../additionalDetails.html | 34 --- .../processors/standard/TestValidateJson.java | 105 --------- .../TestJson/json-object-sample-schema.json | 41 ---- .../TestJson/json-object-sample.json | 59 ----- .../TestJson/json-sample-schema.json | 42 ---- 8 files changed, 492 deletions(-) delete mode 100644 nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ValidateJson.java delete mode 100644 nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.ValidateJson/additionalDetails.html delete mode 100644 nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestValidateJson.java delete mode 100644 nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/resources/TestJson/json-object-sample-schema.json delete mode 100644 nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/resources/TestJson/json-object-sample.json delete mode 100644 nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/resources/TestJson/json-sample-schema.json 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 77cf95075186..f6786c6ffa42 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 @@ -249,11 +249,6 @@ language governing permissions and limitations under the License. --> super-csv 2.4.0 - - org.everit.json - org.everit.json.schema - 1.4.0 - com.fluenda ParCEFone @@ -290,9 +285,6 @@ language governing permissions and limitations under the License. --> src/test/resources/TestIdentifyMimeType/1.txt src/test/resources/TestIdentifyMimeType/1.csv src/test/resources/TestJson/json-sample.json - src/test/resources/TestJson/json-sample-schema.json - src/test/resources/TestJson/json-object-sample.json - src/test/resources/TestJson/json-object-sample-schema.json src/test/resources/TestJson/control-characters.json src/test/resources/TestMergeContent/demarcate src/test/resources/TestMergeContent/foot diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ValidateJson.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ValidateJson.java deleted file mode 100644 index a5a09758dd42..000000000000 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ValidateJson.java +++ /dev/null @@ -1,202 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.nifi.processors.standard; - -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.nio.charset.StandardCharsets; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import java.util.Map; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicReference; - -import org.apache.commons.io.IOUtils; -import org.apache.nifi.annotation.behavior.EventDriven; -import org.apache.nifi.annotation.behavior.InputRequirement; -import org.apache.nifi.annotation.behavior.InputRequirement.Requirement; -import org.apache.nifi.annotation.behavior.SideEffectFree; -import org.apache.nifi.annotation.behavior.SupportsBatching; -import org.apache.nifi.annotation.documentation.CapabilityDescription; -import org.apache.nifi.annotation.documentation.Tags; -import org.apache.nifi.annotation.lifecycle.OnScheduled; -import org.apache.nifi.components.PropertyDescriptor; -import org.apache.nifi.components.ValidationContext; -import org.apache.nifi.components.ValidationResult; -import org.apache.nifi.components.Validator; -import org.apache.nifi.flowfile.FlowFile; -import org.apache.nifi.logging.ComponentLog; -import org.apache.nifi.processor.AbstractProcessor; -import org.apache.nifi.processor.ProcessContext; -import org.apache.nifi.processor.ProcessSession; -import org.apache.nifi.processor.ProcessorInitializationContext; -import org.apache.nifi.processor.Relationship; -import org.apache.nifi.processor.io.InputStreamCallback; -import org.apache.nifi.processor.util.StandardValidators; -import org.apache.nifi.util.StringUtils; - -import org.everit.json.schema.Schema; -import org.everit.json.schema.ValidationException; -import org.everit.json.schema.loader.SchemaLoader; -import org.json.JSONArray; -import org.json.JSONObject; -import org.json.JSONTokener; - - -@EventDriven -@SideEffectFree -@SupportsBatching -@InputRequirement(Requirement.INPUT_REQUIRED) -@Tags({"json", "schema", "validation"}) -@CapabilityDescription("Validates the contents of FlowFiles against a user-specified JSON Schema file") -public class ValidateJson extends AbstractProcessor { - - public static final PropertyDescriptor SCHEMA_FILE = new PropertyDescriptor.Builder() - .name("validate-json-schema-file") - .displayName("Schema File") - .description("The path to the Schema file that is to be used for validation. Only one of Schema File or Schema Body may be used") - .required(false) - .addValidator(StandardValidators.FILE_EXISTS_VALIDATOR) - .build(); - - public static final PropertyDescriptor SCHEMA_BODY = new PropertyDescriptor.Builder() - .name("validate-json-schema-body") - .displayName("Schema Body") - .required(false) - .description("Json Schema Body that is to be used for validation. Only one of Schema File or Schema Body may be used") - .expressionLanguageSupported(false) - .addValidator(Validator.VALID) - .build(); - - public static final Relationship REL_VALID = new Relationship.Builder() - .name("valid") - .description("FlowFiles that are successfully validated against the schema are routed to this relationship") - .build(); - public static final Relationship REL_INVALID = new Relationship.Builder() - .name("invalid") - .description("FlowFiles that are not valid according to the specified schema are routed to this relationship") - .build(); - - private List properties; - private Set relationships; - private final AtomicReference schemaRef = new AtomicReference<>(); - - /** - * Custom validation for ensuring exactly one of Script File or Script Body is populated - * - * @param validationContext provides a mechanism for obtaining externally - * managed values, such as property values and supplies convenience methods - * for operating on those values - * @return A collection of validation results - */ - @Override - protected Collection customValidate(ValidationContext validationContext) { - Set results = new HashSet<>(); - - // Verify that exactly one of "script file" or "script body" is set - Map propertyMap = validationContext.getProperties(); - if (StringUtils.isEmpty(propertyMap.get(SCHEMA_FILE)) == StringUtils.isEmpty(propertyMap.get(SCHEMA_BODY))) { - results.add(new ValidationResult.Builder().valid(false).explanation( - "Exactly one of Schema File or Schema Body must be set").build()); - } - - return results; - } - - @Override - protected void init(final ProcessorInitializationContext context) { - final List properties = new ArrayList<>(); - properties.add(SCHEMA_FILE); - properties.add(SCHEMA_BODY); - this.properties = Collections.unmodifiableList(properties); - - final Set relationships = new HashSet<>(); - relationships.add(REL_VALID); - relationships.add(REL_INVALID); - this.relationships = Collections.unmodifiableSet(relationships); - } - - @Override - public Set getRelationships() { - return relationships; - } - - @Override - protected List getSupportedPropertyDescriptors() { - return properties; - } - - @OnScheduled - public void parseSchema(final ProcessContext context) throws IOException { - JSONObject jsonObjectSchema; - if(context.getProperty(SCHEMA_FILE).isSet()){ - try(FileInputStream inputStream = new FileInputStream(new File(context.getProperty(SCHEMA_FILE).getValue()))) { - JSONTokener jsonTokener = new JSONTokener(inputStream); - jsonObjectSchema = new JSONObject(jsonTokener); - } - } else { - String rawSchema = context.getProperty(SCHEMA_BODY).getValue(); - jsonObjectSchema = new JSONObject(rawSchema); - } - Schema schema = SchemaLoader.load(jsonObjectSchema); - this.schemaRef.set(schema); - } - - @Override - public void onTrigger(final ProcessContext context, final ProcessSession session) { - FlowFile flowFile = session.get(); - if (flowFile == null) { - return; - } - final Schema schema = schemaRef.get(); - final ComponentLog logger = getLogger(); - - final AtomicBoolean valid = new AtomicBoolean(true); - session.read(flowFile, new InputStreamCallback() { - @Override - public void process(final InputStream in) { - try { - String str = IOUtils.toString(in, StandardCharsets.UTF_8); - if (str.startsWith("[")) { - schema.validate(new JSONArray(str)); // throws a ValidationException if this object is invalid - } else { - schema.validate(new JSONObject(str)); // throws a ValidationException if this object is invalid - } - } catch (final IllegalArgumentException | ValidationException | IOException e) { - valid.set(false); - logger.debug("Failed to validate {} against schema due to {}", new Object[]{flowFile, e}); - } - } - }); - - if (valid.get()) { - logger.debug("Successfully validated {} against schema; routing to 'valid'", new Object[]{flowFile}); - session.getProvenanceReporter().route(flowFile, REL_VALID); - session.transfer(flowFile, REL_VALID); - } else { - logger.debug("Failed to validate {} against schema; routing to 'invalid'", new Object[]{flowFile}); - session.getProvenanceReporter().route(flowFile, REL_INVALID); - session.transfer(flowFile, REL_INVALID); - } - } -} diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/META-INF/services/org.apache.nifi.processor.Processor b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/META-INF/services/org.apache.nifi.processor.Processor index 35d03d1d313d..b9aae35b3637 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/META-INF/services/org.apache.nifi.processor.Processor +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/META-INF/services/org.apache.nifi.processor.Processor @@ -89,7 +89,6 @@ org.apache.nifi.processors.standard.TransformXml org.apache.nifi.processors.standard.UnpackContent org.apache.nifi.processors.standard.ValidateXml org.apache.nifi.processors.standard.ValidateCsv -org.apache.nifi.processors.standard.ValidateJson org.apache.nifi.processors.standard.ExecuteSQL org.apache.nifi.processors.standard.FetchDistributedMapCache org.apache.nifi.processors.standard.ListFTP diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.ValidateJson/additionalDetails.html b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.ValidateJson/additionalDetails.html deleted file mode 100644 index ce24cdf09f7a..000000000000 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.ValidateJson/additionalDetails.html +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - ValidateJson - - - - - -

Usage Information

- -

- The Validate JSON processor is based on the json-schema library. - The corresponding java documentation can be found - here. -

- - - diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestValidateJson.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestValidateJson.java deleted file mode 100644 index b1e2bd353c5d..000000000000 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestValidateJson.java +++ /dev/null @@ -1,105 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.nifi.processors.standard; - -import java.io.IOException; -import java.nio.file.Paths; - -import org.apache.commons.io.IOUtils; - -import org.apache.nifi.util.TestRunner; -import org.apache.nifi.util.TestRunners; - -import org.junit.Test; -import org.xml.sax.SAXException; - -public class TestValidateJson { - - @Test - public void testValidJsonArraySchemaFile() throws IOException, SAXException { - final TestRunner runner = TestRunners.newTestRunner(new ValidateJson()); - runner.setProperty(ValidateJson.SCHEMA_FILE, "src/test/resources/TestJson/json-sample-schema.json"); - - runner.enqueue(Paths.get("src/test/resources/TestJson/json-sample.json")); - runner.run(); - - runner.assertAllFlowFilesTransferred(ValidateJson.REL_VALID, 1); - } - - @Test - public void testValidJsonObjectSchemaFile() throws IOException, SAXException { - final TestRunner runner = TestRunners.newTestRunner(new ValidateJson()); - runner.setProperty(ValidateJson.SCHEMA_FILE, "src/test/resources/TestJson/json-object-sample-schema.json"); - - runner.enqueue(Paths.get("src/test/resources/TestJson/json-object-sample.json")); - runner.run(); - - runner.assertAllFlowFilesTransferred(ValidateJson.REL_VALID, 1); - } - - @Test - public void testValidJsonArraySchemaBody() throws IOException, SAXException { - final TestRunner runner = TestRunners.newTestRunner(new ValidateJson()); - - String schemaBody = IOUtils.toString(getClass().getClassLoader().getResourceAsStream("TestJson/json-sample-schema.json"), "UTF-8"); - - runner.setProperty(ValidateJson.SCHEMA_BODY, schemaBody); - - runner.enqueue(Paths.get("src/test/resources/TestJson/json-sample.json")); - runner.run(); - - runner.assertAllFlowFilesTransferred(ValidateJson.REL_VALID, 1); - } - - @Test - public void testValidJsonObjectSchemaBody() throws IOException, SAXException { - final TestRunner runner = TestRunners.newTestRunner(new ValidateJson()); - String schemaBody = IOUtils.toString(getClass().getClassLoader().getResourceAsStream("TestJson/json-object-sample-schema.json"), "UTF-8"); - runner.setProperty(ValidateJson.SCHEMA_BODY, schemaBody); - - runner.enqueue(Paths.get("src/test/resources/TestJson/json-object-sample.json")); - runner.run(); - - runner.assertAllFlowFilesTransferred(ValidateJson.REL_VALID, 1); - } - - @Test - public void testInvalidJsonArraySchemaBody() throws IOException, SAXException { - final TestRunner runner = TestRunners.newTestRunner(new ValidateJson()); - - String schemaBody = "{\"type\": \"object\",\"required\": [\"missingField\"]}"; //invalid schema for JSONArray - - runner.setProperty(ValidateJson.SCHEMA_BODY, schemaBody); - - runner.enqueue(Paths.get("src/test/resources/TestJson/json-sample.json")); - runner.run(); - - runner.assertAllFlowFilesTransferred(ValidateJson.REL_INVALID, 1); - } - - @Test - public void testInvalidJsonObjectSchemaBody() throws IOException, SAXException { - final TestRunner runner = TestRunners.newTestRunner(new ValidateJson()); - String schemaBody = "{\"type\": \"object\",\"required\": [\"missingField\"]}"; //schema requires missingField - runner.setProperty(ValidateJson.SCHEMA_BODY, schemaBody); - - runner.enqueue(Paths.get("src/test/resources/TestJson/json-object-sample.json")); //json without missingField - runner.run(); - - runner.assertAllFlowFilesTransferred(ValidateJson.REL_INVALID, 1); - } -} \ No newline at end of file diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/resources/TestJson/json-object-sample-schema.json b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/resources/TestJson/json-object-sample-schema.json deleted file mode 100644 index 7b0e293a439a..000000000000 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/resources/TestJson/json-object-sample-schema.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "type": "object", - "required": ["_id", "index", "guid", "isActive", "balance", "picture", "age", "eyeColor", "name", "company", "email", "phone" ,"address", "about", "registered", "latitude", "longitude", "tags", "range", "friends", "greeting", "favoriteFruit"], - "properties": { - "_id": {"type": "string"}, - "index": {"type": "integer"}, - "guid": {"type": "string"}, - "isActive": { "type": "boolean"}, - "balance": {"type": "string"}, - "picture": {"type": "string"}, - "age": {"type": "integer"}, - "eyeColor": {"type": "string"}, - "name": { - "type": "object", - "properties": { - "first": {"type":"string"}, - "last": {"type":"string"} - } - }, - "company": {"type": "string"}, - "email": {"type": "string"}, - "phone": {"type": "string"}, - "address": {"type": "string"}, - "about": {"type": "string"}, - "registered": {"type": "string"}, - "latitude": {"type": "number"}, - "longitude": {"type": "number"}, - "tags": {"type": "array"}, - "range": {"type": "array"}, - "friends": { - "type": "array", - "required": ["id", "me"], - "properties": { - "id": {"type":"integer"}, - "name": {"type":"string"} - } - }, - "greeting": {"type": "string"}, - "favoriteFruit": {"type": "string"} - } -} \ No newline at end of file diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/resources/TestJson/json-object-sample.json b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/resources/TestJson/json-object-sample.json deleted file mode 100644 index e7aa0ce18970..000000000000 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/resources/TestJson/json-object-sample.json +++ /dev/null @@ -1,59 +0,0 @@ -{ - "_id": "54df94072d5dbf7dc6340cc5", - "index": 0, - "guid": "b9f636cb-b939-42a9-b067-70d286116271", - "isActive": true, - "balance": "$3,200.07", - "picture": "http://placehold.it/32x32", - "age": 20, - "eyeColor": "brown", - "name": { - "first": "Shaffer", - "last": "Pearson" - }, - "company": "DATAGEN", - "email": "shaffer.pearson@datagen.co.uk", - "phone": "+1 (972) 588-2272", - "address": "662 Rewe Street, Starks, California, 9066", - "about": "Aliquip exercitation ad duis irure consectetur magna aliquip amet. Exercitation labore ex laboris non dolor eu. In magna amet non nulla sit laboris do aliqua aliquip. Est elit ipsum ad ea in Lorem mollit Lorem laborum. Ad labore minim aliqua dolore reprehenderit commodo nulla fugiat eiusmod nostrud cillum est. Deserunt minim in non aliqua non.\r\n", - "registered": "Wednesday, January 7, 2015 5:51 PM", - "latitude": -50.359159, - "longitude": -94.01781, - "tags": [ - "ea", - "enim", - "commodo", - "magna", - "sunt", - "dolore", - "aute" - ], - "range": [ - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9 - ], - "friends": [ - { - "id": 0, - "name": "Holloway Kim" - }, - { - "id": 1, - "name": "Clark Medina" - }, - { - "id": 2, - "name": "Rosemarie Salazar" - } - ], - "greeting": "Hello, Shaffer! You have 9 unread messages.", - "favoriteFruit": "apple" -} \ No newline at end of file diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/resources/TestJson/json-sample-schema.json b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/resources/TestJson/json-sample-schema.json deleted file mode 100644 index dd45c731a276..000000000000 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/resources/TestJson/json-sample-schema.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "type": "array", - "minItems": 1, - "items": { - "required": ["_id", "index", "guid", "isActive", "balance", "picture", "age", "eyeColor", "name", "company", "email", "phone" ,"address", "about", "registered", "latitude", "longitude", "tags", "range", "friends", "greeting", "favoriteFruit"], - "_id": {"type": "string"}, - "index": {"type": "integer"}, - "guid": {"type": "string"}, - "isActive": { "type": "boolean"}, - "balance": {"type": "string"}, - "picture": {"type": "string"}, - "age": {"type": "integer"}, - "eyeColor": {"type": "string"}, - "name": { - "type": "object", - "properties": { - "first": {"type":"string"}, - "last": {"type":"string"} - } - }, - "company": {"type": "string"}, - "email": {"type": "string"}, - "phone": {"type": "string"}, - "address": {"type": "string"}, - "about": {"type": "string"}, - "registered": {"type": "string"}, - "latitude": {"type": "number"}, - "longitude": {"type": "number"}, - "tags": {"type": "array"}, - "range": {"type": "array"}, - "friends": { - "type": "array", - "required": ["id", "me"], - "properties": { - "id": {"type":"integer"}, - "name": {"type":"string"} - } - }, - "greeting": {"type": "string"}, - "favoriteFruit": {"type": "string"} - } -} \ No newline at end of file From 1c60368b1bb8ba9129d32f176174d2f2682b9071 Mon Sep 17 00:00:00 2001 From: joewitt Date: Tue, 15 Nov 2016 16:17:48 -0500 Subject: [PATCH 3/3] NIFI-2991 removed json.org references as appropriate for build. Twitter proc no longer deployed but reference kept in notice just in case someone uses it --- nifi-assembly/NOTICE | 7 ------- .../nifi-aws-nar/src/main/resources/META-INF/NOTICE | 1 - .../nifi-flume-nar/src/main/resources/META-INF/NOTICE | 6 ------ .../nifi-social-media-bundle/nifi-social-media-nar/pom.xml | 4 ++++ 4 files changed, 4 insertions(+), 14 deletions(-) diff --git a/nifi-assembly/NOTICE b/nifi-assembly/NOTICE index fd340b0e9221..e0466952158d 100644 --- a/nifi-assembly/NOTICE +++ b/nifi-assembly/NOTICE @@ -780,12 +780,6 @@ The following binary components are provided under the Apache Software License v Apache License Version 2.0 http://www.apache.org/licenses/. (c) Daniel Lemire, http://lemire.me/en/ - (ASLv2) Twitter4J - The following NOTICE information applies: - Copyright 2007 Yusuke Yamamoto - - Twitter4J includes software from JSON.org to parse JSON response from the Twitter API. You can see the license term at http://www.JSON.org/license.html - (ASLv2) JOAuth The following NOTICE information applies: JOAuth @@ -821,7 +815,6 @@ The following binary components are provided under the Apache Software License v ********************** This software includes third party software subject to the following copyrights: - XML parsing and utility functions from JetS3t - Copyright 2006-2009 James Murty. - - JSON parsing and utility functions from JSON.org - Copyright 2002 JSON.org. - PKCS#1 PEM encoded private key parsing and utility functions from oauth.googlecode.com - Copyright 1998-2010 AOL Inc. (ASLv2) Apache Commons DBCP diff --git a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-nar/src/main/resources/META-INF/NOTICE b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-nar/src/main/resources/META-INF/NOTICE index 38cb6eb16485..5ae7a45ddd68 100644 --- a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-nar/src/main/resources/META-INF/NOTICE +++ b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-nar/src/main/resources/META-INF/NOTICE @@ -68,7 +68,6 @@ The following binary components are provided under the Apache Software License v ********************** This software includes third party software subject to the following copyrights: - XML parsing and utility functions from JetS3t - Copyright 2006-2009 James Murty. - - JSON parsing and utility functions from JSON.org - Copyright 2002 JSON.org. - PKCS#1 PEM encoded private key parsing and utility functions from oauth.googlecode.com - Copyright 1998-2010 AOL Inc. diff --git a/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-nar/src/main/resources/META-INF/NOTICE b/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-nar/src/main/resources/META-INF/NOTICE index 7d73ff98e0f6..a154d24c4a0d 100644 --- a/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-nar/src/main/resources/META-INF/NOTICE +++ b/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-nar/src/main/resources/META-INF/NOTICE @@ -175,12 +175,6 @@ The following binary components are provided under the Apache Software License v Jetty Web Container Copyright 1995-2015 Mort Bay Consulting Pty Ltd. - (ASLv2) Twitter4J - The following NOTICE information applies: - Copyright 2007 Yusuke Yamamoto - - Twitter4J includes software from JSON.org to parse JSON response from the Twitter API. You can see the license term at http://www.JSON.org/license.html - (ASLv2) Apache Velocity The following NOTICE information applies: Apache Velocity diff --git a/nifi-nar-bundles/nifi-social-media-bundle/nifi-social-media-nar/pom.xml b/nifi-nar-bundles/nifi-social-media-bundle/nifi-social-media-nar/pom.xml index add42d4c451a..9eb3391fa923 100644 --- a/nifi-nar-bundles/nifi-social-media-bundle/nifi-social-media-nar/pom.xml +++ b/nifi-nar-bundles/nifi-social-media-bundle/nifi-social-media-nar/pom.xml @@ -36,6 +36,10 @@ 1.1.0-SNAPSHOT +