[tomcat] branch 8.5.x updated: Fix Javadoc related build failure when building with Java 19

[ma...@apache.org]

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

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/8.5.x by this push:
     new 70a07e03cd Fix Javadoc related build failure when building with Java 19
70a07e03cd is described below

commit 70a07e03cd6f8fdee68c027f3c4f47c234d6d4d6
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/javax/el/ELResolver.java                            | 12 ++++++++++++
 java/javax/servlet/jsp/el/ScopedAttributeELResolver.java |  9 +++++++++
 java/javax/servlet/jsp/tagext/JspFragment.java           |  7 +++++++
 3 files changed, 28 insertions(+)

diff --git a/java/javax/el/ELResolver.java b/java/javax/el/ELResolver.java
index 0e438ec310..a43425eee3 100644
--- a/java/javax/el/ELResolver.java
+++ b/java/javax/el/ELResolver.java
@@ -29,6 +29,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
@@ -65,6 +68,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
@@ -82,6 +88,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
@@ -102,6 +111,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/javax/servlet/jsp/el/ScopedAttributeELResolver.java b/java/javax/servlet/jsp/el/ScopedAttributeELResolver.java
index b5481add86..6f709b3359 100644
--- a/java/javax/servlet/jsp/el/ScopedAttributeELResolver.java
+++ b/java/javax/servlet/jsp/el/ScopedAttributeELResolver.java
@@ -31,6 +31,8 @@ import javax.servlet.jsp.JspContext;
 import javax.servlet.jsp.PageContext;
 
 /**
+ * An ELResolver for working with JSP scoped attributes which may have page,
+ * request, session or application scope.
  *
  * @since JSP 2.1
  */
@@ -50,6 +52,13 @@ public class ScopedAttributeELResolver extends ELResolver {
         AST_IDENTIFIER_KEY = key;
     }
 
+    /**
+     * Default constructor.
+     */
+    public ScopedAttributeELResolver() {
+        super();
+    }
+
     @Override
     public Object getValue(ELContext context, Object base, Object property) {
         Objects.requireNonNull(context);
diff --git a/java/javax/servlet/jsp/tagext/JspFragment.java b/java/javax/servlet/jsp/tagext/JspFragment.java
index 9faf8d023f..16eee7cb32 100644
--- a/java/javax/servlet/jsp/tagext/JspFragment.java
+++ b/java/javax/servlet/jsp/tagext/JspFragment.java
@@ -54,6 +54,13 @@ import javax.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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org