Merge branch 'main' into feature/NIFI-14869-mssql-upsert

Author: Adelwageeh96

nifi-commons/nifi-expression-language/src/main/antlr3/org/apache/nifi/attribute/expression/language/antlr/AttributeExpressionLexer.g

@@ -69,6 +69,31 @@ WHITESPACE : (' '|'\t'|'\n'|'\r')+ { $channel = HIDDEN; };
 COMMENT : '#' ( ~('{') ) ( ~('\n') )* '\n' { $channel = HIDDEN; };
 
 // PARAMETERS
+// Capture the entire parameter reference (e.g., #{Batch Size}) as a single token so that
+// parameter names may contain spaces without requiring quotes. The lexer action normalizes
+// the token text to contain only the inner parameter name (without the surrounding "#{" and
+// "}"), and if the inner text itself is quoted (e.g., #{"Batch Size"}), the surrounding quotes
+// are also stripped. This preserves backward compatibility and ensures the parser/AST consumer
+// (ExpressionCompiler) receives a consistent parameter name string.
+PARAMETER_REFERENCE
+    : '#{' (~('}'))+ '}'
+      {
+        final String full = getText();
+        if (full != null && full.length() >= 3) {
+            String inner = full.substring(2, full.length() - 1);
+            if (inner.length() >= 2) {
+                final char first = inner.charAt(0);
+                final char last = inner.charAt(inner.length() - 1);
+                if ((first == '\'' && last == '\'') || (first == '"' && last == '"')) {
+                    inner = inner.substring(1, inner.length() - 1);
+                }
+            }
+            setText(inner);
+        }
+      }
+    ;
+// Retained for legacy form where the parameter name is parsed as a separate token sequence
+// (e.g., #{'Batch Size'}) and rewritten by the parser rule below.
 PARAMETER_REFERENCE_START : '#{';
 
 DOLLAR : '$';

nifi-commons/nifi-expression-language/src/main/antlr3/org/apache/nifi/attribute/expression/language/antlr/AttributeExpressionParser.g

@@ -145,8 +145,17 @@ attributeRefOrFunctionCall	: (attributeRef | standaloneFunction | parameterRefer
 referenceOrFunction : DOLLAR LBRACE attributeRefOrFunctionCall (COLON functionCall)* RBRACE ->
                       	^(EXPRESSION attributeRefOrFunctionCall functionCall*);
 
-parameterReference : PARAMETER_REFERENCE_START singleAttrRef RBRACE ->
-    ^(PARAMETER_REFERENCE singleAttrRef);
+// Parameter reference rule
+// Supports two forms:
+//   1) Legacy: "#{" singleAttrRef "}" where the name is either ATTRIBUTE_NAME or STRING_LITERAL
+//   2) New: a single PARAMETER_REFERENCE token produced by the lexer that already contains the
+//      normalized inner name (surrounding #{ } removed and optional inner quotes stripped).
+// Both forms are rewritten to the same AST shape: ^(PARAMETER_REFERENCE <child-token-with-name>)
+// so downstream consumers (ExpressionCompiler) can read child(0).getText() for the parameter name.
+parameterReference
+    : PARAMETER_REFERENCE_START singleAttrRef RBRACE -> ^(PARAMETER_REFERENCE singleAttrRef)
+    | p=PARAMETER_REFERENCE -> ^(PARAMETER_REFERENCE $p)
+    ;
 
 expression : referenceOrFunction;
 

nifi-commons/nifi-expression-language/src/test/java/org/apache/nifi/attribute/expression/language/TestQuery.java

@@ -447,6 +447,14 @@ public void testParameterReferenceWithSpace() {
         verifyEquals("${#{'test param'}:append(' - '):append(#{'test param'})}", attributes, stateValues, parameters, "unit - unit");
 
         verifyEquals("${#{\"test param\"}}", attributes, stateValues, parameters, "unit");
+
+        // Unquoted parameter reference with spaces should also work
+        verifyEquals("${#{test param}}", attributes, stateValues, parameters, "unit");
+
+        // Unquoted parameter used within a function argument
+        parameters.put("Date Format", "yyyy");
+        final String expectedYear = String.valueOf(java.time.LocalDate.now().getYear());
+        verifyEquals("${now():format(#{Date Format})}", attributes, stateValues, parameters, expectedYear);
     }
 
     @Test

nifi-docs/src/main/asciidoc/images/stats-history.png

@@ -2513,7 +2513,10 @@ representation of the statistics being graphed. The following information is pro
 - *Component-Specific Entries*: Information is shown for each different type of component. For example, for a Processor,
 	the type of Processor is displayed. For a Connection, the source and destination names and IDs are shown.
 
-- *Start*: The earliest time shown on the graph.
+- *Start*: The earliest time shown on the graph. This is a selectable value providing common options for how much of the historical data the user is interested in.
+   Options become available as data supports it, but the "All" option is always available. When "All" is selected it specifies that the earliest time in the graph will be the
+   beginning of all available data. Other options, only available as data becomes available, specify the last N amount of time ago
+   (5 minutes, 10 minutes, 30 minutes, hour).
 
 - *End*: The latest time shown on the graph.
 

nifi-docs/src/main/asciidoc/user-guide.adoc

@@ -33,6 +33,20 @@
 
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>org.mockito</groupId>
+                <artifactId>mockito-bom</artifactId>
+                <version>${mockito.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.junit</groupId>
+                <artifactId>junit-bom</artifactId>
+                <version>${junit.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
             <dependency>
                 <groupId>com.exceptionfactory.jagged</groupId>
                 <artifactId>jagged-bom</artifactId>

nifi-extension-bundles/nifi-cipher-bundle/pom.xml

@@ -22,7 +22,7 @@
     <packaging>jar</packaging>
 
     <properties>
-        <antlr4.version>4.13.1</antlr4.version>
+        <antlr4.version>4.13.2</antlr4.version>
         <antlr4.protobuf3.grammar.url>https://raw.githubusercontent.com/antlr/grammars-v4/e1491245d045474fa5393fb7be03b3b8ed22080f/protobuf3/Protobuf3.g4</antlr4.protobuf3.grammar.url>
         <antlr4.generated.sources>target/generated-sources/antlr4</antlr4.generated.sources>
     </properties>
@@ -33,7 +33,6 @@
             <artifactId>antlr4-runtime</artifactId>
             <version>${antlr4.version}</version>
         </dependency>
-
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-confluent-platform-schema-api</artifactId>
@@ -89,7 +88,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
-                <version>3.4.0</version>
+                <version>3.6.1</version>
                 <executions>
                     <execution>
                         <id>add-source</id>

nifi-extension-bundles/nifi-confluent-platform-bundle/nifi-confluent-protobuf-antlr-parser/pom.xml

@@ -25,7 +25,7 @@
     <packaging>pom</packaging>
 
     <properties>
-        <google.libraries.version>26.65.0</google.libraries.version>
+        <google.libraries.version>26.66.0</google.libraries.version>
     </properties>
 
     <dependencyManagement>

nifi-extension-bundles/nifi-gcp-bundle/pom.xml

@@ -22,7 +22,7 @@
     <artifactId>nifi-github-extensions</artifactId>
     <packaging>jar</packaging>
     <properties>
-        <jjwt.version>0.12.6</jjwt.version>
+        <jjwt.version>0.12.7</jjwt.version>
     </properties>
     <dependencies>
         <dependency>

nifi-extension-bundles/nifi-github-bundle/nifi-github-extensions/pom.xml

@@ -25,7 +25,7 @@
     <artifactId>nifi-graph-test-clients</artifactId>
     <packaging>jar</packaging>
     <properties>
-        <janusgraph.version>1.2.0-20250812-182757.f621a1c</janusgraph.version>
+        <janusgraph.version>1.2.0-20250815-215833.1b92960</janusgraph.version>
         <guava.version>33.4.8-jre</guava.version>
         <amqp-client.version>5.26.0</amqp-client.version>
     </properties>