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
The following commit(s) were added to refs/heads/9.0.x by this push:
new 3988ce967d Code clean-up - formatting. No functional change.
3988ce967d is described below
commit 3988ce967ddd2c02fe946521e4d2f4b792ca4ad9
Author: Mark Thomas <[email protected]>
AuthorDate: Fri Aug 29 15:08:42 2025 +0100
Code clean-up - formatting. No functional change.
---
test/javax/el/TestBeanELResolver.java | 20 ++++++++++----------
.../el/TestBeanELResolverVarargsInvocation.java | 2 +-
test/javax/el/TestELResolver.java | 4 ++--
test/javax/el/TestImportHandlerStandardPackages.java | 4 ++--
test/javax/el/TestMapELResolver.java | 10 +++++-----
test/javax/el/TestStaticFieldELResolver.java | 8 ++++----
test/javax/el/TesterBeanNameResolver.java | 2 +-
7 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/test/javax/el/TestBeanELResolver.java
b/test/javax/el/TestBeanELResolver.java
index 8b0cb728c1..87073dfc58 100644
--- a/test/javax/el/TestBeanELResolver.java
+++ b/test/javax/el/TestBeanELResolver.java
@@ -410,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());
@@ -504,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);
}
@@ -515,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);
}
@@ -758,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);
}
@@ -769,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);
}
diff --git a/test/javax/el/TestBeanELResolverVarargsInvocation.java
b/test/javax/el/TestBeanELResolverVarargsInvocation.java
index b81bcb1478..c3cfc357e5 100644
--- a/test/javax/el/TestBeanELResolverVarargsInvocation.java
+++ b/test/javax/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/javax/el/TestELResolver.java
b/test/javax/el/TestELResolver.java
index 569a1a6746..3c37418858 100644
--- a/test/javax/el/TestELResolver.java
+++ b/test/javax/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/javax/el/TestImportHandlerStandardPackages.java
b/test/javax/el/TestImportHandlerStandardPackages.java
index ca5106215d..5a83d979f2 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());
}
}
diff --git a/test/javax/el/TestMapELResolver.java
b/test/javax/el/TestMapELResolver.java
index feac89820b..6377954b7b 100644
--- a/test/javax/el/TestMapELResolver.java
+++ b/test/javax/el/TestMapELResolver.java
@@ -83,7 +83,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");
@@ -132,7 +132,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"));
@@ -147,7 +147,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");
}
@@ -210,7 +210,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);
@@ -238,7 +238,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");
Iterator<FeatureDescriptor> result =
mapELResolver.getFeatureDescriptors(context, map);
diff --git a/test/javax/el/TestStaticFieldELResolver.java
b/test/javax/el/TestStaticFieldELResolver.java
index 2663451bde..f2572ed8ac 100644
--- a/test/javax/el/TestStaticFieldELResolver.java
+++ b/test/javax/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());
Assert.assertEquals(MethodUnderTest.GET_TYPE.getClass(), result);
Assert.assertTrue(context.isPropertyResolved());
diff --git a/test/javax/el/TesterBeanNameResolver.java
b/test/javax/el/TesterBeanNameResolver.java
index 3995b96120..22bbb8699b 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;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
