NIFI-1660: Fix formatting; update to NOTICE files of nars that bring in EL. Closed Reader that was opened in TestQuery.
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/6de738fd Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/6de738fd Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/6de738fd Branch: refs/heads/master Commit: 6de738fd04f773ba6b05b3768c5214847b55cf50 Parents: abad7d8 Author: Mark Payne <[email protected]> Authored: Tue Jun 7 15:33:13 2016 -0400 Committer: Mark Payne <[email protected]> Committed: Tue Jun 7 15:34:37 2016 -0400 ---------------------------------------------------------------------- .../attribute/expression/language/Query.java | 5 ++- .../expression/language/TestQuery.java | 34 +++++++++----------- .../src/main/resources/META-INF/NOTICE | 8 +++++ .../src/main/resources/META-INF/NOTICE | 8 +++++ 4 files changed, 34 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/6de738fd/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/Query.java ---------------------------------------------------------------------- diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/Query.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/Query.java index 9bd653a..6985bfc 100644 --- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/Query.java +++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/Query.java @@ -1359,9 +1359,8 @@ public class Query { return addToken(new JsonPathEvaluator(toStringEvaluator(subjectEvaluator), toStringEvaluator(argEvaluators.get(0), "first argument to jsonPath")), "jsonPath"); } - default: - throw new AttributeExpressionLanguageParsingException( - "Expected a Function-type expression but got " + tree.toString()); + default: + throw new AttributeExpressionLanguageParsingException("Expected a Function-type expression but got " + tree.toString()); } } http://git-wip-us.apache.org/repos/asf/nifi/blob/6de738fd/nifi-commons/nifi-expression-language/src/test/java/org/apache/nifi/attribute/expression/language/TestQuery.java ---------------------------------------------------------------------- diff --git a/nifi-commons/nifi-expression-language/src/test/java/org/apache/nifi/attribute/expression/language/TestQuery.java b/nifi-commons/nifi-expression-language/src/test/java/org/apache/nifi/attribute/expression/language/TestQuery.java index 39622cb..05bd017 100644 --- a/nifi-commons/nifi-expression-language/src/test/java/org/apache/nifi/attribute/expression/language/TestQuery.java +++ b/nifi-commons/nifi-expression-language/src/test/java/org/apache/nifi/attribute/expression/language/TestQuery.java @@ -241,7 +241,7 @@ public class TestQuery { } @Test - public void testJsonPath() { + public void testJsonPath() throws IOException { final Map<String, String> attributes = new HashMap<>(); attributes.put("json", getResourceAsString("/json/address-book.json")); verifyEquals("${json:jsonPath('$.firstName')}", attributes, "John"); @@ -1315,24 +1315,22 @@ public class TestQuery { assertEquals(expectedResult, result.getValue()); } - private String getResourceAsString(String resourceName) { - Reader reader = new InputStreamReader(new BufferedInputStream(getClass().getResourceAsStream(resourceName))); - int n = 0; - char[] buf = new char[1024]; - StringBuilder sb = new StringBuilder(); - while (n != -1) { - try { - n = reader.read(buf, 0, buf.length); - } catch (IOException e) { - throw new RuntimeException("failed to read resource", e); - } - if (n > 0) { - sb.append(buf, 0, n); + private String getResourceAsString(String resourceName) throws IOException { + try (final Reader reader = new InputStreamReader(new BufferedInputStream(getClass().getResourceAsStream(resourceName)))) { + int n = 0; + char[] buf = new char[1024]; + StringBuilder sb = new StringBuilder(); + while (n != -1) { + try { + n = reader.read(buf, 0, buf.length); + } catch (IOException e) { + throw new RuntimeException("failed to read resource", e); + } + if (n > 0) { + sb.append(buf, 0, n); + } } + return sb.toString(); } - return sb.toString(); - - } - } http://git-wip-us.apache.org/repos/asf/nifi/blob/6de738fd/nifi-nar-bundles/nifi-framework-bundle/nifi-framework-nar/src/main/resources/META-INF/NOTICE ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework-nar/src/main/resources/META-INF/NOTICE b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework-nar/src/main/resources/META-INF/NOTICE index ac7f0b7..8de7a18 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework-nar/src/main/resources/META-INF/NOTICE +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework-nar/src/main/resources/META-INF/NOTICE @@ -100,6 +100,14 @@ The following binary components are provided under the Apache Software License v Swagger Core 1.5.3-M1 Copyright 2015 Reverb Technologies, Inc. + (ASLv2) JSON-SMART + The following NOTICE information applies: + Copyright 2011 JSON-SMART authors + + (ASLv2) JsonPath + The following NOTICE information applies: + Copyright 2011 JsonPath authors + ************************ Common Development and Distribution License 1.1 ************************ http://git-wip-us.apache.org/repos/asf/nifi/blob/6de738fd/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-nar/src/main/resources/META-INF/NOTICE ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-nar/src/main/resources/META-INF/NOTICE b/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-nar/src/main/resources/META-INF/NOTICE index 419dc19..1e90f9f 100644 --- a/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-nar/src/main/resources/META-INF/NOTICE +++ b/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-nar/src/main/resources/META-INF/NOTICE @@ -17,3 +17,11 @@ The following binary components are provided under the Apache Software License v This product includes software from the Spring Framework, under the Apache License 2.0 (see: StringUtils.containsWhitespace()) + + (ASLv2) JSON-SMART + The following NOTICE information applies: + Copyright 2011 JSON-SMART authors + + (ASLv2) JsonPath + The following NOTICE information applies: + Copyright 2011 JsonPath authors
