NIFI-1660: Fix formatting; update to NOTICE files of nars that bring in EL. Closed Reader that was opened in TestQuery.

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:
+            default:
-                throw new AttributeExpressionLanguageParsingException(
+                throw new AttributeExpressionLanguageParsingException("Expected a Function-type expression but got " + tree.toString());
-                        "Expected a Function-type expression but got " + tree.toString());
             }
     }
 

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) {
+    private String getResourceAsString(String resourceName) throws IOException {
-        Reader reader = new InputStreamReader(new BufferedInputStream(getClass().getResourceAsStream(resourceName)));
+        try (final Reader reader = new InputStreamReader(new BufferedInputStream(getClass().getResourceAsStream(resourceName)))) {
-        int n = 0;
+            int n = 0;
-        char[] buf = new char[1024];
+            char[] buf = new char[1024];
-        StringBuilder sb = new StringBuilder();
+            StringBuilder sb = new StringBuilder();
-        while (n != -1) {
+            while (n != -1) {
-            try {
+                try {
-                n = reader.read(buf, 0, buf.length);
+                    n = reader.read(buf, 0, buf.length);
-            } catch (IOException e) {
+                } catch (IOException e) {
-                throw new RuntimeException("failed to read resource", e);
+                    throw new RuntimeException("failed to read resource", e);
-            }
+                }
-            if (n > 0) {
+                if (n > 0) {
-                sb.append(buf, 0, n);
+                    sb.append(buf, 0, n);
+                }
             }
+            return sb.toString();
         }
-        return sb.toString();
-
-
     }
-
 }

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
 ************************

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