You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by jp...@apache.org on 2016/11/15 23:07:31 UTC
[1/3] nifi git commit: NIFI-2991 removed usage of json lib and
components still using it
Repository: nifi
Updated Branches:
refs/heads/master 721964b7d -> b026f0beb
NIFI-2991 removed usage of json lib and components still using it
Signed-off-by: jpercivall <JP...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/1c907733
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/1c907733
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/1c907733
Branch: refs/heads/master
Commit: 1c9077334f8672e10d765b5346b0282fec06126c
Parents: 721964b
Author: joewitt <jo...@apache.org>
Authored: Tue Nov 15 15:48:36 2016 -0500
Committer: jpercivall <JP...@apache.org>
Committed: Tue Nov 15 18:09:09 2016 -0500
----------------------------------------------------------------------
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(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/1c907733/nifi-assembly/pom.xml
----------------------------------------------------------------------
diff --git a/nifi-assembly/pom.xml b/nifi-assembly/pom.xml
index 5eef82f..aa12f85 100755
--- a/nifi-assembly/pom.xml
+++ b/nifi-assembly/pom.xml
@@ -243,11 +243,13 @@ language governing permissions and limitations under the License. -->
<artifactId>nifi-solr-nar</artifactId>
<type>nar</type>
</dependency>
+ <!-- Will restore this when the social media nar no longer has a dependency on cat-x twitter4J version
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-social-media-nar</artifactId>
<type>nar</type>
</dependency>
+ -->
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-hl7-nar</artifactId>
http://git-wip-us.apache.org/repos/asf/nifi/blob/1c907733/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-processors/pom.xml
----------------------------------------------------------------------
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 1a49f51..c069eb5 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 @@
<artifactId>flume-scribe-source</artifactId>
<version>${flume.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.flume.flume-ng-sources</groupId>
- <artifactId>flume-twitter-source</artifactId>
- <version>${flume.version}</version>
- </dependency>
<!-- Flume Sinks -->
<dependency>
http://git-wip-us.apache.org/repos/asf/nifi/blob/1c907733/nifi-nar-bundles/nifi-social-media-bundle/nifi-social-media-nar/pom.xml
----------------------------------------------------------------------
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 ad4f1d2..add42d4 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 @@
<version>1.1.0-SNAPSHOT</version>
</dependency>
</dependencies>
-
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
http://git-wip-us.apache.org/repos/asf/nifi/blob/1c907733/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml
----------------------------------------------------------------------
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 cce9c57..77cf950 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. -->
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-dbcp-service-api</artifactId>
</dependency>
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ </dependency>
<dependency>
<groupId>com.squareup.okhttp</groupId>
<artifactId>okhttp</artifactId>
[3/3] nifi git commit: 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
Posted by jp...@apache.org.
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
This closes #1230
Signed-off-by: jpercivall <JP...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/b026f0be
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/b026f0be
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/b026f0be
Branch: refs/heads/master
Commit: b026f0bebe737aa62ab7de48a776d851807b1350
Parents: 6696529
Author: joewitt <jo...@apache.org>
Authored: Tue Nov 15 16:17:48 2016 -0500
Committer: jpercivall <JP...@apache.org>
Committed: Tue Nov 15 18:09:27 2016 -0500
----------------------------------------------------------------------
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(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/b026f0be/nifi-assembly/NOTICE
----------------------------------------------------------------------
diff --git a/nifi-assembly/NOTICE b/nifi-assembly/NOTICE
index e920ff6..d785dab 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
http://git-wip-us.apache.org/repos/asf/nifi/blob/b026f0be/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-nar/src/main/resources/META-INF/NOTICE
----------------------------------------------------------------------
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 38cb6eb..5ae7a45 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.
http://git-wip-us.apache.org/repos/asf/nifi/blob/b026f0be/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-nar/src/main/resources/META-INF/NOTICE
----------------------------------------------------------------------
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 7d73ff9..a154d24 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
http://git-wip-us.apache.org/repos/asf/nifi/blob/b026f0be/nifi-nar-bundles/nifi-social-media-bundle/nifi-social-media-nar/pom.xml
----------------------------------------------------------------------
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 add42d4..9eb3391 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 @@
<version>1.1.0-SNAPSHOT</version>
</dependency>
</dependencies>
+ <!-- This is here to ensure we do not publish the nar since it would at present
+ publish a cat-x dependency. Since this is optional it is ok to have the jar/bundle
+ and it allows people to build it and use it themselves. Once the dependency - twitter4j
+ no longer uses this cat-x dependency we'll be ok to return it back to normal -->
<build>
<plugins>
<plugin>
[2/3] nifi git commit: Revert "NIFI-1893 Add processor for validating
JSON"
Posted by jp...@apache.org.
Revert "NIFI-1893 Add processor for validating JSON"
This reverts commit f11682202b57edab585967e033839800d4159f4e.
Signed-off-by: jpercivall <JP...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/6696529c
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/6696529c
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/6696529c
Branch: refs/heads/master
Commit: 6696529c99b5b564b076e4012abff3a54755370b
Parents: 1c90773
Author: joewitt <jo...@apache.org>
Authored: Tue Nov 15 15:52:17 2016 -0500
Committer: jpercivall <JP...@apache.org>
Committed: Tue Nov 15 18:09:14 2016 -0500
----------------------------------------------------------------------
.../nifi-standard-processors/pom.xml | 8 -
.../nifi/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 ----
.../resources/TestJson/json-object-sample.json | 59 ------
.../resources/TestJson/json-sample-schema.json | 42 ----
8 files changed, 492 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/6696529c/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml
----------------------------------------------------------------------
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 77cf950..f6786c6 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
@@ -250,11 +250,6 @@ language governing permissions and limitations under the License. -->
<version>2.4.0</version>
</dependency>
<dependency>
- <groupId>org.everit.json</groupId>
- <artifactId>org.everit.json.schema</artifactId>
- <version>1.4.0</version>
- </dependency>
- <dependency>
<groupId>com.fluenda</groupId>
<artifactId>ParCEFone</artifactId>
<version>1.2.0</version>
@@ -290,9 +285,6 @@ language governing permissions and limitations under the License. -->
<exclude>src/test/resources/TestIdentifyMimeType/1.txt</exclude>
<exclude>src/test/resources/TestIdentifyMimeType/1.csv</exclude>
<exclude>src/test/resources/TestJson/json-sample.json</exclude>
- <exclude>src/test/resources/TestJson/json-sample-schema.json</exclude>
- <exclude>src/test/resources/TestJson/json-object-sample.json</exclude>
- <exclude>src/test/resources/TestJson/json-object-sample-schema.json</exclude>
<exclude>src/test/resources/TestJson/control-characters.json</exclude>
<exclude>src/test/resources/TestMergeContent/demarcate</exclude>
<exclude>src/test/resources/TestMergeContent/foot</exclude>
http://git-wip-us.apache.org/repos/asf/nifi/blob/6696529c/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ValidateJson.java
----------------------------------------------------------------------
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 a5a0975..0000000
--- 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<PropertyDescriptor> properties;
- private Set<Relationship> relationships;
- private final AtomicReference<Schema> 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<ValidationResult> customValidate(ValidationContext validationContext) {
- Set<ValidationResult> results = new HashSet<>();
-
- // Verify that exactly one of "script file" or "script body" is set
- Map<PropertyDescriptor, String> 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<PropertyDescriptor> properties = new ArrayList<>();
- properties.add(SCHEMA_FILE);
- properties.add(SCHEMA_BODY);
- this.properties = Collections.unmodifiableList(properties);
-
- final Set<Relationship> relationships = new HashSet<>();
- relationships.add(REL_VALID);
- relationships.add(REL_INVALID);
- this.relationships = Collections.unmodifiableSet(relationships);
- }
-
- @Override
- public Set<Relationship> getRelationships() {
- return relationships;
- }
-
- @Override
- protected List<PropertyDescriptor> 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);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/nifi/blob/6696529c/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/META-INF/services/org.apache.nifi.processor.Processor
----------------------------------------------------------------------
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 35d03d1..b9aae35 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
http://git-wip-us.apache.org/repos/asf/nifi/blob/6696529c/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.ValidateJson/additionalDetails.html
----------------------------------------------------------------------
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 ce24cdf..0000000
--- 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 @@
-<!DOCTYPE html>
-<html lang="en">
-<!--
- 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.
--->
-<head>
- <meta charset="utf-8"/>
- <title>ValidateJson</title>
- <link rel="stylesheet" href="../../css/component-usage.css" type="text/css"/>
-</head>
-
-<body>
-<!-- Processor Documentation ================================================== -->
-<h2>Usage Information</h2>
-
-<p>
- The Validate JSON processor is based on the json-schema library.
- The corresponding java documentation can be found
- <a href="https://github.com/everit-org/json-schema" target="_blank">here</a>.
-</p>
-
-</body>
-</html>
http://git-wip-us.apache.org/repos/asf/nifi/blob/6696529c/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestValidateJson.java
----------------------------------------------------------------------
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 b1e2bd3..0000000
--- 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
http://git-wip-us.apache.org/repos/asf/nifi/blob/6696529c/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/resources/TestJson/json-object-sample-schema.json
----------------------------------------------------------------------
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 7b0e293..0000000
--- 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
http://git-wip-us.apache.org/repos/asf/nifi/blob/6696529c/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/resources/TestJson/json-object-sample.json
----------------------------------------------------------------------
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 e7aa0ce..0000000
--- 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
http://git-wip-us.apache.org/repos/asf/nifi/blob/6696529c/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/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 dd45c73..0000000
--- 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