NIFI-1662 Adding proper UI regex support for decimals in EL

This closes #1018

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

@@ -81,8 +81,7 @@ WHOLE_NUMBER	: ('0'..'9')+;
 
 DECIMAL :    ('0'..'9')+ '.' ('0'..'9')* EXP?
            | '.' ('0'..'9')+ EXP?
-           | ('0'..'9')+ EXP
+           | ('0'..'9')+ EXP;
-           | ('0'..'9')+ ;
 
 fragment EXP : ('e'|'E') ('+'|'-')? ('0'..'9')+ ;
 

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

@@ -821,6 +821,7 @@ public class TestQuery {
 
         // The expected resulted is calculated instead of a set number due to the inaccuracy of double arithmetic
         verifyEquals("${literal(5):toNumber():multiply(${two:plus(1)})}", attributes, 5*3.2);
+        verifyEquals("${literal(5.5E-1):toDecimal():plus(${literal(.5E1)}):multiply(${two:plus(1)})}", attributes, (0.55+5)*3.2);
     }
 
     @Test

nifi-docs/src/main/asciidoc/expression-language-guide.adoc

@@ -194,15 +194,20 @@ Language supports four different data types:
 - *Decimal*: A Decimal is a numeric value that can support decimals and larger values with minimal loss of precision. More precisely it
     is a double-precision 64-bit IEEE 754 floating point. Due to this minimal loss of precision this data type should not be used for
     very precise values, such as currency. For more documentation on the range of values stored in this data type
-    refer to this https://docs.oracle.com/javase/specs/jls/se7/html/jls-4.html#jls-4.2.3[link]. Decimals cannot be expressed as un-quoted characters
+    refer to this https://docs.oracle.com/javase/specs/jls/se7/html/jls-4.html#jls-4.2.3[link]. The following are some examples of the forms of
-    when inputting a literal Decimal to an Expression Language function. They must be input as Strings using quotes, like so: "1.1".
+    literal decimals that are supported in expression language (the "E" can also be lower-case):
+
+        * 1.1
+        * .1E1
+        * 1.11E-12
+
 - *Date*: A Date is an object that holds a Date and Time. Utilizing the <<dates>> and <<type_cast>> functions this data
 	type can be converted to/from Strings and numbers. If the whole Expression Language expression is evaluated to be a
 	date then it will be converted to a String with the format: "<Day of Week> <Month> <Day of Month> <Hour>:<Minute>:<Second> <Time Zone> <Year>".
 	Also expressed as "E MMM dd HH:mm:ss z yyyy" in Java SimpleDateFormat format. For example: "Wed Dec 31 12:00:04 UTC 2016".
 - *Boolean*: A Boolean is one of either `true` or `false`.
 
-After evaluating expression language functions, all attributes are stored as of type String.
+After evaluating expression language functions, all attributes are stored as type String.
 
 The Expression Language is generally able to automatically coerce a value of one data type to the appropriate
 data type for a function. However, functions do exist to manually coerce a value into a specific data type.

nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/nfeditor/languages/nfel.js

@@ -658,7 +658,24 @@ nf.nfel = (function() {
                             }
 
                             return argumentStringResult;
-                        } else if (stream.match(/^[0-9]+/)) {
+                        } else if (stream.match(/^(([0-9]+\.[0-9]*)([eE][+-]?([0-9])+)?)|((\.[0-9]+)([eE][+-]?([0-9])+)?)|(([0-9]+)([eE][+-]?([0-9])+))/)) {
+                            // -------------
+                            // Decimal value
+                            // -------------
+                            // This matches the following ANTLR spec for deciamls
+                            //
+                            // DECIMAL :    ('0'..'9')+ '.' ('0'..'9')* EXP?    ^([0-9]+\.[0-9]*)([eE][+-]?([0-9])+)?
+                            //             | '.' ('0'..'9')+ EXP?
+                            //             | ('0'..'9')+ EXP;
+                            //
+                            // fragment EXP : ('e'|'E') ('+'|'-')? ('0'..'9')+ ;
+
+                            // change context back to arguments
+                            state.context = ARGUMENTS;
+
+                            // style for decimal (use same as number)
+                            return 'number';
+                        } else if (stream.match(/^-?[0-9]+/)) {
                             // -------------
                             // integer value
                             // -------------