This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 723dfc051b5407f67319459dee2eb51d7ed0e2f6
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Apr 14 11:31:42 2023 +0100
Code clean-up - no functional change
---
java/jakarta/el/BeanELResolver.java | 12 ++++++------
java/jakarta/el/ELContext.java | 10 +++++-----
java/jakarta/el/ELManager.java | 2 +-
java/jakarta/el/ExpressionFactory.java | 14 +++++++-------
java/jakarta/el/ImportHandler.java | 12 ++++++------
java/jakarta/el/LambdaExpression.java | 4 ++--
java/jakarta/el/MapELResolver.java | 20 ++++++++++----------
java/jakarta/el/StandardELContext.java | 14 +++++++-------
java/jakarta/el/StaticFieldELResolver.java | 8 ++++----
java/jakarta/el/Util.java | 6 +++---
10 files changed, 51 insertions(+), 51 deletions(-)
diff --git a/java/jakarta/el/BeanELResolver.java
b/java/jakarta/el/BeanELResolver.java
index a909b231ea..0d8ad14558 100644
--- a/java/jakarta/el/BeanELResolver.java
+++ b/java/jakarta/el/BeanELResolver.java
@@ -53,7 +53,7 @@ public class BeanELResolver extends ELResolver {
private final boolean readOnly;
- private final ConcurrentCache<String, BeanProperties> cache = new
ConcurrentCache<>(CACHE_SIZE);
+ private final ConcurrentCache<String,BeanProperties> cache = new
ConcurrentCache<>(CACHE_SIZE);
/**
* Creates a writable instance of the standard JavaBean resolver.
@@ -150,8 +150,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 {
@@ -211,7 +211,7 @@ public class BeanELResolver extends ELResolver {
}
static final class BeanProperties {
- private final Map<String, BeanProperty> properties;
+ private final Map<String,BeanProperty> properties;
private final Class<?> type;
@@ -333,8 +333,8 @@ public class BeanELResolver extends ELResolver {
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/jakarta/el/ELContext.java b/java/jakarta/el/ELContext.java
index 0e80de277f..12840d1597 100644
--- a/java/jakarta/el/ELContext.java
+++ b/java/jakarta/el/ELContext.java
@@ -32,7 +32,7 @@ public abstract class ELContext {
private Locale locale;
- private Map<Class<?>, Object> map;
+ private Map<Class<?>,Object> map;
private boolean resolved;
@@ -40,7 +40,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;
@@ -235,7 +235,7 @@ public abstract class ELContext {
* @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;
}
@@ -253,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;
@@ -270,7 +270,7 @@ public abstract class ELContext {
*
* @since EL 3.0
*/
- public void enterLambdaScope(Map<String, Object> arguments) {
+ public void enterLambdaScope(Map<String,Object> arguments) {
lambdaArguments.push(arguments);
}
diff --git a/java/jakarta/el/ELManager.java b/java/jakarta/el/ELManager.java
index b3787bbd3e..40749368d3 100644
--- a/java/jakarta/el/ELManager.java
+++ b/java/jakarta/el/ELManager.java
@@ -73,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/jakarta/el/ExpressionFactory.java
b/java/jakarta/el/ExpressionFactory.java
index 0302829c9e..f1b372027a 100644
--- a/java/jakarta/el/ExpressionFactory.java
+++ b/java/jakarta/el/ExpressionFactory.java
@@ -48,13 +48,13 @@ public abstract class ExpressionFactory {
private static final String PROPERTY_FILE;
private static final CacheValue nullTcclFactory = new CacheValue();
- private static final Map<CacheKey, CacheValue> factoryCache = new
ConcurrentHashMap<>();
+ private static final Map<CacheKey,CacheValue> factoryCache = new
ConcurrentHashMap<>();
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";
}
@@ -227,7 +227,7 @@ public abstract class ExpressionFactory {
*
* @since EL 3.0
*/
- public Map<String, Method> getInitFunctionMap() {
+ public Map<String,Method> getInitFunctionMap() {
return null;
}
@@ -308,8 +308,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();
diff --git a/java/jakarta/el/ImportHandler.java
b/java/jakarta/el/ImportHandler.java
index 35b15dc981..537705ee83 100644
--- a/java/jakarta/el/ImportHandler.java
+++ b/java/jakarta/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 6.0
@@ -272,10 +272,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() {
@@ -398,7 +398,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)) {
diff --git a/java/jakarta/el/LambdaExpression.java
b/java/jakarta/el/LambdaExpression.java
index 899eacf2f4..737eadff61 100644
--- a/java/jakarta/el/LambdaExpression.java
+++ b/java/jakarta/el/LambdaExpression.java
@@ -25,7 +25,7 @@ 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) {
@@ -61,7 +61,7 @@ public class LambdaExpression {
// Build the argument map
// Start with the arguments from any outer expressions so if there is
// any overlap the local arguments have priority
- Map<String, Object> lambdaArguments = new HashMap<>(nestedArguments);
+ Map<String,Object> lambdaArguments = new HashMap<>(nestedArguments);
for (int i = 0; i < formalParamCount; i++) {
lambdaArguments.put(formalParameters.get(i), args[i]);
}
diff --git a/java/jakarta/el/MapELResolver.java
b/java/jakarta/el/MapELResolver.java
index 7e946df121..5ea23328ab 100644
--- a/java/jakarta/el/MapELResolver.java
+++ b/java/jakarta/el/MapELResolver.java
@@ -43,10 +43,10 @@ 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);
- Map<?, ?> map = (Map<?, ?>) base;
+ Map<?,?> map = (Map<?,?>) base;
if (readOnly || map.getClass() == UNMODIFIABLE) {
return null;
}
@@ -61,9 +61,9 @@ 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;
@@ -73,7 +73,7 @@ public class MapELResolver extends ELResolver {
public void setValue(ELContext context, Object base, Object property,
Object value) {
Objects.requireNonNull(context);
- if (base instanceof Map<?, ?>) {
+ if (base instanceof Map<?,?>) {
context.setPropertyResolved(base, property);
if (this.readOnly) {
@@ -83,7 +83,7 @@ public class MapELResolver extends ELResolver {
try {
@SuppressWarnings("unchecked") // Must be OK
- Map<Object, Object> map = ((Map<Object, Object>) base);
+ Map<Object,Object> map = ((Map<Object,Object>) base);
map.put(property, value);
} catch (UnsupportedOperationException e) {
throw new PropertyNotWritableException(e);
@@ -95,7 +95,7 @@ public class MapELResolver extends ELResolver {
public boolean isReadOnly(ELContext context, Object base, Object property)
{
Objects.requireNonNull(context);
- if (base instanceof Map<?, ?>) {
+ if (base instanceof Map<?,?>) {
context.setPropertyResolved(base, property);
return this.readOnly || UNMODIFIABLE.equals(base.getClass());
}
@@ -106,8 +106,8 @@ public class MapELResolver extends ELResolver {
@Deprecated(forRemoval = true, since = "EL 5.0")
@Override
public Iterator<FeatureDescriptor> getFeatureDescriptors(ELContext
context, Object base) {
- if (base instanceof Map<?, ?>) {
- Iterator<?> itr = ((Map<?, ?>) base).keySet().iterator();
+ if (base instanceof Map<?,?>) {
+ Iterator<?> itr = ((Map<?,?>) base).keySet().iterator();
List<FeatureDescriptor> feats = new ArrayList<>();
Object key;
FeatureDescriptor desc;
@@ -131,7 +131,7 @@ public class MapELResolver extends ELResolver {
@Override
public Class<?> getCommonPropertyType(ELContext context, Object base) {
- if (base instanceof Map<?, ?>) {
+ if (base instanceof Map<?,?>) {
return Object.class;
}
return null;
diff --git a/java/jakarta/el/StandardELContext.java
b/java/jakarta/el/StandardELContext.java
index 092d439f40..11121b7c0b 100644
--- a/java/jakarta/el/StandardELContext.java
+++ b/java/jakarta/el/StandardELContext.java
@@ -30,7 +30,7 @@ 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) {
@@ -108,14 +108,14 @@ public class StandardELContext extends ELContext {
}
- Map<String, Object> getLocalBeans() {
+ Map<String,Object> getLocalBeans() {
return localBeans;
}
private static class StandardVariableMapper extends VariableMapper {
- private Map<String, ValueExpression> vars;
+ private Map<String,ValueExpression> vars;
@Override
public ValueExpression resolveVariable(String variable) {
@@ -141,9 +141,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;
}
@@ -176,9 +176,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);
}
diff --git a/java/jakarta/el/StaticFieldELResolver.java
b/java/jakarta/el/StaticFieldELResolver.java
index c72a90ce51..db70f6e422 100644
--- a/java/jakarta/el/StaticFieldELResolver.java
+++ b/java/jakarta/el/StaticFieldELResolver.java
@@ -87,8 +87,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;
@@ -112,8 +112,8 @@ public class StaticFieldELResolver extends ELResolver {
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 {
diff --git a/java/jakarta/el/Util.java b/java/jakarta/el/Util.java
index 6a0a800c82..b5668527c6 100644
--- a/java/jakarta/el/Util.java
+++ b/java/jakarta/el/Util.java
@@ -103,7 +103,7 @@ class Util {
private static final CacheValue nullTcclFactory = new CacheValue();
- private static final Map<CacheKey, CacheValue> factoryCache = new
ConcurrentHashMap<>();
+ 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
@@ -242,7 +242,7 @@ class Util {
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;
@@ -356,7 +356,7 @@ class Util {
MatchResult bestMatch = new MatchResult(true, 0, 0, 0, 0, true);
Wrapper<T> match = null;
boolean multiple = false;
- for (Map.Entry<Wrapper<T>, MatchResult> entry : candidates.entrySet())
{
+ for (Map.Entry<Wrapper<T>,MatchResult> entry : candidates.entrySet()) {
int cmp = entry.getValue().compareTo(bestMatch);
if (cmp > 0 || match == null) {
bestMatch = entry.getValue();
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
