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
commit 799eea5b1ba1a2dcf5fb592a178a8cd768358bb8
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Feb 20 12:45:18 2024 +0000
Code clean-up. Formatting. No functional change.
---
java/jakarta/el/RecordELResolver.java | 18 +++++++-----------
java/jakarta/el/Util.java | 4 ++--
2 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/java/jakarta/el/RecordELResolver.java
b/java/jakarta/el/RecordELResolver.java
index 6a5683924f..fcb70fe7e9 100644
--- a/java/jakarta/el/RecordELResolver.java
+++ b/java/jakarta/el/RecordELResolver.java
@@ -22,9 +22,9 @@ import java.util.Objects;
/**
* Defines property resolution behavior on instances of {@link Record}.
* <p>
- * The resolver handles base objects of type {@link Record}. It accepts any
non-{@code null} object as a property and coerces it to a
- * String using {@link Object#toString()}. The property string is used to find
an accessor method for a field
- * with the same name.
+ * The resolver handles base objects of type {@link Record}. It accepts any
non-{@code null} object as a property and
+ * coerces it to a String using {@link Object#toString()}. The property string
is used to find an accessor method for a
+ * field with the same name.
* <p>
* This resolver is always read-only since {@link Record}s are always
read-only.
* <p>
@@ -67,8 +67,7 @@ public class RecordELResolver extends ELResolver {
method = base.getClass().getMethod(propertyName);
} catch (NoSuchMethodException nsme) {
throw new PropertyNotFoundException(
- Util.message(context, "propertyNotFound",
base.getClass().getName(), propertyName),
- nsme);
+ Util.message(context, "propertyNotFound",
base.getClass().getName(), propertyName), nsme);
}
try {
@@ -112,8 +111,7 @@ public class RecordELResolver extends ELResolver {
base.getClass().getMethod(propertyName);
} catch (NoSuchMethodException nsme) {
throw new PropertyNotFoundException(
- Util.message(context, "propertyNotFound",
base.getClass().getName(), propertyName),
- nsme);
+ Util.message(context, "propertyNotFound",
base.getClass().getName(), propertyName), nsme);
}
}
return null;
@@ -150,8 +148,7 @@ public class RecordELResolver extends ELResolver {
base.getClass().getMethod(propertyName);
} catch (NoSuchMethodException nsme) {
throw new PropertyNotFoundException(
- Util.message(context, "propertyNotFound",
base.getClass().getName(), propertyName),
- nsme);
+ Util.message(context, "propertyNotFound",
base.getClass().getName(), propertyName), nsme);
}
throw new PropertyNotWritableException(
@@ -187,8 +184,7 @@ public class RecordELResolver extends ELResolver {
base.getClass().getMethod(propertyName);
} catch (NoSuchMethodException nsme) {
throw new PropertyNotFoundException(
- Util.message(context, "propertyNotFound",
base.getClass().getName(), propertyName),
- nsme);
+ Util.message(context, "propertyNotFound",
base.getClass().getName(), propertyName), nsme);
}
return true;
diff --git a/java/jakarta/el/Util.java b/java/jakarta/el/Util.java
index f44b662063..c168de6e5b 100644
--- a/java/jakarta/el/Util.java
+++ b/java/jakarta/el/Util.java
@@ -494,8 +494,8 @@ class Util {
*/
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. See
- * also OptionalELResolver.convertToType().
+ * TODO: This isn't pretty but it works. Significant refactoring would
be required to avoid the exception. See
+ * also OptionalELResolver.convertToType().
*/
try {
context.convertToType(src, target);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
