Author: sebb
Date: Mon Mar 13 12:29:30 2017
New Revision: 1786671
URL: http://svn.apache.org/viewvc?rev=1786671&view=rev
Log:
Add @since markers
Modified:
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/JexlArithmetic.java
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/JexlBuilder.java
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/JexlContext.java
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/JexlEngine.java
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/JexlException.java
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/JexlOperator.java
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/JxltEngine.java
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/introspection/JexlSandbox.java
Modified:
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/JexlArithmetic.java
URL:
http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/JexlArithmetic.java?rev=1786671&r1=1786670&r2=1786671&view=diff
==============================================================================
---
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/JexlArithmetic.java
(original)
+++
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/JexlArithmetic.java
Mon Mar 13 12:29:30 2017
@@ -138,6 +138,7 @@ public class JexlArithmetic {
*
* @param context the context that may extend {@link JexlEngine.Options}
to use
* @return a new arithmetic instance or this
+ * @since 3.1
*/
public JexlArithmetic options(JexlContext context) {
return context instanceof JexlEngine.Options
@@ -154,6 +155,7 @@ public class JexlArithmetic {
* @param bigdContext the math context instance to use for +,-,/,*,%
operations on big decimals.
* @param bigdScale the scale used for big decimals.
* @return default is a new JexlArithmetic instance
+ * @since 3.1
*/
protected JexlArithmetic createWithOptions(boolean astrict, MathContext
bigdContext, int bigdScale) {
return new JexlArithmetic(astrict, bigdContext, bigdScale);
Modified:
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/JexlBuilder.java
URL:
http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/JexlBuilder.java?rev=1786671&r1=1786670&r2=1786671&view=diff
==============================================================================
---
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/JexlBuilder.java
(original)
+++
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/JexlBuilder.java
Mon Mar 13 12:29:30 2017
@@ -203,6 +203,9 @@ public class JexlBuilder {
return loader;
}
+ /**
+ * @deprecated since 3.1 use {@link #charset(Charset)} instead
+ */
@Deprecated
public JexlBuilder loader(Charset arg) {
return charset(arg);
@@ -213,6 +216,7 @@ public class JexlBuilder {
*
* @param arg the charset
* @return this builder
+ * @since 3.1
*/
public JexlBuilder charset(Charset arg) {
this.charset = arg;
@@ -279,13 +283,17 @@ public class JexlBuilder {
*
* @param flag true implies the engine throws the exception, false makes
the engine return null.
* @return this builder
+ * @since 3.1
*/
public JexlBuilder cancellable(boolean flag) {
this.cancellable = flag;
return this;
}
- /** @return the cancellable information flag */
+ /**
+ * @return the cancellable information flag
+ * @since 3.1
+ */
public Boolean cancellable() {
return this.cancellable;
}
Modified:
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/JexlContext.java
URL:
http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/JexlContext.java?rev=1786671&r1=1786670&r2=1786671&view=diff
==============================================================================
---
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/JexlContext.java
(original)
+++
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/JexlContext.java
Mon Mar 13 12:29:30 2017
@@ -125,6 +125,7 @@ public interface JexlContext {
* It is used by the interpreter during evaluation to execute annotation
evaluations.
* <p>If the JexlContext is not an instance of an AnnotationProcessor,
encountering an annotation will generate
* an error or a warning depending on the engine strictness.
+ * @since 3.1
*/
interface AnnotationProcessor {
/**
Modified:
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/JexlEngine.java
URL:
http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/JexlEngine.java?rev=1786671&r1=1786670&r2=1786671&view=diff
==============================================================================
---
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/JexlEngine.java
(original)
+++
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/JexlEngine.java
Mon Mar 13 12:29:30 2017
@@ -122,6 +122,7 @@ public abstract class JexlEngine {
/**
* Whether evaluation will throw JexlException.Cancel (true) or return
null (false) when interrupted.
* @return true when cancellable, false otherwise
+ * @since 3.1
*/
Boolean isCancellable();
Modified:
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/JexlException.java
URL:
http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/JexlException.java?rev=1786671&r1=1786670&r2=1786671&view=diff
==============================================================================
---
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/JexlException.java
(original)
+++
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/JexlException.java
Mon Mar 13 12:29:30 2017
@@ -598,6 +598,7 @@ public class JexlException extends Runti
* @param node the node where the error occurred
* @param annotation the annotation name
* @return the error message
+ * @since 3.1
*/
public static String annotationError(JexlNode node, String annotation) {
StringBuilder msg = errorAt(node);
Modified:
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/JexlOperator.java
URL:
http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/JexlOperator.java?rev=1786671&r1=1786670&r2=1786671&view=diff
==============================================================================
---
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/JexlOperator.java
(original)
+++
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/JexlOperator.java
Mon Mar 13 12:29:30 2017
@@ -299,6 +299,7 @@ public enum JexlOperator {
* If the returned Iterator is AutoCloseable, close will be called after
the last execution of the loop block.
* <br><strong>Syntax:</strong> <code>for(var x : y){...} </code>
* <br><strong>Method:</strong> <code>Iterator<Object> forEach(R
y);</code>.
+ * @since 3.1
*/
FOR_EACH("for(...)", "forEach", 1);
Modified:
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/JxltEngine.java
URL:
http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/JxltEngine.java?rev=1786671&r1=1786670&r2=1786671&view=diff
==============================================================================
---
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/JxltEngine.java
(original)
+++
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/JxltEngine.java
Mon Mar 13 12:29:30 2017
@@ -331,6 +331,7 @@ public abstract class JxltEngine {
* Gets this script pragmas.
*
* @return the (non null, may be empty) pragmas map
+ * @since 3.1
*/
Map<String, Object> getPragmas();
}
Modified:
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/introspection/JexlSandbox.java
URL:
http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/introspection/JexlSandbox.java?rev=1786671&r1=1786670&r2=1786671&view=diff
==============================================================================
---
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/introspection/JexlSandbox.java
(original)
+++
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/introspection/JexlSandbox.java
Mon Mar 13 12:29:30 2017
@@ -80,6 +80,7 @@ public final class JexlSandbox {
* a black-box considers no permissions as "e;nothing is
allowed"e;.
* @param wb whether this sandbox is white (true) or black (false)
* if no permission is explicitly defined for a class.
+ * @since 3.1
*/
public JexlSandbox(boolean wb) {
this(wb, new HashMap<String, Permissions>());
@@ -97,6 +98,7 @@ public final class JexlSandbox {
* Creates a sandbox based on an existing permissions map.
* @param wb whether this sandbox is white (true) or black (false)
* @param map the permissions map
+ * @since 3.1
*/
protected JexlSandbox(boolean wb, Map<String, Permissions> map) {
white = wb;
