This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push: new ea403c3190 Javadoc cleanup ea403c3190 is described below commit ea403c3190ca4445613e059c1e41421eb6e251ea Author: remm <r...@apache.org> AuthorDate: Tue May 28 16:13:28 2024 +0200 Javadoc cleanup The jakarta.el javadoc is incomplete at the moment. --- java/org/apache/el/MethodExpressionImpl.java | 13 ------- java/org/apache/el/ValueExpressionImpl.java | 45 +--------------------- java/org/apache/el/lang/ExpressionBuilder.java | 5 --- java/org/apache/el/lang/FunctionMapperFactory.java | 3 -- java/org/apache/el/lang/FunctionMapperImpl.java | 31 --------------- 5 files changed, 1 insertion(+), 96 deletions(-) diff --git a/java/org/apache/el/MethodExpressionImpl.java b/java/org/apache/el/MethodExpressionImpl.java index df60b8c63b..fbedd4d7b1 100644 --- a/java/org/apache/el/MethodExpressionImpl.java +++ b/java/org/apache/el/MethodExpressionImpl.java @@ -268,11 +268,6 @@ public final class MethodExpressionImpl extends MethodExpression implements return result; } - /* - * (non-Javadoc) - * - * @see java.io.Externalizable#readExternal(java.io.ObjectInput) - */ @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { @@ -287,11 +282,6 @@ public final class MethodExpressionImpl extends MethodExpression implements this.varMapper = (VariableMapper) in.readObject(); } - /* - * (non-Javadoc) - * - * @see java.io.Externalizable#writeExternal(java.io.ObjectOutput) - */ @Override public void writeExternal(ObjectOutput out) throws IOException { out.writeUTF(this.expr); @@ -308,9 +298,6 @@ public final class MethodExpressionImpl extends MethodExpression implements } - /** - * @since EL 3.0 - */ @Override public boolean isParametersProvided() { return this.getNode().isParametersProvided(); diff --git a/java/org/apache/el/ValueExpressionImpl.java b/java/org/apache/el/ValueExpressionImpl.java index 1a7a6e6aff..8746ec86dc 100644 --- a/java/org/apache/el/ValueExpressionImpl.java +++ b/java/org/apache/el/ValueExpressionImpl.java @@ -110,11 +110,6 @@ public final class ValueExpressionImpl extends ValueExpression implements this.expectedType = expectedType; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object obj) { if (!(obj instanceof ValueExpressionImpl)) { @@ -127,11 +122,6 @@ public final class ValueExpressionImpl extends ValueExpression implements return this.getNode().equals(((ValueExpressionImpl) obj).getNode()); } - /* - * (non-Javadoc) - * - * @see javax.el.ValueExpression#getExpectedType() - */ @Override public Class<?> getExpectedType() { return this.expectedType; @@ -159,11 +149,6 @@ public final class ValueExpressionImpl extends ValueExpression implements return this.node; } - /* - * (non-Javadoc) - * - * @see javax.el.ValueExpression#getType(javax.el.ELContext) - */ @Override public Class<?> getType(ELContext context) throws PropertyNotFoundException, ELException { @@ -175,11 +160,7 @@ public final class ValueExpressionImpl extends ValueExpression implements return result; } - /* - * (non-Javadoc) - * - * @see javax.el.ValueExpression#getValue(javax.el.ELContext) - */ + @SuppressWarnings("unchecked") @Override public Object getValue(ELContext context) throws PropertyNotFoundException, ELException { @@ -194,21 +175,11 @@ public final class ValueExpressionImpl extends ValueExpression implements return value; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { return this.getNode().hashCode(); } - /* - * (non-Javadoc) - * - * @see javax.el.ValueExpression#isLiteralText() - */ @Override public boolean isLiteralText() { try { @@ -218,11 +189,6 @@ public final class ValueExpressionImpl extends ValueExpression implements } } - /* - * (non-Javadoc) - * - * @see javax.el.ValueExpression#isReadOnly(javax.el.ELContext) - */ @Override public boolean isReadOnly(ELContext context) throws PropertyNotFoundException, ELException { @@ -246,12 +212,6 @@ public final class ValueExpressionImpl extends ValueExpression implements this.varMapper = (VariableMapper) in.readObject(); } - /* - * (non-Javadoc) - * - * @see javax.el.ValueExpression#setValue(javax.el.ELContext, - * java.lang.Object) - */ @Override public void setValue(ELContext context, Object value) throws PropertyNotFoundException, PropertyNotWritableException, @@ -277,9 +237,6 @@ public final class ValueExpressionImpl extends ValueExpression implements return "ValueExpression["+this.expr+"]"; } - /** - * @since EL 2.2 - */ @Override public ValueReference getValueReference(ELContext context) { EvaluationContext ctx = new EvaluationContext(context, this.fnMapper, diff --git a/java/org/apache/el/lang/ExpressionBuilder.java b/java/org/apache/el/lang/ExpressionBuilder.java index a7cd609b1f..69f74b4038 100644 --- a/java/org/apache/el/lang/ExpressionBuilder.java +++ b/java/org/apache/el/lang/ExpressionBuilder.java @@ -181,11 +181,6 @@ public final class ExpressionBuilder implements NodeVisitor { return n; } - /* - * (non-Javadoc) - * - * @see com.sun.el.parser.NodeVisitor#visit(com.sun.el.parser.Node) - */ @Override public void visit(Node node) throws ELException { if (node instanceof AstFunction) { diff --git a/java/org/apache/el/lang/FunctionMapperFactory.java b/java/org/apache/el/lang/FunctionMapperFactory.java index eefcca5d34..e967d7cfc8 100644 --- a/java/org/apache/el/lang/FunctionMapperFactory.java +++ b/java/org/apache/el/lang/FunctionMapperFactory.java @@ -38,9 +38,6 @@ public class FunctionMapperFactory extends FunctionMapper { } - /* (non-Javadoc) - * @see javax.el.FunctionMapper#resolveFunction(String, String) - */ @Override public Method resolveFunction(String prefix, String localName) { if (this.memento == null) { diff --git a/java/org/apache/el/lang/FunctionMapperImpl.java b/java/org/apache/el/lang/FunctionMapperImpl.java index 56ff1f66d1..05c4d86f32 100644 --- a/java/org/apache/el/lang/FunctionMapperImpl.java +++ b/java/org/apache/el/lang/FunctionMapperImpl.java @@ -40,11 +40,6 @@ public class FunctionMapperImpl extends FunctionMapper implements protected ConcurrentMap<String, Function> functions = new ConcurrentHashMap<>(); - /* - * (non-Javadoc) - * - * @see javax.el.FunctionMapper#resolveFunction(String, String) - */ @Override public Method resolveFunction(String prefix, String localName) { Function f = this.functions.get(prefix + ":" + localName); @@ -65,21 +60,11 @@ public class FunctionMapperImpl extends FunctionMapper implements } } - /* - * (non-Javadoc) - * - * @see java.io.Externalizable#writeExternal(java.io.ObjectOutput) - */ @Override public void writeExternal(ObjectOutput out) throws IOException { out.writeObject(this.functions); } - /* - * (non-Javadoc) - * - * @see java.io.Externalizable#readExternal(java.io.ObjectInput) - */ @SuppressWarnings("unchecked") @Override public void readExternal(ObjectInput in) throws IOException, @@ -112,11 +97,6 @@ public class FunctionMapperImpl extends FunctionMapper implements // for serialization } - /* - * (non-Javadoc) - * - * @see java.io.Externalizable#writeExternal(java.io.ObjectOutput) - */ @Override public void writeExternal(ObjectOutput out) throws IOException { out.writeUTF((this.prefix != null) ? this.prefix : ""); @@ -132,11 +112,6 @@ public class FunctionMapperImpl extends FunctionMapper implements } } - /* - * (non-Javadoc) - * - * @see java.io.Externalizable#readExternal(java.io.ObjectInput) - */ @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { @@ -164,9 +139,6 @@ public class FunctionMapperImpl extends FunctionMapper implements return this.m; } - /* (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object obj) { if (obj instanceof Function) { @@ -175,9 +147,6 @@ public class FunctionMapperImpl extends FunctionMapper implements return false; } - /* (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { return (this.prefix + this.localName).hashCode(); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org