This is an automated email from the ASF dual-hosted git repository.

henrib pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-jexl.git


The following commit(s) were added to refs/heads/master by this push:
     new 2bca64e  JEXL: javadoc woes
     new a539d73  Merge remote-tracking branch 'origin/master'
2bca64e is described below

commit 2bca64e40a4f3ca391f8a88bb6a073dc970e5a38
Author: henrib <[email protected]>
AuthorDate: Sat Mar 20 19:18:20 2021 +0100

    JEXL: javadoc woes
---
 src/main/java/org/apache/commons/jexl3/package.html | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/apache/commons/jexl3/package.html 
b/src/main/java/org/apache/commons/jexl3/package.html
index ee1c811..fbcecf2 100644
--- a/src/main/java/org/apache/commons/jexl3/package.html
+++ b/src/main/java/org/apache/commons/jexl3/package.html
@@ -20,7 +20,6 @@
     </head>
     <body>
         Provides a framework for evaluating JEXL expressions.
-        <br/><br/>
         <ul>
             <li><a href="#intro">Introduction</a></li>
             <li><a href="#example">Brief Example</a></li>
@@ -283,7 +282,7 @@
                     return Math.cos(x);
                 }
             }
-            Map&lt;String, Object> funcs = new HashMap&lt;String, Object&gt;();
+            Map&lt;String, Object&gt; funcs = new HashMap&lt;String, 
Object&gt;();
             funcs.put("math", new MyMath());
             JexlEngine jexl = new JexlBuilder().namespaces(funcs).create();
 
@@ -319,17 +318,17 @@
         <p>
             Those configuration options can be overridden during evaluation by 
implementing a
             {@link org.apache.commons.jexl3.JexlContext}
-            that also implements {@link 
org.apache.commons.jexl3.JexlEngine$Options} to carry evaluation options.
+            that also implements {@link 
org.apache.commons.jexl3.JexlEngine#Options} to carry evaluation options.
             An example of such a class exists in the test package.
         </p>
         <p>
-            {@link org.apache.commons.jexl3.JexlBuilder#strict} or {@link 
org.apache.commons.jexl3.JexlEngine$Options#isStrict}
+            {@link org.apache.commons.jexl3.JexlBuilder#strict} or {@link 
org.apache.commons.jexl3.JexlEngine.Options#isStrict}
             configures when JEXL considers 'null' as an error or not in 
various situations;
             when facing an unreferenceable variable, using null as an argument 
to an arithmetic operator or failing to call
             a method or constructor. The lenient mode is close to JEXL-1.1 
behavior.
         </p>
         <p>
-            {@link org.apache.commons.jexl3.JexlBuilder#silent} or {@link 
org.apache.commons.jexl3.JexlEngine$Options#isSilent}
+            {@link org.apache.commons.jexl3.JexlBuilder#silent} or {@link 
org.apache.commons.jexl3.JexlEngine.Options#isSilent}
             configures how JEXL reacts to errors; if silent, the engine will 
not throw exceptions
             but will warn through loggers and return null in case of errors. 
Note that when non-silent, JEXL throws
             JexlException which are unchecked exception.
@@ -368,7 +367,7 @@
             If you overload some in your JexlArithmetic derived 
implementation, these methods will be called when the
             arguments match your method signature.
             For example, this would be the case if you wanted '+' to operate 
on arrays; you'd need to derive
-            JexlArithmetic and implement 'public Object add(Set<?> x, Set<?> 
y)' method.
+            JexlArithmetic and implement 'public Object add(Set&lt;?;&gt; x, 
Set&lt;?;&gt; y)' method.
             Note however that you can <em>not</em> change the operator 
precedence.
             The list of operator / method matches is the following:
         </p>
@@ -404,7 +403,7 @@
                     <td>mod(x, y)</td>
                 </tr>
                 <tr>
-                    <td>&</td>
+                    <td>&amp;</td>
                     <td>bitwiseAnd</td>
                     <td>bitwiseAnd(x, y)</td>
                 </tr>

Reply via email to