Author: markt Date: Wed Jul 3 19:37:14 2013 New Revision: 1499535 URL: http://svn.apache.org/r1499535 Log: EL 3.0 Replace runtime exception declarations with Javadoc to better document API and to align code with spec API to aid checking for binary compatibility
Modified: tomcat/trunk/java/javax/el/ArrayELResolver.java tomcat/trunk/java/javax/el/BeanELResolver.java tomcat/trunk/java/javax/el/BeanNameELResolver.java tomcat/trunk/java/javax/el/CompositeELResolver.java tomcat/trunk/java/javax/el/ELContext.java tomcat/trunk/java/javax/el/ELResolver.java tomcat/trunk/java/javax/el/ListELResolver.java tomcat/trunk/java/javax/el/MapELResolver.java tomcat/trunk/java/javax/el/ResourceBundleELResolver.java tomcat/trunk/java/javax/el/TypeConverter.java tomcat/trunk/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java tomcat/trunk/java/javax/servlet/jsp/el/ScopedAttributeELResolver.java tomcat/trunk/java/org/apache/jasper/el/ELResolverImpl.java Modified: tomcat/trunk/java/javax/el/ArrayELResolver.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/ArrayELResolver.java?rev=1499535&r1=1499534&r2=1499535&view=diff ============================================================================== --- tomcat/trunk/java/javax/el/ArrayELResolver.java (original) +++ tomcat/trunk/java/javax/el/ArrayELResolver.java Wed Jul 3 19:37:14 2013 @@ -35,8 +35,7 @@ public class ArrayELResolver extends ELR } @Override - public Class<?> getType(ELContext context, Object base, Object property) - throws NullPointerException, PropertyNotFoundException, ELException { + public Class<?> getType(ELContext context, Object base, Object property) { if (context == null) { throw new NullPointerException(); } @@ -52,8 +51,7 @@ public class ArrayELResolver extends ELR } @Override - public Object getValue(ELContext context, Object base, Object property) - throws NullPointerException, PropertyNotFoundException, ELException { + public Object getValue(ELContext context, Object base, Object property) { if (context == null) { throw new NullPointerException(); } @@ -72,9 +70,7 @@ public class ArrayELResolver extends ELR @Override public void setValue(ELContext context, Object base, Object property, - Object value) throws NullPointerException, - PropertyNotFoundException, PropertyNotWritableException, - ELException { + Object value) { if (context == null) { throw new NullPointerException(); } @@ -101,8 +97,7 @@ public class ArrayELResolver extends ELR } @Override - public boolean isReadOnly(ELContext context, Object base, Object property) - throws NullPointerException, PropertyNotFoundException, ELException { + public boolean isReadOnly(ELContext context, Object base, Object property) { if (context == null) { throw new NullPointerException(); } Modified: tomcat/trunk/java/javax/el/BeanELResolver.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/BeanELResolver.java?rev=1499535&r1=1499534&r2=1499535&view=diff ============================================================================== --- tomcat/trunk/java/javax/el/BeanELResolver.java (original) +++ tomcat/trunk/java/javax/el/BeanELResolver.java Wed Jul 3 19:37:14 2013 @@ -70,8 +70,7 @@ public class BeanELResolver extends ELRe } @Override - public Class<?> getType(ELContext context, Object base, Object property) - throws NullPointerException, PropertyNotFoundException, ELException { + public Class<?> getType(ELContext context, Object base, Object property) { if (context == null) { throw new NullPointerException(); } @@ -84,8 +83,7 @@ public class BeanELResolver extends ELRe } @Override - public Object getValue(ELContext context, Object base, Object property) - throws NullPointerException, PropertyNotFoundException, ELException { + public Object getValue(ELContext context, Object base, Object property) { if (context == null) { throw new NullPointerException(); } @@ -116,9 +114,7 @@ public class BeanELResolver extends ELRe @Override public void setValue(ELContext context, Object base, Object property, - Object value) throws NullPointerException, - PropertyNotFoundException, PropertyNotWritableException, - ELException { + Object value) { if (context == null) { throw new NullPointerException(); } @@ -194,8 +190,7 @@ public class BeanELResolver extends ELRe } @Override - public boolean isReadOnly(ELContext context, Object base, Object property) - throws NullPointerException, PropertyNotFoundException, ELException { + public boolean isReadOnly(ELContext context, Object base, Object property) { if (context == null) { throw new NullPointerException(); } Modified: tomcat/trunk/java/javax/el/BeanNameELResolver.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/BeanNameELResolver.java?rev=1499535&r1=1499534&r2=1499535&view=diff ============================================================================== --- tomcat/trunk/java/javax/el/BeanNameELResolver.java (original) +++ tomcat/trunk/java/javax/el/BeanNameELResolver.java Wed Jul 3 19:37:14 2013 @@ -31,8 +31,7 @@ public class BeanNameELResolver extends } @Override - public Object getValue(ELContext context, Object base, Object property) - throws NullPointerException, PropertyNotFoundException, ELException { + public Object getValue(ELContext context, Object base, Object property) { if (context == null) { throw new NullPointerException(); @@ -53,9 +52,7 @@ public class BeanNameELResolver extends @Override public void setValue(ELContext context, Object base, Object property, - Object value) throws NullPointerException, - PropertyNotFoundException, PropertyNotWritableException, - ELException { + Object value) { if (context == null) { throw new NullPointerException(); @@ -74,8 +71,7 @@ public class BeanNameELResolver extends } @Override - public Class<?> getType(ELContext context, Object base, Object property) - throws NullPointerException, PropertyNotFoundException, ELException { + public Class<?> getType(ELContext context, Object base, Object property) { if (context == null) { throw new NullPointerException(); @@ -95,8 +91,7 @@ public class BeanNameELResolver extends } @Override - public boolean isReadOnly(ELContext context, Object base, Object property) - throws NullPointerException, PropertyNotFoundException, ELException { + public boolean isReadOnly(ELContext context, Object base, Object property) { if (context == null) { throw new NullPointerException(); Modified: tomcat/trunk/java/javax/el/CompositeELResolver.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/CompositeELResolver.java?rev=1499535&r1=1499534&r2=1499535&view=diff ============================================================================== --- tomcat/trunk/java/javax/el/CompositeELResolver.java (original) +++ tomcat/trunk/java/javax/el/CompositeELResolver.java Wed Jul 3 19:37:14 2013 @@ -58,8 +58,7 @@ public class CompositeELResolver extends } @Override - public Object getValue(ELContext context, Object base, Object property) - throws NullPointerException, PropertyNotFoundException, ELException { + public Object getValue(ELContext context, Object base, Object property) { context.setPropertyResolved(false); int sz = this.size; Object result = null; @@ -92,8 +91,7 @@ public class CompositeELResolver extends } @Override - public Class<?> getType(ELContext context, Object base, Object property) - throws NullPointerException, PropertyNotFoundException, ELException { + public Class<?> getType(ELContext context, Object base, Object property) { context.setPropertyResolved(false); int sz = this.size; Class<?> type; @@ -120,9 +118,7 @@ public class CompositeELResolver extends @Override public void setValue(ELContext context, Object base, Object property, - Object value) throws NullPointerException, - PropertyNotFoundException, PropertyNotWritableException, - ELException { + Object value) { context.setPropertyResolved(false); int sz = this.size; for (int i = 0; i < sz; i++) { @@ -134,8 +130,7 @@ public class CompositeELResolver extends } @Override - public boolean isReadOnly(ELContext context, Object base, Object property) - throws NullPointerException, PropertyNotFoundException, ELException { + public boolean isReadOnly(ELContext context, Object base, Object property) { context.setPropertyResolved(false); int sz = this.size; boolean readOnly = false; Modified: tomcat/trunk/java/javax/el/ELContext.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/ELContext.java?rev=1499535&r1=1499534&r2=1499535&view=diff ============================================================================== --- tomcat/trunk/java/javax/el/ELContext.java (original) +++ tomcat/trunk/java/javax/el/ELContext.java Wed Jul 3 19:37:14 2013 @@ -59,8 +59,12 @@ public abstract class ELContext { } // Can't use Class<?> because API needs to match specification + /** + * @throws NullPointerException + * If the supplied context is <code>null</code> + */ public void putContext(@SuppressWarnings("rawtypes") Class key, - Object contextObject) throws NullPointerException { + Object contextObject) { if (key == null || contextObject == null) { throw new NullPointerException(); } Modified: tomcat/trunk/java/javax/el/ELResolver.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/ELResolver.java?rev=1499535&r1=1499534&r2=1499535&view=diff ============================================================================== --- tomcat/trunk/java/javax/el/ELResolver.java (original) +++ tomcat/trunk/java/javax/el/ELResolver.java Wed Jul 3 19:37:14 2013 @@ -28,7 +28,18 @@ public abstract class ELResolver { public static final String RESOLVABLE_AT_DESIGN_TIME = "resolvableAtDesignTime"; - public abstract Object getValue(ELContext context, Object base, Object property) throws NullPointerException, PropertyNotFoundException, ELException; + /** + * @throws NullPointerException + * If the supplied context is <code>null</code> + * @throws PropertyNotFoundException + * If the base/property combination provided to the resolver is + * one that the resolver can handle but no match was found or a + * match was found but was not readable + * @throws ELException + * Wraps any exception throw whilst resolving the property + */ + public abstract Object getValue(ELContext context, Object base, + Object property); /** * @since EL 2.2 @@ -41,15 +52,51 @@ public abstract class ELResolver { return null; } - public abstract Class<?> getType(ELContext context, Object base, Object property) throws NullPointerException, PropertyNotFoundException, ELException; + /** + * @throws NullPointerException + * If the supplied context is <code>null</code> + * @throws PropertyNotFoundException + * If the base/property combination provided to the resolver is + * one that the resolver can handle but no match was found or a + * match was found but was not readable + * @throws ELException + * Wraps any exception throw whilst resolving the property + */ + public abstract Class<?> getType(ELContext context, Object base, + Object property); - public abstract void setValue(ELContext context, Object base, Object property, Object value) throws NullPointerException, PropertyNotFoundException, PropertyNotWritableException, ELException; + /** + * @throws NullPointerException + * If the supplied context is <code>null</code> + * @throws PropertyNotFoundException + * If the base/property combination provided to the resolver is + * one that the resolver can handle but no match was found + * @throws PropertyNotWritableException + * If the base/property combination provided to the resolver is + * one that the resolver can handle but the property was not + * writable + * @throws ELException + * Wraps any exception throw whilst resolving the property + */ + public abstract void setValue(ELContext context, Object base, + Object property, Object value); - public abstract boolean isReadOnly(ELContext context, Object base, Object property) throws NullPointerException, PropertyNotFoundException, ELException; + /** + * @throws NullPointerException + * If the supplied context is <code>null</code> + * @throws PropertyNotFoundException + * If the base/property combination provided to the resolver is + * one that the resolver can handle but no match was found + * @throws ELException + * Wraps any exception throw whilst resolving the property + */ + public abstract boolean isReadOnly(ELContext context, Object base, + Object property); public abstract Iterator<java.beans.FeatureDescriptor> getFeatureDescriptors(ELContext context, Object base); - public abstract Class<?> getCommonPropertyType(ELContext context, Object base); + public abstract Class<?> getCommonPropertyType(ELContext context, + Object base); /** * Converts the given object to the given type. This default implementation Modified: tomcat/trunk/java/javax/el/ListELResolver.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/ListELResolver.java?rev=1499535&r1=1499534&r2=1499535&view=diff ============================================================================== --- tomcat/trunk/java/javax/el/ListELResolver.java (original) +++ tomcat/trunk/java/javax/el/ListELResolver.java Wed Jul 3 19:37:14 2013 @@ -40,8 +40,7 @@ public class ListELResolver extends ELRe } @Override - public Object getValue(ELContext context, Object base, Object property) - throws NullPointerException, PropertyNotFoundException, ELException { + public Object getValue(ELContext context, Object base, Object property) { if (context == null) { throw new NullPointerException(); } @@ -60,8 +59,7 @@ public class ListELResolver extends ELRe } @Override - public Class<?> getType(ELContext context, Object base, Object property) - throws NullPointerException, PropertyNotFoundException, ELException { + public Class<?> getType(ELContext context, Object base, Object property) { if (context == null) { throw new NullPointerException(); } @@ -82,9 +80,7 @@ public class ListELResolver extends ELRe @Override public void setValue(ELContext context, Object base, Object property, - Object value) throws NullPointerException, - PropertyNotFoundException, PropertyNotWritableException, - ELException { + Object value) { if (context == null) { throw new NullPointerException(); } @@ -111,8 +107,7 @@ public class ListELResolver extends ELRe } @Override - public boolean isReadOnly(ELContext context, Object base, Object property) - throws NullPointerException, PropertyNotFoundException, ELException { + public boolean isReadOnly(ELContext context, Object base, Object property) { if (context == null) { throw new NullPointerException(); } Modified: tomcat/trunk/java/javax/el/MapELResolver.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/MapELResolver.java?rev=1499535&r1=1499534&r2=1499535&view=diff ============================================================================== --- tomcat/trunk/java/javax/el/MapELResolver.java (original) +++ tomcat/trunk/java/javax/el/MapELResolver.java Wed Jul 3 19:37:14 2013 @@ -41,8 +41,7 @@ public class MapELResolver extends ELRes } @Override - public Object getValue(ELContext context, Object base, Object property) - throws NullPointerException, PropertyNotFoundException, ELException { + public Object getValue(ELContext context, Object base, Object property) { if (context == null) { throw new NullPointerException(); } @@ -56,8 +55,7 @@ public class MapELResolver extends ELRes } @Override - public Class<?> getType(ELContext context, Object base, Object property) - throws NullPointerException, PropertyNotFoundException, ELException { + public Class<?> getType(ELContext context, Object base, Object property) { if (context == null) { throw new NullPointerException(); } @@ -72,9 +70,7 @@ public class MapELResolver extends ELRes @Override public void setValue(ELContext context, Object base, Object property, - Object value) throws NullPointerException, - PropertyNotFoundException, PropertyNotWritableException, - ELException { + Object value) { if (context == null) { throw new NullPointerException(); } @@ -98,8 +94,7 @@ public class MapELResolver extends ELRes } @Override - public boolean isReadOnly(ELContext context, Object base, Object property) - throws NullPointerException, PropertyNotFoundException, ELException { + public boolean isReadOnly(ELContext context, Object base, Object property) { if (context == null) { throw new NullPointerException(); } Modified: tomcat/trunk/java/javax/el/ResourceBundleELResolver.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/ResourceBundleELResolver.java?rev=1499535&r1=1499534&r2=1499535&view=diff ============================================================================== --- tomcat/trunk/java/javax/el/ResourceBundleELResolver.java (original) +++ tomcat/trunk/java/javax/el/ResourceBundleELResolver.java Wed Jul 3 19:37:14 2013 @@ -32,9 +32,7 @@ public class ResourceBundleELResolver ex } @Override - public Object getValue(ELContext context, Object base, Object property) - throws NullPointerException, PropertyNotFoundException, - ELException { + public Object getValue(ELContext context, Object base, Object property) { if (context == null) { throw new NullPointerException(); @@ -57,8 +55,7 @@ public class ResourceBundleELResolver ex } @Override - public Class<?> getType(ELContext context, Object base, Object property) - throws NullPointerException, PropertyNotFoundException, ELException { + public Class<?> getType(ELContext context, Object base, Object property) { if (context == null) { throw new NullPointerException(); } @@ -72,9 +69,7 @@ public class ResourceBundleELResolver ex @Override public void setValue(ELContext context, Object base, Object property, - Object value) throws NullPointerException, - PropertyNotFoundException, PropertyNotWritableException, - ELException { + Object value) { if (context == null) { throw new NullPointerException(); } @@ -87,8 +82,7 @@ public class ResourceBundleELResolver ex } @Override - public boolean isReadOnly(ELContext context, Object base, Object property) - throws NullPointerException, PropertyNotFoundException, ELException { + public boolean isReadOnly(ELContext context, Object base, Object property) { if (context == null) { throw new NullPointerException(); } Modified: tomcat/trunk/java/javax/el/TypeConverter.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/TypeConverter.java?rev=1499535&r1=1499534&r2=1499535&view=diff ============================================================================== --- tomcat/trunk/java/javax/el/TypeConverter.java (original) +++ tomcat/trunk/java/javax/el/TypeConverter.java Wed Jul 3 19:37:14 2013 @@ -25,28 +25,23 @@ import java.util.Iterator; public abstract class TypeConverter extends ELResolver { @Override - public Object getValue(ELContext context, Object base, Object property) - throws NullPointerException, PropertyNotFoundException, ELException { + public Object getValue(ELContext context, Object base, Object property) { return null; } @Override - public Class<?> getType(ELContext context, Object base, Object property) - throws NullPointerException, PropertyNotFoundException, ELException { + public Class<?> getType(ELContext context, Object base, Object property) { return null; } @Override public void setValue(ELContext context, Object base, Object property, - Object value) throws NullPointerException, - PropertyNotFoundException, PropertyNotWritableException, - ELException { + Object value) { // NO-OP } @Override - public boolean isReadOnly(ELContext context, Object base, Object property) - throws NullPointerException, PropertyNotFoundException, ELException { + public boolean isReadOnly(ELContext context, Object base, Object property) { return false; } Modified: tomcat/trunk/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java?rev=1499535&r1=1499534&r2=1499535&view=diff ============================================================================== --- tomcat/trunk/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java (original) +++ tomcat/trunk/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java Wed Jul 3 19:37:14 2013 @@ -30,9 +30,7 @@ import java.util.Set; import java.util.Vector; import javax.el.ELContext; -import javax.el.ELException; import javax.el.ELResolver; -import javax.el.PropertyNotFoundException; import javax.el.PropertyNotWritableException; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; @@ -78,8 +76,7 @@ public class ImplicitObjectELResolver ex } @Override - public Object getValue(ELContext context, Object base, Object property) - throws NullPointerException, PropertyNotFoundException, ELException { + public Object getValue(ELContext context, Object base, Object property) { if (context == null) { throw new NullPointerException(); } @@ -122,8 +119,7 @@ public class ImplicitObjectELResolver ex @Override @SuppressWarnings({ "unchecked", "rawtypes" }) // TCK signature test fails with generics - public Class getType(ELContext context, Object base, Object property) - throws NullPointerException, PropertyNotFoundException, ELException { + public Class getType(ELContext context, Object base, Object property) { if (context == null) { throw new NullPointerException(); } @@ -139,9 +135,7 @@ public class ImplicitObjectELResolver ex @Override public void setValue(ELContext context, Object base, Object property, - Object value) throws NullPointerException, - PropertyNotFoundException, PropertyNotWritableException, - ELException { + Object value) { if (context == null) { throw new NullPointerException(); } @@ -156,8 +150,7 @@ public class ImplicitObjectELResolver ex } @Override - public boolean isReadOnly(ELContext context, Object base, Object property) - throws NullPointerException, PropertyNotFoundException, ELException { + public boolean isReadOnly(ELContext context, Object base, Object property) { if (context == null) { throw new NullPointerException(); } Modified: tomcat/trunk/java/javax/servlet/jsp/el/ScopedAttributeELResolver.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/el/ScopedAttributeELResolver.java?rev=1499535&r1=1499534&r2=1499535&view=diff ============================================================================== --- tomcat/trunk/java/javax/servlet/jsp/el/ScopedAttributeELResolver.java (original) +++ tomcat/trunk/java/javax/servlet/jsp/el/ScopedAttributeELResolver.java Wed Jul 3 19:37:14 2013 @@ -23,10 +23,7 @@ import java.util.Iterator; import java.util.List; import javax.el.ELContext; -import javax.el.ELException; import javax.el.ELResolver; -import javax.el.PropertyNotFoundException; -import javax.el.PropertyNotWritableException; import javax.servlet.jsp.JspContext; import javax.servlet.jsp.PageContext; @@ -41,8 +38,7 @@ public class ScopedAttributeELResolver e } @Override - public Object getValue(ELContext context, Object base, Object property) - throws NullPointerException, PropertyNotFoundException, ELException { + public Object getValue(ELContext context, Object base, Object property) { if (context == null) { throw new NullPointerException(); } @@ -61,8 +57,8 @@ public class ScopedAttributeELResolver e } @Override - public Class<Object> getType(ELContext context, Object base, Object property) - throws NullPointerException, PropertyNotFoundException, ELException { + public Class<Object> getType(ELContext context, Object base, + Object property) { if (context == null) { throw new NullPointerException(); } @@ -77,9 +73,7 @@ public class ScopedAttributeELResolver e @Override public void setValue(ELContext context, Object base, Object property, - Object value) throws NullPointerException, - PropertyNotFoundException, PropertyNotWritableException, - ELException { + Object value) { if (context == null) { throw new NullPointerException(); } @@ -101,8 +95,7 @@ public class ScopedAttributeELResolver e } @Override - public boolean isReadOnly(ELContext context, Object base, Object property) - throws NullPointerException, PropertyNotFoundException, ELException { + public boolean isReadOnly(ELContext context, Object base, Object property) { if (context == null) { throw new NullPointerException(); } Modified: tomcat/trunk/java/org/apache/jasper/el/ELResolverImpl.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/el/ELResolverImpl.java?rev=1499535&r1=1499534&r2=1499535&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/el/ELResolverImpl.java (original) +++ tomcat/trunk/java/org/apache/jasper/el/ELResolverImpl.java Wed Jul 3 19:37:14 2013 @@ -22,7 +22,6 @@ import java.util.Iterator; import javax.el.ELContext; import javax.el.ELException; import javax.el.ELResolver; -import javax.el.PropertyNotFoundException; import javax.el.PropertyNotWritableException; import javax.servlet.jsp.el.VariableResolver; @@ -38,8 +37,7 @@ public final class ELResolverImpl extend } @Override - public Object getValue(ELContext context, Object base, Object property) - throws NullPointerException, PropertyNotFoundException, ELException { + public Object getValue(ELContext context, Object base, Object property) { if (context == null) { throw new NullPointerException(); } @@ -63,8 +61,7 @@ public final class ELResolverImpl extend } @Override - public Class<?> getType(ELContext context, Object base, Object property) - throws NullPointerException, PropertyNotFoundException, ELException { + public Class<?> getType(ELContext context, Object base, Object property) { if (context == null) { throw new NullPointerException(); } @@ -90,9 +87,7 @@ public final class ELResolverImpl extend @Override public void setValue(ELContext context, Object base, Object property, - Object value) throws NullPointerException, - PropertyNotFoundException, PropertyNotWritableException, - ELException { + Object value) { if (context == null) { throw new NullPointerException(); } @@ -109,8 +104,7 @@ public final class ELResolverImpl extend } @Override - public boolean isReadOnly(ELContext context, Object base, Object property) - throws NullPointerException, PropertyNotFoundException, ELException { + public boolean isReadOnly(ELContext context, Object base, Object property) { if (context == null) { throw new NullPointerException(); } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org