This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new ee24f3c92a Code clean-up - formatting. No functional change.
ee24f3c92a is described below
commit ee24f3c92aa923e0618fd7ead6aa88deef9ee88f
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Aug 29 15:07:29 2025 +0100
Code clean-up - formatting. No functional change.
---
test/jakarta/el/TestBeanELResolver.java | 20 ++++++++++----------
.../el/TestBeanELResolverVarargsInvocation.java | 2 +-
test/jakarta/el/TestELResolver.java | 4 ++--
.../el/TestImportHandlerStandardPackages.java | 4 ++--
test/jakarta/el/TestMapELResolver.java | 8 ++++----
test/jakarta/el/TestOptionalELResolver.java | 6 ++++--
test/jakarta/el/TestStaticFieldELResolver.java | 8 ++++----
test/jakarta/el/TesterBeanA.java | 1 -
test/jakarta/el/TesterBeanNameResolver.java | 2 +-
9 files changed, 28 insertions(+), 27 deletions(-)
diff --git a/test/jakarta/el/TestBeanELResolver.java
b/test/jakarta/el/TestBeanELResolver.java
index b35571e4df..75684a3fe6 100644
--- a/test/jakarta/el/TestBeanELResolver.java
+++ b/test/jakarta/el/TestBeanELResolver.java
@@ -379,8 +379,8 @@ public class TestBeanELResolver extends ELBaseTest {
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());
@@ -473,8 +473,8 @@ public class TestBeanELResolver extends ELBaseTest {
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);
}
@@ -484,8 +484,8 @@ public class TestBeanELResolver extends ELBaseTest {
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);
}
@@ -727,8 +727,8 @@ public class TestBeanELResolver extends ELBaseTest {
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);
}
@@ -738,8 +738,8 @@ public class TestBeanELResolver extends ELBaseTest {
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);
}
diff --git a/test/jakarta/el/TestBeanELResolverVarargsInvocation.java
b/test/jakarta/el/TestBeanELResolverVarargsInvocation.java
index 89f913f6b1..93ea4bd1cf 100644
--- a/test/jakarta/el/TestBeanELResolverVarargsInvocation.java
+++ b/test/jakarta/el/TestBeanELResolverVarargsInvocation.java
@@ -55,7 +55,7 @@ public class TestBeanELResolverVarargsInvocation {
beanELResolver = new BeanELResolver();
elContext = new ELContext() {
private VariableMapper variableMapper = new VariableMapper() {
- private Map<String, ValueExpression> vars = new HashMap<>();
+ private Map<String,ValueExpression> vars = new HashMap<>();
@Override
public ValueExpression setVariable(String arg0,
ValueExpression arg1) {
diff --git a/test/jakarta/el/TestELResolver.java
b/test/jakarta/el/TestELResolver.java
index 4b83910b31..dcb3ff3592 100644
--- a/test/jakarta/el/TestELResolver.java
+++ b/test/jakarta/el/TestELResolver.java
@@ -119,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/jakarta/el/TestImportHandlerStandardPackages.java
b/test/jakarta/el/TestImportHandlerStandardPackages.java
index 1d4485e53c..2ef704d555 100644
--- a/test/jakarta/el/TestImportHandlerStandardPackages.java
+++ b/test/jakarta/el/TestImportHandlerStandardPackages.java
@@ -40,9 +40,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());
}
}
diff --git a/test/jakarta/el/TestMapELResolver.java
b/test/jakarta/el/TestMapELResolver.java
index 3de333902f..0c7b2f8edb 100644
--- a/test/jakarta/el/TestMapELResolver.java
+++ b/test/jakarta/el/TestMapELResolver.java
@@ -81,7 +81,7 @@ public class TestMapELResolver {
MapELResolver mapELResolver = new MapELResolver();
ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
- Map<String, String> map = new HashMap<>();
+ Map<String,String> map = new HashMap<>();
map.put("key", "value");
Object result = mapELResolver.getValue(context, map, "key");
@@ -130,7 +130,7 @@ public class TestMapELResolver {
MapELResolver mapELResolver = new MapELResolver();
ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
- Map<String, String> map = new HashMap<>();
+ Map<String,String> map = new HashMap<>();
mapELResolver.setValue(context, map, "key", "value");
Assert.assertEquals("value", mapELResolver.getValue(context, map,
"key"));
@@ -145,7 +145,7 @@ public class TestMapELResolver {
MapELResolver mapELResolver = new MapELResolver();
ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
- Map<Object, Object> map = Collections.unmodifiableMap(new HashMap<>());
+ Map<Object,Object> map = Collections.unmodifiableMap(new HashMap<>());
mapELResolver.setValue(context, map, "key", "value");
}
@@ -208,7 +208,7 @@ public class TestMapELResolver {
MapELResolver mapELResolver = new MapELResolver();
ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
- Map<Object, Object> map = Collections.unmodifiableMap(new HashMap<>());
+ Map<Object,Object> map = Collections.unmodifiableMap(new HashMap<>());
boolean result = mapELResolver.isReadOnly(context, map, new Object());
Assert.assertTrue(result);
diff --git a/test/jakarta/el/TestOptionalELResolver.java
b/test/jakarta/el/TestOptionalELResolver.java
index e6dbb866ed..ed01453cc0 100644
--- a/test/jakarta/el/TestOptionalELResolver.java
+++ b/test/jakarta/el/TestOptionalELResolver.java
@@ -141,7 +141,8 @@ public class TestOptionalELResolver {
ValueExpression varBeanA = factory.createValueExpression(beanA,
TesterBeanA.class);
context.getVariableMapper().setVariable("beanA", varBeanA);
- ValueExpression ve = factory.createValueExpression(context,
"${beanA.beanBOpt.map(b -> b.name)}", Optional.class);
+ ValueExpression ve =
+ factory.createValueExpression(context, "${beanA.beanBOpt.map(b
-> b.name)}", Optional.class);
Object result = ve.getValue(context);
Assert.assertNotNull(result);
@@ -162,7 +163,8 @@ public class TestOptionalELResolver {
ValueExpression varBeanA = factory.createValueExpression(beanA,
TesterBeanA.class);
context.getVariableMapper().setVariable("beanA", varBeanA);
- ValueExpression ve = factory.createValueExpression(context,
"${beanA.beanBOpt.map(b -> b.name)}", Optional.class);
+ ValueExpression ve =
+ factory.createValueExpression(context, "${beanA.beanBOpt.map(b
-> b.name)}", Optional.class);
Object result = ve.getValue(context);
Assert.assertNotNull(result);
diff --git a/test/jakarta/el/TestStaticFieldELResolver.java
b/test/jakarta/el/TestStaticFieldELResolver.java
index d55ebd7cde..dcd4d6533e 100644
--- a/test/jakarta/el/TestStaticFieldELResolver.java
+++ b/test/jakarta/el/TestStaticFieldELResolver.java
@@ -111,8 +111,8 @@ public class TestStaticFieldELResolver {
StaticFieldELResolver resolver = new StaticFieldELResolver();
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());
@@ -284,8 +284,8 @@ public class TestStaticFieldELResolver {
StaticFieldELResolver resolver = new StaticFieldELResolver();
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());
// Resolver is read-only so this should return null
Assert.assertNull(result);
diff --git a/test/jakarta/el/TesterBeanA.java b/test/jakarta/el/TesterBeanA.java
index 97f153a440..3a194b7664 100644
--- a/test/jakarta/el/TesterBeanA.java
+++ b/test/jakarta/el/TesterBeanA.java
@@ -30,4 +30,3 @@ public class TesterBeanA {
}
}
-
diff --git a/test/jakarta/el/TesterBeanNameResolver.java
b/test/jakarta/el/TesterBeanNameResolver.java
index e04fd44884..f3e4b2ca1f 100644
--- a/test/jakarta/el/TesterBeanNameResolver.java
+++ b/test/jakarta/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;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
