You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2023/02/22 19:43:51 UTC
[tomcat] branch 9.0.x updated (d0b2ef9414 -> ce9432bbd3)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
from d0b2ef9414 Add support for txt: and rnd: map types
new 6e6386fb3f Clean-up. Reformatting. No functional change.
new 5a6e5a6d78 Clean-up. Reformatting. No functional change.
new ce9432bbd3 Clean-up. Reformatting. No functional change.
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
java/javax/el/ArrayELResolver.java | 22 +-
java/javax/el/BeanELResolver.java | 57 ++---
java/javax/el/BeanNameELResolver.java | 12 +-
java/javax/el/BeanNameResolver.java | 18 +-
java/javax/el/CompositeELResolver.java | 3 +-
java/javax/el/ELContext.java | 41 ++--
java/javax/el/ELContextListener.java | 1 -
java/javax/el/ELException.java | 15 +-
java/javax/el/ELManager.java | 8 +-
java/javax/el/ELProcessor.java | 92 +++-----
java/javax/el/ELResolver.java | 126 +++++-----
java/javax/el/EvaluationListener.java | 3 +-
java/javax/el/ExpressionFactory.java | 79 +++----
java/javax/el/ImportHandler.java | 68 +++---
java/javax/el/JreCompat.java | 15 +-
java/javax/el/LambdaExpression.java | 17 +-
java/javax/el/ListELResolver.java | 17 +-
java/javax/el/MapELResolver.java | 16 +-
java/javax/el/MethodExpression.java | 40 ++--
java/javax/el/ResourceBundleELResolver.java | 13 +-
java/javax/el/StandardELContext.java | 33 ++-
java/javax/el/StaticFieldELResolver.java | 47 ++--
java/javax/el/TypeConverter.java | 9 +-
java/javax/el/Util.java | 120 +++++-----
java/javax/el/ValueExpression.java | 58 ++---
test/javax/el/TestArrayELResolver.java | 147 +++++-------
test/javax/el/TestBeanELResolver.java | 202 ++++++++--------
.../el/TestBeanELResolverVarargsInvocation.java | 16 +-
test/javax/el/TestBeanNameELResolver.java | 117 ++++------
test/javax/el/TestCompositeELResolver.java | 3 +-
test/javax/el/TestELContext.java | 24 +-
test/javax/el/TestELProcessor.java | 15 +-
test/javax/el/TestELResolver.java | 32 +--
test/javax/el/TestEvaluationListener.java | 6 +-
test/javax/el/TestImportHandler.java | 17 +-
.../el/TestImportHandlerStandardPackages.java | 39 ++--
test/javax/el/TestListELResolver.java | 112 ++++-----
test/javax/el/TestMapELResolver.java | 117 ++++------
test/javax/el/TestResourceBundleELResolver.java | 117 ++++------
test/javax/el/TestStaticFieldELResolver.java | 182 ++++++---------
test/javax/el/TesterBean.java | 2 +-
test/javax/el/TesterBeanNameResolver.java | 5 +-
test/javax/el/TesterEvaluationListener.java | 3 +-
test/javax/el/TesterImportHandlerPerformance.java | 14 +-
test/org/apache/el/TestELEvaluation.java | 40 ++--
test/org/apache/el/TestELInJsp.java | 58 ++---
test/org/apache/el/TestMethodExpressionImpl.java | 255 +++++++++------------
test/org/apache/el/TestValueExpressionImpl.java | 68 ++----
test/org/apache/el/TesterBeanB.java | 2 +-
test/org/apache/el/TesterBeanC.java | 6 +-
test/org/apache/el/TesterBeanF.java | 8 +-
test/org/apache/el/TesterBeanG.java | 7 +-
test/org/apache/el/TesterBeanH.java | 5 +-
test/org/apache/el/TesterEnum.java | 3 +-
test/org/apache/el/TesterFunctions.java | 1 +
55 files changed, 1021 insertions(+), 1532 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/03: Clean-up. Reformatting. No functional change.
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 5a6e5a6d7847b5569c265b8eb471f3b25cb32425
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Feb 22 19:43:17 2023 +0000
Clean-up. Reformatting. No functional change.
---
test/javax/el/TestArrayELResolver.java | 147 ++++++---------
test/javax/el/TestBeanELResolver.java | 202 +++++++++------------
.../el/TestBeanELResolverVarargsInvocation.java | 16 +-
test/javax/el/TestBeanNameELResolver.java | 117 +++++-------
test/javax/el/TestCompositeELResolver.java | 3 +-
test/javax/el/TestELContext.java | 24 +--
test/javax/el/TestELProcessor.java | 15 +-
test/javax/el/TestELResolver.java | 32 +---
test/javax/el/TestEvaluationListener.java | 6 +-
test/javax/el/TestImportHandler.java | 17 +-
.../el/TestImportHandlerStandardPackages.java | 39 ++--
test/javax/el/TestListELResolver.java | 112 +++++-------
test/javax/el/TestMapELResolver.java | 117 +++++-------
test/javax/el/TestResourceBundleELResolver.java | 117 +++++-------
test/javax/el/TestStaticFieldELResolver.java | 182 ++++++++-----------
test/javax/el/TesterBean.java | 2 +-
test/javax/el/TesterBeanNameResolver.java | 5 +-
test/javax/el/TesterEvaluationListener.java | 3 +-
test/javax/el/TesterImportHandlerPerformance.java | 14 +-
19 files changed, 469 insertions(+), 701 deletions(-)
diff --git a/test/javax/el/TestArrayELResolver.java b/test/javax/el/TestArrayELResolver.java
index 69ae176e31..fddbf1aa78 100644
--- a/test/javax/el/TestArrayELResolver.java
+++ b/test/javax/el/TestArrayELResolver.java
@@ -35,8 +35,7 @@ public class TestArrayELResolver {
*/
@Test
public void testGetType02() {
- doNegativeTest(new Object(), new Object(), MethodUnderTest.GET_TYPE,
- true);
+ doNegativeTest(new Object(), new Object(), MethodUnderTest.GET_TYPE, true);
}
/**
@@ -45,8 +44,7 @@ public class TestArrayELResolver {
@Test
public void testGetType03() {
ArrayELResolver resolver = new ArrayELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
String[] base = new String[] { "element" };
Class<?> result = resolver.getType(context, base, Integer.valueOf(0));
@@ -61,8 +59,7 @@ public class TestArrayELResolver {
@Test(expected = PropertyNotFoundException.class)
public void testGetType04() {
ArrayELResolver resolver = new ArrayELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
String[] base = new String[] { "element" };
resolver.getType(context, base, Integer.valueOf(1));
@@ -74,8 +71,7 @@ public class TestArrayELResolver {
@Test
public void testGetType05() {
ArrayELResolver resolver = new ArrayELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
String[] base = new String[] { "element" };
Class<?> result = resolver.getType(context, base, "index");
@@ -90,8 +86,7 @@ public class TestArrayELResolver {
@Test
public void testGetType06() {
ArrayELResolver resolver = new ArrayELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
Class<?> result = resolver.getType(context, null, "index");
@@ -113,8 +108,7 @@ public class TestArrayELResolver {
*/
@Test
public void testGetValue02() {
- doNegativeTest(new Object(), new Object(), MethodUnderTest.GET_VALUE,
- true);
+ doNegativeTest(new Object(), new Object(), MethodUnderTest.GET_VALUE, true);
}
/**
@@ -123,8 +117,7 @@ public class TestArrayELResolver {
@Test
public void testGetValue03() {
ArrayELResolver resolver = new ArrayELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
String[] base = new String[] { "element" };
Object result = resolver.getValue(context, base, Integer.valueOf(0));
@@ -136,8 +129,7 @@ public class TestArrayELResolver {
@Test
public void testGetValueCoercion01() {
ArrayELResolver resolver = new ArrayELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
String[] base = new String[] { "element" };
Object result = resolver.getValue(context, base, Character.valueOf((char) 0));
@@ -149,8 +141,7 @@ public class TestArrayELResolver {
@Test
public void testGetValueCoercion02a() {
ArrayELResolver resolver = new ArrayELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
String[] base = new String[] { "element" };
Object result = resolver.getValue(context, base, Boolean.FALSE);
@@ -162,8 +153,7 @@ public class TestArrayELResolver {
@Test
public void testGetValueCoercion02b() {
ArrayELResolver resolver = new ArrayELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
String[] base = new String[] { "element" };
Object result = resolver.getValue(context, base, Boolean.TRUE);
@@ -175,8 +165,7 @@ public class TestArrayELResolver {
@Test
public void testGetValueCoercion03() {
ArrayELResolver resolver = new ArrayELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
String[] base = new String[] { "element" };
Object result = resolver.getValue(context, base, "0");
@@ -188,8 +177,7 @@ public class TestArrayELResolver {
@Test(expected = IllegalArgumentException.class)
public void testGetValueCoercion04() {
ArrayELResolver resolver = new ArrayELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
String[] base = new String[] { "element" };
resolver.getValue(context, base, new Object());
@@ -198,8 +186,7 @@ public class TestArrayELResolver {
@Test(expected = IllegalArgumentException.class)
public void testGetValueCoercion05() {
ArrayELResolver resolver = new ArrayELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
String[] base = new String[] { "element" };
resolver.getValue(context, base, null);
@@ -211,8 +198,7 @@ public class TestArrayELResolver {
@Test(expected = IllegalArgumentException.class)
public void testGetValueCoercion06() {
ArrayELResolver resolver = new ArrayELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
String[] base = new String[] { "element" };
resolver.getValue(context, base, "key");
@@ -224,8 +210,7 @@ public class TestArrayELResolver {
@Test
public void testGetValue05() {
ArrayELResolver resolver = new ArrayELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
String[] base = new String[] { "element" };
Object result = resolver.getValue(context, base, Integer.valueOf(1));
@@ -253,8 +238,7 @@ public class TestArrayELResolver {
*/
@Test
public void testSetValue02() {
- doNegativeTest(new Object(), new Object(), MethodUnderTest.SET_VALUE,
- false);
+ doNegativeTest(new Object(), new Object(), MethodUnderTest.SET_VALUE, false);
}
/**
@@ -263,8 +247,7 @@ public class TestArrayELResolver {
@Test(expected = PropertyNotWritableException.class)
public void testSetValue03() {
ArrayELResolver resolver = new ArrayELResolver(true);
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
resolver.setValue(context, new String[] {}, new Object(), new Object());
}
@@ -275,20 +258,17 @@ public class TestArrayELResolver {
@Test
public void testSetValue04() {
ArrayELResolver resolver = new ArrayELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
String[] base = new String[] { "element" };
resolver.setValue(context, base, Integer.valueOf(0), "new-element");
- Assert.assertEquals("new-element",
- resolver.getValue(context, base, Integer.valueOf(0)));
+ Assert.assertEquals("new-element", resolver.getValue(context, base, Integer.valueOf(0)));
Assert.assertTrue(context.isPropertyResolved());
resolver.setValue(context, base, Integer.valueOf(0), null);
- Assert.assertEquals(null,
- resolver.getValue(context, base, Integer.valueOf(0)));
+ Assert.assertEquals(null, resolver.getValue(context, base, Integer.valueOf(0)));
Assert.assertTrue(context.isPropertyResolved());
}
@@ -298,8 +278,7 @@ public class TestArrayELResolver {
@Test(expected = IllegalArgumentException.class)
public void testSetValue05() {
ArrayELResolver resolver = new ArrayELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
String[] base = new String[] { "element" };
resolver.setValue(context, base, "key", "new-element");
@@ -311,36 +290,31 @@ public class TestArrayELResolver {
@Test(expected = PropertyNotFoundException.class)
public void testSetValue06() {
ArrayELResolver resolver = new ArrayELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
String[] base = new String[] { "element" };
resolver.setValue(context, base, Integer.valueOf(1), "new-element");
}
/**
- * Tests that an exception will be thrown if the value is not from the
- * corresponding type.
+ * Tests that an exception will be thrown if the value is not from the corresponding type.
*/
@Test(expected = ClassCastException.class)
public void testSetValue07() {
ArrayELResolver resolver = new ArrayELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
String[] base = new String[] { "element" };
resolver.setValue(context, base, Integer.valueOf(0), Integer.valueOf(1));
}
/**
- * Tests setting arrays of primitives.
- * https://bz.apache.org/bugzilla/show_bug.cgi?id=55691
+ * Tests setting arrays of primitives. https://bz.apache.org/bugzilla/show_bug.cgi?id=55691
*/
@Test
public void testSetValue08() {
ArrayELResolver resolver = new ArrayELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
int[] base = new int[] { 1, 2, 3 };
resolver.setValue(context, base, Integer.valueOf(1), Integer.valueOf(4));
@@ -354,8 +328,7 @@ public class TestArrayELResolver {
@Test
public void testSetValue09() {
ArrayELResolver resolver = new ArrayELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
resolver.setValue(context, null, Integer.valueOf(1), Integer.valueOf(4));
Assert.assertFalse(context.isPropertyResolved());
@@ -376,11 +349,9 @@ public class TestArrayELResolver {
@Test
public void testIsReadOnly02() {
ArrayELResolver resolver = new ArrayELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
- boolean result = resolver.isReadOnly(context, new Object(),
- new Object());
+ boolean result = resolver.isReadOnly(context, new Object(), new Object());
Assert.assertFalse(result);
Assert.assertFalse(context.isPropertyResolved());
@@ -394,14 +365,13 @@ public class TestArrayELResolver {
}
/**
- * Tests that if the ArrayELResolver is constructed with readOnly the method
- * will return always true, otherwise false.
+ * Tests that if the ArrayELResolver is constructed with readOnly the method will return always true, otherwise
+ * false.
*/
@Test
public void testIsReadOnly03() {
ArrayELResolver resolver = new ArrayELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
String[] base = new String[] { "element" };
boolean result = resolver.isReadOnly(context, base, Integer.valueOf(0));
@@ -432,8 +402,7 @@ public class TestArrayELResolver {
private void doTestIsReadOutOfBounds(int index) {
ArrayELResolver resolver = new ArrayELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
String[] base = new String[] { "element" };
resolver.isReadOnly(context, base, Integer.valueOf(index));
@@ -446,8 +415,7 @@ public class TestArrayELResolver {
@Test
public void testIsReadOnly06() {
ArrayELResolver resolver = new ArrayELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
String[] base = new String[] { "element" };
boolean result = resolver.isReadOnly(context, base, "key");
@@ -466,8 +434,7 @@ public class TestArrayELResolver {
@Test
public void testIsReadOnly07() {
ArrayELResolver resolver = new ArrayELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
boolean result = resolver.isReadOnly(context, null, null);
@@ -482,30 +449,28 @@ public class TestArrayELResolver {
Assert.assertFalse(context.isPropertyResolved());
}
- private void doNegativeTest(Object base, Object trigger,
- MethodUnderTest method, boolean checkResult) {
+ private void doNegativeTest(Object base, Object trigger, MethodUnderTest method, boolean checkResult) {
ArrayELResolver resolver = new ArrayELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
Object result = null;
switch (method) {
- case GET_VALUE: {
- result = resolver.getValue(context, base, trigger);
- break;
- }
- case SET_VALUE: {
- resolver.setValue(context, base, trigger, new Object());
- break;
- }
- case GET_TYPE: {
- result = resolver.getType(context, base, trigger);
- break;
- }
- default: {
- // Should never happen
- Assert.fail("Missing case for method");
- }
+ case GET_VALUE: {
+ result = resolver.getValue(context, base, trigger);
+ break;
+ }
+ case SET_VALUE: {
+ resolver.setValue(context, base, trigger, new Object());
+ break;
+ }
+ case GET_TYPE: {
+ result = resolver.getType(context, base, trigger);
+ break;
+ }
+ default: {
+ // Should never happen
+ Assert.fail("Missing case for method");
+ }
}
if (checkResult) {
@@ -515,7 +480,9 @@ public class TestArrayELResolver {
}
private enum MethodUnderTest {
- GET_VALUE, SET_VALUE, GET_TYPE
+ GET_VALUE,
+ SET_VALUE,
+ GET_TYPE
}
@@ -547,7 +514,7 @@ public class TestArrayELResolver {
public void testGetCommonPropertyType03() {
// array base, Integer response
ArrayELResolver resolver = new ArrayELResolver();
- Class<?> clazz = resolver.getCommonPropertyType(null, new Object[]{});
+ Class<?> clazz = resolver.getCommonPropertyType(null, new Object[] {});
Assert.assertNotNull(clazz);
Assert.assertEquals(clazz, Integer.class);
}
diff --git a/test/javax/el/TestBeanELResolver.java b/test/javax/el/TestBeanELResolver.java
index aabd5459bd..8b0cb728c1 100644
--- a/test/javax/el/TestBeanELResolver.java
+++ b/test/javax/el/TestBeanELResolver.java
@@ -47,13 +47,11 @@ public class TestBeanELResolver {
Bean bean = new Bean();
- ValueExpression varBean =
- factory.createValueExpression(bean, Bean.class);
+ ValueExpression varBean = factory.createValueExpression(bean, Bean.class);
context.getVariableMapper().setVariable("bean", varBean);
- ValueExpression ve = factory.createValueExpression(
- context, "${bean.valueA}", String.class);
+ ValueExpression ve = factory.createValueExpression(context, "${bean.valueA}", String.class);
Exception e = null;
try {
ve.getValue(context);
@@ -64,8 +62,7 @@ public class TestBeanELResolver {
String type = Bean.class.getName();
@SuppressWarnings("null") // Not possible due to test above
String msg = e.getMessage();
- Assert.assertTrue("No reference to type [" + type +
- "] where property cannot be found in [" + msg + "]",
+ Assert.assertTrue("No reference to type [" + type + "] where property cannot be found in [" + msg + "]",
msg.contains(type));
}
@@ -112,8 +109,7 @@ public class TestBeanELResolver {
}
/**
- * Tests that an exception will be thrown when a coercion cannot be
- * performed.
+ * Tests that an exception will be thrown when a coercion cannot be performed.
*/
@Test(expected = PropertyNotFoundException.class)
public void testGetType05() {
@@ -166,8 +162,7 @@ public class TestBeanELResolver {
}
/**
- * Tests that an exception will be thrown when a coercion cannot be
- * performed.
+ * Tests that an exception will be thrown when a coercion cannot be performed.
*/
@Test(expected = PropertyNotFoundException.class)
public void testGetValue05() {
@@ -243,8 +238,7 @@ public class TestBeanELResolver {
}
/**
- * Tests that an exception will be thrown when a coercion cannot be
- * performed.
+ * Tests that an exception will be thrown when a coercion cannot be performed.
*/
@Test(expected = PropertyNotFoundException.class)
public void testSetValue05() {
@@ -266,8 +260,7 @@ public class TestBeanELResolver {
}
/**
- * Tests that an exception will be thrown when the property does not have
- * setter method.
+ * Tests that an exception will be thrown when the property does not have setter method.
*/
@Test(expected = PropertyNotWritableException.class)
public void testSetValue07() {
@@ -306,8 +299,7 @@ public class TestBeanELResolver {
}
/**
- * Tests that if the BeanELResolver is constructed with readOnly the method
- * will return always true.
+ * Tests that if the BeanELResolver is constructed with readOnly the method will return always true.
*/
@Test
public void testIsReadOnly03() {
@@ -350,8 +342,7 @@ public class TestBeanELResolver {
}
/**
- * Tests that true will be returned when the property does not have setter
- * method.
+ * Tests that true will be returned when the property does not have setter method.
*/
@Test
public void testIsReadOnly06() {
@@ -365,8 +356,7 @@ public class TestBeanELResolver {
}
/**
- * Tests that a valid FeatureDescriptors are not returned if base is not
- * Map.
+ * Tests that a valid FeatureDescriptors are not returned if base is not Map.
*/
@Test
public void testGetFeatureDescriptors01() {
@@ -390,10 +380,8 @@ public class TestBeanELResolver {
while (result.hasNext()) {
PropertyDescriptor featureDescriptor = (PropertyDescriptor) result.next();
- Assert.assertEquals(featureDescriptor.getPropertyType(),
- featureDescriptor.getValue(ELResolver.TYPE));
- Assert.assertEquals(Boolean.TRUE,
- featureDescriptor.getValue(ELResolver.RESOLVABLE_AT_DESIGN_TIME));
+ Assert.assertEquals(featureDescriptor.getPropertyType(), featureDescriptor.getValue(ELResolver.TYPE));
+ Assert.assertEquals(Boolean.TRUE, featureDescriptor.getValue(ELResolver.RESOLVABLE_AT_DESIGN_TIME));
}
}
@@ -422,8 +410,8 @@ public class TestBeanELResolver {
BeanELResolver resolver = new BeanELResolver();
ELContext context = new StandardELContext(ELManager.getExpressionFactory());
- Object result = resolver.invoke(context, new TesterBean(BEAN_NAME), METHOD01_NAME,
- new Class<?>[] {}, new Object[] {});
+ Object result = resolver.invoke(context, new TesterBean(BEAN_NAME), METHOD01_NAME, new Class<?>[] {},
+ new Object[] {});
Assert.assertEquals(BEAN_NAME, result);
Assert.assertTrue(context.isPropertyResolved());
@@ -445,8 +433,7 @@ public class TestBeanELResolver {
BeanELResolver resolver = new BeanELResolver();
ELContext context = new StandardELContext(ELManager.getExpressionFactory());
- resolver.invoke(context, new TesterBean(BEAN_NAME), METHOD02_NAME, new Class<?>[] {},
- new Object[] {});
+ resolver.invoke(context, new TesterBean(BEAN_NAME), METHOD02_NAME, new Class<?>[] {}, new Object[] {});
}
/**
@@ -457,8 +444,7 @@ public class TestBeanELResolver {
BeanELResolver resolver = new BeanELResolver();
ELContext context = new StandardELContext(ELManager.getExpressionFactory());
- resolver.invoke(context, new TesterBean(BEAN_NAME), METHOD03_NAME, new Class<?>[] {},
- new Object[] {});
+ resolver.invoke(context, new TesterBean(BEAN_NAME), METHOD03_NAME, new Class<?>[] {}, new Object[] {});
}
@Test
@@ -466,8 +452,8 @@ public class TestBeanELResolver {
BeanELResolver resolver = new BeanELResolver();
ELContext context = new StandardELContext(ELManager.getExpressionFactory());
- Object result = resolver.invoke(context, new TesterBean(BEAN_NAME), "getNameVarargs",
- new Class<?>[] {}, new String[] {});
+ Object result = resolver.invoke(context, new TesterBean(BEAN_NAME), "getNameVarargs", new Class<?>[] {},
+ new String[] {});
Assert.assertEquals(BEAN_NAME, result);
}
@@ -477,8 +463,7 @@ public class TestBeanELResolver {
BeanELResolver resolver = new BeanELResolver();
ELContext context = new StandardELContext(ELManager.getExpressionFactory());
- Object result = resolver.invoke(context, new TesterBean(BEAN_NAME), "getNameVarargs",
- null, null);
+ Object result = resolver.invoke(context, new TesterBean(BEAN_NAME), "getNameVarargs", null, null);
Assert.assertEquals(BEAN_NAME, result);
}
@@ -488,8 +473,7 @@ public class TestBeanELResolver {
BeanELResolver resolver = new BeanELResolver();
ELContext context = new StandardELContext(ELManager.getExpressionFactory());
- Object result = resolver.invoke(context, new TesterBean(BEAN_NAME), "getNameVarargs",
- null, new String[] {});
+ Object result = resolver.invoke(context, new TesterBean(BEAN_NAME), "getNameVarargs", null, new String[] {});
Assert.assertEquals(BEAN_NAME, result);
}
@@ -499,8 +483,7 @@ public class TestBeanELResolver {
BeanELResolver resolver = new BeanELResolver();
ELContext context = new StandardELContext(ELManager.getExpressionFactory());
- Object result = resolver.invoke(context, new TesterBean(BEAN_NAME), "getNameVarargs",
- new Class<?>[] {}, null);
+ Object result = resolver.invoke(context, new TesterBean(BEAN_NAME), "getNameVarargs", new Class<?>[] {}, null);
Assert.assertEquals(BEAN_NAME, result);
}
@@ -510,8 +493,8 @@ public class TestBeanELResolver {
BeanELResolver resolver = new BeanELResolver();
ELContext context = new StandardELContext(ELManager.getExpressionFactory());
- Object result = resolver.invoke(context, new TesterBean(BEAN_NAME), "getNameVarargs",
- new Class<?>[] { null }, new String[] { null });
+ Object result = resolver.invoke(context, new TesterBean(BEAN_NAME), "getNameVarargs", new Class<?>[] { null },
+ new String[] { null });
Assert.assertEquals(BEAN_NAME, result);
}
@@ -521,8 +504,8 @@ public class TestBeanELResolver {
BeanELResolver resolver = new BeanELResolver();
ELContext context = new StandardELContext(ELManager.getExpressionFactory());
- Object result = resolver.invoke(context, new TesterBean(BEAN_NAME), "getNameVarargs",
- null, new String[] { null });
+ Object result = resolver.invoke(context, new TesterBean(BEAN_NAME), "getNameVarargs", null,
+ new String[] { null });
Assert.assertEquals(BEAN_NAME, result);
}
@@ -532,8 +515,8 @@ public class TestBeanELResolver {
BeanELResolver resolver = new BeanELResolver();
ELContext context = new StandardELContext(ELManager.getExpressionFactory());
- Object result = resolver.invoke(context, new TesterBean(BEAN_NAME), "getNameVarargs",
- new Class<?>[] { null }, null);
+ Object result = resolver.invoke(context, new TesterBean(BEAN_NAME), "getNameVarargs", new Class<?>[] { null },
+ null);
Assert.assertEquals(BEAN_NAME, result);
}
@@ -615,7 +598,7 @@ public class TestBeanELResolver {
Assert.assertEquals(BEAN_NAME, result);
}
- @Test(expected=MethodNotFoundException.class)
+ @Test(expected = MethodNotFoundException.class)
public void testInvokeVarargsCoerce15() {
BeanELResolver resolver = new BeanELResolver();
ELContext context = new StandardELContext(ELManager.getExpressionFactory());
@@ -632,25 +615,23 @@ public class TestBeanELResolver {
ELContext context = new StandardELContext(ELManager.getExpressionFactory());
Object result = resolver.invoke(context, new TesterBean(BEAN_NAME), "getNameVarargs",
- new Class<?>[] { String.class, String.class, String.class },
- new Object[] { "10", "11", "12" });
+ new Class<?>[] { String.class, String.class, String.class }, new Object[] { "10", "11", "12" });
Assert.assertEquals(BEAN_NAME, result);
}
- @Test(expected=MethodNotFoundException.class)
+ @Test(expected = MethodNotFoundException.class)
public void testInvokeVarargsCoerce17() {
BeanELResolver resolver = new BeanELResolver();
ELContext context = new StandardELContext(ELManager.getExpressionFactory());
Object result = resolver.invoke(context, new TesterBean(BEAN_NAME), "getNameVarargs",
- new Class<?>[] { String.class, String.class },
- new Object[] { "10", "11", "12" });
+ new Class<?>[] { String.class, String.class }, new Object[] { "10", "11", "12" });
Assert.assertEquals(BEAN_NAME, result);
}
- @Test(expected=MethodNotFoundException.class)
+ @Test(expected = MethodNotFoundException.class)
public void testInvokeVarargsCoerce18() {
BeanELResolver resolver = new BeanELResolver();
ELContext context = new StandardELContext(ELManager.getExpressionFactory());
@@ -674,19 +655,18 @@ public class TestBeanELResolver {
Assert.assertEquals(BEAN_NAME, result);
}
- @Test(expected=MethodNotFoundException.class)
+ @Test(expected = MethodNotFoundException.class)
public void testInvokeVarargsCoerce20() {
BeanELResolver resolver = new BeanELResolver();
ELContext context = new StandardELContext(ELManager.getExpressionFactory());
Object result = resolver.invoke(context, new TesterBean(BEAN_NAME), "getNameVarargs",
- new Class<?>[] { String.class, String.class, String.class },
- new Object[] { "true", "10", "11", "12" });
+ new Class<?>[] { String.class, String.class, String.class }, new Object[] { "true", "10", "11", "12" });
Assert.assertEquals(BEAN_NAME, result);
}
- @Test(expected=MethodNotFoundException.class)
+ @Test(expected = MethodNotFoundException.class)
public void testInvokeVarargsCoerce21() {
BeanELResolver resolver = new BeanELResolver();
ELContext context = new StandardELContext(ELManager.getExpressionFactory());
@@ -705,20 +685,18 @@ public class TestBeanELResolver {
context.addELResolver(new StringToLongNeverFailResolver());
Object result = resolver.invoke(context, new TesterBean(BEAN_NAME), "getNameVarargs",
- new Class<?>[] { String.class, String.class, String.class },
- new Object[] { "AA", "BB", "CC" });
+ new Class<?>[] { String.class, String.class, String.class }, new Object[] { "AA", "BB", "CC" });
Assert.assertEquals(BEAN_NAME, result);
}
- @Test(expected=MethodNotFoundException.class)
+ @Test(expected = MethodNotFoundException.class)
public void testInvokeVarargsCoerce23() {
BeanELResolver resolver = new BeanELResolver();
StandardELContext context = new StandardELContext(ELManager.getExpressionFactory());
Object result = resolver.invoke(context, new TesterBean(BEAN_NAME), "getNameVarargs",
- new Class<?>[] { String.class, String.class, String.class },
- new Object[] { "AA", "BB", "CC" });
+ new Class<?>[] { String.class, String.class, String.class }, new Object[] { "AA", "BB", "CC" });
Assert.assertEquals(BEAN_NAME, result);
}
@@ -728,8 +706,8 @@ public class TestBeanELResolver {
BeanELResolver resolver = new BeanELResolver();
ELContext context = new StandardELContext(ELManager.getExpressionFactory());
- Object result = resolver.invoke(context, new TesterBean(BEAN_NAME), "getNameVarargs",
- new Class<?>[] {}, new Object[] {});
+ Object result = resolver.invoke(context, new TesterBean(BEAN_NAME), "getNameVarargs", new Class<?>[] {},
+ new Object[] {});
Assert.assertEquals(BEAN_NAME, result);
}
@@ -739,8 +717,7 @@ public class TestBeanELResolver {
BeanELResolver resolver = new BeanELResolver();
ELContext context = new StandardELContext(ELManager.getExpressionFactory());
- Object result = resolver.invoke(context, new TesterBean(BEAN_NAME), "getNameVarargs",
- null, null);
+ Object result = resolver.invoke(context, new TesterBean(BEAN_NAME), "getNameVarargs", null, null);
Assert.assertEquals(BEAN_NAME, result);
}
@@ -750,8 +727,7 @@ public class TestBeanELResolver {
BeanELResolver resolver = new BeanELResolver();
ELContext context = new StandardELContext(ELManager.getExpressionFactory());
- Object result = resolver.invoke(context, new TesterBean(BEAN_NAME), "getNameVarargs",
- null, new Object[] {});
+ Object result = resolver.invoke(context, new TesterBean(BEAN_NAME), "getNameVarargs", null, new Object[] {});
Assert.assertEquals(BEAN_NAME, result);
}
@@ -761,8 +737,7 @@ public class TestBeanELResolver {
BeanELResolver resolver = new BeanELResolver();
ELContext context = new StandardELContext(ELManager.getExpressionFactory());
- Object result = resolver.invoke(context, new TesterBean(BEAN_NAME), "getNameVarargs",
- new Class<?>[] {}, null);
+ Object result = resolver.invoke(context, new TesterBean(BEAN_NAME), "getNameVarargs", new Class<?>[] {}, null);
Assert.assertEquals(BEAN_NAME, result);
}
@@ -772,8 +747,8 @@ public class TestBeanELResolver {
BeanELResolver resolver = new BeanELResolver();
ELContext context = new StandardELContext(ELManager.getExpressionFactory());
- Object result = resolver.invoke(context, new TesterBean(BEAN_NAME), "getNameVarargs",
- new Class<?>[] { null }, new Object[] { null });
+ Object result = resolver.invoke(context, new TesterBean(BEAN_NAME), "getNameVarargs", new Class<?>[] { null },
+ new Object[] { null });
Assert.assertEquals(BEAN_NAME, result);
}
@@ -783,8 +758,8 @@ public class TestBeanELResolver {
BeanELResolver resolver = new BeanELResolver();
ELContext context = new StandardELContext(ELManager.getExpressionFactory());
- Object result = resolver.invoke(context, new TesterBean(BEAN_NAME), "getNameVarargs",
- null, new Object[] { null });
+ Object result = resolver.invoke(context, new TesterBean(BEAN_NAME), "getNameVarargs", null,
+ new Object[] { null });
Assert.assertEquals(BEAN_NAME, result);
}
@@ -794,8 +769,8 @@ public class TestBeanELResolver {
BeanELResolver resolver = new BeanELResolver();
ELContext context = new StandardELContext(ELManager.getExpressionFactory());
- Object result = resolver.invoke(context, new TesterBean(BEAN_NAME), "getNameVarargs",
- new Class<?>[] { null }, null);
+ Object result = resolver.invoke(context, new TesterBean(BEAN_NAME), "getNameVarargs", new Class<?>[] { null },
+ null);
Assert.assertEquals(BEAN_NAME, result);
}
@@ -861,13 +836,14 @@ public class TestBeanELResolver {
ELContext context = new StandardELContext(ELManager.getExpressionFactory());
Object result = resolver.invoke(context, new TesterBean(BEAN_NAME), "getNameVarargs",
- new Class<?>[] { Integer.class, Integer.class }, new Object[] { Integer.valueOf(10), Integer.valueOf(11) });
+ new Class<?>[] { Integer.class, Integer.class },
+ new Object[] { Integer.valueOf(10), Integer.valueOf(11) });
Assert.assertEquals(BEAN_NAME, result);
}
// Note: The coercion rules are that a null of any type can be coerced to a
- // null of *any* other type so this works.
+ // null of *any* other type so this works.
@Test
public void testInvokeVarargs14() {
BeanELResolver resolver = new BeanELResolver();
@@ -879,7 +855,7 @@ public class TestBeanELResolver {
Assert.assertEquals(BEAN_NAME, result);
}
- @Test(expected=MethodNotFoundException.class)
+ @Test(expected = MethodNotFoundException.class)
public void testInvokeVarargs15() {
BeanELResolver resolver = new BeanELResolver();
ELContext context = new StandardELContext(ELManager.getExpressionFactory());
@@ -897,31 +873,31 @@ public class TestBeanELResolver {
Object result = resolver.invoke(context, new TesterBean(BEAN_NAME), "getNameVarargs",
new Class<?>[] { Integer.class, Integer.class, Integer.class },
- new Object[] { Integer.valueOf(10), Integer.valueOf(11), Integer.valueOf(12) });
+ new Object[] { Integer.valueOf(10), Integer.valueOf(11), Integer.valueOf(12) });
Assert.assertEquals(BEAN_NAME, result);
}
- @Test(expected=MethodNotFoundException.class)
+ @Test(expected = MethodNotFoundException.class)
public void testInvokeVarargs17() {
BeanELResolver resolver = new BeanELResolver();
ELContext context = new StandardELContext(ELManager.getExpressionFactory());
Object result = resolver.invoke(context, new TesterBean(BEAN_NAME), "getNameVarargs",
new Class<?>[] { Integer.class, Integer.class },
- new Object[] { Integer.valueOf(10), Integer.valueOf(11), Integer.valueOf(12) });
+ new Object[] { Integer.valueOf(10), Integer.valueOf(11), Integer.valueOf(12) });
Assert.assertEquals(BEAN_NAME, result);
}
- @Test(expected=MethodNotFoundException.class)
+ @Test(expected = MethodNotFoundException.class)
public void testInvokeVarargs18() {
BeanELResolver resolver = new BeanELResolver();
ELContext context = new StandardELContext(ELManager.getExpressionFactory());
Object result = resolver.invoke(context, new TesterBean(BEAN_NAME), "getNameVarargs",
new Class<?>[] { Integer.class, Integer.class, Integer.class, Integer.class },
- new Object[] { Integer.valueOf(10), Integer.valueOf(11), Integer.valueOf(12) });
+ new Object[] { Integer.valueOf(10), Integer.valueOf(11), Integer.valueOf(12) });
Assert.assertEquals(BEAN_NAME, result);
}
@@ -933,31 +909,31 @@ public class TestBeanELResolver {
Object result = resolver.invoke(context, new TesterBean(BEAN_NAME), "getNameVarargs",
new Class<?>[] { Boolean.class, Integer.class, Integer.class, Integer.class },
- new Object[] { Boolean.TRUE, Integer.valueOf(10), Integer.valueOf(11), Integer.valueOf(12) });
+ new Object[] { Boolean.TRUE, Integer.valueOf(10), Integer.valueOf(11), Integer.valueOf(12) });
Assert.assertEquals(BEAN_NAME, result);
}
- @Test(expected=MethodNotFoundException.class)
+ @Test(expected = MethodNotFoundException.class)
public void testInvokeVarargs20() {
BeanELResolver resolver = new BeanELResolver();
ELContext context = new StandardELContext(ELManager.getExpressionFactory());
Object result = resolver.invoke(context, new TesterBean(BEAN_NAME), "getNameVarargs",
new Class<?>[] { Boolean.class, Integer.class, Integer.class },
- new Object[] { Boolean.TRUE, Integer.valueOf(10), Integer.valueOf(11), Integer.valueOf(12) });
+ new Object[] { Boolean.TRUE, Integer.valueOf(10), Integer.valueOf(11), Integer.valueOf(12) });
Assert.assertEquals(BEAN_NAME, result);
}
- @Test(expected=MethodNotFoundException.class)
+ @Test(expected = MethodNotFoundException.class)
public void testInvokeVarargs21() {
BeanELResolver resolver = new BeanELResolver();
ELContext context = new StandardELContext(ELManager.getExpressionFactory());
Object result = resolver.invoke(context, new TesterBean(BEAN_NAME), "getNameVarargs",
new Class<?>[] { Boolean.class, Integer.class, Integer.class, Integer.class, Integer.class },
- new Object[] { Boolean.TRUE, Integer.valueOf(10), Integer.valueOf(11), Integer.valueOf(12) });
+ new Object[] { Boolean.TRUE, Integer.valueOf(10), Integer.valueOf(11), Integer.valueOf(12) });
Assert.assertEquals(BEAN_NAME, result);
}
@@ -970,33 +946,32 @@ public class TestBeanELResolver {
}
}
- private void doNegativeTest(Object base, Object trigger, MethodUnderTest method,
- boolean checkResult) {
+ private void doNegativeTest(Object base, Object trigger, MethodUnderTest method, boolean checkResult) {
BeanELResolver resolver = new BeanELResolver();
ELContext context = new StandardELContext(ELManager.getExpressionFactory());
Object result = null;
switch (method) {
- case GET_VALUE: {
- result = resolver.getValue(context, base, trigger);
- break;
- }
- case SET_VALUE: {
- resolver.setValue(context, base, trigger, new Object());
- break;
- }
- case GET_TYPE: {
- result = resolver.getType(context, base, trigger);
- break;
- }
- case INVOKE: {
- result = resolver.invoke(context, base, trigger, new Class<?>[0], new Object[0]);
- break;
- }
- default: {
- // Should never happen
- Assert.fail("Missing case for method");
- }
+ case GET_VALUE: {
+ result = resolver.getValue(context, base, trigger);
+ break;
+ }
+ case SET_VALUE: {
+ resolver.setValue(context, base, trigger, new Object());
+ break;
+ }
+ case GET_TYPE: {
+ result = resolver.getType(context, base, trigger);
+ break;
+ }
+ case INVOKE: {
+ result = resolver.invoke(context, base, trigger, new Class<?>[0], new Object[0]);
+ break;
+ }
+ default: {
+ // Should never happen
+ Assert.fail("Missing case for method");
+ }
}
if (checkResult) {
@@ -1006,13 +981,16 @@ public class TestBeanELResolver {
}
private enum MethodUnderTest {
- GET_VALUE, SET_VALUE, GET_TYPE, INVOKE
+ GET_VALUE,
+ SET_VALUE,
+ GET_TYPE,
+ INVOKE
}
/*
- * Custom resolver that will always convert a string to an integer. If the
- * provided string is not a valid integer, zero will be returned.
+ * Custom resolver that will always convert a string to an integer. If the provided string is not a valid integer,
+ * zero will be returned.
*/
private static class StringToLongNeverFailResolver extends ELResolver {
diff --git a/test/javax/el/TestBeanELResolverVarargsInvocation.java b/test/javax/el/TestBeanELResolverVarargsInvocation.java
index 7c1dec32aa..b81bcb1478 100644
--- a/test/javax/el/TestBeanELResolverVarargsInvocation.java
+++ b/test/javax/el/TestBeanELResolverVarargsInvocation.java
@@ -58,8 +58,7 @@ public class TestBeanELResolverVarargsInvocation {
private Map<String, ValueExpression> vars = new HashMap<>();
@Override
- public ValueExpression setVariable(String arg0,
- ValueExpression arg1) {
+ public ValueExpression setVariable(String arg0, ValueExpression arg1) {
if (arg1 == null) {
return vars.remove(arg0);
} else {
@@ -102,21 +101,18 @@ public class TestBeanELResolverVarargsInvocation {
*/
@Test
public void testJoinDelimited() {
- Assert.assertEquals(foo.joinDelimited("-", "foo", "bar", "baz"),
- beanELResolver.invoke(elContext, foo, "joinDelimited", null,
- new Object[] { "-", "foo", "bar", "baz" }));
+ Assert.assertEquals(foo.joinDelimited("-", "foo", "bar", "baz"), beanELResolver.invoke(elContext, foo,
+ "joinDelimited", null, new Object[] { "-", "foo", "bar", "baz" }));
}
/**
- * Tests varargs that constitute a method's only parameters, as well as
- * bogus results due to improper matching of ANY vararg method, and
- * depending on the order in which reflected methods are encountered.
+ * Tests varargs that constitute a method's only parameters, as well as bogus results due to improper matching of
+ * ANY vararg method, and depending on the order in which reflected methods are encountered.
*/
@Test
public void testJoin() {
Assert.assertEquals(foo.join("foo", "bar", "baz"),
- beanELResolver.invoke(elContext, foo, "join", null,
- new Object[] { "foo", "bar", "baz" }));
+ beanELResolver.invoke(elContext, foo, "join", null, new Object[] { "foo", "bar", "baz" }));
}
}
\ No newline at end of file
diff --git a/test/javax/el/TestBeanNameELResolver.java b/test/javax/el/TestBeanNameELResolver.java
index f5ea30f331..666ae1caa9 100644
--- a/test/javax/el/TestBeanNameELResolver.java
+++ b/test/javax/el/TestBeanNameELResolver.java
@@ -29,8 +29,7 @@ public class TestBeanNameELResolver {
private static final TesterBean BEAN99 = new TesterBean(BEAN99_NAME);
/**
- * Creates the resolver that is used for the test. All the tests use a
- * resolver with the same configuration.
+ * Creates the resolver that is used for the test. All the tests use a resolver with the same configuration.
*/
private BeanNameELResolver createBeanNameELResolver() {
return createBeanNameELResolver(true);
@@ -43,8 +42,7 @@ public class TestBeanNameELResolver {
beanNameResolver.setBeanValue(BEAN02_NAME, BEAN02);
beanNameResolver.setAllowCreate(allowCreate);
- BeanNameELResolver beanNameELResolver =
- new BeanNameELResolver(beanNameResolver);
+ BeanNameELResolver beanNameELResolver = new BeanNameELResolver(beanNameResolver);
return beanNameELResolver;
}
@@ -52,7 +50,7 @@ public class TestBeanNameELResolver {
/**
* Tests that a null context results in an NPE as per EL Javadoc.
*/
- @Test(expected=NullPointerException.class)
+ @Test(expected = NullPointerException.class)
public void testGetValue01() {
BeanNameELResolver resolver = createBeanNameELResolver();
resolver.getValue(null, new Object(), new Object());
@@ -66,8 +64,7 @@ public class TestBeanNameELResolver {
public void testGetValue02() {
BeanNameELResolver resolver = createBeanNameELResolver();
- ELContext context =
- new StandardELContext(ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
Object result = resolver.getValue(context, null, BEAN01_NAME);
@@ -83,8 +80,7 @@ public class TestBeanNameELResolver {
public void testGetValue03() {
BeanNameELResolver resolver = createBeanNameELResolver();
- ELContext context =
- new StandardELContext(ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
Object result = resolver.getValue(context, new Object(), BEAN01_NAME);
@@ -94,15 +90,14 @@ public class TestBeanNameELResolver {
/**
- * Tests that a valid bean is not resolved if property is not a String even
- * if it can be coerced to a valid bean name.
+ * Tests that a valid bean is not resolved if property is not a String even if it can be coerced to a valid bean
+ * name.
*/
@Test
public void testGetValue04() {
BeanNameELResolver resolver = createBeanNameELResolver();
- ELContext context =
- new StandardELContext(ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
Object property = new Object() {
@Override
@@ -125,8 +120,7 @@ public class TestBeanNameELResolver {
public void testGetValue05() {
BeanNameELResolver resolver = createBeanNameELResolver();
- ELContext context =
- new StandardELContext(ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
Object result = resolver.getValue(context, null, BEAN99_NAME);
@@ -140,8 +134,7 @@ public class TestBeanNameELResolver {
*/
@Test
public void testGetValue06() {
- doThrowableTest(TesterBeanNameResolver.EXCEPTION_TRIGGER_NAME,
- MethodUnderTest.GET_VALUE);
+ doThrowableTest(TesterBeanNameResolver.EXCEPTION_TRIGGER_NAME, MethodUnderTest.GET_VALUE);
}
@@ -150,15 +143,14 @@ public class TestBeanNameELResolver {
*/
@Test
public void testGetValue07() {
- doThrowableTest(TesterBeanNameResolver.THROWABLE_TRIGGER_NAME,
- MethodUnderTest.GET_VALUE);
+ doThrowableTest(TesterBeanNameResolver.THROWABLE_TRIGGER_NAME, MethodUnderTest.GET_VALUE);
}
/**
* Tests that a null context results in an NPE as per EL Javadoc.
*/
- @Test(expected=NullPointerException.class)
+ @Test(expected = NullPointerException.class)
public void testSetValue01() {
BeanNameELResolver resolver = createBeanNameELResolver();
resolver.setValue(null, new Object(), new Object(), new Object());
@@ -204,20 +196,18 @@ public class TestBeanNameELResolver {
/**
* Test replacing a read-only bean with create enabled.
*/
- @Test(expected=PropertyNotWritableException.class)
+ @Test(expected = PropertyNotWritableException.class)
public void testSetValue06() {
- doSetValueCreateReplaceTest(true,
- TesterBeanNameResolver.READ_ONLY_NAME);
+ doSetValueCreateReplaceTest(true, TesterBeanNameResolver.READ_ONLY_NAME);
}
/**
* Test replacing a read-only bean with create disable.
*/
- @Test(expected=PropertyNotWritableException.class)
+ @Test(expected = PropertyNotWritableException.class)
public void testSetValue07() {
- doSetValueCreateReplaceTest(false,
- TesterBeanNameResolver.READ_ONLY_NAME);
+ doSetValueCreateReplaceTest(false, TesterBeanNameResolver.READ_ONLY_NAME);
}
@@ -226,8 +216,7 @@ public class TestBeanNameELResolver {
*/
@Test
public void testSetValue08() {
- doThrowableTest(TesterBeanNameResolver.EXCEPTION_TRIGGER_NAME,
- MethodUnderTest.SET_VALUE);
+ doThrowableTest(TesterBeanNameResolver.EXCEPTION_TRIGGER_NAME, MethodUnderTest.SET_VALUE);
}
@@ -236,15 +225,14 @@ public class TestBeanNameELResolver {
*/
@Test
public void testSetValue09() {
- doThrowableTest(TesterBeanNameResolver.THROWABLE_TRIGGER_NAME,
- MethodUnderTest.SET_VALUE);
+ doThrowableTest(TesterBeanNameResolver.THROWABLE_TRIGGER_NAME, MethodUnderTest.SET_VALUE);
}
/**
* Tests that a null context results in an NPE as per EL Javadoc.
*/
- @Test(expected=NullPointerException.class)
+ @Test(expected = NullPointerException.class)
public void testGetType01() {
BeanNameELResolver resolver = createBeanNameELResolver();
resolver.getType(null, new Object(), new Object());
@@ -258,8 +246,7 @@ public class TestBeanNameELResolver {
public void testGetType02() {
BeanNameELResolver resolver = createBeanNameELResolver();
- ELContext context =
- new StandardELContext(ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
Class<?> result = resolver.getType(context, null, BEAN01_NAME);
@@ -275,8 +262,7 @@ public class TestBeanNameELResolver {
public void testGetType03() {
BeanNameELResolver resolver = createBeanNameELResolver();
- ELContext context =
- new StandardELContext(ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
Class<?> result = resolver.getType(context, new Object(), BEAN01_NAME);
@@ -286,15 +272,14 @@ public class TestBeanNameELResolver {
/**
- * Tests that a valid bean is not resolved if property is not a String even
- * if it can be coerced to a valid bean name.
+ * Tests that a valid bean is not resolved if property is not a String even if it can be coerced to a valid bean
+ * name.
*/
@Test
public void testGetType04() {
BeanNameELResolver resolver = createBeanNameELResolver();
- ELContext context =
- new StandardELContext(ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
Object property = new Object() {
@Override
@@ -317,8 +302,7 @@ public class TestBeanNameELResolver {
public void testGetType05() {
BeanNameELResolver resolver = createBeanNameELResolver();
- ELContext context =
- new StandardELContext(ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
Class<?> result = resolver.getType(context, null, BEAN99_NAME);
@@ -332,8 +316,7 @@ public class TestBeanNameELResolver {
*/
@Test
public void testGetType06() {
- doThrowableTest(TesterBeanNameResolver.EXCEPTION_TRIGGER_NAME,
- MethodUnderTest.GET_TYPE);
+ doThrowableTest(TesterBeanNameResolver.EXCEPTION_TRIGGER_NAME, MethodUnderTest.GET_TYPE);
}
@@ -342,15 +325,14 @@ public class TestBeanNameELResolver {
*/
@Test
public void testGetType07() {
- doThrowableTest(TesterBeanNameResolver.THROWABLE_TRIGGER_NAME,
- MethodUnderTest.GET_TYPE);
+ doThrowableTest(TesterBeanNameResolver.THROWABLE_TRIGGER_NAME, MethodUnderTest.GET_TYPE);
}
/**
* Tests that a null context results in an NPE as per EL Javadoc.
*/
- @Test(expected=NullPointerException.class)
+ @Test(expected = NullPointerException.class)
public void testIsReadOnly01() {
BeanNameELResolver resolver = createBeanNameELResolver();
resolver.isReadOnly(null, new Object(), new Object());
@@ -364,8 +346,7 @@ public class TestBeanNameELResolver {
public void testIsReadOnly02() {
BeanNameELResolver resolver = createBeanNameELResolver();
- ELContext context =
- new StandardELContext(ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
boolean result = resolver.isReadOnly(context, null, BEAN01_NAME);
@@ -381,11 +362,9 @@ public class TestBeanNameELResolver {
public void testIsReadOnly03() {
BeanNameELResolver resolver = createBeanNameELResolver();
- ELContext context =
- new StandardELContext(ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
- boolean result = resolver.isReadOnly(context, null,
- TesterBeanNameResolver.READ_ONLY_NAME);
+ boolean result = resolver.isReadOnly(context, null, TesterBeanNameResolver.READ_ONLY_NAME);
Assert.assertTrue(result);
Assert.assertTrue(context.isPropertyResolved());
@@ -399,8 +378,7 @@ public class TestBeanNameELResolver {
public void testIsReadOnly04() {
BeanNameELResolver resolver = createBeanNameELResolver();
- ELContext context =
- new StandardELContext(ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
resolver.isReadOnly(context, new Object(), BEAN01_NAME);
@@ -409,15 +387,14 @@ public class TestBeanNameELResolver {
/**
- * Tests that a valid bean is not resolved if property is not a String even
- * if it can be coerced to a valid bean name.
+ * Tests that a valid bean is not resolved if property is not a String even if it can be coerced to a valid bean
+ * name.
*/
@Test
public void testIsReadOnly05() {
BeanNameELResolver resolver = createBeanNameELResolver();
- ELContext context =
- new StandardELContext(ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
Object property = new Object() {
@Override
@@ -439,8 +416,7 @@ public class TestBeanNameELResolver {
public void testIsReadOnly06() {
BeanNameELResolver resolver = createBeanNameELResolver();
- ELContext context =
- new StandardELContext(ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
resolver.isReadOnly(context, null, BEAN99_NAME);
@@ -453,8 +429,7 @@ public class TestBeanNameELResolver {
*/
@Test
public void testIsReadOnly07() {
- doThrowableTest(TesterBeanNameResolver.EXCEPTION_TRIGGER_NAME,
- MethodUnderTest.IS_READ_ONLY);
+ doThrowableTest(TesterBeanNameResolver.EXCEPTION_TRIGGER_NAME, MethodUnderTest.IS_READ_ONLY);
}
@@ -463,8 +438,7 @@ public class TestBeanNameELResolver {
*/
@Test
public void testIsReadOnly08() {
- doThrowableTest(TesterBeanNameResolver.THROWABLE_TRIGGER_NAME,
- MethodUnderTest.IS_READ_ONLY);
+ doThrowableTest(TesterBeanNameResolver.THROWABLE_TRIGGER_NAME, MethodUnderTest.IS_READ_ONLY);
}
@@ -473,8 +447,7 @@ public class TestBeanNameELResolver {
*/
public void testGetFeatureDescriptors01() {
BeanNameELResolver resolver = createBeanNameELResolver();
- ELContext context =
- new StandardELContext(ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
Object result = resolver.getFeatureDescriptors(context, null);
@@ -500,8 +473,7 @@ public class TestBeanNameELResolver {
*/
public void testGetCommonPropertyType01() {
BeanNameELResolver resolver = createBeanNameELResolver();
- ELContext context =
- new StandardELContext(ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
Object result = resolver.getCommonPropertyType(context, null);
@@ -524,8 +496,7 @@ public class TestBeanNameELResolver {
private void doThrowableTest(String trigger, MethodUnderTest method) {
BeanNameELResolver resolver = createBeanNameELResolver();
- ELContext context =
- new StandardELContext(ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
ELException elException = null;
try {
@@ -567,11 +538,9 @@ public class TestBeanNameELResolver {
/**
* Tests adding/replacing beans beans
*/
- private void doSetValueCreateReplaceTest(boolean canCreate,
- String beanName) {
+ private void doSetValueCreateReplaceTest(boolean canCreate, String beanName) {
BeanNameELResolver resolver = createBeanNameELResolver(canCreate);
- ELContext context =
- new StandardELContext(ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
// Get bean one to be sure it has been replaced when testing replace
Object bean = resolver.getValue(context, null, BEAN01_NAME);
diff --git a/test/javax/el/TestCompositeELResolver.java b/test/javax/el/TestCompositeELResolver.java
index a4485ff589..7ff2d3b559 100644
--- a/test/javax/el/TestCompositeELResolver.java
+++ b/test/javax/el/TestCompositeELResolver.java
@@ -30,8 +30,7 @@ public class TestCompositeELResolver extends TomcatBaseTest {
public void testBug50408() throws Exception {
getTomcatInstanceTestWebapp(true, true);
- int rc = getUrl("http://localhost:" + getPort() +
- "/test/bug5nnnn/bug50408.jsp", new ByteChunk(), null);
+ int rc = getUrl("http://localhost:" + getPort() + "/test/bug5nnnn/bug50408.jsp", new ByteChunk(), null);
Assert.assertEquals(HttpServletResponse.SC_OK, rc);
}
diff --git a/test/javax/el/TestELContext.java b/test/javax/el/TestELContext.java
index ce9f257c27..825e204cd4 100644
--- a/test/javax/el/TestELContext.java
+++ b/test/javax/el/TestELContext.java
@@ -53,9 +53,8 @@ public class TestELContext {
}
/**
- * Tests that the context object will be added to the map with context
- * objects. The key is used as unique identifier of the context object in
- * the map.
+ * Tests that the context object will be added to the map with context objects. The key is used as unique identifier
+ * of the context object in the map.
*/
@Test
public void testPutContext03() {
@@ -68,8 +67,7 @@ public class TestELContext {
}
/**
- * Tests that propertyResolved will be set to true and the corresponding
- * listeners will be notified.
+ * Tests that propertyResolved will be set to true and the corresponding listeners will be notified.
*/
@Test
public void testSetPropertyResolved() {
@@ -135,8 +133,7 @@ public class TestELContext {
}
/**
- * Tests that if there is no ELResolver the standard coercions will be
- * invoked.
+ * Tests that if there is no ELResolver the standard coercions will be invoked.
*/
@Test
public void testConvertToType02() {
@@ -147,13 +144,12 @@ public class TestELContext {
Object result = elContext.convertToType("test", String.class);
Assert.assertEquals("test", result);
- Assert.assertTrue(originalPropertyResolved == elContext
- .isPropertyResolved());
+ Assert.assertTrue(originalPropertyResolved == elContext.isPropertyResolved());
}
/**
- * Tests that if there is ELResolver it will handle the conversion. If this
- * resolver cannot return a result the standard coercions will be invoked.
+ * Tests that if there is ELResolver it will handle the conversion. If this resolver cannot return a result the
+ * standard coercions will be invoked.
*/
@Test
public void testConvertToType03() {
@@ -164,12 +160,10 @@ public class TestELContext {
Object result = elContext.convertToType("1", String.class);
Assert.assertEquals("ONE", result);
- Assert.assertTrue(originalPropertyResolved == elContext
- .isPropertyResolved());
+ Assert.assertTrue(originalPropertyResolved == elContext.isPropertyResolved());
result = elContext.convertToType("test", String.class);
Assert.assertEquals("test", result);
- Assert.assertTrue(originalPropertyResolved == elContext
- .isPropertyResolved());
+ Assert.assertTrue(originalPropertyResolved == elContext.isPropertyResolved());
}
}
diff --git a/test/javax/el/TestELProcessor.java b/test/javax/el/TestELProcessor.java
index 4d3a14611d..b46cbe68ab 100644
--- a/test/javax/el/TestELProcessor.java
+++ b/test/javax/el/TestELProcessor.java
@@ -29,14 +29,14 @@ public class TestELProcessor {
}
- @Test(expected=ELException.class)
+ @Test(expected = ELException.class)
public void testEval01() {
ELProcessor elp = new ELProcessor();
elp.eval("${1+1}");
}
- @Test(expected=ELException.class)
+ @Test(expected = ELException.class)
public void testEval02() {
ELProcessor elp = new ELProcessor();
elp.eval("#{1+1}");
@@ -55,10 +55,8 @@ public class TestELProcessor {
@Test
public void testDefineFunctionMethod01() throws Exception {
ELProcessor elp = new ELProcessor();
- elp.defineFunction("fn", "toBoolean",
- Boolean.class.getMethod("valueOf", String.class));
- Assert.assertEquals(Boolean.valueOf(true),
- elp.eval("fn:toBoolean(true)"));
+ elp.defineFunction("fn", "toBoolean", Boolean.class.getMethod("valueOf", String.class));
+ Assert.assertEquals(Boolean.valueOf(true), elp.eval("fn:toBoolean(true)"));
}
@@ -68,8 +66,7 @@ public class TestELProcessor {
// java.lang should be automatically imported so no need for full class
// name
elp.defineFunction("fn", "toBoolean", "Boolean", "valueOf");
- Assert.assertEquals(Boolean.valueOf(true),
- elp.eval("fn:toBoolean(true)"));
+ Assert.assertEquals(Boolean.valueOf(true), elp.eval("fn:toBoolean(true)"));
}
@@ -196,7 +193,7 @@ public class TestELProcessor {
@Test
public void testPrimitiveArray01() {
ELProcessor elp = new ELProcessor();
- TesterBean bean01= new TesterBean("bean01");
+ TesterBean bean01 = new TesterBean("bean01");
elp.defineBean("bean01", bean01);
elp.defineBean("bean02", new TesterBean("bean02"));
diff --git a/test/javax/el/TestELResolver.java b/test/javax/el/TestELResolver.java
index 3caaa53eb3..569a1a6746 100644
--- a/test/javax/el/TestELResolver.java
+++ b/test/javax/el/TestELResolver.java
@@ -25,9 +25,7 @@ public class TestELResolver {
public void testConvertToType01() {
ELContext context = new TesterELContext();
- ValueExpression ve =
- ELManager.getExpressionFactory().createValueExpression(
- context, "1", String.class);
+ ValueExpression ve = ELManager.getExpressionFactory().createValueExpression(context, "1", String.class);
String result = (String) ve.getValue(context);
@@ -39,9 +37,7 @@ public class TestELResolver {
public void testConvertToType02() {
ELContext context = new TesterELContext(new TesterELResolverOne());
- ValueExpression ve =
- ELManager.getExpressionFactory().createValueExpression(
- context, "1", String.class);
+ ValueExpression ve = ELManager.getExpressionFactory().createValueExpression(context, "1", String.class);
String result = (String) ve.getValue(context);
@@ -53,9 +49,7 @@ public class TestELResolver {
public void testConvertToType03() {
ELContext context = new TesterELContext(new TesterELResolverOne());
- ValueExpression ve =
- ELManager.getExpressionFactory().createValueExpression(
- context, "2", String.class);
+ ValueExpression ve = ELManager.getExpressionFactory().createValueExpression(context, "2", String.class);
String result = (String) ve.getValue(context);
@@ -68,9 +62,7 @@ public class TestELResolver {
CompositeELResolver resolver = new CompositeELResolver();
ELContext context = new TesterELContext(resolver);
- ValueExpression ve =
- ELManager.getExpressionFactory().createValueExpression(
- context, "2", String.class);
+ ValueExpression ve = ELManager.getExpressionFactory().createValueExpression(context, "2", String.class);
String result = (String) ve.getValue(context);
@@ -85,9 +77,7 @@ public class TestELResolver {
resolver.add(new TesterELResolverTwo());
ELContext context = new TesterELContext(resolver);
- ValueExpression ve =
- ELManager.getExpressionFactory().createValueExpression(
- context, "1", String.class);
+ ValueExpression ve = ELManager.getExpressionFactory().createValueExpression(context, "1", String.class);
String result = (String) ve.getValue(context);
@@ -102,9 +92,7 @@ public class TestELResolver {
resolver.add(new TesterELResolverTwo());
ELContext context = new TesterELContext(resolver);
- ValueExpression ve =
- ELManager.getExpressionFactory().createValueExpression(
- context, "2", String.class);
+ ValueExpression ve = ELManager.getExpressionFactory().createValueExpression(context, "2", String.class);
String result = (String) ve.getValue(context);
@@ -119,9 +107,7 @@ public class TestELResolver {
resolver.add(new TesterELResolverTwo());
ELContext context = new TesterELContext(resolver);
- ValueExpression ve =
- ELManager.getExpressionFactory().createValueExpression(
- context, "3", String.class);
+ ValueExpression ve = ELManager.getExpressionFactory().createValueExpression(context, "3", String.class);
String result = (String) ve.getValue(context);
@@ -133,8 +119,8 @@ public class TestELResolver {
public void testDefaultConvertToType() {
ELContext context = new TesterELContext(new StaticFieldELResolver());
- ValueExpression ve = ELManager.getExpressionFactory().createValueExpression(
- context, "${!Boolean.FALSE}", Boolean.class);
+ ValueExpression ve = ELManager.getExpressionFactory().createValueExpression(context, "${!Boolean.FALSE}",
+ Boolean.class);
Boolean result = (Boolean) ve.getValue(context);
diff --git a/test/javax/el/TestEvaluationListener.java b/test/javax/el/TestEvaluationListener.java
index 13d8356ffe..fe00e6fc02 100644
--- a/test/javax/el/TestEvaluationListener.java
+++ b/test/javax/el/TestEvaluationListener.java
@@ -84,8 +84,7 @@ public class TestEvaluationListener {
ExpressionFactory factory = ELManager.getExpressionFactory();
ELContext context = new TesterELContext();
String expression = "${1 + 1}";
- ValueExpression ve =
- factory.createValueExpression(context, expression, int.class);
+ ValueExpression ve = factory.createValueExpression(context, expression, int.class);
TesterEvaluationListener listener = new TesterEvaluationListener();
context.addEvaluationListener(listener);
@@ -110,8 +109,7 @@ public class TestEvaluationListener {
ExpressionFactory factory = ELManager.getExpressionFactory();
ELContext context = new TesterELContext(new CompositeELResolver());
String expression = "${foo.bar + 1}";
- ValueExpression ve =
- factory.createValueExpression(context, expression, int.class);
+ ValueExpression ve = factory.createValueExpression(context, expression, int.class);
TesterEvaluationListener listener = new TesterEvaluationListener();
context.addEvaluationListener(listener);
diff --git a/test/javax/el/TestImportHandler.java b/test/javax/el/TestImportHandler.java
index 56c4a28205..271c39e5a4 100644
--- a/test/javax/el/TestImportHandler.java
+++ b/test/javax/el/TestImportHandler.java
@@ -64,8 +64,7 @@ public class TestImportHandler {
for (int i = 1; i <= 3; i++) {
try {
Class<?> clazz = handler.resolveClass("ExceptionUtils");
- Assert.fail("Expected ELException but got [" + clazz.getName()
- + "] on iteration " + i);
+ Assert.fail("Expected ELException but got [" + clazz.getName() + "] on iteration " + i);
} catch (ELException ex) {
// Expected
}
@@ -74,8 +73,7 @@ public class TestImportHandler {
/**
- * Multiple package imports with a single match.
- * https://bz.apache.org/bugzilla/show_bug.cgi?id=57113
+ * Multiple package imports with a single match. https://bz.apache.org/bugzilla/show_bug.cgi?id=57113
*/
@Test
public void testResolveClass04() {
@@ -158,8 +156,7 @@ public class TestImportHandler {
for (int i = 1; i <= 3; i++) {
try {
handler.importClass("org.apache.jasper.util.ExceptionUtils");
- Assert.fail("Expected ELException but got none on iteration "
- + i);
+ Assert.fail("Expected ELException but got none on iteration " + i);
} catch (ELException ex) {
// Expected
}
@@ -214,7 +211,7 @@ public class TestImportHandler {
/**
* Import an invalid static field - does not exist.
*/
- @Test(expected=ELException.class)
+ @Test(expected = ELException.class)
public void testImportStatic02() {
ImportHandler handler = new ImportHandler();
@@ -248,8 +245,7 @@ public class TestImportHandler {
for (int i = 1; i <= 3; i++) {
try {
handler.importStatic("org.apache.tomcat.util.threads.Constants.Package");
- Assert.fail("Expected ELException but got none on iteration "
- + i);
+ Assert.fail("Expected ELException but got none on iteration " + i);
} catch (ELException ex) {
// Expected
}
@@ -258,8 +254,7 @@ public class TestImportHandler {
/**
- * Package imports with conflicts due to non-public classes should not
- * conflict.
+ * Package imports with conflicts due to non-public classes should not conflict.
*/
@Test
public void testBug57135() {
diff --git a/test/javax/el/TestImportHandlerStandardPackages.java b/test/javax/el/TestImportHandlerStandardPackages.java
index e80f1b51f5..0fad5b69ff 100644
--- a/test/javax/el/TestImportHandlerStandardPackages.java
+++ b/test/javax/el/TestImportHandlerStandardPackages.java
@@ -43,9 +43,9 @@ public class TestImportHandlerStandardPackages {
Object obj = f.get(null);
@SuppressWarnings("unchecked")
- Map<String,Set<String>> standardPackageName = (Map<String, Set<String>>) obj;
+ Map<String, Set<String>> standardPackageName = (Map<String, Set<String>>) obj;
- for (Map.Entry<String,Set<String>> entry : standardPackageName.entrySet()) {
+ for (Map.Entry<String, Set<String>> entry : standardPackageName.entrySet()) {
checkPackageClassList(entry.getKey(), entry.getValue());
}
}
@@ -64,27 +64,25 @@ public class TestImportHandlerStandardPackages {
if (!JreCompat.isJre9Available()) {
return;
}
- getJavaBaseClasses().filter(c -> (c.startsWith("java/lang/")))
- .filter(c -> c.lastIndexOf('/') == 9) // Exclude sub-packages
- .filter(c -> c.endsWith(".class")) // Exclude non-class resources
- .map(c -> c.substring(10, c.length() - 6)) // Extract class name
- .map(c-> {
+ getJavaBaseClasses().filter(c -> (c.startsWith("java/lang/"))).filter(c -> c.lastIndexOf('/') == 9) // Exclude
+ // sub-packages
+ .filter(c -> c.endsWith(".class")) // Exclude non-class resources
+ .map(c -> c.substring(10, c.length() - 6)) // Extract class name
+ .map(c -> {
try {
return Class.forName("java.lang." + c, false,
- TesterImportHandlerPerformance.class.getClassLoader()); // Get the class object
+ TesterImportHandlerPerformance.class.getClassLoader()); // Get the class object
} catch (ClassNotFoundException e) {
throw new RuntimeException(c);
}
- })
- .filter(c -> null != c)
- .filter(c -> Modifier.isPublic(c.getModifiers())) // Exclude non-public classes
- .map(c -> c.getName().substring(10)) // Back to the class name
- .map(c -> c.replace('$', '.'))
- .filter(c -> !classNames.contains(c)) // Skip classes already listed
- .filter(c -> !c.startsWith("FdLibm.")) // Skip public inner class
- .filter(c -> !c.startsWith("LiveStackFrame.")) // Skip public inner class
- .filter(c -> !c.startsWith("WeakPairMap.")) // Skip public inner class
- .forEach(c -> Assert.fail("java.lang." + c)); // Should have in list
+ }).filter(c -> null != c).filter(c -> Modifier.isPublic(c.getModifiers())) // Exclude non-public
+ // classes
+ .map(c -> c.getName().substring(10)) // Back to the class name
+ .map(c -> c.replace('$', '.')).filter(c -> !classNames.contains(c)) // Skip classes already listed
+ .filter(c -> !c.startsWith("FdLibm.")) // Skip public inner class
+ .filter(c -> !c.startsWith("LiveStackFrame.")) // Skip public inner class
+ .filter(c -> !c.startsWith("WeakPairMap.")) // Skip public inner class
+ .forEach(c -> Assert.fail("java.lang." + c)); // Should have in list
} else {
// When this test runs, the class loader will be loading resources
// from a directory for each of these packages.
@@ -122,7 +120,7 @@ public class TestImportHandlerStandardPackages {
// Skip classes already known
continue;
}
- File f = new File (dir, file);
+ File f = new File(dir, file);
if (!f.isFile()) {
// Skip directories
continue;
@@ -151,8 +149,7 @@ public class TestImportHandlerStandardPackages {
// Returns ModuleFinder
Object mf = clazzModuleFinder.getMethod("ofSystem").invoke(null);
// Returns ModuleReference
- Object mRef = ((Optional<?>) clazzModuleFinder.getMethod(
- "find", String.class).invoke(mf, "java.base")).get();
+ Object mRef = ((Optional<?>) clazzModuleFinder.getMethod("find", String.class).invoke(mf, "java.base")).get();
// Returns ModuleReader
Object mr = clazzModuleReference.getMethod("open").invoke(mRef);
// Returns the contents of the module
diff --git a/test/javax/el/TestListELResolver.java b/test/javax/el/TestListELResolver.java
index 60aea8cd3a..d0dc5602f9 100644
--- a/test/javax/el/TestListELResolver.java
+++ b/test/javax/el/TestListELResolver.java
@@ -39,8 +39,7 @@ public class TestListELResolver {
*/
@Test
public void testGetValue02() {
- doNegativeTest(new Object(), new Object(), MethodUnderTest.GET_VALUE,
- true);
+ doNegativeTest(new Object(), new Object(), MethodUnderTest.GET_VALUE, true);
}
/**
@@ -49,8 +48,7 @@ public class TestListELResolver {
@Test
public void testGetValue03() {
ListELResolver resolver = new ListELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
List<String> list = new ArrayList<>();
list.add("key");
@@ -66,8 +64,7 @@ public class TestListELResolver {
@Test(expected = IllegalArgumentException.class)
public void testGetValue04() {
ListELResolver resolver = new ListELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
List<String> list = new ArrayList<>();
list.add("key");
@@ -80,8 +77,7 @@ public class TestListELResolver {
@Test
public void testGetValue05() {
ListELResolver resolver = new ListELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
List<String> list = new ArrayList<>();
list.add("key");
@@ -110,8 +106,7 @@ public class TestListELResolver {
*/
@Test
public void testGetType02() {
- doNegativeTest(new Object(), new Object(), MethodUnderTest.GET_TYPE,
- true);
+ doNegativeTest(new Object(), new Object(), MethodUnderTest.GET_TYPE, true);
}
/**
@@ -120,8 +115,7 @@ public class TestListELResolver {
@Test
public void testGetType03() {
ListELResolver resolver = new ListELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
List<String> list = new ArrayList<>();
list.add("key");
@@ -137,8 +131,7 @@ public class TestListELResolver {
@Test(expected = PropertyNotFoundException.class)
public void testGetType04() {
ListELResolver resolver = new ListELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
List<String> list = new ArrayList<>();
list.add("key");
@@ -159,8 +152,7 @@ public class TestListELResolver {
*/
@Test
public void testSetValue02() {
- doNegativeTest(new Object(), new Object(), MethodUnderTest.SET_VALUE,
- false);
+ doNegativeTest(new Object(), new Object(), MethodUnderTest.SET_VALUE, false);
}
/**
@@ -169,11 +161,9 @@ public class TestListELResolver {
@Test(expected = PropertyNotWritableException.class)
public void testSetValue03() {
ListELResolver resolver = new ListELResolver(true);
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
- resolver.setValue(context, new ArrayList<>(), new Object(),
- new Object());
+ resolver.setValue(context, new ArrayList<>(), new Object(), new Object());
}
/**
@@ -182,15 +172,13 @@ public class TestListELResolver {
@Test
public void testSetValue04() {
ListELResolver resolver = new ListELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
List<String> list = new ArrayList<>();
list.add("value");
resolver.setValue(context, list, Integer.valueOf(0), "value");
- Assert.assertEquals("value",
- resolver.getValue(context, list, Integer.valueOf(0)));
+ Assert.assertEquals("value", resolver.getValue(context, list, Integer.valueOf(0)));
Assert.assertTrue(context.isPropertyResolved());
}
@@ -200,8 +188,7 @@ public class TestListELResolver {
@Test(expected = PropertyNotWritableException.class)
public void testSetValue05() {
ListELResolver resolver = new ListELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
List<Object> list = Collections.unmodifiableList(new ArrayList<>());
resolver.setValue(context, list, Integer.valueOf(0), "value");
@@ -213,8 +200,7 @@ public class TestListELResolver {
@Test(expected = IllegalArgumentException.class)
public void testSetValue06() {
ListELResolver resolver = new ListELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
List<String> list = new ArrayList<>();
list.add("key");
@@ -227,8 +213,7 @@ public class TestListELResolver {
@Test(expected = PropertyNotFoundException.class)
public void testSetValue07() {
ListELResolver resolver = new ListELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
List<String> list = new ArrayList<>();
list.add("key");
@@ -250,11 +235,9 @@ public class TestListELResolver {
@Test
public void testIsReadOnly02() {
ListELResolver resolver = new ListELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
- boolean result = resolver.isReadOnly(context, new Object(),
- new Object());
+ boolean result = resolver.isReadOnly(context, new Object(), new Object());
Assert.assertFalse(result);
Assert.assertFalse(context.isPropertyResolved());
@@ -268,14 +251,13 @@ public class TestListELResolver {
}
/**
- * Tests that if the ListELResolver is constructed with readOnly the method
- * will return always true, otherwise false.
+ * Tests that if the ListELResolver is constructed with readOnly the method will return always true, otherwise
+ * false.
*/
@Test
public void testIsReadOnly03() {
ListELResolver resolver = new ListELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
List<String> list = new ArrayList<>();
list.add("key");
@@ -298,14 +280,12 @@ public class TestListELResolver {
@Test
public void testIsReadOnly04() {
ListELResolver resolver = new ListELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
List<String> list = new ArrayList<>();
list.add("key");
List<String> unmodifiableList = Collections.unmodifiableList(list);
- boolean result = resolver.isReadOnly(context, unmodifiableList,
- Integer.valueOf(0));
+ boolean result = resolver.isReadOnly(context, unmodifiableList, Integer.valueOf(0));
Assert.assertTrue(result);
Assert.assertTrue(context.isPropertyResolved());
@@ -317,8 +297,7 @@ public class TestListELResolver {
@Test(expected = PropertyNotFoundException.class)
public void testIsReadOnly05() {
ListELResolver resolver = new ListELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
List<String> list = new ArrayList<>();
list.add("key");
@@ -331,8 +310,7 @@ public class TestListELResolver {
@Test
public void testIsReadOnly06() {
ListELResolver resolver = new ListELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
List<String> list = new ArrayList<>();
list.add("key");
@@ -349,30 +327,28 @@ public class TestListELResolver {
Assert.assertTrue(context.isPropertyResolved());
}
- private void doNegativeTest(Object base, Object trigger,
- MethodUnderTest method, boolean checkResult) {
+ private void doNegativeTest(Object base, Object trigger, MethodUnderTest method, boolean checkResult) {
ListELResolver resolver = new ListELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
Object result = null;
switch (method) {
- case GET_VALUE: {
- result = resolver.getValue(context, base, trigger);
- break;
- }
- case SET_VALUE: {
- resolver.setValue(context, base, trigger, new Object());
- break;
- }
- case GET_TYPE: {
- result = resolver.getType(context, base, trigger);
- break;
- }
- default: {
- // Should never happen
- Assert.fail("Missing case for method");
- }
+ case GET_VALUE: {
+ result = resolver.getValue(context, base, trigger);
+ break;
+ }
+ case SET_VALUE: {
+ resolver.setValue(context, base, trigger, new Object());
+ break;
+ }
+ case GET_TYPE: {
+ result = resolver.getType(context, base, trigger);
+ break;
+ }
+ default: {
+ // Should never happen
+ Assert.fail("Missing case for method");
+ }
}
if (checkResult) {
@@ -382,7 +358,9 @@ public class TestListELResolver {
}
private enum MethodUnderTest {
- GET_VALUE, SET_VALUE, GET_TYPE
+ GET_VALUE,
+ SET_VALUE,
+ GET_TYPE
}
}
diff --git a/test/javax/el/TestMapELResolver.java b/test/javax/el/TestMapELResolver.java
index 1a87b7ff08..feac89820b 100644
--- a/test/javax/el/TestMapELResolver.java
+++ b/test/javax/el/TestMapELResolver.java
@@ -41,8 +41,7 @@ public class TestMapELResolver {
*/
@Test
public void testGetType02() {
- doNegativeTest(new Object(), new Object(), MethodUnderTest.GET_TYPE,
- true);
+ doNegativeTest(new Object(), new Object(), MethodUnderTest.GET_TYPE, true);
}
/**
@@ -51,11 +50,9 @@ public class TestMapELResolver {
@Test
public void testGetType03() {
MapELResolver mapELResolver = new MapELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
- Class<?> result = mapELResolver.getType(context, new HashMap<>(),
- "test");
+ Class<?> result = mapELResolver.getType(context, new HashMap<>(), "test");
Assert.assertEquals(Object.class, result);
Assert.assertTrue(context.isPropertyResolved());
@@ -75,8 +72,7 @@ public class TestMapELResolver {
*/
@Test
public void testGetValue02() {
- doNegativeTest(new Object(), new Object(), MethodUnderTest.GET_VALUE,
- true);
+ doNegativeTest(new Object(), new Object(), MethodUnderTest.GET_VALUE, true);
}
/**
@@ -85,8 +81,7 @@ public class TestMapELResolver {
@Test
public void testGetValue03() {
MapELResolver mapELResolver = new MapELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
Map<String, String> map = new HashMap<>();
map.put("key", "value");
@@ -115,8 +110,7 @@ public class TestMapELResolver {
*/
@Test
public void testSetValue02() {
- doNegativeTest(new Object(), new Object(), MethodUnderTest.SET_VALUE,
- false);
+ doNegativeTest(new Object(), new Object(), MethodUnderTest.SET_VALUE, false);
}
/**
@@ -125,11 +119,9 @@ public class TestMapELResolver {
@Test(expected = PropertyNotWritableException.class)
public void testSetValue03() {
MapELResolver mapELResolver = new MapELResolver(true);
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
- mapELResolver.setValue(context, new HashMap<>(), new Object(),
- new Object());
+ mapELResolver.setValue(context, new HashMap<>(), new Object(), new Object());
}
/**
@@ -138,14 +130,12 @@ public class TestMapELResolver {
@Test
public void testSetValue04() {
MapELResolver mapELResolver = new MapELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
Map<String, String> map = new HashMap<>();
mapELResolver.setValue(context, map, "key", "value");
- Assert.assertEquals("value",
- mapELResolver.getValue(context, map, "key"));
+ Assert.assertEquals("value", mapELResolver.getValue(context, map, "key"));
Assert.assertTrue(context.isPropertyResolved());
}
@@ -155,8 +145,7 @@ public class TestMapELResolver {
@Test(expected = PropertyNotWritableException.class)
public void testSetValue05() {
MapELResolver mapELResolver = new MapELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
Map<Object, Object> map = Collections.unmodifiableMap(new HashMap<>());
mapELResolver.setValue(context, map, "key", "value");
@@ -177,11 +166,9 @@ public class TestMapELResolver {
@Test
public void testIsReadOnly02() {
MapELResolver mapELResolver = new MapELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
- boolean result = mapELResolver.isReadOnly(context, new Object(),
- new Object());
+ boolean result = mapELResolver.isReadOnly(context, new Object(), new Object());
Assert.assertFalse(result);
Assert.assertFalse(context.isPropertyResolved());
@@ -195,25 +182,21 @@ public class TestMapELResolver {
}
/**
- * Tests that if the MapELResolver is constructed with readOnly the method
- * will return always true, otherwise false.
+ * Tests that if the MapELResolver is constructed with readOnly the method will return always true, otherwise false.
*/
@Test
public void testIsReadOnly03() {
MapELResolver mapELResolver = new MapELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
- boolean result = mapELResolver.isReadOnly(context, new HashMap<>(),
- new Object());
+ boolean result = mapELResolver.isReadOnly(context, new HashMap<>(), new Object());
Assert.assertFalse(result);
Assert.assertTrue(context.isPropertyResolved());
mapELResolver = new MapELResolver(true);
- result = mapELResolver.isReadOnly(context, new HashMap<>(),
- new Object());
+ result = mapELResolver.isReadOnly(context, new HashMap<>(), new Object());
Assert.assertTrue(result);
Assert.assertTrue(context.isPropertyResolved());
@@ -225,8 +208,7 @@ public class TestMapELResolver {
@Test
public void testIsReadOnly04() {
MapELResolver mapELResolver = new MapELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
Map<Object, Object> map = Collections.unmodifiableMap(new HashMap<>());
boolean result = mapELResolver.isReadOnly(context, map, new Object());
@@ -236,17 +218,14 @@ public class TestMapELResolver {
}
/**
- * Tests that a valid FeatureDescriptors are not returned if base is not
- * Map.
+ * Tests that a valid FeatureDescriptors are not returned if base is not Map.
*/
@Test
public void testGetFeatureDescriptors01() {
MapELResolver mapELResolver = new MapELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
- Iterator<FeatureDescriptor> result = mapELResolver
- .getFeatureDescriptors(context, new Object());
+ Iterator<FeatureDescriptor> result = mapELResolver.getFeatureDescriptors(context, new Object());
Assert.assertNull(result);
}
@@ -257,13 +236,11 @@ public class TestMapELResolver {
@Test
public void testGetFeatureDescriptors02() {
MapELResolver mapELResolver = new MapELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
Map<String, String> map = new HashMap<>();
map.put("key", "value");
- Iterator<FeatureDescriptor> result = mapELResolver
- .getFeatureDescriptors(context, map);
+ Iterator<FeatureDescriptor> result = mapELResolver.getFeatureDescriptors(context, map);
while (result.hasNext()) {
FeatureDescriptor featureDescriptor = result.next();
@@ -273,37 +250,33 @@ public class TestMapELResolver {
Assert.assertFalse(featureDescriptor.isExpert());
Assert.assertFalse(featureDescriptor.isHidden());
Assert.assertTrue(featureDescriptor.isPreferred());
- Assert.assertEquals("key".getClass(),
- featureDescriptor.getValue(ELResolver.TYPE));
- Assert.assertEquals(Boolean.TRUE, featureDescriptor
- .getValue(ELResolver.RESOLVABLE_AT_DESIGN_TIME));
+ Assert.assertEquals("key".getClass(), featureDescriptor.getValue(ELResolver.TYPE));
+ Assert.assertEquals(Boolean.TRUE, featureDescriptor.getValue(ELResolver.RESOLVABLE_AT_DESIGN_TIME));
}
}
- private void doNegativeTest(Object base, Object trigger,
- MethodUnderTest method, boolean checkResult) {
+ private void doNegativeTest(Object base, Object trigger, MethodUnderTest method, boolean checkResult) {
MapELResolver resolver = new MapELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
Object result = null;
switch (method) {
- case GET_VALUE: {
- result = resolver.getValue(context, base, trigger);
- break;
- }
- case SET_VALUE: {
- resolver.setValue(context, base, trigger, new Object());
- break;
- }
- case GET_TYPE: {
- result = resolver.getType(context, base, trigger);
- break;
- }
- default: {
- // Should never happen
- Assert.fail("Missing case for method");
- }
+ case GET_VALUE: {
+ result = resolver.getValue(context, base, trigger);
+ break;
+ }
+ case SET_VALUE: {
+ resolver.setValue(context, base, trigger, new Object());
+ break;
+ }
+ case GET_TYPE: {
+ result = resolver.getType(context, base, trigger);
+ break;
+ }
+ default: {
+ // Should never happen
+ Assert.fail("Missing case for method");
+ }
}
if (checkResult) {
@@ -313,6 +286,8 @@ public class TestMapELResolver {
}
private enum MethodUnderTest {
- GET_VALUE, SET_VALUE, GET_TYPE
+ GET_VALUE,
+ SET_VALUE,
+ GET_TYPE
}
}
diff --git a/test/javax/el/TestResourceBundleELResolver.java b/test/javax/el/TestResourceBundleELResolver.java
index fe704cebc5..f1ea5db189 100644
--- a/test/javax/el/TestResourceBundleELResolver.java
+++ b/test/javax/el/TestResourceBundleELResolver.java
@@ -36,15 +36,12 @@ public class TestResourceBundleELResolver {
ResourceBundle rb = new TesterResourceBundle();
- ValueExpression var = factory.createValueExpression(rb,
- ResourceBundle.class);
+ ValueExpression var = factory.createValueExpression(rb, ResourceBundle.class);
context.getVariableMapper().setVariable("rb", var);
- ValueExpression ve = factory.createValueExpression(context,
- "${rb.keys}", String.class);
+ ValueExpression ve = factory.createValueExpression(context, "${rb.keys}", String.class);
- MethodExpression me = factory.createMethodExpression(context,
- "${rb.getKeys()}", Enumeration.class, null);
+ MethodExpression me = factory.createMethodExpression(context, "${rb.getKeys()}", Enumeration.class, null);
// Ensure we are specification compliant
String result1 = (String) ve.getValue(context);
@@ -80,13 +77,11 @@ public class TestResourceBundleELResolver {
}
/**
- * Tests that a valid property is not resolved if base is not
- * ResourceBundle.
+ * Tests that a valid property is not resolved if base is not ResourceBundle.
*/
@Test
public void testGetValue02() {
- doNegativeTest(new Object(), new Object(), MethodUnderTest.GET_VALUE,
- true);
+ doNegativeTest(new Object(), new Object(), MethodUnderTest.GET_VALUE, true);
}
/**
@@ -95,8 +90,7 @@ public class TestResourceBundleELResolver {
@Test
public void testGetValue03() {
ResourceBundleELResolver resolver = new ResourceBundleELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
ResourceBundle resourceBundle = new TesterResourceBundle();
Object result = resolver.getValue(context, resourceBundle, "key1");
@@ -125,24 +119,20 @@ public class TestResourceBundleELResolver {
}
/**
- * Tests that a valid property is not resolved if base is not
- * ResourceBundle.
+ * Tests that a valid property is not resolved if base is not ResourceBundle.
*/
@Test
public void testGetType02() {
- doNegativeTest(new Object(), new Object(), MethodUnderTest.GET_TYPE,
- true);
+ doNegativeTest(new Object(), new Object(), MethodUnderTest.GET_TYPE, true);
}
/**
- * Tests that null will be returned when base is ResourceBundle. Checks that
- * the propertyResolved is true.
+ * Tests that null will be returned when base is ResourceBundle. Checks that the propertyResolved is true.
*/
@Test
public void testGetType03() {
ResourceBundleELResolver resolver = new ResourceBundleELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
ResourceBundle resourceBundle = new TesterResourceBundle();
Class<?> result = resolver.getType(context, resourceBundle, "key1");
@@ -165,8 +155,7 @@ public class TestResourceBundleELResolver {
*/
@Test
public void testSetValue02() {
- doNegativeTest(new Object(), new Object(), MethodUnderTest.SET_VALUE,
- false);
+ doNegativeTest(new Object(), new Object(), MethodUnderTest.SET_VALUE, false);
}
/**
@@ -175,8 +164,7 @@ public class TestResourceBundleELResolver {
@Test(expected = PropertyNotWritableException.class)
public void testSetValue03() {
ResourceBundleELResolver resolver = new ResourceBundleELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
ResourceBundle resourceBundle = new TesterResourceBundle();
resolver.setValue(context, resourceBundle, new Object(), new Object());
@@ -192,17 +180,14 @@ public class TestResourceBundleELResolver {
}
/**
- * Tests that the propertyResolved is false and readOnly is false if base is
- * not ResourceBundle.
+ * Tests that the propertyResolved is false and readOnly is false if base is not ResourceBundle.
*/
@Test
public void testIsReadOnly02() {
ResourceBundleELResolver resolver = new ResourceBundleELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
- boolean result = resolver.isReadOnly(context, new Object(),
- new Object());
+ boolean result = resolver.isReadOnly(context, new Object(), new Object());
Assert.assertFalse(result);
Assert.assertFalse(context.isPropertyResolved());
@@ -214,29 +199,24 @@ public class TestResourceBundleELResolver {
@Test
public void testIsReadOnly03() {
ResourceBundleELResolver resolver = new ResourceBundleELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
ResourceBundle resourceBundle = new TesterResourceBundle();
- boolean result = resolver.isReadOnly(context, resourceBundle,
- new Object());
+ boolean result = resolver.isReadOnly(context, resourceBundle, new Object());
Assert.assertTrue(result);
Assert.assertTrue(context.isPropertyResolved());
}
/**
- * Tests that a valid FeatureDescriptors are not returned if base is not
- * ResourceBundle.
+ * Tests that a valid FeatureDescriptors are not returned if base is not ResourceBundle.
*/
@Test
public void testGetFeatureDescriptors01() {
ResourceBundleELResolver resolver = new ResourceBundleELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
- Iterator<FeatureDescriptor> result = resolver.getFeatureDescriptors(
- context, new Object());
+ Iterator<FeatureDescriptor> result = resolver.getFeatureDescriptors(context, new Object());
Assert.assertNull(result);
}
@@ -247,13 +227,10 @@ public class TestResourceBundleELResolver {
@Test
public void testGetFeatureDescriptors02() {
ResourceBundleELResolver resolver = new ResourceBundleELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
- ResourceBundle resourceBundle = new TesterResourceBundle(
- new Object[][] { { "key", "value" } });
- Iterator<FeatureDescriptor> result = resolver.getFeatureDescriptors(
- context, resourceBundle);
+ ResourceBundle resourceBundle = new TesterResourceBundle(new Object[][] { { "key", "value" } });
+ Iterator<FeatureDescriptor> result = resolver.getFeatureDescriptors(context, resourceBundle);
while (result.hasNext()) {
FeatureDescriptor featureDescriptor = result.next();
@@ -263,10 +240,8 @@ public class TestResourceBundleELResolver {
Assert.assertFalse(featureDescriptor.isExpert());
Assert.assertFalse(featureDescriptor.isHidden());
Assert.assertTrue(featureDescriptor.isPreferred());
- Assert.assertEquals(String.class,
- featureDescriptor.getValue(ELResolver.TYPE));
- Assert.assertEquals(Boolean.TRUE, featureDescriptor
- .getValue(ELResolver.RESOLVABLE_AT_DESIGN_TIME));
+ Assert.assertEquals(String.class, featureDescriptor.getValue(ELResolver.TYPE));
+ Assert.assertEquals(Boolean.TRUE, featureDescriptor.getValue(ELResolver.RESOLVABLE_AT_DESIGN_TIME));
}
}
@@ -288,30 +263,28 @@ public class TestResourceBundleELResolver {
private Object[][] contents;
}
- private void doNegativeTest(Object base, Object trigger,
- MethodUnderTest method, boolean checkResult) {
+ private void doNegativeTest(Object base, Object trigger, MethodUnderTest method, boolean checkResult) {
ResourceBundleELResolver resolver = new ResourceBundleELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
Object result = null;
switch (method) {
- case GET_VALUE: {
- result = resolver.getValue(context, base, trigger);
- break;
- }
- case SET_VALUE: {
- resolver.setValue(context, base, trigger, new Object());
- break;
- }
- case GET_TYPE: {
- result = resolver.getType(context, base, trigger);
- break;
- }
- default: {
- // Should never happen
- Assert.fail("Missing case for method");
- }
+ case GET_VALUE: {
+ result = resolver.getValue(context, base, trigger);
+ break;
+ }
+ case SET_VALUE: {
+ resolver.setValue(context, base, trigger, new Object());
+ break;
+ }
+ case GET_TYPE: {
+ result = resolver.getType(context, base, trigger);
+ break;
+ }
+ default: {
+ // Should never happen
+ Assert.fail("Missing case for method");
+ }
}
if (checkResult) {
@@ -321,6 +294,8 @@ public class TestResourceBundleELResolver {
}
private enum MethodUnderTest {
- GET_VALUE, SET_VALUE, GET_TYPE
+ GET_VALUE,
+ SET_VALUE,
+ GET_TYPE
}
}
diff --git a/test/javax/el/TestStaticFieldELResolver.java b/test/javax/el/TestStaticFieldELResolver.java
index 3655865153..2663451bde 100644
--- a/test/javax/el/TestStaticFieldELResolver.java
+++ b/test/javax/el/TestStaticFieldELResolver.java
@@ -47,11 +47,9 @@ public class TestStaticFieldELResolver {
@Test
public void testGetValue02() {
StaticFieldELResolver resolver = new StaticFieldELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
- Object result = resolver.getValue(context, new ELClass(
- TesterClass.class), PROPERTY01_NAME);
+ Object result = resolver.getValue(context, new ELClass(TesterClass.class), PROPERTY01_NAME);
Assert.assertEquals(PROPERTY01_NAME, result);
Assert.assertTrue(context.isPropertyResolved());
@@ -70,8 +68,7 @@ public class TestStaticFieldELResolver {
*/
@Test
public void testGetValue04() {
- doNegativeTest(new ELClass(TesterClass.class), new Object(),
- MethodUnderTest.GET_VALUE);
+ doNegativeTest(new ELClass(TesterClass.class), new Object(), MethodUnderTest.GET_VALUE);
}
/**
@@ -112,11 +109,10 @@ public class TestStaticFieldELResolver {
@Test
public void testGetValue09() {
StaticFieldELResolver resolver = new StaticFieldELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
- Object result = resolver.getValue(context, new ELClass(
- MethodUnderTest.class), MethodUnderTest.GET_TYPE.toString());
+ Object result = resolver.getValue(context, new ELClass(MethodUnderTest.class),
+ MethodUnderTest.GET_TYPE.toString());
Assert.assertEquals(MethodUnderTest.GET_TYPE, result);
Assert.assertTrue(context.isPropertyResolved());
@@ -137,11 +133,9 @@ public class TestStaticFieldELResolver {
@Test(expected = PropertyNotWritableException.class)
public void testSetValue02() {
StaticFieldELResolver resolver = new StaticFieldELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
- resolver.setValue(context, new ELClass(TesterClass.class),
- PROPERTY01_NAME, PROPERTY01_VALUE);
+ resolver.setValue(context, new ELClass(TesterClass.class), PROPERTY01_NAME, PROPERTY01_VALUE);
}
/**
@@ -157,8 +151,7 @@ public class TestStaticFieldELResolver {
*/
@Test
public void testSetValue04() {
- doNegativeTest(new ELClass(TesterClass.class), new Object(),
- MethodUnderTest.SET_VALUE);
+ doNegativeTest(new ELClass(TesterClass.class), new Object(), MethodUnderTest.SET_VALUE);
}
/**
@@ -171,17 +164,14 @@ public class TestStaticFieldELResolver {
}
/**
- * Tests that the propertyResolved is true when base is ELCLass and the
- * property is String.
+ * Tests that the propertyResolved is true when base is ELCLass and the property is String.
*/
@Test
public void testIsReadOnly02() {
StaticFieldELResolver resolver = new StaticFieldELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
- boolean result = resolver.isReadOnly(context, new ELClass(
- TesterClass.class), PROPERTY01_NAME);
+ boolean result = resolver.isReadOnly(context, new ELClass(TesterClass.class), PROPERTY01_NAME);
Assert.assertTrue(result);
Assert.assertTrue(context.isPropertyResolved());
@@ -193,11 +183,9 @@ public class TestStaticFieldELResolver {
@Test
public void testIsReadOnly03() {
StaticFieldELResolver resolver = new StaticFieldELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
- boolean result = resolver.isReadOnly(context, new Object(),
- PROPERTY01_NAME);
+ boolean result = resolver.isReadOnly(context, new Object(), PROPERTY01_NAME);
Assert.assertTrue(result);
Assert.assertFalse(context.isPropertyResolved());
@@ -209,11 +197,9 @@ public class TestStaticFieldELResolver {
@Test
public void testIsReadOnly04() {
StaticFieldELResolver resolver = new StaticFieldELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
- boolean result = resolver.isReadOnly(context, new ELClass(
- TesterClass.class), new Object());
+ boolean result = resolver.isReadOnly(context, new ELClass(TesterClass.class), new Object());
Assert.assertTrue(result);
Assert.assertFalse(context.isPropertyResolved());
@@ -234,11 +220,9 @@ public class TestStaticFieldELResolver {
@Test
public void testGetType02() {
StaticFieldELResolver resolver = new StaticFieldELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
- Class<?> result = resolver.getType(context, new ELClass(
- TesterClass.class), PROPERTY01_NAME);
+ Class<?> result = resolver.getType(context, new ELClass(TesterClass.class), PROPERTY01_NAME);
Assert.assertEquals(PROPERTY01_NAME.getClass(), result);
Assert.assertTrue(context.isPropertyResolved());
@@ -257,8 +241,7 @@ public class TestStaticFieldELResolver {
*/
@Test
public void testGetType04() {
- doNegativeTest(new ELClass(TesterClass.class), new Object(),
- MethodUnderTest.GET_TYPE);
+ doNegativeTest(new ELClass(TesterClass.class), new Object(), MethodUnderTest.GET_TYPE);
}
/**
@@ -299,11 +282,10 @@ public class TestStaticFieldELResolver {
@Test
public void testGetType09() {
StaticFieldELResolver resolver = new StaticFieldELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
- Class<?> result = resolver.getType(context, new ELClass(
- MethodUnderTest.class), MethodUnderTest.GET_TYPE.toString());
+ Class<?> result = resolver.getType(context, new ELClass(MethodUnderTest.class),
+ MethodUnderTest.GET_TYPE.toString());
Assert.assertEquals(MethodUnderTest.GET_TYPE.getClass(), result);
Assert.assertTrue(context.isPropertyResolved());
@@ -315,8 +297,7 @@ public class TestStaticFieldELResolver {
@Test(expected = NullPointerException.class)
public void testInvoke01() {
StaticFieldELResolver resolver = new StaticFieldELResolver();
- resolver.invoke(null, new Object(), new Object(), new Class<?>[] {},
- new Object[] {});
+ resolver.invoke(null, new Object(), new Object(), new Class<?>[] {}, new Object[] {});
}
/**
@@ -325,11 +306,9 @@ public class TestStaticFieldELResolver {
@Test
public void testInvoke02() {
StaticFieldELResolver resolver = new StaticFieldELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
- Object result = resolver.invoke(context,
- new ELClass(TesterClass.class), METHOD01_NAME, null, null);
+ Object result = resolver.invoke(context, new ELClass(TesterClass.class), METHOD01_NAME, null, null);
Assert.assertEquals(TesterClass.class, result.getClass());
Assert.assertTrue(context.isPropertyResolved());
@@ -341,12 +320,10 @@ public class TestStaticFieldELResolver {
@Test
public void testInvoke03() {
StaticFieldELResolver resolver = new StaticFieldELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
- Object result = resolver.invoke(context,
- new ELClass(TesterClass.class), METHOD02_NAME,
- new Class<?>[] {}, new Object[] {});
+ Object result = resolver.invoke(context, new ELClass(TesterClass.class), METHOD02_NAME, new Class<?>[] {},
+ new Object[] {});
Assert.assertEquals(PROPERTY01_NAME, result);
Assert.assertTrue(context.isPropertyResolved());
@@ -365,8 +342,7 @@ public class TestStaticFieldELResolver {
*/
@Test
public void testInvoke05() {
- doNegativeTest(new ELClass(TesterClass.class), new Object(),
- MethodUnderTest.INVOKE);
+ doNegativeTest(new ELClass(TesterClass.class), new Object(), MethodUnderTest.INVOKE);
}
/**
@@ -391,75 +367,36 @@ public class TestStaticFieldELResolver {
@Test
public void testInvoke08() {
StaticFieldELResolver resolver = new StaticFieldELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
- Object result = resolver.invoke(context,
- new ELClass(TesterClass.class), METHOD04_NAME,
- new Class<?>[] {}, new Object[] {});
+ Object result = resolver.invoke(context, new ELClass(TesterClass.class), METHOD04_NAME, new Class<?>[] {},
+ new Object[] {});
Assert.assertNull(result);
Assert.assertTrue(context.isPropertyResolved());
}
- private void doNegativeTest(Object elClass, Object trigger,
- MethodUnderTest method) {
+ private void doNegativeTest(Object elClass, Object trigger, MethodUnderTest method) {
StaticFieldELResolver resolver = new StaticFieldELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
Object result = null;
switch (method) {
- case GET_VALUE: {
- result = resolver.getValue(context, elClass, trigger);
- break;
- }
- case SET_VALUE: {
- resolver.setValue(context, elClass, trigger, PROPERTY01_VALUE);
- result = resolver.getValue(context, elClass, trigger);
- break;
- }
- case GET_TYPE: {
- result = resolver.getType(context, elClass, trigger);
- break;
- }
- case INVOKE: {
- result = resolver.invoke(context, elClass, trigger,
- new Class<?>[] { String.class }, new Object[] { "test" });
- break;
- }
- default: {
- // Should never happen
- Assert.fail("Missing case for method");
- }
- }
-
- Assert.assertNull(result);
- Assert.assertFalse(context.isPropertyResolved());
- }
-
- private void doThrowableTest(String trigger, MethodUnderTest method,
- boolean checkCause) {
- StaticFieldELResolver resolver = new StaticFieldELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
-
- ELException exception = null;
- try {
- switch (method) {
case GET_VALUE: {
- resolver.getValue(context, new ELClass(TesterClass.class),
- trigger);
+ result = resolver.getValue(context, elClass, trigger);
+ break;
+ }
+ case SET_VALUE: {
+ resolver.setValue(context, elClass, trigger, PROPERTY01_VALUE);
+ result = resolver.getValue(context, elClass, trigger);
break;
}
case GET_TYPE: {
- resolver.getType(context, new ELClass(TesterClass.class),
- trigger);
+ result = resolver.getType(context, elClass, trigger);
break;
}
case INVOKE: {
- resolver.invoke(context, new ELClass(TesterClass.class),
- trigger, new Class<?>[] { String.class },
+ result = resolver.invoke(context, elClass, trigger, new Class<?>[] { String.class },
new Object[] { "test" });
break;
}
@@ -467,6 +404,36 @@ public class TestStaticFieldELResolver {
// Should never happen
Assert.fail("Missing case for method");
}
+ }
+
+ Assert.assertNull(result);
+ Assert.assertFalse(context.isPropertyResolved());
+ }
+
+ private void doThrowableTest(String trigger, MethodUnderTest method, boolean checkCause) {
+ StaticFieldELResolver resolver = new StaticFieldELResolver();
+ ELContext context = new StandardELContext(ELManager.getExpressionFactory());
+
+ ELException exception = null;
+ try {
+ switch (method) {
+ case GET_VALUE: {
+ resolver.getValue(context, new ELClass(TesterClass.class), trigger);
+ break;
+ }
+ case GET_TYPE: {
+ resolver.getType(context, new ELClass(TesterClass.class), trigger);
+ break;
+ }
+ case INVOKE: {
+ resolver.invoke(context, new ELClass(TesterClass.class), trigger, new Class<?>[] { String.class },
+ new Object[] { "test" });
+ break;
+ }
+ default: {
+ // Should never happen
+ Assert.fail("Missing case for method");
+ }
}
} catch (PropertyNotFoundException | MethodNotFoundException e) {
@@ -484,6 +451,9 @@ public class TestStaticFieldELResolver {
}
private enum MethodUnderTest {
- GET_VALUE, SET_VALUE, GET_TYPE, INVOKE
+ GET_VALUE,
+ SET_VALUE,
+ GET_TYPE,
+ INVOKE
}
}
diff --git a/test/javax/el/TesterBean.java b/test/javax/el/TesterBean.java
index 0ee12fa749..cd5e9a3c8b 100644
--- a/test/javax/el/TesterBean.java
+++ b/test/javax/el/TesterBean.java
@@ -52,7 +52,7 @@ public class TesterBean {
}
public int[] getValueB() {
- return new int[] {1,2,3,4,5};
+ return new int[] { 1, 2, 3, 4, 5 };
}
public void setValueC(Integer[] values) {
diff --git a/test/javax/el/TesterBeanNameResolver.java b/test/javax/el/TesterBeanNameResolver.java
index 8da8638b55..3995b96120 100644
--- a/test/javax/el/TesterBeanNameResolver.java
+++ b/test/javax/el/TesterBeanNameResolver.java
@@ -25,7 +25,7 @@ public class TesterBeanNameResolver extends BeanNameResolver {
public static final String THROWABLE_TRIGGER_NAME = "throwable";
public static final String READ_ONLY_NAME = "readonly";
- private Map<String,Object> beans = new HashMap<>();
+ private Map<String, Object> beans = new HashMap<>();
private boolean allowCreate = true;
@@ -36,8 +36,7 @@ public class TesterBeanNameResolver extends BeanNameResolver {
}
@Override
- public void setBeanValue(String beanName, Object value)
- throws PropertyNotWritableException {
+ public void setBeanValue(String beanName, Object value) throws PropertyNotWritableException {
checkTriggers(beanName);
if (allowCreate || beans.containsKey(beanName)) {
beans.put(beanName, value);
diff --git a/test/javax/el/TesterEvaluationListener.java b/test/javax/el/TesterEvaluationListener.java
index 7431beeb5c..a61ad073d1 100644
--- a/test/javax/el/TesterEvaluationListener.java
+++ b/test/javax/el/TesterEvaluationListener.java
@@ -27,8 +27,7 @@ public class TesterEvaluationListener extends EvaluationListener {
@Override
- public void propertyResolved(ELContext context, Object base,
- Object property) {
+ public void propertyResolved(ELContext context, Object base, Object property) {
resolvedProperties.add(new Pair(base, property));
}
diff --git a/test/javax/el/TesterImportHandlerPerformance.java b/test/javax/el/TesterImportHandlerPerformance.java
index e15405abb7..ce05d0b8d0 100644
--- a/test/javax/el/TesterImportHandlerPerformance.java
+++ b/test/javax/el/TesterImportHandlerPerformance.java
@@ -21,15 +21,11 @@ import org.junit.Test;
public class TesterImportHandlerPerformance {
/*
- * This test is looking at the cost of looking up a class when the standard
- * JSP package imports are present:
- * - java.lang
- * - javax.servlet
- * - javax.servlet.http
- * - javax.servlet.jsp
+ * This test is looking at the cost of looking up a class when the standard JSP package imports are present: -
+ * java.lang - javax.servlet - javax.servlet.http - javax.servlet.jsp
*
- * Before optimisation, this test took ~4.6s on markt's desktop
- * After optimisation, this test took ~0.05s on markt's desktop
+ * Before optimisation, this test took ~4.6s on markt's desktop After optimisation, this test took ~0.05s on markt's
+ * desktop
*/
@Test
public void testBug62453() throws Exception {
@@ -42,7 +38,7 @@ public class TesterImportHandlerPerformance {
long start = System.nanoTime();
ih.resolveClass("unknown");
long end = System.nanoTime();
- totalTime += (end -start);
+ totalTime += (end - start);
}
System.out.println("Time taken: " + totalTime + "ns");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/03: Clean-up. Reformatting. No functional change.
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 6e6386fb3f5570b04154b56e29458e58767ce5cd
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Feb 22 19:42:54 2023 +0000
Clean-up. Reformatting. No functional change.
---
java/javax/el/ArrayELResolver.java | 22 ++---
java/javax/el/BeanELResolver.java | 57 ++++++-------
java/javax/el/BeanNameELResolver.java | 12 +--
java/javax/el/BeanNameResolver.java | 18 ++--
java/javax/el/CompositeELResolver.java | 3 +-
java/javax/el/ELContext.java | 41 ++++-----
java/javax/el/ELContextListener.java | 1 -
java/javax/el/ELException.java | 15 ++--
java/javax/el/ELManager.java | 8 +-
java/javax/el/ELProcessor.java | 92 ++++++++------------
java/javax/el/ELResolver.java | 126 +++++++++++-----------------
java/javax/el/EvaluationListener.java | 3 +-
java/javax/el/ExpressionFactory.java | 79 ++++++++---------
java/javax/el/ImportHandler.java | 68 +++++++--------
java/javax/el/JreCompat.java | 15 ++--
java/javax/el/LambdaExpression.java | 17 ++--
java/javax/el/ListELResolver.java | 17 ++--
java/javax/el/MapELResolver.java | 16 ++--
java/javax/el/MethodExpression.java | 40 ++++-----
java/javax/el/ResourceBundleELResolver.java | 13 ++-
java/javax/el/StandardELContext.java | 33 +++-----
java/javax/el/StaticFieldELResolver.java | 47 ++++-------
java/javax/el/TypeConverter.java | 9 +-
java/javax/el/Util.java | 120 ++++++++++++--------------
java/javax/el/ValueExpression.java | 58 +++++--------
25 files changed, 367 insertions(+), 563 deletions(-)
diff --git a/java/javax/el/ArrayELResolver.java b/java/javax/el/ArrayELResolver.java
index 9d7b86156c..dac4cd3d01 100644
--- a/java/javax/el/ArrayELResolver.java
+++ b/java/javax/el/ArrayELResolver.java
@@ -38,8 +38,7 @@ public class ArrayELResolver extends ELResolver {
/**
* Creates an instance of the standard array resolver.
*
- * @param readOnly {@code true} if the created instance should be read-only
- * otherwise false.
+ * @param readOnly {@code true} if the created instance should be read-only otherwise false.
*/
public ArrayELResolver(boolean readOnly) {
this.readOnly = readOnly;
@@ -80,24 +79,21 @@ public class ArrayELResolver extends ELResolver {
}
@Override
- public void setValue(ELContext context, Object base, Object property,
- Object value) {
+ public void setValue(ELContext context, Object base, Object property, Object value) {
Objects.requireNonNull(context);
if (base != null && base.getClass().isArray()) {
context.setPropertyResolved(base, property);
if (this.readOnly) {
- throw new PropertyNotWritableException(Util.message(context,
- "resolverNotWritable", base.getClass().getName()));
+ throw new PropertyNotWritableException(
+ Util.message(context, "resolverNotWritable", base.getClass().getName()));
}
int idx = coerce(property);
checkBounds(base, idx);
- if (value != null && !Util.isAssignableFrom(value.getClass(),
- base.getClass().getComponentType())) {
- throw new ClassCastException(Util.message(context,
- "objectNotAssignable", value.getClass().getName(),
+ if (value != null && !Util.isAssignableFrom(value.getClass(), base.getClass().getComponentType())) {
+ throw new ClassCastException(Util.message(context, "objectNotAssignable", value.getClass().getName(),
base.getClass().getComponentType().getName()));
}
Array.set(base, idx, value);
@@ -136,8 +132,7 @@ public class ArrayELResolver extends ELResolver {
private static void checkBounds(Object base, int idx) {
if (idx < 0 || idx >= Array.getLength(base)) {
- throw new PropertyNotFoundException(
- new ArrayIndexOutOfBoundsException(idx).getMessage());
+ throw new PropertyNotFoundException(new ArrayIndexOutOfBoundsException(idx).getMessage());
}
}
@@ -154,8 +149,7 @@ public class ArrayELResolver extends ELResolver {
if (property instanceof String) {
return Integer.parseInt((String) property);
}
- throw new IllegalArgumentException(property != null ?
- property.toString() : "null");
+ throw new IllegalArgumentException(property != null ? property.toString() : "null");
}
}
diff --git a/java/javax/el/BeanELResolver.java b/java/javax/el/BeanELResolver.java
index ede82d3669..e3823b7c8b 100644
--- a/java/javax/el/BeanELResolver.java
+++ b/java/javax/el/BeanELResolver.java
@@ -45,8 +45,9 @@ public class BeanELResolver extends ELResolver {
if (System.getSecurityManager() == null) {
CACHE_SIZE = Integer.getInteger(CACHE_SIZE_PROP, 1000).intValue();
} else {
- CACHE_SIZE = AccessController.doPrivileged(
- (PrivilegedAction<Integer>) () -> Integer.getInteger(CACHE_SIZE_PROP, 1000)).intValue();
+ CACHE_SIZE = AccessController
+ .doPrivileged((PrivilegedAction<Integer>) () -> Integer.getInteger(CACHE_SIZE_PROP, 1000))
+ .intValue();
}
}
@@ -64,8 +65,7 @@ public class BeanELResolver extends ELResolver {
/**
* Creates an instance of the standard JavaBean resolver.
*
- * @param readOnly {@code true} if the created instance should be read-only
- * otherwise false.
+ * @param readOnly {@code true} if the created instance should be read-only otherwise false.
*/
public BeanELResolver(boolean readOnly) {
this.readOnly = readOnly;
@@ -96,16 +96,15 @@ public class BeanELResolver extends ELResolver {
} catch (InvocationTargetException e) {
Throwable cause = e.getCause();
Util.handleThrowable(cause);
- throw new ELException(Util.message(context, "propertyReadError",
- base.getClass().getName(), property.toString()), cause);
+ throw new ELException(
+ Util.message(context, "propertyReadError", base.getClass().getName(), property.toString()), cause);
} catch (Exception e) {
throw new ELException(e);
}
}
@Override
- public void setValue(ELContext context, Object base, Object property,
- Object value) {
+ public void setValue(ELContext context, Object base, Object property, Object value) {
Objects.requireNonNull(context);
if (base == null || property == null) {
return;
@@ -114,8 +113,8 @@ public class BeanELResolver extends ELResolver {
context.setPropertyResolved(base, property);
if (this.readOnly) {
- throw new PropertyNotWritableException(Util.message(context,
- "resolverNotWritable", base.getClass().getName()));
+ throw new PropertyNotWritableException(
+ Util.message(context, "resolverNotWritable", base.getClass().getName()));
}
Method m = this.property(context, base, property).write(context, base);
@@ -124,8 +123,8 @@ public class BeanELResolver extends ELResolver {
} catch (InvocationTargetException e) {
Throwable cause = e.getCause();
Util.handleThrowable(cause);
- throw new ELException(Util.message(context, "propertyWriteError",
- base.getClass().getName(), property.toString()), cause);
+ throw new ELException(
+ Util.message(context, "propertyWriteError", base.getClass().getName(), property.toString()), cause);
} catch (Exception e) {
throw new ELException(e);
}
@@ -135,8 +134,7 @@ public class BeanELResolver extends ELResolver {
* @since EL 2.2
*/
@Override
- public Object invoke(ELContext context, Object base, Object method,
- Class<?>[] paramTypes, Object[] params) {
+ public Object invoke(ELContext context, Object base, Object method, Class<?>[] paramTypes, Object[] params) {
Objects.requireNonNull(context);
if (base == null || method == null) {
return null;
@@ -149,8 +147,8 @@ public class BeanELResolver extends ELResolver {
// Find the matching method
Method matchingMethod = Util.findMethod(context, base.getClass(), base, methodName, paramTypes, params);
- Object[] parameters = Util.buildParameters(
- context, matchingMethod.getParameterTypes(), matchingMethod.isVarArgs(), params);
+ Object[] parameters = Util.buildParameters(context, matchingMethod.getParameterTypes(),
+ matchingMethod.isVarArgs(), params);
Object result = null;
try {
@@ -219,7 +217,7 @@ public class BeanELResolver extends ELResolver {
try {
BeanInfo info = Introspector.getBeanInfo(this.type);
PropertyDescriptor[] pds = info.getPropertyDescriptors();
- for (PropertyDescriptor pd: pds) {
+ for (PropertyDescriptor pd : pds) {
this.properties.put(pd.getName(), new BeanProperty(type, pd));
}
if (System.getSecurityManager() != null) {
@@ -240,8 +238,7 @@ public class BeanELResolver extends ELResolver {
PropertyDescriptor[] pds = info.getPropertyDescriptors();
for (PropertyDescriptor pd : pds) {
if (!this.properties.containsKey(pd.getName())) {
- this.properties.put(pd.getName(), new BeanProperty(
- this.type, pd));
+ this.properties.put(pd.getName(), new BeanProperty(this.type, pd));
}
}
populateFromInterfaces(ifs);
@@ -256,8 +253,7 @@ public class BeanELResolver extends ELResolver {
private BeanProperty get(ELContext ctx, String name) {
BeanProperty property = this.properties.get(name);
if (property == null) {
- throw new PropertyNotFoundException(Util.message(ctx,
- "propertyNotFound", type.getName(), name));
+ throw new PropertyNotFoundException(Util.message(ctx, "propertyNotFound", type.getName(), name));
}
return property;
}
@@ -297,9 +293,8 @@ public class BeanELResolver extends ELResolver {
if (this.write == null) {
this.write = Util.getMethod(this.owner, base, descriptor.getWriteMethod());
if (this.write == null) {
- throw new PropertyNotWritableException(Util.message(ctx,
- "propertyNotWritable", new Object[] {
- owner.getName(), descriptor.getName() }));
+ throw new PropertyNotWritableException(Util.message(ctx, "propertyNotWritable",
+ new Object[] { owner.getName(), descriptor.getName() }));
}
}
return this.write;
@@ -309,17 +304,15 @@ public class BeanELResolver extends ELResolver {
if (this.read == null) {
this.read = Util.getMethod(this.owner, base, descriptor.getReadMethod());
if (this.read == null) {
- throw new PropertyNotFoundException(Util.message(ctx,
- "propertyNotReadable", new Object[] {
- owner.getName(), descriptor.getName() }));
+ throw new PropertyNotFoundException(Util.message(ctx, "propertyNotReadable",
+ new Object[] { owner.getName(), descriptor.getName() }));
}
}
return this.read;
}
}
- private BeanProperty property(ELContext ctx, Object base,
- Object property) {
+ private BeanProperty property(ELContext ctx, Object base, Object property) {
Class<?> type = base.getClass();
String prop = property.toString();
@@ -332,11 +325,11 @@ public class BeanELResolver extends ELResolver {
return props.get(ctx, prop);
}
- private static final class ConcurrentCache<K,V> {
+ private static final class ConcurrentCache<K, V> {
private final int size;
- private final Map<K,V> eden;
- private final Map<K,V> longterm;
+ private final Map<K, V> eden;
+ private final Map<K, V> longterm;
ConcurrentCache(int size) {
this.size = size;
diff --git a/java/javax/el/BeanNameELResolver.java b/java/javax/el/BeanNameELResolver.java
index 0e7b48dee6..2be04045e9 100644
--- a/java/javax/el/BeanNameELResolver.java
+++ b/java/javax/el/BeanNameELResolver.java
@@ -55,8 +55,7 @@ public class BeanNameELResolver extends ELResolver {
}
@Override
- public void setValue(ELContext context, Object base, Object property,
- Object value) {
+ public void setValue(ELContext context, Object base, Object property, Object value) {
Objects.requireNonNull(context);
if (base != null || !(property instanceof String)) {
return;
@@ -77,12 +76,10 @@ public class BeanNameELResolver extends ELResolver {
}
if (isReadOnly) {
- throw new PropertyNotWritableException(Util.message(context,
- "beanNameELResolver.beanReadOnly", beanName));
+ throw new PropertyNotWritableException(Util.message(context, "beanNameELResolver.beanReadOnly", beanName));
}
- if (beanNameResolver.isNameResolved(beanName) ||
- beanNameResolver.canCreateBean(beanName)) {
+ if (beanNameResolver.isNameResolved(beanName) || beanNameResolver.canCreateBean(beanName)) {
try {
beanNameResolver.setBeanValue(beanName, value);
context.setPropertyResolved(base, property);
@@ -143,8 +140,7 @@ public class BeanNameELResolver extends ELResolver {
}
@Override
- public Iterator<FeatureDescriptor> getFeatureDescriptors(ELContext context,
- Object base) {
+ public Iterator<FeatureDescriptor> getFeatureDescriptors(ELContext context, Object base) {
return null;
}
diff --git a/java/javax/el/BeanNameResolver.java b/java/javax/el/BeanNameResolver.java
index abe0356046..751b79515d 100644
--- a/java/javax/el/BeanNameResolver.java
+++ b/java/javax/el/BeanNameResolver.java
@@ -17,8 +17,8 @@
package javax.el;
/**
- * Base implementation that provides a minimal default implementation that is
- * intended to be extended by application developers.
+ * Base implementation that provides a minimal default implementation that is intended to be extended by application
+ * developers.
*
* @since EL 3.0
*/
@@ -49,17 +49,15 @@ public abstract class BeanNameResolver {
/**
- * Sets a value of a bean of the given name. If the named bean does not
- * exist and {@link #canCreateBean} returns <code>true</code> then a bean
- * is created with the given value.
+ * Sets a value of a bean of the given name. If the named bean does not exist and {@link #canCreateBean} returns
+ * <code>true</code> then a bean is created with the given value.
*
* @param beanName The name of the bean to be set/create
* @param value The value of the bean to set/create
*
* @throws PropertyNotWritableException if the bean is read only
*/
- public void setBeanValue(String beanName, Object value)
- throws PropertyNotWritableException {
+ public void setBeanValue(String beanName, Object value) throws PropertyNotWritableException {
throw new PropertyNotWritableException();
}
@@ -69,8 +67,7 @@ public abstract class BeanNameResolver {
*
* @param beanName The name of the bean of interest
*
- * @return <code>true</code> if the bean is read only, otherwise
- * <code>false</code>
+ * @return <code>true</code> if the bean is read only, otherwise <code>false</code>
*/
public boolean isReadOnly(String beanName) {
return true;
@@ -82,8 +79,7 @@ public abstract class BeanNameResolver {
*
* @param beanName The name of the bean of interest
*
- * @return <code>true</code> if the bean may be created, otherwise
- * <code>false</code>
+ * @return <code>true</code> if the bean may be created, otherwise <code>false</code>
*/
public boolean canCreateBean(String beanName) {
return false;
diff --git a/java/javax/el/CompositeELResolver.java b/java/javax/el/CompositeELResolver.java
index 43e3ea3e62..61a88e6e32 100644
--- a/java/javax/el/CompositeELResolver.java
+++ b/java/javax/el/CompositeELResolver.java
@@ -71,8 +71,7 @@ public class CompositeELResolver extends ELResolver {
* @since EL 2.2
*/
@Override
- public Object invoke(ELContext context, Object base, Object method,
- Class<?>[] paramTypes, Object[] params) {
+ public Object invoke(ELContext context, Object base, Object method, Class<?>[] paramTypes, Object[] params) {
context.setPropertyResolved(false);
int sz = this.size;
for (int i = 0; i < sz; i++) {
diff --git a/java/javax/el/ELContext.java b/java/javax/el/ELContext.java
index 65feac5aa1..5a1cbdbf9e 100644
--- a/java/javax/el/ELContext.java
+++ b/java/javax/el/ELContext.java
@@ -38,7 +38,7 @@ public abstract class ELContext {
private List<EvaluationListener> listeners;
- private Deque<Map<String,Object>> lambdaArguments = new ArrayDeque<>();
+ private Deque<Map<String, Object>> lambdaArguments = new ArrayDeque<>();
public ELContext() {
this.resolved = false;
@@ -72,11 +72,9 @@ public abstract class ELContext {
* @param key The key under which to store the object
* @param contextObject The object to add
*
- * @throws NullPointerException
- * If the supplied key or context is <code>null</code>
+ * @throws NullPointerException If the supplied key or context is <code>null</code>
*/
- public void putContext(@SuppressWarnings("rawtypes") Class key,
- Object contextObject) {
+ public void putContext(@SuppressWarnings("rawtypes") Class key, Object contextObject) {
Objects.requireNonNull(key);
Objects.requireNonNull(contextObject);
@@ -95,8 +93,7 @@ public abstract class ELContext {
*
* @return The value of the context object associated with the given key
*
- * @throws NullPointerException
- * If the supplied key is <code>null</code>
+ * @throws NullPointerException If the supplied key is <code>null</code>
*/
public Object getContext(@SuppressWarnings("rawtypes") Class key) {
Objects.requireNonNull(key);
@@ -109,8 +106,7 @@ public abstract class ELContext {
public abstract ELResolver getELResolver();
/**
- * Obtain the ImportHandler for this ELContext, creating one if necessary.
- * This method is not thread-safe.
+ * Obtain the ImportHandler for this ELContext, creating one if necessary. This method is not thread-safe.
*
* @return the ImportHandler for this ELContext.
*
@@ -229,18 +225,17 @@ public abstract class ELContext {
}
/**
- * Determine if the specified name is recognised as the name of a lambda
- * argument.
+ * Determine if the specified name is recognised as the name of a lambda argument.
*
* @param name The name of the lambda argument
*
- * @return <code>true</code> if the name is recognised as the name of a
- * lambda argument, otherwise <code>false</code>
+ * @return <code>true</code> if the name is recognised as the name of a lambda argument, otherwise
+ * <code>false</code>
*
* @since EL 3.0
*/
public boolean isLambdaArgument(String name) {
- for (Map<String,Object> arguments : lambdaArguments) {
+ for (Map<String, Object> arguments : lambdaArguments) {
if (arguments.containsKey(name)) {
return true;
}
@@ -258,7 +253,7 @@ public abstract class ELContext {
* @since EL 3.0
*/
public Object getLambdaArgument(String name) {
- for (Map<String,Object> arguments : lambdaArguments) {
+ for (Map<String, Object> arguments : lambdaArguments) {
Object result = arguments.get(name);
if (result != null) {
return result;
@@ -268,20 +263,19 @@ public abstract class ELContext {
}
/**
- * Called when starting to evaluate a lambda expression so that the
- * arguments are available to the EL context during evaluation.
+ * Called when starting to evaluate a lambda expression so that the arguments are available to the EL context during
+ * evaluation.
+ *
+ * @param arguments The arguments in scope for the current lambda expression.
*
- * @param arguments The arguments in scope for the current lambda
- * expression.
* @since EL 3.0
*/
- public void enterLambdaScope(Map<String,Object> arguments) {
+ public void enterLambdaScope(Map<String, Object> arguments) {
lambdaArguments.push(arguments);
}
/**
- * Called after evaluating a lambda expression to signal that the arguments
- * are no longer required.
+ * Called after evaluating a lambda expression to signal that the arguments are no longer required.
*
* @since EL 3.0
*/
@@ -297,8 +291,7 @@ public abstract class ELContext {
*
* @return An instance of the requested type.
*
- * @throws ELException
- * If the conversion fails
+ * @throws ELException If the conversion fails
*
* @since EL 3.0
*/
diff --git a/java/javax/el/ELContextListener.java b/java/javax/el/ELContextListener.java
index 737b83adc2..ee566bf750 100644
--- a/java/javax/el/ELContextListener.java
+++ b/java/javax/el/ELContextListener.java
@@ -18,7 +18,6 @@ package javax.el;
/**
* @author Jacob Hookom [jacob/hookom.net]
- *
*/
public interface ELContextListener extends java.util.EventListener {
diff --git a/java/javax/el/ELException.java b/java/javax/el/ELException.java
index d959f0618d..68d0a1f0aa 100644
--- a/java/javax/el/ELException.java
+++ b/java/javax/el/ELException.java
@@ -17,8 +17,7 @@
package javax.el;
/**
- * Represents any of the exception conditions that can arise during expression
- * evaluation.
+ * Represents any of the exception conditions that can arise during expression evaluation.
*
* @since 2.1
*/
@@ -36,8 +35,7 @@ public class ELException extends RuntimeException {
/**
* Creates an ELException with the provided detail message.
*
- * @param message
- * the detail message
+ * @param message the detail message
*/
public ELException(String message) {
super(message);
@@ -46,8 +44,7 @@ public class ELException extends RuntimeException {
/**
* Creates an ELException with the given cause
*
- * @param cause
- * the originating cause of this exception
+ * @param cause the originating cause of this exception
*/
public ELException(Throwable cause) {
super(cause);
@@ -56,10 +53,8 @@ public class ELException extends RuntimeException {
/**
* Creates an ELException with the given detail message and root cause.
*
- * @param message
- * the detail message
- * @param cause
- * the originating cause of this exception
+ * @param message the detail message
+ * @param cause the originating cause of this exception
*/
public ELException(String message, Throwable cause) {
super(message, cause);
diff --git a/java/javax/el/ELManager.java b/java/javax/el/ELManager.java
index c3d60eaed7..6b3cf7bc74 100644
--- a/java/javax/el/ELManager.java
+++ b/java/javax/el/ELManager.java
@@ -53,16 +53,14 @@ public class ELManager {
}
public void mapFunction(String prefix, String function, Method method) {
- getELContext().getFunctionMapper().mapFunction(
- prefix, function, method);
+ getELContext().getFunctionMapper().mapFunction(prefix, function, method);
}
public void setVariable(String variable, ValueExpression expression) {
getELContext().getVariableMapper().setVariable(variable, expression);
}
- public void importStatic(String staticMemberName)
- throws javax.el.ELException {
+ public void importStatic(String staticMemberName) throws javax.el.ELException {
getELContext().getImportHandler().importStatic(staticMemberName);
}
@@ -75,7 +73,7 @@ public class ELManager {
}
public Object defineBean(String name, Object bean) {
- Map<String,Object> localBeans = getELContext().getLocalBeans();
+ Map<String, Object> localBeans = getELContext().getLocalBeans();
if (bean == null) {
return localBeans.remove(name);
diff --git a/java/javax/el/ELProcessor.java b/java/javax/el/ELProcessor.java
index 8e367c00fd..8133c5026d 100644
--- a/java/javax/el/ELProcessor.java
+++ b/java/javax/el/ELProcessor.java
@@ -56,15 +56,13 @@ public class ELProcessor {
public Object getValue(String expression, Class<?> expectedType) {
- ValueExpression ve = factory.createValueExpression(
- context, bracket(expression), expectedType);
+ ValueExpression ve = factory.createValueExpression(context, bracket(expression), expectedType);
return ve.getValue(context);
}
public void setValue(String expression, Object value) {
- ValueExpression ve = factory.createValueExpression(
- context, bracket(expression), Object.class);
+ ValueExpression ve = factory.createValueExpression(context, bracket(expression), Object.class);
ve.setValue(context, value);
}
@@ -73,21 +71,17 @@ public class ELProcessor {
if (expression == null) {
manager.setVariable(variable, null);
} else {
- ValueExpression ve = factory.createValueExpression(
- context, bracket(expression), Object.class);
+ ValueExpression ve = factory.createValueExpression(context, bracket(expression), Object.class);
manager.setVariable(variable, ve);
}
}
- public void defineFunction(String prefix, String function, String className,
- String methodName) throws ClassNotFoundException,
- NoSuchMethodException {
+ public void defineFunction(String prefix, String function, String className, String methodName)
+ throws ClassNotFoundException, NoSuchMethodException {
- if (prefix == null || function == null || className == null ||
- methodName == null) {
- throw new NullPointerException(Util.message(
- context, "elProcessor.defineFunctionNullParams"));
+ if (prefix == null || function == null || className == null || methodName == null) {
+ throw new NullPointerException(Util.message(context, "elProcessor.defineFunctionNullParams"));
}
// Check the imports
@@ -98,12 +92,11 @@ public class ELProcessor {
}
if (!Modifier.isPublic(clazz.getModifiers())) {
- throw new ClassNotFoundException(Util.message(context,
- "elProcessor.defineFunctionInvalidClass", className));
+ throw new ClassNotFoundException(
+ Util.message(context, "elProcessor.defineFunctionInvalidClass", className));
}
- MethodSignature sig =
- new MethodSignature(context, methodName, className);
+ MethodSignature sig = new MethodSignature(context, methodName, className);
if (function.length() == 0) {
function = sig.getName();
@@ -139,7 +132,7 @@ public class ELProcessor {
if (types.length == typeNames.length) {
boolean match = true;
for (int i = 0; i < types.length; i++) {
- if (i == types.length -1 && method.isVarArgs()) {
+ if (i == types.length - 1 && method.isVarArgs()) {
String typeName = typeNames[i];
if (typeName.endsWith("...")) {
typeName = typeName.substring(0, typeName.length() - 3);
@@ -163,29 +156,25 @@ public class ELProcessor {
}
}
- throw new NoSuchMethodException(Util.message(context,
- "elProcessor.defineFunctionNoMethod", methodName, className));
+ throw new NoSuchMethodException(
+ Util.message(context, "elProcessor.defineFunctionNoMethod", methodName, className));
}
/**
* Map a method to a function name.
*
- * @param prefix Function prefix
- * @param function Function name
- * @param method Method
+ * @param prefix Function prefix
+ * @param function Function name
+ * @param method Method
*
- * @throws NullPointerException
- * If any of the arguments are null
- * @throws NoSuchMethodException
- * If the method is not static
+ * @throws NullPointerException If any of the arguments are null
+ * @throws NoSuchMethodException If the method is not static
*/
- public void defineFunction(String prefix, String function, Method method)
- throws java.lang.NoSuchMethodException {
+ public void defineFunction(String prefix, String function, Method method) throws java.lang.NoSuchMethodException {
if (prefix == null || function == null || method == null) {
- throw new NullPointerException(Util.message(
- context, "elProcessor.defineFunctionNullParams"));
+ throw new NullPointerException(Util.message(context, "elProcessor.defineFunctionNullParams"));
}
int modifiers = method.getModifiers();
@@ -193,9 +182,8 @@ public class ELProcessor {
// Check for static, public method and module access for Java 9+
JreCompat jreCompat = JreCompat.getInstance();
if (!Modifier.isStatic(modifiers) || !jreCompat.canAccess(null, method)) {
- throw new NoSuchMethodException(Util.message(context,
- "elProcessor.defineFunctionInvalidMethod", method.getName(),
- method.getDeclaringClass().getName()));
+ throw new NoSuchMethodException(Util.message(context, "elProcessor.defineFunctionInvalidMethod",
+ method.getName(), method.getDeclaringClass().getName()));
}
manager.mapFunction(prefix, function, method);
@@ -216,8 +204,7 @@ public class ELProcessor {
private final String name;
private final String[] parameterTypeNames;
- MethodSignature(ELContext context, String methodName,
- String className) throws NoSuchMethodException {
+ MethodSignature(ELContext context, String methodName, String className) throws NoSuchMethodException {
int paramIndex = methodName.indexOf('(');
@@ -245,8 +232,7 @@ public class ELProcessor {
// We know the params start with '(', check they end with ')'
if (!paramString.endsWith(")")) {
throw new NoSuchMethodException(Util.message(context,
- "elProcessor.defineFunctionInvalidParameterList",
- paramString, methodName, className));
+ "elProcessor.defineFunctionInvalidParameterList", paramString, methodName, className));
}
// Trim '(' and ')'
paramString = paramString.substring(1, paramString.length() - 1).trim();
@@ -260,11 +246,10 @@ public class ELProcessor {
int dimension = 0;
int bracketPos = parameterTypeName.indexOf('[');
if (bracketPos > -1) {
- String parameterTypeNameOnly =
- parameterTypeName.substring(0, bracketPos).trim();
+ String parameterTypeNameOnly = parameterTypeName.substring(0, bracketPos).trim();
while (bracketPos > -1) {
dimension++;
- bracketPos = parameterTypeName.indexOf('[', bracketPos+ 1);
+ bracketPos = parameterTypeName.indexOf('[', bracketPos + 1);
}
parameterTypeName = parameterTypeNameOnly;
}
@@ -272,14 +257,12 @@ public class ELProcessor {
if (parameterTypeName.endsWith("...")) {
varArgs = true;
dimension = 1;
- parameterTypeName = parameterTypeName.substring(
- 0, parameterTypeName.length() -3).trim();
+ parameterTypeName = parameterTypeName.substring(0, parameterTypeName.length() - 3).trim();
}
boolean isPrimitive = PRIMITIVES.contains(parameterTypeName);
if (isPrimitive && dimension > 0) {
// When in an array, class name changes for primitive
- switch(parameterTypeName)
- {
+ switch (parameterTypeName) {
case "boolean":
parameterTypeName = "Z";
break;
@@ -308,16 +291,12 @@ public class ELProcessor {
// Should never happen
break;
}
- } else if (!isPrimitive &&
- !parameterTypeName.contains(".")) {
- Class<?> clazz = importHandler.resolveClass(
- parameterTypeName);
+ } else if (!isPrimitive && !parameterTypeName.contains(".")) {
+ Class<?> clazz = importHandler.resolveClass(parameterTypeName);
if (clazz == null) {
- throw new NoSuchMethodException(Util.message(
- context,
- "elProcessor.defineFunctionInvalidParameterTypeName",
- parameterTypeNames[i], methodName,
- className));
+ throw new NoSuchMethodException(
+ Util.message(context, "elProcessor.defineFunctionInvalidParameterTypeName",
+ parameterTypeNames[i], methodName, className));
}
parameterTypeName = clazz.getName();
}
@@ -351,9 +330,8 @@ public class ELProcessor {
}
/**
- * @return <code>null</code> if just the method name was specified, an
- * empty List if an empty parameter list was specified - i.e. ()
- * - otherwise an ordered list of parameter type names
+ * @return <code>null</code> if just the method name was specified, an empty List if an empty parameter list was
+ * specified - i.e. () - otherwise an ordered list of parameter type names
*/
public String[] getParamTypeNames() {
return parameterTypeNames;
diff --git a/java/javax/el/ELResolver.java b/java/javax/el/ELResolver.java
index a43425eee3..b426d0ace4 100644
--- a/java/javax/el/ELResolver.java
+++ b/java/javax/el/ELResolver.java
@@ -20,7 +20,6 @@ import java.util.Iterator;
/**
* @author Jacob Hookom [jacob/hookom.net]
- *
*/
public abstract class ELResolver {
@@ -29,28 +28,24 @@ 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.
+ * 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 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
+ *
* @return the value of the provided property
- * @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
+ *
+ * @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);
+ public abstract Object getValue(ELContext context, Object base, Object property);
/**
- * Invokes a method on the the given object. This default implementation
- * always returns <code>null</code>.
+ * Invokes a method on the the given object. This default implementation always returns <code>null</code>.
*
* @param context The EL context for this evaluation
* @param base The base object on which the method is to be found
@@ -62,83 +57,67 @@ public abstract class ELResolver {
*
* @since EL 2.2
*/
- public Object invoke(ELContext context, Object base, Object method,
- Class<?>[] paramTypes, Object[] params) {
+ public Object invoke(ELContext context, Object base, Object method, Class<?>[] paramTypes, Object[] params) {
return null;
}
/**
- * Obtain the type of the given property on the given object using the given
- * context.
+ * 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 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
+ *
* @return the type of the provided property
- * @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
+ *
+ * @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 Class<?> getType(ELContext context, Object base, Object property);
/**
- * Set the value of the given property on the given object using the given
- * context.
+ * 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
* @param value The value to set the property to
- * @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
+ *
+ * @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 void setValue(ELContext context, Object base, Object property, Object value);
/**
- * Determine if the given property on the given object is read-only using
- * the given context.
+ * 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 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
- * @return <code>true</code> if the identified property is read only,
- * otherwise <code>false</code>
- * @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
+ *
+ * @return <code>true</code> if the identified property is read only, otherwise <code>false</code>
+ *
+ * @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 boolean isReadOnly(ELContext context, Object base, Object property);
/**
- * Obtain the feature descriptors for the resolvable properties of the given
- * object.
+ * Obtain the feature descriptors for the resolvable properties of the given object.
*
* @param context The context in which the examination takes place
- * @param base The object to examine
+ * @param base The object to examine
*
- * @return An iterator, possibly empty, of feature descriptors of the given
- * object
+ * @return An iterator, possibly empty, of feature descriptors of the given object
*/
public abstract Iterator<java.beans.FeatureDescriptor> getFeatureDescriptors(ELContext context, Object base);
@@ -146,17 +125,14 @@ public abstract class ELResolver {
* Obtain the most common type that is acceptable for the given base object.
*
* @param context The context in which the examination takes place
- * @param base The object to examine
+ * @param base The object to examine
*
- * @return {code null} if the most common type cannot be determine,
- * otherwise the most common type
+ * @return {code null} if the most common type cannot be determine, otherwise the most common type
*/
- 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
- * always returns <code>null</code>.
+ * Converts the given object to the given type. This default implementation always returns <code>null</code>.
*
* @param context The EL context for this evaluation
* @param obj The object to convert
diff --git a/java/javax/el/EvaluationListener.java b/java/javax/el/EvaluationListener.java
index 785ebdad60..3eb4d2b1e9 100644
--- a/java/javax/el/EvaluationListener.java
+++ b/java/javax/el/EvaluationListener.java
@@ -24,8 +24,7 @@ public abstract class EvaluationListener {
/**
* Fired before the evaluation of the expression.
*
- * @param context The EL context in which the expression will be
- * evaluated
+ * @param context The EL context in which the expression will be evaluated
* @param expression The expression that will be evaluated
*/
public void beforeEvaluation(ELContext context, String expression) {
diff --git a/java/javax/el/ExpressionFactory.java b/java/javax/el/ExpressionFactory.java
index a829ae3f79..77007f875d 100644
--- a/java/javax/el/ExpressionFactory.java
+++ b/java/javax/el/ExpressionFactory.java
@@ -52,26 +52,23 @@ public abstract class ExpressionFactory {
static {
if (IS_SECURITY_ENABLED) {
- PROPERTY_FILE = AccessController.doPrivileged(
- (PrivilegedAction<String>) () -> System.getProperty("java.home") + File.separator +
- "lib" + File.separator + "el.properties"
- );
+ PROPERTY_FILE = AccessController
+ .doPrivileged((PrivilegedAction<String>) () -> System.getProperty("java.home") + File.separator +
+ "lib" + File.separator + "el.properties");
} else {
- PROPERTY_FILE = System.getProperty("java.home") + File.separator + "lib" +
- File.separator + "el.properties";
+ PROPERTY_FILE = System.getProperty("java.home") + File.separator + "lib" + File.separator + "el.properties";
}
}
/**
- * Create a new {@link ExpressionFactory}. The class to use is determined by
- * the following search order:
+ * Create a new {@link ExpressionFactory}. The class to use is determined by the following search order:
* <ol>
* <li>services API (META-INF/services/javax.el.ExpressionFactory)</li>
* <li>$JRE_HOME/lib/el.properties - key javax.el.ExpressionFactory</li>
* <li>javax.el.ExpressionFactory</li>
- * <li>Platform default implementation -
- * org.apache.el.ExpressionFactoryImpl</li>
+ * <li>Platform default implementation - org.apache.el.ExpressionFactoryImpl</li>
* </ol>
+ *
* @return the new ExpressionFactory
*/
public static ExpressionFactory newInstance() {
@@ -79,10 +76,11 @@ public abstract class ExpressionFactory {
}
/**
- * Create a new {@link ExpressionFactory} passing in the provided
- * {@link Properties}. Search order is the same as {@link #newInstance()}.
+ * Create a new {@link ExpressionFactory} passing in the provided {@link Properties}. Search order is the same as
+ * {@link #newInstance()}.
*
* @param properties the properties to be passed to the new instance (may be null)
+ *
* @return the new ExpressionFactory
*/
public static ExpressionFactory newInstance(Properties properties) {
@@ -156,8 +154,7 @@ public abstract class ExpressionFactory {
if (constructor == null) {
result = (ExpressionFactory) clazz.getConstructor().newInstance();
} else {
- result =
- (ExpressionFactory) constructor.newInstance(properties);
+ result = (ExpressionFactory) constructor.newInstance(properties);
}
} catch (InvocationTargetException e) {
@@ -176,42 +173,32 @@ public abstract class ExpressionFactory {
*
* @param context The EL context for this evaluation
* @param expression The String representation of the value expression
- * @param expectedType The expected type of the result of evaluating the
- * expression
+ * @param expectedType The expected type of the result of evaluating the expression
*
* @return A new value expression formed from the input parameters
*
- * @throws NullPointerException
- * If the expected type is <code>null</code>
- * @throws ELException
- * If there are syntax errors in the provided expression
+ * @throws NullPointerException If the expected type is <code>null</code>
+ * @throws ELException If there are syntax errors in the provided expression
*/
- public abstract ValueExpression createValueExpression(ELContext context,
- String expression, Class<?> expectedType);
+ public abstract ValueExpression createValueExpression(ELContext context, String expression, Class<?> expectedType);
- public abstract ValueExpression createValueExpression(Object instance,
- Class<?> expectedType);
+ public abstract ValueExpression createValueExpression(Object instance, Class<?> expectedType);
/**
* Create a new method expression instance.
*
* @param context The EL context for this evaluation
- * @param expression The String representation of the method
- * expression
- * @param expectedReturnType The expected type of the result of invoking the
- * method
+ * @param expression The String representation of the method expression
+ * @param expectedReturnType The expected type of the result of invoking the method
* @param expectedParamTypes The expected types of the input parameters
*
* @return A new method expression formed from the input parameters.
*
- * @throws NullPointerException
- * If the expected parameters types are <code>null</code>
- * @throws ELException
- * If there are syntax errors in the provided expression
+ * @throws NullPointerException If the expected parameters types are <code>null</code>
+ * @throws ELException If there are syntax errors in the provided expression
*/
- public abstract MethodExpression createMethodExpression(ELContext context,
- String expression, Class<?> expectedReturnType,
- Class<?>[] expectedParamTypes);
+ public abstract MethodExpression createMethodExpression(ELContext context, String expression,
+ Class<?> expectedReturnType, Class<?>[] expectedParamTypes);
/**
* Coerce the supplied object to the requested type.
@@ -221,8 +208,7 @@ public abstract class ExpressionFactory {
*
* @return An instance of the requested type.
*
- * @throws ELException
- * If the conversion fails
+ * @throws ELException If the conversion fails
*/
public abstract Object coerceToType(Object obj, Class<?> expectedType);
@@ -240,14 +226,13 @@ public abstract class ExpressionFactory {
*
* @since EL 3.0
*/
- public Map<String,Method> getInitFunctionMap() {
+ public Map<String, Method> getInitFunctionMap() {
return null;
}
/**
- * Key used to cache ExpressionFactory discovery information per class
- * loader. The class loader reference is never {@code null}, because
- * {@code null} tccl is handled separately.
+ * Key used to cache ExpressionFactory discovery information per class loader. The class loader reference is never
+ * {@code null}, because {@code null} tccl is handled separately.
*/
private static class CacheKey {
private final int hash;
@@ -311,8 +296,8 @@ public abstract class ExpressionFactory {
/**
* Discover the name of class that implements ExpressionFactory.
*
- * @param tccl
- * {@code ClassLoader}
+ * @param tccl {@code ClassLoader}
+ *
* @return Class name. There is default, so it is never {@code null}.
*/
private static String discoverClassName(ClassLoader tccl) {
@@ -322,7 +307,8 @@ public abstract class ExpressionFactory {
className = getClassNameServices(tccl);
if (className == null) {
if (IS_SECURITY_ENABLED) {
- className = AccessController.doPrivileged((PrivilegedAction<String>) ExpressionFactory::getClassNameJreDir);
+ className = AccessController
+ .doPrivileged((PrivilegedAction<String>) ExpressionFactory::getClassNameJreDir);
} else {
// Second el.properties file
className = getClassNameJreDir();
@@ -330,7 +316,8 @@ public abstract class ExpressionFactory {
}
if (className == null) {
if (IS_SECURITY_ENABLED) {
- className = AccessController.doPrivileged((PrivilegedAction<String>) ExpressionFactory::getClassNameSysProp);
+ className = AccessController
+ .doPrivileged((PrivilegedAction<String>) ExpressionFactory::getClassNameSysProp);
} else {
// Third system property
className = getClassNameSysProp();
@@ -363,7 +350,7 @@ public abstract class ExpressionFactory {
private static String getClassNameJreDir() {
File file = new File(PROPERTY_FILE);
if (file.canRead()) {
- try (InputStream is = new FileInputStream(file)){
+ try (InputStream is = new FileInputStream(file)) {
Properties props = new Properties();
props.load(is);
String value = props.getProperty(PROPERTY_NAME);
diff --git a/java/javax/el/ImportHandler.java b/java/javax/el/ImportHandler.java
index 91b3dae2cf..a653a855c4 100644
--- a/java/javax/el/ImportHandler.java
+++ b/java/javax/el/ImportHandler.java
@@ -31,7 +31,7 @@ import java.util.concurrent.ConcurrentHashMap;
*/
public class ImportHandler {
- private static final Map<String,Set<String>> standardPackages = new HashMap<>();
+ private static final Map<String, Set<String>> standardPackages = new HashMap<>();
static {
// Servlet 4.0
@@ -119,7 +119,7 @@ public class ImportHandler {
// JSP 2.3
Set<String> servletJspClassNames = new HashSet<>();
- //Interfaces
+ // Interfaces
servletJspClassNames.add("HttpJspPage");
servletJspClassNames.add("JspApplicationContext");
servletJspClassNames.add("JspPage");
@@ -155,7 +155,7 @@ public class ImportHandler {
javaLangClassNames.add("Thread.Builder.OfPlatform");
javaLangClassNames.add("Thread.Builder.OfVirtual");
javaLangClassNames.add("Thread.UncaughtExceptionHandler");
- //Classes
+ // Classes
javaLangClassNames.add("Boolean");
javaLangClassNames.add("Byte");
javaLangClassNames.add("Character");
@@ -201,13 +201,13 @@ public class ImportHandler {
javaLangClassNames.add("ThreadLocal");
javaLangClassNames.add("Throwable");
javaLangClassNames.add("Void");
- //Enums
+ // Enums
javaLangClassNames.add("Character.UnicodeScript");
javaLangClassNames.add("ProcessBuilder.Redirect.Type");
javaLangClassNames.add("StackWalker.Option");
javaLangClassNames.add("System.Logger.Level");
javaLangClassNames.add("Thread.State");
- //Exceptions
+ // Exceptions
javaLangClassNames.add("ArithmeticException");
javaLangClassNames.add("ArrayIndexOutOfBoundsException");
javaLangClassNames.add("ArrayStoreException");
@@ -239,7 +239,7 @@ public class ImportHandler {
javaLangClassNames.add("TypeNotPresentException");
javaLangClassNames.add("UnsupportedOperationException");
javaLangClassNames.add("WrongThreadException");
- //Errors
+ // Errors
javaLangClassNames.add("AbstractMethodError");
javaLangClassNames.add("AssertionError");
javaLangClassNames.add("BootstrapMethodError");
@@ -263,7 +263,7 @@ public class ImportHandler {
javaLangClassNames.add("UnsupportedClassVersionError");
javaLangClassNames.add("VerifyError");
javaLangClassNames.add("VirtualMachineError");
- //Annotation Types
+ // Annotation Types
javaLangClassNames.add("Deprecated");
javaLangClassNames.add("FunctionalInterface");
javaLangClassNames.add("Override");
@@ -273,10 +273,10 @@ public class ImportHandler {
}
- private Map<String,Set<String>> packageNames = new ConcurrentHashMap<>();
- private Map<String,String> classNames = new ConcurrentHashMap<>();
- private Map<String,Class<?>> clazzes = new ConcurrentHashMap<>();
- private Map<String,Class<?>> statics = new ConcurrentHashMap<>();
+ private Map<String, Set<String>> packageNames = new ConcurrentHashMap<>();
+ private Map<String, String> classNames = new ConcurrentHashMap<>();
+ private Map<String, Class<?>> clazzes = new ConcurrentHashMap<>();
+ private Map<String, Class<?>> statics = new ConcurrentHashMap<>();
public ImportHandler() {
@@ -288,8 +288,7 @@ public class ImportHandler {
int lastPeriod = name.lastIndexOf('.');
if (lastPeriod < 0) {
- throw new ELException(Util.message(
- null, "importHandler.invalidStaticName", name));
+ throw new ELException(Util.message(null, "importHandler.invalidStaticName", name));
}
String className = name.substring(0, lastPeriod);
@@ -298,9 +297,7 @@ public class ImportHandler {
Class<?> clazz = findClass(className, true);
if (clazz == null) {
- throw new ELException(Util.message(
- null, "importHandler.invalidClassNameForStatic",
- className, name));
+ throw new ELException(Util.message(null, "importHandler.invalidClassNameForStatic", className, name));
}
boolean found = false;
@@ -308,8 +305,7 @@ public class ImportHandler {
for (Field field : clazz.getFields()) {
if (field.getName().equals(fieldOrMethodName)) {
int modifiers = field.getModifiers();
- if (Modifier.isStatic(modifiers) &&
- Modifier.isPublic(modifiers)) {
+ if (Modifier.isStatic(modifiers) && Modifier.isPublic(modifiers)) {
found = true;
break;
}
@@ -320,8 +316,7 @@ public class ImportHandler {
for (Method method : clazz.getMethods()) {
if (method.getName().equals(fieldOrMethodName)) {
int modifiers = method.getModifiers();
- if (Modifier.isStatic(modifiers) &&
- Modifier.isPublic(modifiers)) {
+ if (Modifier.isStatic(modifiers) && Modifier.isPublic(modifiers)) {
found = true;
break;
}
@@ -330,16 +325,14 @@ public class ImportHandler {
}
if (!found) {
- throw new ELException(Util.message(null,
- "importHandler.staticNotFound", fieldOrMethodName,
- className, name));
+ throw new ELException(
+ Util.message(null, "importHandler.staticNotFound", fieldOrMethodName, className, name));
}
Class<?> conflict = statics.get(fieldOrMethodName);
if (conflict != null) {
- throw new ELException(Util.message(null,
- "importHandler.ambiguousStaticImport", name,
- conflict.getName() + '.' + fieldOrMethodName));
+ throw new ELException(Util.message(null, "importHandler.ambiguousStaticImport", name,
+ conflict.getName() + '.' + fieldOrMethodName));
}
statics.put(fieldOrMethodName, clazz);
@@ -350,8 +343,7 @@ public class ImportHandler {
int lastPeriodIndex = name.lastIndexOf('.');
if (lastPeriodIndex < 0) {
- throw new ELException(Util.message(
- null, "importHandler.invalidClassName", name));
+ throw new ELException(Util.message(null, "importHandler.invalidClassName", name));
}
String unqualifiedName = name.substring(lastPeriodIndex + 1);
@@ -359,8 +351,7 @@ public class ImportHandler {
if (currentName != null && !currentName.equals(name)) {
// Conflict. Same unqualifiedName, different fully qualified names
- throw new ELException(Util.message(null,
- "importHandler.ambiguousImport", name, currentName));
+ throw new ELException(Util.message(null, "importHandler.ambiguousImport", name, currentName));
}
}
@@ -408,7 +399,7 @@ public class ImportHandler {
// Search the package imports - note there may be multiple matches
// (which correctly triggers an error)
- for (Map.Entry<String,Set<String>> entry : packageNames.entrySet()) {
+ for (Map.Entry<String, Set<String>> entry : packageNames.entrySet()) {
if (!entry.getValue().isEmpty()) {
// Standard package where we know all the class names
if (!entry.getValue().contains(name)) {
@@ -422,9 +413,8 @@ public class ImportHandler {
Class<?> clazz = findClass(className, false);
if (clazz != null) {
if (result != null) {
- throw new ELException(Util.message(null,
- "importHandler.ambiguousImport", className,
- result.getName()));
+ throw new ELException(
+ Util.message(null, "importHandler.ambiguousImport", className, result.getName()));
}
result = clazz;
}
@@ -459,11 +449,10 @@ public class ImportHandler {
// Java 9+) in an exported package
JreCompat jreCompat = JreCompat.getInstance();
int modifiers = clazz.getModifiers();
- if (!Modifier.isPublic(modifiers) || Modifier.isAbstract(modifiers) ||
- Modifier.isInterface(modifiers) || !jreCompat.isExported(clazz)) {
+ if (!Modifier.isPublic(modifiers) || Modifier.isAbstract(modifiers) || Modifier.isInterface(modifiers) ||
+ !jreCompat.isExported(clazz)) {
if (throwException) {
- throw new ELException(Util.message(
- null, "importHandler.invalidClass", name));
+ throw new ELException(Util.message(null, "importHandler.invalidClass", name));
} else {
return null;
}
@@ -474,8 +463,7 @@ public class ImportHandler {
/*
- * Marker class used because null values are not permitted in a
- * ConcurrentHashMap.
+ * Marker class used because null values are not permitted in a ConcurrentHashMap.
*/
private static class NotFound {
}
diff --git a/java/javax/el/JreCompat.java b/java/javax/el/JreCompat.java
index 23604d45aa..bed8e91dc7 100644
--- a/java/javax/el/JreCompat.java
+++ b/java/javax/el/JreCompat.java
@@ -44,14 +44,12 @@ class JreCompat {
/**
- * Is the accessibleObject accessible (as a result of appropriate module
- * exports) on the provided instance?
+ * Is the accessibleObject accessible (as a result of appropriate module exports) on the provided instance?
*
- * @param base The specific instance to be tested.
- * @param accessibleObject The method/field/constructor to be tested.
+ * @param base The specific instance to be tested.
+ * @param accessibleObject The method/field/constructor to be tested.
*
- * @return {code true} if the AccessibleObject can be accessed otherwise
- * {code false}
+ * @return {code true} if the AccessibleObject can be accessed otherwise {code false}
*/
public boolean canAccess(Object base, AccessibleObject accessibleObject) {
// Java 8 doesn't support modules so default to true
@@ -62,10 +60,9 @@ class JreCompat {
/**
* Is the given class in an exported package?
*
- * @param type The class to test
+ * @param type The class to test
*
- * @return Always {@code true} for Java 8. {@code true} if the enclosing
- * package is exported for Java 9+
+ * @return Always {@code true} for Java 8. {@code true} if the enclosing package is exported for Java 9+
*/
public boolean isExported(Class<?> type) {
return true;
diff --git a/java/javax/el/LambdaExpression.java b/java/javax/el/LambdaExpression.java
index 36c7929109..cd07fdc9d2 100644
--- a/java/javax/el/LambdaExpression.java
+++ b/java/javax/el/LambdaExpression.java
@@ -25,11 +25,10 @@ public class LambdaExpression {
private final List<String> formalParameters;
private final ValueExpression expression;
- private final Map<String,Object> nestedArguments = new HashMap<>();
+ private final Map<String, Object> nestedArguments = new HashMap<>();
private ELContext context = null;
- public LambdaExpression(List<String> formalParameters,
- ValueExpression expression) {
+ public LambdaExpression(List<String> formalParameters, ValueExpression expression) {
this.formalParameters = formalParameters;
this.expression = expression;
@@ -40,8 +39,7 @@ public class LambdaExpression {
}
@SuppressWarnings("null") // args[i] can't be null due to earlier checks
- public Object invoke(ELContext context, Object... args)
- throws ELException {
+ public Object invoke(ELContext context, Object... args) throws ELException {
Objects.requireNonNull(context);
@@ -56,9 +54,7 @@ public class LambdaExpression {
}
if (formalParamCount > argCount) {
- throw new ELException(Util.message(context,
- "lambdaExpression.tooFewArgs",
- Integer.valueOf(argCount),
+ throw new ELException(Util.message(context, "lambdaExpression.tooFewArgs", Integer.valueOf(argCount),
Integer.valueOf(formalParamCount)));
}
@@ -77,8 +73,7 @@ public class LambdaExpression {
// Make arguments from this expression available to any nested
// expression
if (result instanceof LambdaExpression) {
- ((LambdaExpression) result).nestedArguments.putAll(
- lambdaArguments);
+ ((LambdaExpression) result).nestedArguments.putAll(lambdaArguments);
}
return result;
} finally {
@@ -87,6 +82,6 @@ public class LambdaExpression {
}
public java.lang.Object invoke(Object... args) {
- return invoke (context, args);
+ return invoke(context, args);
}
}
diff --git a/java/javax/el/ListELResolver.java b/java/javax/el/ListELResolver.java
index 3b15e901b9..4874f95ad1 100644
--- a/java/javax/el/ListELResolver.java
+++ b/java/javax/el/ListELResolver.java
@@ -46,8 +46,7 @@ public class ListELResolver extends ELResolver {
List<?> list = (List<?>) base;
int idx = coerce(property);
if (idx < 0 || idx >= list.size()) {
- throw new PropertyNotFoundException(
- new ArrayIndexOutOfBoundsException(idx).getMessage());
+ throw new PropertyNotFoundException(new ArrayIndexOutOfBoundsException(idx).getMessage());
}
return Object.class;
}
@@ -73,8 +72,7 @@ public class ListELResolver extends ELResolver {
}
@Override
- public void setValue(ELContext context, Object base, Object property,
- Object value) {
+ public void setValue(ELContext context, Object base, Object property, Object value) {
Objects.requireNonNull(context);
if (base instanceof List<?>) {
@@ -83,8 +81,8 @@ public class ListELResolver extends ELResolver {
List<Object> list = (List<Object>) base;
if (this.readOnly) {
- throw new PropertyNotWritableException(Util.message(context,
- "resolverNotWritable", base.getClass().getName()));
+ throw new PropertyNotWritableException(
+ Util.message(context, "resolverNotWritable", base.getClass().getName()));
}
int idx = coerce(property);
@@ -108,9 +106,7 @@ public class ListELResolver extends ELResolver {
try {
int idx = coerce(property);
if (idx < 0 || idx >= list.size()) {
- throw new PropertyNotFoundException(
- new ArrayIndexOutOfBoundsException(idx)
- .getMessage());
+ throw new PropertyNotFoundException(new ArrayIndexOutOfBoundsException(idx).getMessage());
}
} catch (IllegalArgumentException e) {
// ignore
@@ -147,7 +143,6 @@ public class ListELResolver extends ELResolver {
if (property instanceof String) {
return Integer.parseInt((String) property);
}
- throw new IllegalArgumentException(property != null ?
- property.toString() : "null");
+ throw new IllegalArgumentException(property != null ? property.toString() : "null");
}
}
diff --git a/java/javax/el/MapELResolver.java b/java/javax/el/MapELResolver.java
index 5306bf3d58..67f8000c48 100644
--- a/java/javax/el/MapELResolver.java
+++ b/java/javax/el/MapELResolver.java
@@ -27,8 +27,7 @@ import java.util.Objects;
public class MapELResolver extends ELResolver {
- private static final Class<?> UNMODIFIABLE =
- Collections.unmodifiableMap(new HashMap<>()).getClass();
+ private static final Class<?> UNMODIFIABLE = Collections.unmodifiableMap(new HashMap<>()).getClass();
private final boolean readOnly;
@@ -44,7 +43,7 @@ public class MapELResolver extends ELResolver {
public Class<?> getType(ELContext context, Object base, Object property) {
Objects.requireNonNull(context);
- if (base instanceof Map<?,?>) {
+ if (base instanceof Map<?, ?>) {
context.setPropertyResolved(base, property);
return Object.class;
}
@@ -56,25 +55,24 @@ public class MapELResolver extends ELResolver {
public Object getValue(ELContext context, Object base, Object property) {
Objects.requireNonNull(context);
- if (base instanceof Map<?,?>) {
+ if (base instanceof Map<?, ?>) {
context.setPropertyResolved(base, property);
- return ((Map<?,?>) base).get(property);
+ return ((Map<?, ?>) base).get(property);
}
return null;
}
@Override
- public void setValue(ELContext context, Object base, Object property,
- Object value) {
+ public void setValue(ELContext context, Object base, Object property, Object value) {
Objects.requireNonNull(context);
if (base instanceof Map<?, ?>) {
context.setPropertyResolved(base, property);
if (this.readOnly) {
- throw new PropertyNotWritableException(Util.message(context,
- "resolverNotWritable", base.getClass().getName()));
+ throw new PropertyNotWritableException(
+ Util.message(context, "resolverNotWritable", base.getClass().getName()));
}
try {
diff --git a/java/javax/el/MethodExpression.java b/java/javax/el/MethodExpression.java
index a0a7e697d3..a364f0fe63 100644
--- a/java/javax/el/MethodExpression.java
+++ b/java/javax/el/MethodExpression.java
@@ -25,15 +25,11 @@ public abstract class MethodExpression extends Expression {
*
* @return Information about the method that this expression resolves to
*
- * @throws NullPointerException
- * If the supplied context is <code>null</code>
- * @throws PropertyNotFoundException
- * If a property/variable resolution failed because no match
- * was found or a match was found but was not readable
- * @throws MethodNotFoundException
- * If no matching method can be found
- * @throws ELException
- * Wraps any exception throw whilst resolving the property
+ * @throws NullPointerException If the supplied context is <code>null</code>
+ * @throws PropertyNotFoundException If a property/variable resolution failed because no match was found or a match
+ * was found but was not readable
+ * @throws MethodNotFoundException If no matching method can be found
+ * @throws ELException Wraps any exception throw whilst resolving the property
*/
public abstract MethodInfo getMethodInfo(ELContext context);
@@ -43,21 +39,18 @@ public abstract class MethodExpression extends Expression {
*
* @return The result of invoking this method expression
*
- * @throws NullPointerException
- * If the supplied context is <code>null</code>
- * @throws PropertyNotFoundException
- * If a property/variable resolution failed because no match
- * was found or a match was found but was not readable
- * @throws MethodNotFoundException
- * If no matching method can be found
- * @throws ELException
- * Wraps any exception throw whilst resolving the property or
- * coercion of the result to the expected return type fails
+ * @throws NullPointerException If the supplied context is <code>null</code>
+ * @throws PropertyNotFoundException If a property/variable resolution failed because no match was found or a match
+ * was found but was not readable
+ * @throws MethodNotFoundException If no matching method can be found
+ * @throws ELException Wraps any exception throw whilst resolving the property or coercion of the
+ * result to the expected return type fails
*/
public abstract Object invoke(ELContext context, Object[] params);
/**
* @return This default implementation always returns <code>false</code>
+ *
* @since EL 3.0
*/
public boolean isParametersProvided() {
@@ -66,15 +59,12 @@ public abstract class MethodExpression extends Expression {
}
/**
- * @since EL 2.2
- *
- * Note: The spelling mistake is deliberate.
- * isParmetersProvided() - Specification definition
- * isParametersProvided() - Corrected spelling
+ * @since EL 2.2 Note: The spelling mistake is deliberate. isParmetersProvided() - Specification definition
+ * isParametersProvided() - Corrected spelling
*
* @return Always <code>false</code>
*
- * @deprecated Use {@link #isParametersProvided()}
+ * @deprecated Use {@link #isParametersProvided()}
*/
@Deprecated
public boolean isParmetersProvided() {
diff --git a/java/javax/el/ResourceBundleELResolver.java b/java/javax/el/ResourceBundleELResolver.java
index a387232cd0..ad2163ad59 100644
--- a/java/javax/el/ResourceBundleELResolver.java
+++ b/java/javax/el/ResourceBundleELResolver.java
@@ -40,8 +40,7 @@ public class ResourceBundleELResolver extends ELResolver {
if (property != null) {
try {
- return ((ResourceBundle) base).getObject(property
- .toString());
+ return ((ResourceBundle) base).getObject(property.toString());
} catch (MissingResourceException mre) {
return "???" + property.toString() + "???";
}
@@ -63,14 +62,13 @@ public class ResourceBundleELResolver extends ELResolver {
}
@Override
- public void setValue(ELContext context, Object base, Object property,
- Object value) {
+ public void setValue(ELContext context, Object base, Object property, Object value) {
Objects.requireNonNull(context);
if (base instanceof ResourceBundle) {
context.setPropertyResolved(base, property);
- throw new PropertyNotWritableException(Util.message(context,
- "resolverNotWritable", base.getClass().getName()));
+ throw new PropertyNotWritableException(
+ Util.message(context, "resolverNotWritable", base.getClass().getName()));
}
}
@@ -87,8 +85,7 @@ public class ResourceBundleELResolver extends ELResolver {
}
@Override
- public Iterator<FeatureDescriptor> getFeatureDescriptors(
- ELContext context, Object base) {
+ public Iterator<FeatureDescriptor> getFeatureDescriptors(ELContext context, Object base) {
if (base instanceof ResourceBundle) {
List<FeatureDescriptor> feats = new ArrayList<>();
Enumeration<String> e = ((ResourceBundle) base).getKeys();
diff --git a/java/javax/el/StandardELContext.java b/java/javax/el/StandardELContext.java
index 6e62994e74..3185c5cd34 100644
--- a/java/javax/el/StandardELContext.java
+++ b/java/javax/el/StandardELContext.java
@@ -30,22 +30,20 @@ public class StandardELContext extends ELContext {
private final FunctionMapper functionMapper;
private final CompositeELResolver standardResolver;
private final CompositeELResolver customResolvers;
- private final Map<String,Object> localBeans = new HashMap<>();
+ private final Map<String, Object> localBeans = new HashMap<>();
public StandardELContext(ExpressionFactory factory) {
wrappedContext = null;
variableMapper = new StandardVariableMapper();
- functionMapper =
- new StandardFunctionMapper(factory.getInitFunctionMap());
+ functionMapper = new StandardFunctionMapper(factory.getInitFunctionMap());
standardResolver = new CompositeELResolver();
customResolvers = new CompositeELResolver();
ELResolver streamResolver = factory.getStreamELResolver();
// Add resolvers in order
- standardResolver.add(new BeanNameELResolver(
- new StandardBeanNameResolver(localBeans)));
+ standardResolver.add(new BeanNameELResolver(new StandardBeanNameResolver(localBeans)));
standardResolver.add(customResolvers);
if (streamResolver != null) {
standardResolver.add(streamResolver);
@@ -66,8 +64,7 @@ public class StandardELContext extends ELContext {
customResolvers = new CompositeELResolver();
// Add resolvers in order
- standardResolver.add(new BeanNameELResolver(
- new StandardBeanNameResolver(localBeans)));
+ standardResolver.add(new BeanNameELResolver(new StandardBeanNameResolver(localBeans)));
standardResolver.add(customResolvers);
// Use resolvers from context from this point on
standardResolver.add(context.getELResolver());
@@ -75,8 +72,7 @@ public class StandardELContext extends ELContext {
// Can't use Class<?> because API needs to match specification
@Override
- public void putContext(@SuppressWarnings("rawtypes") Class key,
- Object contextObject) {
+ public void putContext(@SuppressWarnings("rawtypes") Class key, Object contextObject) {
if (wrappedContext == null) {
super.putContext(key, contextObject);
} else {
@@ -113,7 +109,7 @@ public class StandardELContext extends ELContext {
}
- Map<String,Object> getLocalBeans() {
+ Map<String, Object> getLocalBeans() {
return localBeans;
}
@@ -131,8 +127,7 @@ public class StandardELContext extends ELContext {
}
@Override
- public ValueExpression setVariable(String variable,
- ValueExpression expression) {
+ public ValueExpression setVariable(String variable, ValueExpression expression) {
if (vars == null) {
vars = new HashMap<>();
}
@@ -147,9 +142,9 @@ public class StandardELContext extends ELContext {
private static class StandardBeanNameResolver extends BeanNameResolver {
- private final Map<String,Object> beans;
+ private final Map<String, Object> beans;
- StandardBeanNameResolver(Map<String,Object> beans) {
+ StandardBeanNameResolver(Map<String, Object> beans) {
this.beans = beans;
}
@@ -164,8 +159,7 @@ public class StandardELContext extends ELContext {
}
@Override
- public void setBeanValue(String beanName, Object value)
- throws PropertyNotWritableException {
+ public void setBeanValue(String beanName, Object value) throws PropertyNotWritableException {
beans.put(beanName, value);
}
@@ -183,9 +177,9 @@ public class StandardELContext extends ELContext {
private static class StandardFunctionMapper extends FunctionMapper {
- private final Map<String,Method> methods = new HashMap<>();
+ private final Map<String, Method> methods = new HashMap<>();
- StandardFunctionMapper(Map<String,Method> initFunctionMap) {
+ StandardFunctionMapper(Map<String, Method> initFunctionMap) {
if (initFunctionMap != null) {
methods.putAll(initFunctionMap);
}
@@ -198,8 +192,7 @@ public class StandardELContext extends ELContext {
}
@Override
- public void mapFunction(String prefix, String localName,
- Method method) {
+ public void mapFunction(String prefix, String localName, Method method) {
String key = prefix + ':' + localName;
if (method == null) {
methods.remove(key);
diff --git a/java/javax/el/StaticFieldELResolver.java b/java/javax/el/StaticFieldELResolver.java
index 678724acfc..90f7eacd6e 100644
--- a/java/javax/el/StaticFieldELResolver.java
+++ b/java/javax/el/StaticFieldELResolver.java
@@ -44,17 +44,13 @@ public class StaticFieldELResolver extends ELResolver {
Field field = clazz.getField(name);
int modifiers = field.getModifiers();
JreCompat jreCompat = JreCompat.getInstance();
- if (Modifier.isStatic(modifiers) &&
- Modifier.isPublic(modifiers) &&
- jreCompat.canAccess(null, field)) {
+ if (Modifier.isStatic(modifiers) && Modifier.isPublic(modifiers) && jreCompat.canAccess(null, field)) {
return field.get(null);
}
- } catch (IllegalArgumentException | IllegalAccessException |
- NoSuchFieldException | SecurityException e) {
+ } catch (IllegalArgumentException | IllegalAccessException | NoSuchFieldException | SecurityException e) {
exception = e;
}
- String msg = Util.message(context, "staticFieldELResolver.notFound",
- name, clazz.getName());
+ String msg = Util.message(context, "staticFieldELResolver.notFound", name, clazz.getName());
if (exception == null) {
throw new PropertyNotFoundException(msg);
} else {
@@ -66,24 +62,21 @@ public class StaticFieldELResolver extends ELResolver {
@Override
- public void setValue(ELContext context, Object base, Object property,
- Object value) {
+ public void setValue(ELContext context, Object base, Object property, Object value) {
Objects.requireNonNull(context);
if (base instanceof ELClass && property instanceof String) {
Class<?> clazz = ((ELClass) base).getKlass();
String name = (String) property;
- throw new PropertyNotWritableException(Util.message(context,
- "staticFieldELResolver.notWritable", name,
- clazz.getName()));
+ throw new PropertyNotWritableException(
+ Util.message(context, "staticFieldELResolver.notWritable", name, clazz.getName()));
}
}
@Override
- public Object invoke(ELContext context, Object base, Object method,
- Class<?>[] paramTypes, Object[] params) {
+ public Object invoke(ELContext context, Object base, Object method, Class<?>[] paramTypes, Object[] params) {
Objects.requireNonNull(context);
if (base instanceof ELClass && method instanceof String) {
@@ -95,8 +88,8 @@ public class StaticFieldELResolver extends ELResolver {
if ("<init>".equals(methodName)) {
Constructor<?> match = Util.findConstructor(context, clazz, paramTypes, params);
- Object[] parameters = Util.buildParameters(
- context, match.getParameterTypes(), match.isVarArgs(), params);
+ Object[] parameters = Util.buildParameters(context, match.getParameterTypes(), match.isVarArgs(),
+ params);
Object result = null;
@@ -119,13 +112,12 @@ public class StaticFieldELResolver extends ELResolver {
// unnecessary because the canAccess() call in Util.findMethod()
// effectively performs the same check
if (match == null || !Modifier.isStatic(match.getModifiers())) {
- throw new MethodNotFoundException(Util.message(context,
- "staticFieldELResolver.methodNotFound", methodName,
- clazz.getName()));
+ throw new MethodNotFoundException(
+ Util.message(context, "staticFieldELResolver.methodNotFound", methodName, clazz.getName()));
}
- Object[] parameters = Util.buildParameters(
- context, match.getParameterTypes(), match.isVarArgs(), params);
+ Object[] parameters = Util.buildParameters(context, match.getParameterTypes(), match.isVarArgs(),
+ params);
Object result = null;
try {
@@ -157,17 +149,13 @@ public class StaticFieldELResolver extends ELResolver {
Field field = clazz.getField(name);
int modifiers = field.getModifiers();
JreCompat jreCompat = JreCompat.getInstance();
- if (Modifier.isStatic(modifiers) &&
- Modifier.isPublic(modifiers) &&
- jreCompat.canAccess(null, field)) {
+ if (Modifier.isStatic(modifiers) && Modifier.isPublic(modifiers) && jreCompat.canAccess(null, field)) {
return field.getType();
}
- } catch (IllegalArgumentException | NoSuchFieldException |
- SecurityException e) {
+ } catch (IllegalArgumentException | NoSuchFieldException | SecurityException e) {
exception = e;
}
- String msg = Util.message(context, "staticFieldELResolver.notFound",
- name, clazz.getName());
+ String msg = Util.message(context, "staticFieldELResolver.notFound", name, clazz.getName());
if (exception == null) {
throw new PropertyNotFoundException(msg);
} else {
@@ -193,8 +181,7 @@ public class StaticFieldELResolver extends ELResolver {
* Always returns <code>null</code>.
*/
@Override
- public Iterator<FeatureDescriptor> getFeatureDescriptors(ELContext context,
- Object base) {
+ public Iterator<FeatureDescriptor> getFeatureDescriptors(ELContext context, Object base) {
return null;
}
diff --git a/java/javax/el/TypeConverter.java b/java/javax/el/TypeConverter.java
index 6c4d8dc833..c5940816e3 100644
--- a/java/javax/el/TypeConverter.java
+++ b/java/javax/el/TypeConverter.java
@@ -35,8 +35,7 @@ public abstract class TypeConverter extends ELResolver {
}
@Override
- public void setValue(ELContext context, Object base, Object property,
- Object value) {
+ public void setValue(ELContext context, Object base, Object property, Object value) {
// NO-OP
}
@@ -46,8 +45,7 @@ public abstract class TypeConverter extends ELResolver {
}
@Override
- public Iterator<FeatureDescriptor> getFeatureDescriptors(ELContext context,
- Object base) {
+ public Iterator<FeatureDescriptor> getFeatureDescriptors(ELContext context, Object base) {
return null;
}
@@ -57,6 +55,5 @@ public abstract class TypeConverter extends ELResolver {
}
@Override
- public abstract Object convertToType(ELContext context, Object obj,
- Class<?> type);
+ public abstract Object convertToType(ELContext context, Object obj, Class<?> type);
}
diff --git a/java/javax/el/Util.java b/java/javax/el/Util.java
index 11e625c4db..753521e000 100644
--- a/java/javax/el/Util.java
+++ b/java/javax/el/Util.java
@@ -51,9 +51,8 @@ class Util {
// Defaults to using a privileged block
// When running on Tomcat this will be set to false in
// $CATALINA_BASE/conf/catalina.properties
- String value = AccessController.doPrivileged(
- (PrivilegedAction<String>) () -> System.getProperty(
- "org.apache.el.GET_CLASSLOADER_USE_PRIVILEGED", "true"));
+ String value = AccessController.doPrivileged((PrivilegedAction<String>) () -> System
+ .getProperty("org.apache.el.GET_CLASSLOADER_USE_PRIVILEGED", "true"));
GET_CLASSLOADER_USE_PRIVILEGED = Boolean.parseBoolean(value);
} else {
// No security manager - no need to use a privileged block.
@@ -63,8 +62,8 @@ class Util {
/**
- * Checks whether the supplied Throwable is one that needs to be
- * rethrown and swallows all others.
+ * Checks whether the supplied Throwable is one that needs to be rethrown and swallows all others.
+ *
* @param t the Throwable to check
*/
static void handleThrowable(Throwable t) {
@@ -89,8 +88,7 @@ class Util {
return "";
}
}
- ResourceBundle bundle = ResourceBundle.getBundle(
- "javax.el.LocalStrings", locale);
+ ResourceBundle bundle = ResourceBundle.getBundle("javax.el.LocalStrings", locale);
try {
String template = bundle.getString(name);
if (props != null) {
@@ -107,8 +105,8 @@ class Util {
private static final Map<CacheKey, CacheValue> factoryCache = new ConcurrentHashMap<>();
/**
- * Provides a per class loader cache of ExpressionFactory instances without
- * pinning any in memory as that could trigger a memory leak.
+ * Provides a per class loader cache of ExpressionFactory instances without pinning any in memory as that could
+ * trigger a memory leak.
*/
static ExpressionFactory getExpressionFactory() {
@@ -158,9 +156,8 @@ class Util {
/**
- * Key used to cache default ExpressionFactory information per class
- * loader. The class loader reference is never {@code null}, because
- * {@code null} tccl is handled separately.
+ * Key used to cache default ExpressionFactory information per class loader. The class loader reference is never
+ * {@code null}, because {@code null} tccl is handled separately.
*/
private static class CacheKey {
private final int hash;
@@ -214,16 +211,14 @@ class Util {
/*
- * This method duplicates code in org.apache.el.util.ReflectionUtil. When
- * making changes keep the code in sync.
+ * This method duplicates code in org.apache.el.util.ReflectionUtil. When making changes keep the code in sync.
*/
- static Method findMethod(ELContext context, Class<?> clazz, Object base, String methodName,
- Class<?>[] paramTypes, Object[] paramValues) {
+ static Method findMethod(ELContext context, Class<?> clazz, Object base, String methodName, Class<?>[] paramTypes,
+ Object[] paramValues) {
if (clazz == null || methodName == null) {
throw new MethodNotFoundException(
- message(null, "util.method.notfound", clazz, methodName,
- paramString(paramTypes)));
+ message(null, "util.method.notfound", clazz, methodName, paramString(paramTypes)));
}
if (paramTypes == null) {
@@ -240,14 +235,13 @@ class Util {
}
/*
- * This method duplicates code in org.apache.el.util.ReflectionUtil. When
- * making changes keep the code in sync.
+ * This method duplicates code in org.apache.el.util.ReflectionUtil. When making changes keep the code in sync.
*/
@SuppressWarnings("null")
- private static <T> Wrapper<T> findWrapper(ELContext context, Class<?> clazz, List<Wrapper<T>> wrappers,
- String name, Class<?>[] paramTypes, Object[] paramValues) {
+ private static <T> Wrapper<T> findWrapper(ELContext context, Class<?> clazz, List<Wrapper<T>> wrappers, String name,
+ Class<?>[] paramTypes, Object[] paramValues) {
- Map<Wrapper<T>,MatchResult> candidates = new HashMap<>();
+ Map<Wrapper<T>, MatchResult> candidates = new HashMap<>();
int paramCount = paramTypes.length;
@@ -266,17 +260,16 @@ class Util {
// Method has wrong number of parameters
continue;
}
- if (w.isVarArgs() && paramCount < mParamCount -1) {
+ if (w.isVarArgs() && paramCount < mParamCount - 1) {
// Method has wrong number of parameters
continue;
}
- if (w.isVarArgs() && paramCount == mParamCount && paramValues != null &&
- paramValues.length > paramCount && !paramTypes[mParamCount -1].isArray()) {
+ if (w.isVarArgs() && paramCount == mParamCount && paramValues != null && paramValues.length > paramCount &&
+ !paramTypes[mParamCount - 1].isArray()) {
// Method arguments don't match
continue;
}
- if (w.isVarArgs() && paramCount > mParamCount && paramValues != null &&
- paramValues.length != paramCount) {
+ if (w.isVarArgs() && paramCount > mParamCount && paramValues != null && paramValues.length != paramCount) {
// Might match a different varargs method
continue;
}
@@ -353,8 +346,8 @@ class Util {
return w;
}
- candidates.put(w, new MatchResult(
- w.isVarArgs(), exactMatch, assignableMatch, coercibleMatch, varArgsMatch, w.isBridge()));
+ candidates.put(w, new MatchResult(w.isVarArgs(), exactMatch, assignableMatch, coercibleMatch, varArgsMatch,
+ w.isBridge()));
}
// Look for the method that has the highest number of parameters where
@@ -384,17 +377,15 @@ class Util {
if (match == null) {
// If multiple methods have the same matching number of parameters
// the match is ambiguous so throw an exception
- throw new MethodNotFoundException(message(
- null, "util.method.ambiguous", clazz, name,
- paramString(paramTypes)));
+ throw new MethodNotFoundException(
+ message(null, "util.method.ambiguous", clazz, name, paramString(paramTypes)));
}
}
// Handle case where no match at all was found
if (match == null) {
- throw new MethodNotFoundException(message(
- null, "util.method.notfound", clazz, name,
- paramString(paramTypes)));
+ throw new MethodNotFoundException(
+ message(null, "util.method.notfound", clazz, name, paramString(paramTypes)));
}
return match;
@@ -421,11 +412,9 @@ class Util {
/*
- * This method duplicates code in org.apache.el.util.ReflectionUtil. When
- * making changes keep the code in sync.
+ * This method duplicates code in org.apache.el.util.ReflectionUtil. When making changes keep the code in sync.
*/
- private static <T> Wrapper<T> resolveAmbiguousWrapper(Set<Wrapper<T>> candidates,
- Class<?>[] paramTypes) {
+ private static <T> Wrapper<T> resolveAmbiguousWrapper(Set<Wrapper<T>> candidates, Class<?>[] paramTypes) {
// Identify which parameter isn't an exact match
Wrapper<T> w = candidates.iterator().next();
@@ -470,8 +459,7 @@ class Util {
if (Number.class.isAssignableFrom(nonMatchClass)) {
for (Wrapper<T> c : candidates) {
Class<?> candidateType = c.getParameterTypes()[nonMatchIndex];
- if (Number.class.isAssignableFrom(candidateType) ||
- candidateType.isPrimitive()) {
+ if (Number.class.isAssignableFrom(candidateType) || candidateType.isPrimitive()) {
if (match == null) {
match = c;
} else {
@@ -488,8 +476,7 @@ class Util {
/*
- * This method duplicates code in org.apache.el.util.ReflectionUtil. When
- * making changes keep the code in sync.
+ * This method duplicates code in org.apache.el.util.ReflectionUtil. When making changes keep the code in sync.
*/
static boolean isAssignableFrom(Class<?> src, Class<?> target) {
// src will always be an object
@@ -526,12 +513,11 @@ class Util {
/*
- * This method duplicates code in org.apache.el.util.ReflectionUtil. When
- * making changes keep the code in sync.
+ * This method duplicates code in org.apache.el.util.ReflectionUtil. When making changes keep the code in sync.
*/
private static boolean isCoercibleFrom(ELContext context, Object src, Class<?> target) {
// TODO: This isn't pretty but it works. Significant refactoring would
- // be required to avoid the exception.
+ // be required to avoid the exception.
try {
context.convertToType(src, target);
} catch (ELException e) {
@@ -559,14 +545,13 @@ class Util {
/*
- * This method duplicates code in org.apache.el.util.ReflectionUtil. When
- * making changes keep the code in sync.
+ * This method duplicates code in org.apache.el.util.ReflectionUtil. When making changes keep the code in sync.
*/
static Method getMethod(Class<?> type, Object base, Method m) {
JreCompat jreCompat = JreCompat.getInstance();
- if (m == null ||
- (Modifier.isPublic(type.getModifiers()) &&
- (Modifier.isStatic(m.getModifiers()) && jreCompat.canAccess(null, m) || jreCompat.canAccess(base, m)))) {
+ if (m == null || (Modifier.isPublic(type.getModifiers()) &&
+ (Modifier.isStatic(m.getModifiers()) && jreCompat.canAccess(null, m) ||
+ jreCompat.canAccess(base, m)))) {
return m;
}
Class<?>[] interfaces = type.getInterfaces();
@@ -605,8 +590,7 @@ class Util {
if (clazz == null) {
throw new MethodNotFoundException(
- message(null, "util.method.notfound", null, methodName,
- paramString(paramTypes)));
+ message(null, "util.method.notfound", null, methodName, paramString(paramTypes)));
}
if (paramTypes == null) {
@@ -623,16 +607,15 @@ class Util {
JreCompat jreCompat = JreCompat.getInstance();
if (!Modifier.isPublic(clazz.getModifiers()) || !jreCompat.canAccess(null, constructor)) {
- throw new MethodNotFoundException(message(
- null, "util.method.notfound", clazz, methodName,
- paramString(paramTypes)));
+ throw new MethodNotFoundException(
+ message(null, "util.method.notfound", clazz, methodName, paramString(paramTypes)));
}
return constructor;
}
- static Object[] buildParameters(ELContext context, Class<?>[] parameterTypes, boolean isVarArgs,Object[] params) {
+ static Object[] buildParameters(ELContext context, Class<?>[] parameterTypes, boolean isVarArgs, Object[] params) {
Object[] parameters = null;
if (parameterTypes.length > 0) {
parameters = new Object[parameterTypes.length];
@@ -699,8 +682,11 @@ class Util {
}
public abstract T unWrap();
+
public abstract Class<?>[] getParameterTypes();
+
public abstract boolean isVarArgs();
+
public abstract boolean isBridge();
}
@@ -762,8 +748,7 @@ class Util {
}
/*
- * This class duplicates code in org.apache.el.util.ReflectionUtil. When
- * making changes keep the code in sync.
+ * This class duplicates code in org.apache.el.util.ReflectionUtil. When making changes keep the code in sync.
*/
private static class MatchResult implements Comparable<MatchResult> {
@@ -837,14 +822,13 @@ class Util {
@Override
public boolean equals(Object o) {
- return o == this || (null != o &&
- this.getClass().equals(o.getClass()) &&
- ((MatchResult)o).getExactCount() == this.getExactCount() &&
- ((MatchResult)o).getAssignableCount() == this.getAssignableCount() &&
- ((MatchResult)o).getCoercibleCount() == this.getCoercibleCount() &&
- ((MatchResult)o).getVarArgsCount() == this.getVarArgsCount() &&
- ((MatchResult)o).isVarArgs() == this.isVarArgs() &&
- ((MatchResult)o).isBridge() == this.isBridge());
+ return o == this || (null != o && this.getClass().equals(o.getClass()) &&
+ ((MatchResult) o).getExactCount() == this.getExactCount() &&
+ ((MatchResult) o).getAssignableCount() == this.getAssignableCount() &&
+ ((MatchResult) o).getCoercibleCount() == this.getCoercibleCount() &&
+ ((MatchResult) o).getVarArgsCount() == this.getVarArgsCount() &&
+ ((MatchResult) o).isVarArgs() == this.isVarArgs() &&
+ ((MatchResult) o).isBridge() == this.isBridge());
}
@Override
diff --git a/java/javax/el/ValueExpression.java b/java/javax/el/ValueExpression.java
index ffdf8ccaab..86c9c57d89 100644
--- a/java/javax/el/ValueExpression.java
+++ b/java/javax/el/ValueExpression.java
@@ -25,50 +25,34 @@ public abstract class ValueExpression extends Expression {
*
* @return The result of evaluating this value expression
*
- * @throws NullPointerException
- * If the supplied context is <code>null</code>
- * @throws PropertyNotFoundException
- * If a property/variable resolution failed because no match
- * was found or a match was found but was not readable
- * @throws ELException
- * Wraps any exception throw whilst resolving a property or
- * variable
+ * @throws NullPointerException If the supplied context is <code>null</code>
+ * @throws PropertyNotFoundException If a property/variable resolution failed because no match was found or a match
+ * was found but was not readable
+ * @throws ELException Wraps any exception throw whilst resolving a property or variable
*/
public abstract Object getValue(ELContext context);
/**
* @param context The EL context for this evaluation
- * @param value The value to set the property to which this value
- * expression refers
+ * @param value The value to set the property to which this value expression refers
*
- * @throws NullPointerException
- * If the supplied context is <code>null</code>
- * @throws PropertyNotFoundException
- * If a property/variable resolution failed because no match
- * was found
- * @throws PropertyNotWritableException
- * If a property/variable resolution failed because a match was
- * found but was not writable
- * @throws ELException
- * Wraps any exception throw whilst resolving a property or
- * variable
+ * @throws NullPointerException If the supplied context is <code>null</code>
+ * @throws PropertyNotFoundException If a property/variable resolution failed because no match was found
+ * @throws PropertyNotWritableException If a property/variable resolution failed because a match was found but was
+ * not writable
+ * @throws ELException Wraps any exception throw whilst resolving a property or variable
*/
public abstract void setValue(ELContext context, Object value);
/**
* @param context The EL context for this evaluation
*
- * @return <code>true</code> if this expression is read only otherwise
- * <code>false</code>
+ * @return <code>true</code> if this expression is read only otherwise <code>false</code>
*
- * @throws NullPointerException
- * If the supplied context is <code>null</code>
- * @throws PropertyNotFoundException
- * If a property/variable resolution failed because no match
- * was found or a match was found but was not readable
- * @throws ELException
- * Wraps any exception throw whilst resolving a property or
- * variable
+ * @throws NullPointerException If the supplied context is <code>null</code>
+ * @throws PropertyNotFoundException If a property/variable resolution failed because no match was found or a match
+ * was found but was not readable
+ * @throws ELException Wraps any exception throw whilst resolving a property or variable
*/
public abstract boolean isReadOnly(ELContext context);
@@ -77,14 +61,10 @@ public abstract class ValueExpression extends Expression {
*
* @return The type of the result of this value expression
*
- * @throws NullPointerException
- * If the supplied context is <code>null</code>
- * @throws PropertyNotFoundException
- * If a property/variable resolution failed because no match
- * was found or a match was found but was not readable
- * @throws ELException
- * Wraps any exception throw whilst resolving a property or
- * variable
+ * @throws NullPointerException If the supplied context is <code>null</code>
+ * @throws PropertyNotFoundException If a property/variable resolution failed because no match was found or a match
+ * was found but was not readable
+ * @throws ELException Wraps any exception throw whilst resolving a property or variable
*/
public abstract Class<?> getType(ELContext context);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 03/03: Clean-up. Reformatting. No functional change.
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit ce9432bbd3fc0f020900b5a15500f48ba89add71
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Feb 22 19:43:34 2023 +0000
Clean-up. Reformatting. No functional change.
---
test/org/apache/el/TestELEvaluation.java | 40 ++--
test/org/apache/el/TestELInJsp.java | 58 ++----
test/org/apache/el/TestMethodExpressionImpl.java | 255 ++++++++++-------------
test/org/apache/el/TestValueExpressionImpl.java | 68 ++----
test/org/apache/el/TesterBeanB.java | 2 +-
test/org/apache/el/TesterBeanC.java | 6 +-
test/org/apache/el/TesterBeanF.java | 8 +-
test/org/apache/el/TesterBeanG.java | 7 +-
test/org/apache/el/TesterBeanH.java | 5 +-
test/org/apache/el/TesterEnum.java | 3 +-
test/org/apache/el/TesterFunctions.java | 1 +
11 files changed, 185 insertions(+), 268 deletions(-)
diff --git a/test/org/apache/el/TestELEvaluation.java b/test/org/apache/el/TestELEvaluation.java
index 73e03e2207..6646c3a9b8 100644
--- a/test/org/apache/el/TestELEvaluation.java
+++ b/test/org/apache/el/TestELEvaluation.java
@@ -29,15 +29,13 @@ import org.apache.el.lang.ELSupport;
import org.apache.jasper.el.ELContextImpl;
/**
- * Tests the EL engine directly. Similar tests may be found in
- * {@link org.apache.jasper.compiler.TestAttributeParser} and
- * {@link TestELInJsp}.
+ * Tests the EL engine directly. Similar tests may be found in {@link org.apache.jasper.compiler.TestAttributeParser}
+ * and {@link TestELInJsp}.
*/
public class TestELEvaluation {
/**
- * Test use of spaces in ternary expressions. This was primarily an EL
- * parser bug.
+ * Test use of spaces in ternary expressions. This was primarily an EL parser bug.
*/
@Test
public void testBug42565() {
@@ -65,12 +63,9 @@ public class TestELEvaluation {
*/
@Test
public void testBug44994() {
- Assert.assertEquals("none", evaluateExpression(
- "${0 lt 0 ? 1 lt 0 ? 'many': 'one': 'none'}"));
- Assert.assertEquals("one", evaluateExpression(
- "${0 lt 1 ? 1 lt 1 ? 'many': 'one': 'none'}"));
- Assert.assertEquals("many", evaluateExpression(
- "${0 lt 2 ? 1 lt 2 ? 'many': 'one': 'none'}"));
+ Assert.assertEquals("none", evaluateExpression("${0 lt 0 ? 1 lt 0 ? 'many': 'one': 'none'}"));
+ Assert.assertEquals("one", evaluateExpression("${0 lt 1 ? 1 lt 1 ? 'many': 'one': 'none'}"));
+ Assert.assertEquals("many", evaluateExpression("${0 lt 2 ? 1 lt 2 ? 'many': 'one': 'none'}"));
}
@Test
@@ -97,8 +92,8 @@ public class TestELEvaluation {
Assert.assertEquals("\\\\", evaluateExpression("\\\\"));
/*
- * LiteralExpressions can only contain ${ or #{ if escaped with \
- * \ is not an escape character in any other circumstances including \\
+ * LiteralExpressions can only contain ${ or #{ if escaped with \ \ is not an escape character in any other
+ * circumstances including \\
*/
Assert.assertEquals("\\", evaluateExpression("\\"));
Assert.assertEquals("$", evaluateExpression("$"));
@@ -162,22 +157,22 @@ public class TestELEvaluation {
Assert.assertEquals("''", evaluateExpression("${\"\'\'\"}"));
}
- private void compareBoth(String msg, int expected, Object o1, Object o2){
+ private void compareBoth(String msg, int expected, Object o1, Object o2) {
int i1 = ELSupport.compare(null, o1, o2);
int i2 = ELSupport.compare(null, o2, o1);
- Assert.assertEquals(msg,expected, i1);
- Assert.assertEquals(msg,expected, -i2);
+ Assert.assertEquals(msg, expected, i1);
+ Assert.assertEquals(msg, expected, -i2);
}
@Test
- public void testElSupportCompare(){
+ public void testElSupportCompare() {
compareBoth("Nulls should compare equal", 0, null, null);
compareBoth("Null should compare equal to \"\"", 0, "", null);
- compareBoth("Null should be less than File()",-1, null, new File(""));
- compareBoth("Null should be less than Date()",-1, null, new Date());
- compareBoth("Date(0) should be less than Date(1)",-1, new Date(0), new Date(1));
+ compareBoth("Null should be less than File()", -1, null, new File(""));
+ compareBoth("Null should be less than Date()", -1, null, new Date());
+ compareBoth("Date(0) should be less than Date(1)", -1, new Date(0), new Date(1));
try {
- compareBoth("Should not compare",0, new Date(), new File(""));
+ compareBoth("Should not compare", 0, new Date(), new File(""));
Assert.fail("Expecting ClassCastException");
} catch (ClassCastException expected) {
// Expected
@@ -256,8 +251,7 @@ public class TestELEvaluation {
ExpressionFactoryImpl exprFactory = new ExpressionFactoryImpl();
ELContextImpl ctx = new ELContextImpl(exprFactory);
ctx.setFunctionMapper(new TesterFunctions.FMapper());
- ValueExpression ve = exprFactory.createValueExpression(ctx, expression,
- String.class);
+ ValueExpression ve = exprFactory.createValueExpression(ctx, expression, String.class);
return (String) ve.getValue(ctx);
}
}
diff --git a/test/org/apache/el/TestELInJsp.java b/test/org/apache/el/TestELInJsp.java
index 66c0f3d7e3..e36f939af5 100644
--- a/test/org/apache/el/TestELInJsp.java
+++ b/test/org/apache/el/TestELInJsp.java
@@ -33,9 +33,8 @@ import org.apache.jasper.servlet.JasperInitializer;
import org.apache.tomcat.util.buf.ByteChunk;
/**
- * Tests EL with an without JSP attributes using a test web application. Similar
- * tests may be found in {@link TestELEvaluation} and
- * {@link org.apache.jasper.compiler.TestAttributeParser}.
+ * Tests EL with an without JSP attributes using a test web application. Similar tests may be found in
+ * {@link TestELEvaluation} and {@link org.apache.jasper.compiler.TestAttributeParser}.
*/
public class TestELInJsp extends TomcatBaseTest {
@@ -90,8 +89,7 @@ public class TestELInJsp extends TomcatBaseTest {
public void testBug45427() throws Exception {
getTomcatInstanceTestWebapp(false, true);
- ByteChunk res = getUrl("http://localhost:" + getPort() +
- "/test/bug45nnn/bug45427.jsp");
+ ByteChunk res = getUrl("http://localhost:" + getPort() + "/test/bug45nnn/bug45427.jsp");
String result = res.toString();
// Warning: JSP attribute escaping != Java String escaping
@@ -117,8 +115,7 @@ public class TestELInJsp extends TomcatBaseTest {
public void testBug45451() throws Exception {
getTomcatInstanceTestWebapp(false, true);
- ByteChunk res = getUrl("http://localhost:" + getPort() +
- "/test/bug45nnn/bug45451a.jsp");
+ ByteChunk res = getUrl("http://localhost:" + getPort() + "/test/bug45nnn/bug45451a.jsp");
String result = res.toString();
// Warning: JSP attribute escaping != Java String escaping
@@ -131,7 +128,7 @@ public class TestELInJsp extends TomcatBaseTest {
result = res.toString();
// Warning: JSP attribute escaping != Java String escaping
// Warning: Attributes are always unescaped before passing to the EL
- // processor
+ // processor
assertEcho(result, "00-2");
assertEcho(result, "01-${1+1}");
assertEcho(result, "02-\\${1+1}");
@@ -160,7 +157,7 @@ public class TestELInJsp extends TomcatBaseTest {
result = res.toString();
// Warning: JSP attribute escaping != Java String escaping
// TODO - Currently we allow a single unescaped \ in attribute values
- // Review if this should cause a warning/error
+ // Review if this should cause a warning/error
assertEcho(result, "00-${1+1}");
assertEcho(result, "01-\\${1+1}");
assertEcho(result, "02-\\\\${1+1}");
@@ -203,7 +200,7 @@ public class TestELInJsp extends TomcatBaseTest {
result = res.toString();
// Warning: JSP attribute escaping != Java String escaping
// Warning: Attributes are always unescaped before passing to the EL
- // processor
+ // processor
assertEcho(result, "00-2");
assertEcho(result, "01-${1+1}");
assertEcho(result, "02-\\${1+1}");
@@ -226,8 +223,7 @@ public class TestELInJsp extends TomcatBaseTest {
public void testBug45511() throws Exception {
getTomcatInstanceTestWebapp(false, true);
- ByteChunk res = getUrl("http://localhost:" + getPort() +
- "/test/bug45nnn/bug45511.jsp");
+ ByteChunk res = getUrl("http://localhost:" + getPort() + "/test/bug45nnn/bug45511.jsp");
String result = res.toString();
assertEcho(result, "00-true");
@@ -268,8 +264,7 @@ public class TestELInJsp extends TomcatBaseTest {
public void testBug48112() throws Exception {
getTomcatInstanceTestWebapp(false, true);
- ByteChunk res = getUrl("http://localhost:" + getPort() +
- "/test/bug48nnn/bug48112.jsp");
+ ByteChunk res = getUrl("http://localhost:" + getPort() + "/test/bug48nnn/bug48112.jsp");
String result = res.toString();
assertEcho(result, "{OK}");
}
@@ -288,8 +283,7 @@ public class TestELInJsp extends TomcatBaseTest {
public void testBug51544() throws Exception {
getTomcatInstanceTestWebapp(false, true);
- ByteChunk res = getUrl("http://localhost:" + getPort() +
- "/test/bug5nnnn/bug51544.jsp");
+ ByteChunk res = getUrl("http://localhost:" + getPort() + "/test/bug5nnnn/bug51544.jsp");
String result = res.toString();
assertEcho(result, "Empty list: true");
@@ -311,8 +305,7 @@ public class TestELInJsp extends TomcatBaseTest {
// Create the context (don't use addWebapp as we want to modify the
// JSP Servlet settings).
File appDir = new File("test/webapp");
- StandardContext ctxt = (StandardContext) tomcat.addContext(
- null, "/test", appDir.getAbsolutePath());
+ StandardContext ctxt = (StandardContext) tomcat.addContext(null, "/test", appDir.getAbsolutePath());
ctxt.addServletContainerInitializer(new JasperInitializer(), null);
@@ -398,8 +391,7 @@ public class TestELInJsp extends TomcatBaseTest {
public void testBug56029() throws Exception {
getTomcatInstanceTestWebapp(true, true);
- ByteChunk res = getUrl("http://localhost:" + getPort() +
- "/test/bug5nnnn/bug56029.jspx");
+ ByteChunk res = getUrl("http://localhost:" + getPort() + "/test/bug5nnnn/bug56029.jspx");
String result = res.toString();
@@ -411,8 +403,7 @@ public class TestELInJsp extends TomcatBaseTest {
public void testBug56147() throws Exception {
getTomcatInstanceTestWebapp(true, true);
- ByteChunk res = getUrl("http://localhost:" + getPort() +
- "/test/bug5nnnn/bug56147.jsp");
+ ByteChunk res = getUrl("http://localhost:" + getPort() + "/test/bug5nnnn/bug56147.jsp");
String result = res.toString();
assertEcho(result, "00-OK");
@@ -423,8 +414,7 @@ public class TestELInJsp extends TomcatBaseTest {
public void testBug56612() throws Exception {
getTomcatInstanceTestWebapp(false, true);
- ByteChunk res = getUrl("http://localhost:" + getPort() +
- "/test/bug5nnnn/bug56612.jsp");
+ ByteChunk res = getUrl("http://localhost:" + getPort() + "/test/bug5nnnn/bug56612.jsp");
String result = res.toString();
Assert.assertTrue(result.contains("00-''"));
@@ -438,8 +428,7 @@ public class TestELInJsp extends TomcatBaseTest {
public void testBug57141() throws Exception {
getTomcatInstanceTestWebapp(false, true);
- ByteChunk res = getUrl("http://localhost:" + getPort() +
- "/test/bug5nnnn/bug57141.jsp");
+ ByteChunk res = getUrl("http://localhost:" + getPort() + "/test/bug5nnnn/bug57141.jsp");
String result = res.toString();
assertEcho(result, "00-true");
@@ -449,16 +438,14 @@ public class TestELInJsp extends TomcatBaseTest {
/*
- * BZ https://bz.apache.org/bugzilla/show_bug.cgi?id=57142
- * javax.servlet, javax.servlet.http and javax.servlet.jsp should be
- * imported by default.
+ * BZ https://bz.apache.org/bugzilla/show_bug.cgi?id=57142 javax.servlet, javax.servlet.http and javax.servlet.jsp
+ * should be imported by default.
*/
@Test
public void testBug57142() throws Exception {
getTomcatInstanceTestWebapp(false, true);
- ByteChunk res = getUrl("http://localhost:" + getPort() +
- "/test/bug5nnnn/bug57142.jsp");
+ ByteChunk res = getUrl("http://localhost:" + getPort() + "/test/bug5nnnn/bug57142.jsp");
String result = res.toString();
// javax.servlet
@@ -474,15 +461,14 @@ public class TestELInJsp extends TomcatBaseTest {
/*
- * BZ https://bz.apache.org/bugzilla/show_bug.cgi?id=57441
- * Can't validate function names defined in lambdas (or via imports)
+ * BZ https://bz.apache.org/bugzilla/show_bug.cgi?id=57441 Can't validate function names defined in lambdas (or via
+ * imports)
*/
@Test
public void testBug57441() throws Exception {
getTomcatInstanceTestWebapp(false, true);
- ByteChunk res = getUrl("http://localhost:" + getPort() +
- "/test/bug5nnnn/bug57441.jsp");
+ ByteChunk res = getUrl("http://localhost:" + getPort() + "/test/bug5nnnn/bug57441.jsp");
String result = res.toString();
assertEcho(result, "00-11");
@@ -513,7 +499,7 @@ public class TestELInJsp extends TomcatBaseTest {
@Test
public void testBug61854a() throws Exception {
- getTomcatInstanceTestWebapp(true, true);
+ getTomcatInstanceTestWebapp(true, true);
ByteChunk res = getUrl("http://localhost:" + getPort() + "/test/bug6nnnn/bug61854.jsp");
String result = res.toString();
diff --git a/test/org/apache/el/TestMethodExpressionImpl.java b/test/org/apache/el/TestMethodExpressionImpl.java
index 97aceaf315..4a944843fe 100644
--- a/test/org/apache/el/TestMethodExpressionImpl.java
+++ b/test/org/apache/el/TestMethodExpressionImpl.java
@@ -47,37 +47,30 @@ public class TestMethodExpressionImpl {
TesterBeanA beanA = new TesterBeanA();
beanA.setName("A");
- context.getVariableMapper().setVariable("beanA",
- factory.createValueExpression(beanA, TesterBeanA.class));
+ context.getVariableMapper().setVariable("beanA", factory.createValueExpression(beanA, TesterBeanA.class));
TesterBeanAA beanAA = new TesterBeanAA();
beanAA.setName("AA");
- context.getVariableMapper().setVariable("beanAA",
- factory.createValueExpression(beanAA, TesterBeanAA.class));
+ context.getVariableMapper().setVariable("beanAA", factory.createValueExpression(beanAA, TesterBeanAA.class));
TesterBeanAAA beanAAA = new TesterBeanAAA();
beanAAA.setName("AAA");
- context.getVariableMapper().setVariable("beanAAA",
- factory.createValueExpression(beanAAA, TesterBeanAAA.class));
+ context.getVariableMapper().setVariable("beanAAA", factory.createValueExpression(beanAAA, TesterBeanAAA.class));
beanB = new TesterBeanB();
beanB.setName("B");
- context.getVariableMapper().setVariable("beanB",
- factory.createValueExpression(beanB, TesterBeanB.class));
+ context.getVariableMapper().setVariable("beanB", factory.createValueExpression(beanB, TesterBeanB.class));
TesterBeanBB beanBB = new TesterBeanBB();
beanBB.setName("BB");
- context.getVariableMapper().setVariable("beanBB",
- factory.createValueExpression(beanBB, TesterBeanBB.class));
+ context.getVariableMapper().setVariable("beanBB", factory.createValueExpression(beanBB, TesterBeanBB.class));
TesterBeanBBB beanBBB = new TesterBeanBBB();
beanBBB.setName("BBB");
- context.getVariableMapper().setVariable("beanBBB",
- factory.createValueExpression(beanBBB, TesterBeanBBB.class));
+ context.getVariableMapper().setVariable("beanBBB", factory.createValueExpression(beanBBB, TesterBeanBBB.class));
TesterBeanC beanC = new TesterBeanC();
- context.getVariableMapper().setVariable("beanC",
- factory.createValueExpression(beanC, TesterBeanC.class));
+ context.getVariableMapper().setVariable("beanC", factory.createValueExpression(beanC, TesterBeanC.class));
TesterBeanEnum beanEnum = new TesterBeanEnum();
context.getVariableMapper().setVariable("beanEnum",
@@ -86,10 +79,9 @@ public class TestMethodExpressionImpl {
@Test
public void testIsParametersProvided() {
- MethodExpression me1 = factory.createMethodExpression(
- context, "${beanB.getName}", String.class, new Class<?>[] {});
- MethodExpression me2 = factory.createMethodExpression(
- context, "${beanB.sayHello('JUnit')}", String.class,
+ MethodExpression me1 = factory.createMethodExpression(context, "${beanB.getName}", String.class,
+ new Class<?>[] {});
+ MethodExpression me2 = factory.createMethodExpression(context, "${beanB.sayHello('JUnit')}", String.class,
new Class<?>[] { String.class });
Assert.assertFalse(me1.isParametersProvided());
@@ -98,101 +90,86 @@ public class TestMethodExpressionImpl {
@Test
public void testInvoke() {
- MethodExpression me1 = factory.createMethodExpression(
- context, "${beanB.getName}", String.class, new Class<?>[] {});
- MethodExpression me2 = factory.createMethodExpression(
- context, "${beanB.sayHello('JUnit')}", String.class,
+ MethodExpression me1 = factory.createMethodExpression(context, "${beanB.getName}", String.class,
+ new Class<?>[] {});
+ MethodExpression me2 = factory.createMethodExpression(context, "${beanB.sayHello('JUnit')}", String.class,
new Class<?>[] { String.class });
- MethodExpression me3 = factory.createMethodExpression(
- context, "${beanB.sayHello}", String.class,
+ MethodExpression me3 = factory.createMethodExpression(context, "${beanB.sayHello}", String.class,
new Class<?>[] { String.class });
Assert.assertEquals("B", me1.invoke(context, null));
Assert.assertEquals("Hello JUnit from B", me2.invoke(context, null));
- Assert.assertEquals("Hello JUnit from B",
- me2.invoke(context, new Object[] { "JUnit2" }));
- Assert.assertEquals("Hello JUnit2 from B",
- me3.invoke(context, new Object[] { "JUnit2" }));
- Assert.assertEquals("Hello JUnit from B",
- me2.invoke(context, new Object[] { null }));
- Assert.assertEquals("Hello from B",
- me3.invoke(context, new Object[] { null }));
+ Assert.assertEquals("Hello JUnit from B", me2.invoke(context, new Object[] { "JUnit2" }));
+ Assert.assertEquals("Hello JUnit2 from B", me3.invoke(context, new Object[] { "JUnit2" }));
+ Assert.assertEquals("Hello JUnit from B", me2.invoke(context, new Object[] { null }));
+ Assert.assertEquals("Hello from B", me3.invoke(context, new Object[] { null }));
}
@Test
public void testInvokeWithSuper() {
- MethodExpression me = factory.createMethodExpression(context,
- "${beanA.setBean(beanBB)}", null ,
+ MethodExpression me = factory.createMethodExpression(context, "${beanA.setBean(beanBB)}", null,
new Class<?>[] { TesterBeanB.class });
me.invoke(context, null);
- ValueExpression ve = factory.createValueExpression(context,
- "${beanA.bean.name}", String.class);
+ ValueExpression ve = factory.createValueExpression(context, "${beanA.bean.name}", String.class);
Object r = ve.getValue(context);
Assert.assertEquals("BB", r);
}
@Test
public void testInvokeWithSuperABNoReturnTypeNoParamTypes() {
- MethodExpression me2 = factory.createMethodExpression(context,
- "${beanC.sayHello(beanA,beanB)}", null , null);
+ MethodExpression me2 = factory.createMethodExpression(context, "${beanC.sayHello(beanA,beanB)}", null, null);
Object r2 = me2.invoke(context, null);
Assert.assertEquals("AB: Hello A from B", r2.toString());
}
@Test
public void testInvokeWithSuperABReturnTypeNoParamTypes() {
- MethodExpression me3 = factory.createMethodExpression(context,
- "${beanC.sayHello(beanA,beanB)}", String.class , null);
+ MethodExpression me3 = factory.createMethodExpression(context, "${beanC.sayHello(beanA,beanB)}", String.class,
+ null);
Object r3 = me3.invoke(context, null);
Assert.assertEquals("AB: Hello A from B", r3.toString());
}
@Test
public void testInvokeWithSuperABNoReturnTypeParamTypes() {
- MethodExpression me4 = factory.createMethodExpression(context,
- "${beanC.sayHello(beanA,beanB)}", null ,
- new Class<?>[] {TesterBeanA.class, TesterBeanB.class});
+ MethodExpression me4 = factory.createMethodExpression(context, "${beanC.sayHello(beanA,beanB)}", null,
+ new Class<?>[] { TesterBeanA.class, TesterBeanB.class });
Object r4 = me4.invoke(context, null);
Assert.assertEquals("AB: Hello A from B", r4.toString());
}
@Test
public void testInvokeWithSuperABReturnTypeParamTypes() {
- MethodExpression me5 = factory.createMethodExpression(context,
- "${beanC.sayHello(beanA,beanB)}", String.class ,
- new Class<?>[] {TesterBeanA.class, TesterBeanB.class});
+ MethodExpression me5 = factory.createMethodExpression(context, "${beanC.sayHello(beanA,beanB)}", String.class,
+ new Class<?>[] { TesterBeanA.class, TesterBeanB.class });
Object r5 = me5.invoke(context, null);
Assert.assertEquals("AB: Hello A from B", r5.toString());
}
@Test
public void testInvokeWithSuperABB() {
- MethodExpression me6 = factory.createMethodExpression(context,
- "${beanC.sayHello(beanA,beanBB)}", null , null);
+ MethodExpression me6 = factory.createMethodExpression(context, "${beanC.sayHello(beanA,beanBB)}", null, null);
Object r6 = me6.invoke(context, null);
Assert.assertEquals("ABB: Hello A from BB", r6.toString());
}
@Test
public void testInvokeWithSuperABBB() {
- MethodExpression me7 = factory.createMethodExpression(context,
- "${beanC.sayHello(beanA,beanBBB)}", null , null);
+ MethodExpression me7 = factory.createMethodExpression(context, "${beanC.sayHello(beanA,beanBBB)}", null, null);
Object r7 = me7.invoke(context, null);
Assert.assertEquals("ABB: Hello A from BBB", r7.toString());
}
@Test
public void testInvokeWithSuperAAB() {
- MethodExpression me8 = factory.createMethodExpression(context,
- "${beanC.sayHello(beanAA,beanB)}", null , null);
+ MethodExpression me8 = factory.createMethodExpression(context, "${beanC.sayHello(beanAA,beanB)}", null, null);
Object r8 = me8.invoke(context, null);
Assert.assertEquals("AAB: Hello AA from B", r8.toString());
}
@Test
public void testInvokeWithSuperAABB() {
- MethodExpression me9 = factory.createMethodExpression(context,
- "${beanC.sayHello(beanAA,beanBB)}", null , null);
+ MethodExpression me9 = factory.createMethodExpression(context, "${beanC.sayHello(beanAA,beanBB)}", null, null);
Exception e = null;
try {
me9.invoke(context, null);
@@ -208,16 +185,15 @@ public class TestMethodExpressionImpl {
// The Java compiler reports this as ambiguous. Using the parameter that
// matches exactly seems reasonable to limit the scope of the method
// search so the EL will find a match.
- MethodExpression me10 = factory.createMethodExpression(context,
- "${beanC.sayHello(beanAA,beanBBB)}", null , null);
+ MethodExpression me10 = factory.createMethodExpression(context, "${beanC.sayHello(beanAA,beanBBB)}", null,
+ null);
Object r10 = me10.invoke(context, null);
Assert.assertEquals("AAB: Hello AA from BBB", r10.toString());
}
@Test
public void testInvokeWithSuperAAAB() {
- MethodExpression me11 = factory.createMethodExpression(context,
- "${beanC.sayHello(beanAAA,beanB)}", null , null);
+ MethodExpression me11 = factory.createMethodExpression(context, "${beanC.sayHello(beanAAA,beanB)}", null, null);
Object r11 = me11.invoke(context, null);
Assert.assertEquals("AAB: Hello AAA from B", r11.toString());
}
@@ -227,16 +203,16 @@ public class TestMethodExpressionImpl {
// The Java compiler reports this as ambiguous. Using the parameter that
// matches exactly seems reasonable to limit the scope of the method
// search so the EL will find a match.
- MethodExpression me12 = factory.createMethodExpression(context,
- "${beanC.sayHello(beanAAA,beanBB)}", null , null);
+ MethodExpression me12 = factory.createMethodExpression(context, "${beanC.sayHello(beanAAA,beanBB)}", null,
+ null);
Object r12 = me12.invoke(context, null);
Assert.assertEquals("ABB: Hello AAA from BB", r12.toString());
}
@Test
public void testInvokeWithSuperAAABBB() {
- MethodExpression me13 = factory.createMethodExpression(context,
- "${beanC.sayHello(beanAAA,beanBBB)}", null , null);
+ MethodExpression me13 = factory.createMethodExpression(context, "${beanC.sayHello(beanAAA,beanBBB)}", null,
+ null);
Exception e = null;
try {
me13.invoke(context, null);
@@ -249,8 +225,8 @@ public class TestMethodExpressionImpl {
@Test
public void testInvokeWithVarArgsAB() throws Exception {
- MethodExpression me1 = factory.createMethodExpression(context,
- "${beanC.sayHello(beanA,beanB,beanB)}", null , null);
+ MethodExpression me1 = factory.createMethodExpression(context, "${beanC.sayHello(beanA,beanB,beanB)}", null,
+ null);
Exception e = null;
try {
me1.invoke(context, null);
@@ -263,24 +239,24 @@ public class TestMethodExpressionImpl {
@Test
public void testInvokeWithVarArgsABB() throws Exception {
- MethodExpression me2 = factory.createMethodExpression(context,
- "${beanC.sayHello(beanA,beanBB,beanBB)}", null , null);
+ MethodExpression me2 = factory.createMethodExpression(context, "${beanC.sayHello(beanA,beanBB,beanBB)}", null,
+ null);
Object r2 = me2.invoke(context, null);
Assert.assertEquals("ABB[]: Hello A from BB, BB", r2.toString());
}
@Test
public void testInvokeWithVarArgsABBB() throws Exception {
- MethodExpression me3 = factory.createMethodExpression(context,
- "${beanC.sayHello(beanA,beanBBB,beanBBB)}", null , null);
+ MethodExpression me3 = factory.createMethodExpression(context, "${beanC.sayHello(beanA,beanBBB,beanBBB)}", null,
+ null);
Object r3 = me3.invoke(context, null);
Assert.assertEquals("ABB[]: Hello A from BBB, BBB", r3.toString());
}
@Test
public void testInvokeWithVarArgsAAB() throws Exception {
- MethodExpression me4 = factory.createMethodExpression(context,
- "${beanC.sayHello(beanAA,beanB,beanB)}", null , null);
+ MethodExpression me4 = factory.createMethodExpression(context, "${beanC.sayHello(beanAA,beanB,beanB)}", null,
+ null);
Exception e = null;
try {
me4.invoke(context, null);
@@ -293,24 +269,24 @@ public class TestMethodExpressionImpl {
@Test
public void testInvokeWithVarArgsAABB() throws Exception {
- MethodExpression me5 = factory.createMethodExpression(context,
- "${beanC.sayHello(beanAA,beanBB,beanBB)}", null , null);
+ MethodExpression me5 = factory.createMethodExpression(context, "${beanC.sayHello(beanAA,beanBB,beanBB)}", null,
+ null);
Object r5 = me5.invoke(context, null);
Assert.assertEquals("ABB[]: Hello AA from BB, BB", r5.toString());
}
@Test
public void testInvokeWithVarArgsAABBB() throws Exception {
- MethodExpression me6 = factory.createMethodExpression(context,
- "${beanC.sayHello(beanAA,beanBBB,beanBBB)}", null , null);
+ MethodExpression me6 = factory.createMethodExpression(context, "${beanC.sayHello(beanAA,beanBBB,beanBBB)}",
+ null, null);
Object r6 = me6.invoke(context, null);
Assert.assertEquals("ABB[]: Hello AA from BBB, BBB", r6.toString());
}
@Test
public void testInvokeWithVarArgsAAAB() throws Exception {
- MethodExpression me7 = factory.createMethodExpression(context,
- "${beanC.sayHello(beanAAA,beanB,beanB)}", null , null);
+ MethodExpression me7 = factory.createMethodExpression(context, "${beanC.sayHello(beanAAA,beanB,beanB)}", null,
+ null);
Exception e = null;
try {
me7.invoke(context, null);
@@ -323,100 +299,89 @@ public class TestMethodExpressionImpl {
@Test
public void testInvokeWithVarArgsAAABB() throws Exception {
- MethodExpression me8 = factory.createMethodExpression(context,
- "${beanC.sayHello(beanAAA,beanBB,beanBB)}", null , null);
+ MethodExpression me8 = factory.createMethodExpression(context, "${beanC.sayHello(beanAAA,beanBB,beanBB)}", null,
+ null);
Object r8 = me8.invoke(context, null);
Assert.assertEquals("ABB[]: Hello AAA from BB, BB", r8.toString());
}
@Test
public void testInvokeWithVarArgsAAABBB() throws Exception {
- MethodExpression me9 = factory.createMethodExpression(context,
- "${beanC.sayHello(beanAAA,beanBBB,beanBBB)}", null , null);
+ MethodExpression me9 = factory.createMethodExpression(context, "${beanC.sayHello(beanAAA,beanBBB,beanBBB)}",
+ null, null);
Object r9 = me9.invoke(context, null);
Assert.assertEquals("ABB[]: Hello AAA from BBB, BBB", r9.toString());
}
/*
- * This is also tested implicitly in numerous places elsewhere in this
- * class.
+ * This is also tested implicitly in numerous places elsewhere in this class.
*/
@Test
public void testBug49655() throws Exception {
// This is the call the failed
- MethodExpression me = factory.createMethodExpression(context,
- "#{beanA.setName('New value')}", null, null);
+ MethodExpression me = factory.createMethodExpression(context, "#{beanA.setName('New value')}", null, null);
// The rest is to check it worked correctly
me.invoke(context, null);
- ValueExpression ve = factory.createValueExpression(context,
- "#{beanA.name}", java.lang.String.class);
+ ValueExpression ve = factory.createValueExpression(context, "#{beanA.name}", java.lang.String.class);
Assert.assertEquals("New value", ve.getValue(context));
}
@Test
public void testBugPrimitives() throws Exception {
- MethodExpression me = factory.createMethodExpression(context,
- "${beanA.setValLong(5)}", null, null);
+ MethodExpression me = factory.createMethodExpression(context, "${beanA.setValLong(5)}", null, null);
me.invoke(context, null);
- ValueExpression ve = factory.createValueExpression(context,
- "#{beanA.valLong}", java.lang.String.class);
+ ValueExpression ve = factory.createValueExpression(context, "#{beanA.valLong}", java.lang.String.class);
Assert.assertEquals("5", ve.getValue(context));
}
@Test
public void testBug50449a() throws Exception {
- MethodExpression me1 = factory.createMethodExpression(context,
- "${beanB.sayHello()}", null, null);
+ MethodExpression me1 = factory.createMethodExpression(context, "${beanB.sayHello()}", null, null);
String actual = (String) me1.invoke(context, null);
Assert.assertEquals("Hello from B", actual);
}
@Test
public void testBug50449b() throws Exception {
- MethodExpression me1 = factory.createMethodExpression(context,
- "${beanB.sayHello('Tomcat')}", null, null);
+ MethodExpression me1 = factory.createMethodExpression(context, "${beanB.sayHello('Tomcat')}", null, null);
String actual = (String) me1.invoke(context, null);
Assert.assertEquals("Hello Tomcat from B", actual);
}
@Test
public void testBug50790a() throws Exception {
- ValueExpression ve = factory.createValueExpression(context,
- "#{beanAA.name.contains(beanA.name)}", java.lang.Boolean.class);
+ ValueExpression ve = factory.createValueExpression(context, "#{beanAA.name.contains(beanA.name)}",
+ java.lang.Boolean.class);
Boolean actual = (Boolean) ve.getValue(context);
Assert.assertEquals(Boolean.TRUE, actual);
}
@Test
public void testBug50790b() throws Exception {
- ValueExpression ve = factory.createValueExpression(context,
- "#{beanA.name.contains(beanAA.name)}", java.lang.Boolean.class);
+ ValueExpression ve = factory.createValueExpression(context, "#{beanA.name.contains(beanAA.name)}",
+ java.lang.Boolean.class);
Boolean actual = (Boolean) ve.getValue(context);
Assert.assertEquals(Boolean.FALSE, actual);
}
@Test
public void testBug52445a() {
- MethodExpression me = factory.createMethodExpression(context,
- "${beanA.setBean(beanBB)}", null ,
+ MethodExpression me = factory.createMethodExpression(context, "${beanA.setBean(beanBB)}", null,
new Class<?>[] { TesterBeanB.class });
me.invoke(context, null);
- MethodExpression me1 = factory.createMethodExpression(context,
- "${beanA.bean.sayHello()}", null, null);
+ MethodExpression me1 = factory.createMethodExpression(context, "${beanA.bean.sayHello()}", null, null);
String actual = (String) me1.invoke(context, null);
Assert.assertEquals("Hello from BB", actual);
}
@Test
public void testBug52970() {
- MethodExpression me = factory.createMethodExpression(context,
- "${beanEnum.submit('APPLE')}", null ,
+ MethodExpression me = factory.createMethodExpression(context, "${beanEnum.submit('APPLE')}", null,
new Class<?>[] { TesterBeanEnum.class });
me.invoke(context, null);
- ValueExpression ve = factory.createValueExpression(context,
- "#{beanEnum.lastSubmitted}", TesterEnum.class);
+ ValueExpression ve = factory.createValueExpression(context, "#{beanEnum.lastSubmitted}", TesterEnum.class);
TesterEnum actual = (TesterEnum) ve.getValue(context);
Assert.assertEquals(TesterEnum.APPLE, actual);
@@ -424,34 +389,29 @@ public class TestMethodExpressionImpl {
@Test
public void testBug53792a() {
- MethodExpression me = factory.createMethodExpression(context,
- "${beanA.setBean(beanB)}", null ,
+ MethodExpression me = factory.createMethodExpression(context, "${beanA.setBean(beanB)}", null,
new Class<?>[] { TesterBeanB.class });
me.invoke(context, null);
- me = factory.createMethodExpression(context,
- "${beanB.setName('" + BUG53792 + "')}", null ,
+ me = factory.createMethodExpression(context, "${beanB.setName('" + BUG53792 + "')}", null,
new Class<?>[] { TesterBeanB.class });
me.invoke(context, null);
- ValueExpression ve = factory.createValueExpression(context,
- "#{beanA.getBean().name}", java.lang.String.class);
+ ValueExpression ve = factory.createValueExpression(context, "#{beanA.getBean().name}", java.lang.String.class);
String actual = (String) ve.getValue(context);
Assert.assertEquals(BUG53792, actual);
}
@Test
public void testBug53792b() {
- MethodExpression me = factory.createMethodExpression(context,
- "${beanA.setBean(beanB)}", null ,
+ MethodExpression me = factory.createMethodExpression(context, "${beanA.setBean(beanB)}", null,
new Class<?>[] { TesterBeanB.class });
me.invoke(context, null);
- me = factory.createMethodExpression(context,
- "${beanB.setName('" + BUG53792 + "')}", null ,
+ me = factory.createMethodExpression(context, "${beanB.setName('" + BUG53792 + "')}", null,
new Class<?>[] { TesterBeanB.class });
me.invoke(context, null);
- ValueExpression ve = factory.createValueExpression(context,
- "#{beanA.getBean().name.length()}", java.lang.Integer.class);
+ ValueExpression ve = factory.createValueExpression(context, "#{beanA.getBean().name.length()}",
+ java.lang.Integer.class);
Integer actual = (Integer) ve.getValue(context);
Assert.assertEquals(Integer.valueOf(BUG53792.length()), actual);
}
@@ -459,8 +419,8 @@ public class TestMethodExpressionImpl {
@Test
public void testBug53792c() {
- MethodExpression me = factory.createMethodExpression(context,
- "#{beanB.sayHello().length()}", null, new Class<?>[] {});
+ MethodExpression me = factory.createMethodExpression(context, "#{beanB.sayHello().length()}", null,
+ new Class<?>[] {});
Integer result = (Integer) me.invoke(context, null);
Assert.assertEquals(beanB.sayHello().length(), result.intValue());
}
@@ -468,8 +428,8 @@ public class TestMethodExpressionImpl {
@Test
public void testBug53792d() {
- MethodExpression me = factory.createMethodExpression(context,
- "#{beanB.sayHello().length()}", null, new Class<?>[] {});
+ MethodExpression me = factory.createMethodExpression(context, "#{beanB.sayHello().length()}", null,
+ new Class<?>[] {});
Integer result = (Integer) me.invoke(context, new Object[] { "foo" });
Assert.assertEquals(beanB.sayHello().length(), result.intValue());
}
@@ -477,8 +437,7 @@ public class TestMethodExpressionImpl {
@Test
public void testBug56797a() {
- MethodExpression me = factory.createMethodExpression(context,
- "${beanAA.echo1('Hello World!')}", null , null);
+ MethodExpression me = factory.createMethodExpression(context, "${beanAA.echo1('Hello World!')}", null, null);
Object r = me.invoke(context, null);
Assert.assertEquals("AA1Hello World!", r.toString());
}
@@ -486,57 +445,56 @@ public class TestMethodExpressionImpl {
@Test
public void testBug56797b() {
- MethodExpression me = factory.createMethodExpression(context,
- "${beanAA.echo2('Hello World!')}", null , null);
+ MethodExpression me = factory.createMethodExpression(context, "${beanAA.echo2('Hello World!')}", null, null);
Object r = me.invoke(context, null);
Assert.assertEquals("AA2Hello World!", r.toString());
}
- @Test(expected=MethodNotFoundException.class)
+ @Test(expected = MethodNotFoundException.class)
public void testBug57855a() {
- MethodExpression me = factory.createMethodExpression(context,
- "${beanAA.echo2}", null , new Class[]{String.class});
+ MethodExpression me = factory.createMethodExpression(context, "${beanAA.echo2}", null,
+ new Class[] { String.class });
me.invoke(context, new Object[0]);
}
- @Test(expected=IllegalArgumentException.class)
+ @Test(expected = IllegalArgumentException.class)
public void testBug57855b() {
- MethodExpression me = factory.createMethodExpression(context,
- "${beanAA.echo2}", null , new Class[]{String.class});
+ MethodExpression me = factory.createMethodExpression(context, "${beanAA.echo2}", null,
+ new Class[] { String.class });
me.invoke(context, null);
}
@Test
public void testBug57855c() {
- MethodExpression me = factory.createMethodExpression(context,
- "${beanB.echo}", null , new Class[]{String.class});
+ MethodExpression me = factory.createMethodExpression(context, "${beanB.echo}", null,
+ new Class[] { String.class });
me.invoke(context, null);
}
@Test
public void testBug57855d() {
- MethodExpression me = factory.createMethodExpression(context,
- "${beanB.echo}", null , new Class[]{String.class});
+ MethodExpression me = factory.createMethodExpression(context, "${beanB.echo}", null,
+ new Class[] { String.class });
Object r = me.invoke(context, new String[] { "aaa" });
Assert.assertEquals("aaa", r.toString());
}
- @Test(expected=MethodNotFoundException.class)
+ @Test(expected = MethodNotFoundException.class)
public void testBug57855e() {
- MethodExpression me = factory.createMethodExpression(context,
- "${beanB.echo}", null , new Class[]{String.class});
+ MethodExpression me = factory.createMethodExpression(context, "${beanB.echo}", null,
+ new Class[] { String.class });
Object r = me.invoke(context, new String[] { "aaa", "bbb" });
Assert.assertEquals("aaa, bbb", r.toString());
}
- @Test(expected=IllegalArgumentException.class)
+ @Test(expected = IllegalArgumentException.class)
public void testBug60844() {
- MethodExpression me2 = factory.createMethodExpression(context,
- "${beanC.sayHello}", null , new Class[]{ TesterBeanA.class, TesterBeanB.class});
+ MethodExpression me2 = factory.createMethodExpression(context, "${beanC.sayHello}", null,
+ new Class[] { TesterBeanA.class, TesterBeanB.class });
me2.invoke(context, new Object[] { new Object() });
}
@@ -603,7 +561,7 @@ public class TestMethodExpressionImpl {
}
- private void doTestVarArgsBeanF(String expression, Function<TesterBeanF,String> func) {
+ private void doTestVarArgsBeanF(String expression, Function<TesterBeanF, String> func) {
ELProcessor elp = new ELProcessor();
elp.defineBean("apple", TesterEnum.APPLE);
elp.defineBean("beanF", new TesterBeanF());
@@ -673,7 +631,7 @@ public class TestMethodExpressionImpl {
}
- private void doTestVarArgsBeanG(String expression, Function<TesterBeanG,String> func) {
+ private void doTestVarArgsBeanG(String expression, Function<TesterBeanG, String> func) {
ELProcessor elp = new ELProcessor();
elp.defineBean("apple", TesterEnum.APPLE);
elp.defineBean("beanG", new TesterBeanG());
@@ -742,7 +700,7 @@ public class TestMethodExpressionImpl {
}
- private void doTestVarArgsBeanH(String expression, Function<TesterBeanH,String> func) {
+ private void doTestVarArgsBeanH(String expression, Function<TesterBeanH, String> func) {
ELProcessor elp = new ELProcessor();
elp.defineBean("apple", TesterEnum.APPLE);
elp.defineBean("beanH", new TesterBeanH());
@@ -766,8 +724,7 @@ public class TestMethodExpressionImpl {
@Test
public void testGetMethodInfo01() throws Exception {
- MethodExpression me = factory.createMethodExpression(context,
- "#{beanA.setName('New value')}", null, null);
+ MethodExpression me = factory.createMethodExpression(context, "#{beanA.setName('New value')}", null, null);
// This is the call that failed
MethodInfo mi = me.getMethodInfo(context);
// The rest is to check it worked correctly
@@ -779,8 +736,8 @@ public class TestMethodExpressionImpl {
@Test
public void testGetMethodInfo02() throws Exception {
- MethodExpression me = factory.createMethodExpression(context,
- "#{beanA.setName}", null, new Class[] { String.class } );
+ MethodExpression me = factory.createMethodExpression(context, "#{beanA.setName}", null,
+ new Class[] { String.class });
// This is the call that failed
MethodInfo mi = me.getMethodInfo(context);
// The rest is to check it worked correctly
diff --git a/test/org/apache/el/TestValueExpressionImpl.java b/test/org/apache/el/TestValueExpressionImpl.java
index f0dac49a88..bebaa32ba3 100644
--- a/test/org/apache/el/TestValueExpressionImpl.java
+++ b/test/org/apache/el/TestValueExpressionImpl.java
@@ -41,12 +41,10 @@ public class TestValueExpressionImpl {
TesterBeanB beanB = new TesterBeanB();
beanB.setName("Tomcat");
- ValueExpression var =
- factory.createValueExpression(beanB, TesterBeanB.class);
+ ValueExpression var = factory.createValueExpression(beanB, TesterBeanB.class);
context.getVariableMapper().setVariable("beanB", var);
- ValueExpression ve = factory.createValueExpression(
- context, "${beanB.name}", String.class);
+ ValueExpression ve = factory.createValueExpression(context, "${beanB.name}", String.class);
// First check the basics work
String result = (String) ve.getValue(context);
@@ -67,17 +65,14 @@ public class TestValueExpressionImpl {
TesterBeanB beanB = new TesterBeanB();
beanB.setName("Tomcat");
- ValueExpression var =
- factory.createValueExpression(beanB, TesterBeanB.class);
+ ValueExpression var = factory.createValueExpression(beanB, TesterBeanB.class);
context.getVariableMapper().setVariable("beanB", var);
- ValueExpression var2 = factory.createValueExpression(
- context, "${beanB.name}", String.class);
+ ValueExpression var2 = factory.createValueExpression(context, "${beanB.name}", String.class);
context.getVariableMapper().setVariable("foo", var2);
- ValueExpression ve = factory.createValueExpression(
- context, "${foo}", ValueExpression.class);
+ ValueExpression ve = factory.createValueExpression(context, "${foo}", ValueExpression.class);
// Now check the value reference
@@ -98,12 +93,10 @@ public class TestValueExpressionImpl {
beanB.setName("Tomcat");
beanA.setBean(beanB);
- ValueExpression var =
- factory.createValueExpression(beanA, TesterBeanA.class);
+ ValueExpression var = factory.createValueExpression(beanA, TesterBeanA.class);
context.getVariableMapper().setVariable("beanA", var);
- ValueExpression ve = factory.createValueExpression(
- context, "${beanA.bean.name}", String.class);
+ ValueExpression ve = factory.createValueExpression(context, "${beanA.bean.name}", String.class);
// First check the basics work
String result = (String) ve.getValue(context);
@@ -124,18 +117,15 @@ public class TestValueExpressionImpl {
TesterEnum testEnum = TesterEnum.APPLE;
- ValueExpression var =
- factory.createValueExpression(testEnum, TesterEnum.class);
+ ValueExpression var = factory.createValueExpression(testEnum, TesterEnum.class);
context.getVariableMapper().setVariable("testEnum", var);
// When coercing an Enum to a String, name() should always be used.
- ValueExpression ve1 = factory.createValueExpression(
- context, "${testEnum}", String.class);
+ ValueExpression ve1 = factory.createValueExpression(context, "${testEnum}", String.class);
String result1 = (String) ve1.getValue(context);
Assert.assertEquals("APPLE", result1);
- ValueExpression ve2 = factory.createValueExpression(
- context, "foo${testEnum}bar", String.class);
+ ValueExpression ve2 = factory.createValueExpression(context, "foo${testEnum}bar", String.class);
String result2 = (String) ve2.getValue(context);
Assert.assertEquals("fooAPPLEbar", result2);
}
@@ -148,21 +138,18 @@ public class TestValueExpressionImpl {
Object o1 = "String value";
Object o2 = Integer.valueOf(32);
- Map<Object,Object> map = new HashMap<>();
+ Map<Object, Object> map = new HashMap<>();
map.put("key1", o1);
map.put("key2", o2);
- ValueExpression var =
- factory.createValueExpression(map, Map.class);
+ ValueExpression var = factory.createValueExpression(map, Map.class);
context.getVariableMapper().setVariable("map", var);
- ValueExpression ve1 = factory.createValueExpression(
- context, "${map.key1}", Object.class);
+ ValueExpression ve1 = factory.createValueExpression(context, "${map.key1}", Object.class);
ve1.setValue(context, o2);
Assert.assertEquals(o2, ve1.getValue(context));
- ValueExpression ve2 = factory.createValueExpression(
- context, "${map.key2}", Object.class);
+ ValueExpression ve2 = factory.createValueExpression(context, "${map.key2}", Object.class);
ve2.setValue(context, o1);
Assert.assertEquals(o1, ve2.getValue(context));
}
@@ -179,17 +166,14 @@ public class TestValueExpressionImpl {
list.add(0, o1);
list.add(1, o2);
- ValueExpression var =
- factory.createValueExpression(list, List.class);
+ ValueExpression var = factory.createValueExpression(list, List.class);
context.getVariableMapper().setVariable("list", var);
- ValueExpression ve1 = factory.createValueExpression(
- context, "${list[0]}", Object.class);
+ ValueExpression ve1 = factory.createValueExpression(context, "${list[0]}", Object.class);
ve1.setValue(context, o2);
Assert.assertEquals(o2, ve1.getValue(context));
- ValueExpression ve2 = factory.createValueExpression(
- context, "${list[1]}", Object.class);
+ ValueExpression ve2 = factory.createValueExpression(context, "${list[1]}", Object.class);
ve2.setValue(context, o1);
Assert.assertEquals(o1, ve2.getValue(context));
}
@@ -206,12 +190,10 @@ public class TestValueExpressionImpl {
TesterBeanA beanA = new TesterBeanA();
beanA.setValList(Collections.emptyList());
- ValueExpression var =
- factory.createValueExpression(beanA, TesterBeanA.class);
+ ValueExpression var = factory.createValueExpression(beanA, TesterBeanA.class);
context.getVariableMapper().setVariable("beanA", var);
- ValueExpression ve = factory.createValueExpression(
- context, "${beanA.valList.size()}", Integer.class);
+ ValueExpression ve = factory.createValueExpression(context, "${beanA.valList.size()}", Integer.class);
Integer result = (Integer) ve.getValue(context);
Assert.assertEquals(Integer.valueOf(0), result);
@@ -228,12 +210,10 @@ public class TestValueExpressionImpl {
List<?> list = Collections.emptyList();
- ValueExpression var =
- factory.createValueExpression(list, List.class);
+ ValueExpression var = factory.createValueExpression(list, List.class);
context.getVariableMapper().setVariable("list", var);
- ValueExpression ve = factory.createValueExpression(
- context, "${list.size()}", Integer.class);
+ ValueExpression ve = factory.createValueExpression(context, "${list.size()}", Integer.class);
Integer result = (Integer) ve.getValue(context);
Assert.assertEquals(Integer.valueOf(0), result);
@@ -247,12 +227,10 @@ public class TestValueExpressionImpl {
TesterBeanB beanB = new TesterBeanB();
beanB.setName("Tomcat");
- ValueExpression var =
- factory.createValueExpression(beanB, TesterBeanB.class);
+ ValueExpression var = factory.createValueExpression(beanB, TesterBeanB.class);
context.getVariableMapper().setVariable("beanB", var);
- ValueExpression ve = factory.createValueExpression(
- context, "${beanB.name}", String.class);
+ ValueExpression ve = factory.createValueExpression(context, "${beanB.name}", String.class);
// First check the basics work
String result = (String) ve.getValue(context);
diff --git a/test/org/apache/el/TesterBeanB.java b/test/org/apache/el/TesterBeanB.java
index f1cd34392e..e98f6eef96 100644
--- a/test/org/apache/el/TesterBeanB.java
+++ b/test/org/apache/el/TesterBeanB.java
@@ -35,7 +35,7 @@ public class TesterBeanB {
return "Hello " + to + " from " + name;
}
- public String echo(String...strings) {
+ public String echo(String... strings) {
if (strings == null) {
return null;
}
diff --git a/test/org/apache/el/TesterBeanC.java b/test/org/apache/el/TesterBeanC.java
index 16438529e4..aa4801e50a 100644
--- a/test/org/apache/el/TesterBeanC.java
+++ b/test/org/apache/el/TesterBeanC.java
@@ -20,15 +20,17 @@ public class TesterBeanC {
public String sayHello(TesterBeanA a, TesterBeanB b) {
return "AB: Hello " + a.getName() + " from " + b.getName();
}
+
public String sayHello(TesterBeanAA a, TesterBeanB b) {
return "AAB: Hello " + a.getName() + " from " + b.getName();
}
+
public String sayHello(TesterBeanA a, TesterBeanBB b) {
return "ABB: Hello " + a.getName() + " from " + b.getName();
}
+
public String sayHello(TesterBeanA a, TesterBeanBB... b) {
- StringBuilder result =
- new StringBuilder("ABB[]: Hello " + a.getName() + " from ");
+ StringBuilder result = new StringBuilder("ABB[]: Hello " + a.getName() + " from ");
for (int i = 0; i < b.length; i++) {
if (i > 0) {
result.append(", ");
diff --git a/test/org/apache/el/TesterBeanF.java b/test/org/apache/el/TesterBeanF.java
index 242cab0af7..42e340c13b 100644
--- a/test/org/apache/el/TesterBeanF.java
+++ b/test/org/apache/el/TesterBeanF.java
@@ -40,13 +40,13 @@ public class TesterBeanF {
@SuppressWarnings("unused")
- public String doTest(TesterEnum param1, TesterEnum... param2 ) {
+ public String doTest(TesterEnum param1, TesterEnum... param2) {
return "Enum-VEnum";
}
@SuppressWarnings("unused")
- public String doTest(TesterEnum param1, String... param2 ) {
+ public String doTest(TesterEnum param1, String... param2) {
return "Enum-VString";
}
@@ -70,13 +70,13 @@ public class TesterBeanF {
@SuppressWarnings("unused")
- public String doTest(String param1, TesterEnum... param2 ) {
+ public String doTest(String param1, TesterEnum... param2) {
return "String-VEnum";
}
@SuppressWarnings("unused")
- public String doTest(String param1, String... param2 ) {
+ public String doTest(String param1, String... param2) {
return "String-VString";
}
}
diff --git a/test/org/apache/el/TesterBeanG.java b/test/org/apache/el/TesterBeanG.java
index 4872781637..87a03abbc0 100644
--- a/test/org/apache/el/TesterBeanG.java
+++ b/test/org/apache/el/TesterBeanG.java
@@ -17,9 +17,8 @@
package org.apache.el;
/**
- * Test cases based on https://bz.apache.org/bugzilla/show_bug.cgi?id=65358
- * BeanG is BeanF with all the methods that use Enum parameters removed so that
- * the EL caller always has to coerce the Enum to String.
+ * Test cases based on https://bz.apache.org/bugzilla/show_bug.cgi?id=65358 BeanG is BeanF with all the methods that use
+ * Enum parameters removed so that the EL caller always has to coerce the Enum to String.
*/
public class TesterBeanG {
@@ -36,7 +35,7 @@ public class TesterBeanG {
@SuppressWarnings("unused")
- public String doTest(String param1, String... param2 ) {
+ public String doTest(String param1, String... param2) {
return "String-VString";
}
}
diff --git a/test/org/apache/el/TesterBeanH.java b/test/org/apache/el/TesterBeanH.java
index 7ebd5c0927..f6d7f0c482 100644
--- a/test/org/apache/el/TesterBeanH.java
+++ b/test/org/apache/el/TesterBeanH.java
@@ -17,13 +17,12 @@
package org.apache.el;
/**
- * Test cases based on https://bz.apache.org/bugzilla/show_bug.cgi?id=65358
- * BeanH is BeanG with just the varargs method.
+ * Test cases based on https://bz.apache.org/bugzilla/show_bug.cgi?id=65358 BeanH is BeanG with just the varargs method.
*/
public class TesterBeanH {
@SuppressWarnings("unused")
- public String doTest(String param1, String... param2 ) {
+ public String doTest(String param1, String... param2) {
return "String-VString";
}
}
diff --git a/test/org/apache/el/TesterEnum.java b/test/org/apache/el/TesterEnum.java
index 241fbbe336..1ff0bbf8d9 100644
--- a/test/org/apache/el/TesterEnum.java
+++ b/test/org/apache/el/TesterEnum.java
@@ -17,7 +17,8 @@
package org.apache.el;
public enum TesterEnum {
- APPLE, ORANGE;
+ APPLE,
+ ORANGE;
@Override
public String toString() {
diff --git a/test/org/apache/el/TesterFunctions.java b/test/org/apache/el/TesterFunctions.java
index a1fb8e5cc3..12543428ce 100644
--- a/test/org/apache/el/TesterFunctions.java
+++ b/test/org/apache/el/TesterFunctions.java
@@ -52,6 +52,7 @@ public class TesterFunctions {
public static class Inner$Class {
public static final String RETVAL = "Return from bug49555";
+
public static String bug49555() {
return RETVAL;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org