This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push: new d95b769b4f Fix Javadoc related build failure when building with Java 19 d95b769b4f is described below commit d95b769b4fc5d52f63b95a9835f570d4e4e947d8 Author: Mark Thomas <ma...@apache.org> AuthorDate: Thu Oct 20 15:01:21 2022 +0100 Fix Javadoc related build failure when building with Java 19 --- java/jakarta/el/ELResolver.java | 12 ++++++++++++ java/jakarta/servlet/jsp/el/ImportELResolver.java | 7 +++++++ java/jakarta/servlet/jsp/el/NotFoundELResolver.java | 7 +++++++ java/jakarta/servlet/jsp/el/ScopedAttributeELResolver.java | 9 +++++++++ java/jakarta/servlet/jsp/tagext/JspFragment.java | 7 +++++++ 5 files changed, 42 insertions(+) diff --git a/java/jakarta/el/ELResolver.java b/java/jakarta/el/ELResolver.java index 09bb98b01f..f33d3dd25e 100644 --- a/java/jakarta/el/ELResolver.java +++ b/java/jakarta/el/ELResolver.java @@ -27,6 +27,9 @@ public abstract class ELResolver { public static final String RESOLVABLE_AT_DESIGN_TIME = "resolvableAtDesignTime"; /** + * Obtain the value of the given property on the given object using the + * given context. + * * @param context The EL context for this evaluation * @param base The base object on which the property is to be found * @param property The property whose value is to be returned @@ -63,6 +66,9 @@ public abstract class ELResolver { } /** + * Obtain the type of the given property on the given object using the given + * context. + * * @param context The EL context for this evaluation * @param base The base object on which the property is to be found * @param property The property whose type is to be returned @@ -80,6 +86,9 @@ public abstract class ELResolver { Object property); /** + * Set the value of the given property on the given object using the given + * context. + * * @param context The EL context for this evaluation * @param base The base object on which the property is to be found * @param property The property whose value is to be set @@ -100,6 +109,9 @@ public abstract class ELResolver { Object property, Object value); /** + * Determine if the given property on the given object is read-only using + * the given context. + * * @param context The EL context for this evaluation * @param base The base object on which the property is to be found * @param property The property to be checked for read only status diff --git a/java/jakarta/servlet/jsp/el/ImportELResolver.java b/java/jakarta/servlet/jsp/el/ImportELResolver.java index 6e2cd81f75..38b3a26d7e 100644 --- a/java/jakarta/servlet/jsp/el/ImportELResolver.java +++ b/java/jakarta/servlet/jsp/el/ImportELResolver.java @@ -45,6 +45,13 @@ public class ImportELResolver extends ELResolver { AST_IDENTIFIER_KEY = key; } + /** + * Default constructor. + */ + public ImportELResolver() { + super(); + } + @Override public Object getValue(ELContext context, Object base, Object property) { Objects.requireNonNull(context); diff --git a/java/jakarta/servlet/jsp/el/NotFoundELResolver.java b/java/jakarta/servlet/jsp/el/NotFoundELResolver.java index 23645abd6f..2849bad38b 100644 --- a/java/jakarta/servlet/jsp/el/NotFoundELResolver.java +++ b/java/jakarta/servlet/jsp/el/NotFoundELResolver.java @@ -34,6 +34,13 @@ public class NotFoundELResolver extends ELResolver { private static final String LSTRING_FILE = "jakarta.servlet.jsp.LocalStrings"; private static final ResourceBundle lStrings = ResourceBundle.getBundle(LSTRING_FILE); + /** + * Default constructor. + */ + public NotFoundELResolver() { + super(); + } + /** * {@inheritDoc} * <p> diff --git a/java/jakarta/servlet/jsp/el/ScopedAttributeELResolver.java b/java/jakarta/servlet/jsp/el/ScopedAttributeELResolver.java index 5908a4832c..2ec39ca7e5 100644 --- a/java/jakarta/servlet/jsp/el/ScopedAttributeELResolver.java +++ b/java/jakarta/servlet/jsp/el/ScopedAttributeELResolver.java @@ -24,11 +24,20 @@ import jakarta.servlet.jsp.JspContext; import jakarta.servlet.jsp.PageContext; /** + * An ELResolver for working with JSP scoped attributes which may have page, + * request, session or application scope. * * @since JSP 2.1 */ public class ScopedAttributeELResolver extends ELResolver { + /** + * Default constructor. + */ + public ScopedAttributeELResolver() { + super(); + } + @Override public Object getValue(ELContext context, Object base, Object property) { Objects.requireNonNull(context); diff --git a/java/jakarta/servlet/jsp/tagext/JspFragment.java b/java/jakarta/servlet/jsp/tagext/JspFragment.java index ab9fb7d0a2..5a9d7566fb 100644 --- a/java/jakarta/servlet/jsp/tagext/JspFragment.java +++ b/java/jakarta/servlet/jsp/tagext/JspFragment.java @@ -54,6 +54,13 @@ import jakarta.servlet.jsp.JspException; */ public abstract class JspFragment { + /** + * Default constructor. + */ + public JspFragment() { + // NO-OP by default + } + /** * Executes the fragment and directs all output to the given Writer, * or the JspWriter returned by the getOut() method of the JspContext --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org