This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/11.0.x by this push:
new 100bb929cc Code clean-up - formatting. No functional change
100bb929cc is described below
commit 100bb929ccc1e4cb7b75f7c4f5c2e1b32148d089
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Feb 27 14:51:22 2025 +0000
Code clean-up - formatting. No functional change
---
java/org/apache/jasper/el/ELContextImpl.java | 8 ++---
java/org/apache/jasper/el/JasperELResolver.java | 40 ++++++++--------------
java/org/apache/jasper/el/JspMethodExpression.java | 12 +++----
.../jasper/el/JspPropertyNotFoundException.java | 3 +-
.../jasper/el/JspPropertyNotWritableException.java | 3 +-
java/org/apache/jasper/el/JspValueExpression.java | 18 ++++------
6 files changed, 30 insertions(+), 54 deletions(-)
diff --git a/java/org/apache/jasper/el/ELContextImpl.java
b/java/org/apache/jasper/el/ELContextImpl.java
index 6b9f86f6e6..ec911507e4 100644
--- a/java/org/apache/jasper/el/ELContextImpl.java
+++ b/java/org/apache/jasper/el/ELContextImpl.java
@@ -51,7 +51,7 @@ public class ELContextImpl extends ELContext {
private static final class VariableMapperImpl extends VariableMapper {
- private Map<String, ValueExpression> vars;
+ private Map<String,ValueExpression> vars;
@Override
public ValueExpression resolveVariable(String variable) {
@@ -62,8 +62,7 @@ public class ELContextImpl extends ELContext {
}
@Override
- public ValueExpression setVariable(String variable,
- ValueExpression expression) {
+ public ValueExpression setVariable(String variable, ValueExpression
expression) {
if (vars == null) {
vars = new HashMap<>();
}
@@ -79,8 +78,7 @@ public class ELContextImpl extends ELContext {
static {
DefaultResolver = new CompositeELResolver();
- ((CompositeELResolver) DefaultResolver).add(
- ELManager.getExpressionFactory().getStreamELResolver());
+ ((CompositeELResolver)
DefaultResolver).add(ELManager.getExpressionFactory().getStreamELResolver());
((CompositeELResolver) DefaultResolver).add(new
StaticFieldELResolver());
((CompositeELResolver) DefaultResolver).add(new MapELResolver());
((CompositeELResolver) DefaultResolver).add(new
ResourceBundleELResolver());
diff --git a/java/org/apache/jasper/el/JasperELResolver.java
b/java/org/apache/jasper/el/JasperELResolver.java
index 8af1f7c2e1..c32884ac3f 100644
--- a/java/org/apache/jasper/el/JasperELResolver.java
+++ b/java/org/apache/jasper/el/JasperELResolver.java
@@ -42,8 +42,7 @@ import org.apache.jasper.runtime.ExceptionUtils;
import org.apache.jasper.runtime.JspRuntimeLibrary;
/**
- * Jasper-specific CompositeELResolver that optimizes certain functions to
avoid
- * unnecessary resolver calls.
+ * Jasper-specific CompositeELResolver that optimizes certain functions to
avoid unnecessary resolver calls.
*/
public class JasperELResolver extends CompositeELResolver {
@@ -54,8 +53,7 @@ public class JasperELResolver extends CompositeELResolver {
private volatile ELResolver[] resolvers;
private final int appResolversSize;
- public JasperELResolver(List<ELResolver> appResolvers,
- ELResolver streamResolver) {
+ public JasperELResolver(List<ELResolver> appResolvers, ELResolver
streamResolver) {
appResolversSize = appResolvers.size();
resolvers = new ELResolver[appResolversSize +
STANDARD_RESOLVERS_COUNT];
@@ -99,7 +97,7 @@ public class JasperELResolver extends CompositeELResolver {
@Override
public Object getValue(ELContext context, Object base, Object property)
- throws NullPointerException, PropertyNotFoundException, ELException {
+ throws NullPointerException, PropertyNotFoundException,
ELException {
context.setPropertyResolved(false);
int start;
@@ -137,8 +135,7 @@ public class JasperELResolver extends CompositeELResolver {
}
@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) {
String targetMethod = coerceToString(method);
if (targetMethod.length() == 0) {
throw new ELException(new NoSuchMethodException());
@@ -150,11 +147,9 @@ public class JasperELResolver extends CompositeELResolver {
// skip implicit and call app resolvers, stream resolver and static
// resolver
- int index = 1 /* implicit */ + appResolversSize +
- 2 /* stream + static */;
+ int index = 1 /* implicit */ + appResolversSize + 2 /* stream + static
*/;
for (int i = 1; i < index; i++) {
- result = resolvers[i].invoke(
- context, base, targetMethod, paramTypes, params);
+ result = resolvers[i].invoke(context, base, targetMethod,
paramTypes, params);
if (context.isPropertyResolved()) {
return result;
}
@@ -165,8 +160,7 @@ public class JasperELResolver extends CompositeELResolver {
// call bean and the rest of resolvers
int size = resolversSize.get();
for (int i = index; i < size; i++) {
- result = resolvers[i].invoke(
- context, base, targetMethod, paramTypes, params);
+ result = resolvers[i].invoke(context, base, targetMethod,
paramTypes, params);
if (context.isPropertyResolved()) {
return result;
}
@@ -191,14 +185,13 @@ public class JasperELResolver extends CompositeELResolver
{
}
/**
- * Extend ELResolver for Graal to avoid bean info use if possible,
- * as BeanELResolver needs manual reflection configuration.
+ * Extend ELResolver for Graal to avoid bean info use if possible, as
BeanELResolver needs manual reflection
+ * configuration.
*/
public static class GraalBeanELResolver extends ELResolver {
@Override
- public Object getValue(ELContext context, Object base,
- Object property) {
+ public Object getValue(ELContext context, Object base, Object
property) {
Objects.requireNonNull(context);
if (base == null || property == null) {
return null;
@@ -219,8 +212,7 @@ public class JasperELResolver extends CompositeELResolver {
}
@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;
@@ -238,8 +230,7 @@ public class JasperELResolver extends CompositeELResolver {
}
@Override
- public boolean isReadOnly(ELContext context, Object base,
- Object property) {
+ public boolean isReadOnly(ELContext context, Object base, Object
property) {
Objects.requireNonNull(context);
if (base == null || property == null) {
return false;
@@ -270,8 +261,8 @@ public class JasperELResolver extends CompositeELResolver {
String setter = "set" + capitalize(prop);
Method methods[] = beanClass.getMethods();
for (Method method : methods) {
- if (method.getParameterCount() == 1 &&
setter.equals(method.getName())
- && (valueClass == null ||
valueClass.isAssignableFrom(method.getParameterTypes()[0]))) {
+ if (method.getParameterCount() == 1 &&
setter.equals(method.getName()) &&
+ (valueClass == null ||
valueClass.isAssignableFrom(method.getParameterTypes()[0]))) {
return method;
}
}
@@ -288,8 +279,7 @@ public class JasperELResolver extends CompositeELResolver {
}
@Override
- public Class<?> getType(ELContext context, Object base,
- Object property) {
+ public Class<?> getType(ELContext context, Object base, Object
property) {
return null;
}
diff --git a/java/org/apache/jasper/el/JspMethodExpression.java
b/java/org/apache/jasper/el/JspMethodExpression.java
index bc9ad0ab63..861a3e9cf0 100644
--- a/java/org/apache/jasper/el/JspMethodExpression.java
+++ b/java/org/apache/jasper/el/JspMethodExpression.java
@@ -29,8 +29,7 @@ import jakarta.el.MethodNotFoundException;
import jakarta.el.MethodReference;
import jakarta.el.PropertyNotFoundException;
-public final class JspMethodExpression extends MethodExpression implements
- Externalizable {
+public final class JspMethodExpression extends MethodExpression implements
Externalizable {
private String mark;
@@ -47,8 +46,7 @@ public final class JspMethodExpression extends
MethodExpression implements
@Override
public MethodInfo getMethodInfo(ELContext context)
- throws NullPointerException, PropertyNotFoundException,
- MethodNotFoundException, ELException {
+ throws NullPointerException, PropertyNotFoundException,
MethodNotFoundException, ELException {
context.notifyBeforeEvaluation(getExpressionString());
try {
MethodInfo result = this.target.getMethodInfo(context);
@@ -74,8 +72,7 @@ public final class JspMethodExpression extends
MethodExpression implements
@Override
public Object invoke(ELContext context, Object[] params)
- throws NullPointerException, PropertyNotFoundException,
- MethodNotFoundException, ELException {
+ throws NullPointerException, PropertyNotFoundException,
MethodNotFoundException, ELException {
context.notifyBeforeEvaluation(getExpressionString());
try {
Object result = this.target.invoke(context, params);
@@ -156,8 +153,7 @@ public final class JspMethodExpression extends
MethodExpression implements
}
@Override
- public void readExternal(ObjectInput in) throws IOException,
- ClassNotFoundException {
+ public void readExternal(ObjectInput in) throws IOException,
ClassNotFoundException {
this.mark = in.readUTF();
this.target = (MethodExpression) in.readObject();
}
diff --git a/java/org/apache/jasper/el/JspPropertyNotFoundException.java
b/java/org/apache/jasper/el/JspPropertyNotFoundException.java
index 4217449f80..8842906033 100644
--- a/java/org/apache/jasper/el/JspPropertyNotFoundException.java
+++ b/java/org/apache/jasper/el/JspPropertyNotFoundException.java
@@ -18,8 +18,7 @@ package org.apache.jasper.el;
import jakarta.el.PropertyNotFoundException;
-public final class JspPropertyNotFoundException extends
- PropertyNotFoundException {
+public final class JspPropertyNotFoundException extends
PropertyNotFoundException {
private static final long serialVersionUID = 1L;
diff --git a/java/org/apache/jasper/el/JspPropertyNotWritableException.java
b/java/org/apache/jasper/el/JspPropertyNotWritableException.java
index 38bde6398f..43654bb931 100644
--- a/java/org/apache/jasper/el/JspPropertyNotWritableException.java
+++ b/java/org/apache/jasper/el/JspPropertyNotWritableException.java
@@ -18,8 +18,7 @@ package org.apache.jasper.el;
import jakarta.el.PropertyNotWritableException;
-public class JspPropertyNotWritableException extends
- PropertyNotWritableException {
+public class JspPropertyNotWritableException extends
PropertyNotWritableException {
private static final long serialVersionUID = 1L;
diff --git a/java/org/apache/jasper/el/JspValueExpression.java
b/java/org/apache/jasper/el/JspValueExpression.java
index 64f6ccd654..7cd6753c51 100644
--- a/java/org/apache/jasper/el/JspValueExpression.java
+++ b/java/org/apache/jasper/el/JspValueExpression.java
@@ -32,8 +32,7 @@ import jakarta.el.ValueExpression;
*
* @author Jacob Hookom
*/
-public final class JspValueExpression extends ValueExpression implements
- Externalizable {
+public final class JspValueExpression extends ValueExpression implements
Externalizable {
private ValueExpression target;
@@ -54,8 +53,7 @@ public final class JspValueExpression extends ValueExpression
implements
}
@Override
- public Class<?> getType(ELContext context) throws NullPointerException,
- PropertyNotFoundException, ELException {
+ public Class<?> getType(ELContext context) throws NullPointerException,
PropertyNotFoundException, ELException {
context.notifyBeforeEvaluation(getExpressionString());
try {
Class<?> result = this.target.getType(context);
@@ -75,8 +73,7 @@ public final class JspValueExpression extends ValueExpression
implements
}
@Override
- public boolean isReadOnly(ELContext context) throws NullPointerException,
- PropertyNotFoundException, ELException {
+ public boolean isReadOnly(ELContext context) throws NullPointerException,
PropertyNotFoundException, ELException {
context.notifyBeforeEvaluation(getExpressionString());
try {
boolean result = this.target.isReadOnly(context);
@@ -97,8 +94,7 @@ public final class JspValueExpression extends ValueExpression
implements
@Override
public void setValue(ELContext context, Object value)
- throws NullPointerException, PropertyNotFoundException,
- PropertyNotWritableException, ELException {
+ throws NullPointerException, PropertyNotFoundException,
PropertyNotWritableException, ELException {
context.notifyBeforeEvaluation(getExpressionString());
try {
this.target.setValue(context, value);
@@ -122,8 +118,7 @@ public final class JspValueExpression extends
ValueExpression implements
}
@Override
- public <T> T getValue(ELContext context) throws NullPointerException,
- PropertyNotFoundException, ELException {
+ public <T> T getValue(ELContext context) throws NullPointerException,
PropertyNotFoundException, ELException {
context.notifyBeforeEvaluation(getExpressionString());
try {
T result = this.target.getValue(context);
@@ -169,8 +164,7 @@ public final class JspValueExpression extends
ValueExpression implements
}
@Override
- public void readExternal(ObjectInput in) throws IOException,
- ClassNotFoundException {
+ public void readExternal(ObjectInput in) throws IOException,
ClassNotFoundException {
this.mark = in.readUTF();
this.target = (ValueExpression) in.readObject();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
