root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Polish documentation and implementation of SpEL's Indexer

This commit is contained in:
Sam Brannen 2024-05-28 15:24:48 +02:00
parent 726ac9110c
commit defb6b7a62
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
spring-expression/src/main/java/org/springframework/expression/spel/ast/Indexer.java
View File

@ -54,10 +54,11 @@ import org.springframework.util.ReflectionUtils;
* *
* <ul> * <ul>
* <li>Arrays: the n<sup>th</sup> element</li> * <li>Arrays: the n<sup>th</sup> element</li>
* <li>Collections (lists and sets): the n<sup>th</sup> element</li> * <li>Collections (lists, sets, etc.): the n<sup>th</sup> element</li>
* <li>Strings: the n<sup>th</sup> character as a {@link String}</li> * <li>Strings: the n<sup>th</sup> character as a {@link String}</li>
* <li>Maps: the value for the specified key</li> * <li>Maps: the value for the specified key</li>
* <li>Objects: the property with the specified name</li> * <li>Objects: the property with the specified name</li>
* <li>Custom Structures: via registered {@link IndexAccessor} implementations</li>
* </ul> * </ul>
* *
* <h3>Null-safe Indexing</h3> * <h3>Null-safe Indexing</h3>
@ -72,6 +73,9 @@ import org.springframework.util.ReflectionUtils;
* @author Stephane Nicoll * @author Stephane Nicoll
* @author Sam Brannen * @author Sam Brannen
* @since 3.0 * @since 3.0
* @see org.springframework.expression.IndexAccessor
* @see org.springframework.expression.spel.CompilableIndexAccessor
* @see org.springframework.expression.spel.support.ReflectiveIndexAccessor
*/ */
public class Indexer extends SpelNodeImpl { public class Indexer extends SpelNodeImpl {
@ -385,7 +389,7 @@ public class Indexer extends SpelNodeImpl {
mv.visitTypeInsn(CHECKCAST, "java/util/Map"); mv.visitTypeInsn(CHECKCAST, "java/util/Map");
// Special case when the key is an unquoted string literal that will be parsed as // Special case when the key is an unquoted string literal that will be parsed as
// a property/field reference // a property/field reference
if ((index instanceof PropertyOrFieldReference reference)) { if (index instanceof PropertyOrFieldReference reference) {
String mapKeyName = reference.getName(); String mapKeyName = reference.getName();
mv.visitLdcInsn(mapKeyName); mv.visitLdcInsn(mapKeyName);
} }
@ -849,6 +853,7 @@ public class Indexer extends SpelNodeImpl {
exitTypeDescriptor = CodeFlow.toDescriptor(Object.class); exitTypeDescriptor = CodeFlow.toDescriptor(Object.class);
return new TypedValue(o, this.collectionEntryDescriptor.elementTypeDescriptor(o)); return new TypedValue(o, this.collectionEntryDescriptor.elementTypeDescriptor(o));
} }
int pos = 0; int pos = 0;
for (Object o : this.collection) { for (Object o : this.collection) {
if (pos == this.index) { if (pos == this.index) {
@ -856,23 +861,23 @@ public class Indexer extends SpelNodeImpl {
} }
pos++; pos++;
} }
throw new IllegalStateException("Failed to find indexed element " + this.index + ": " + this.collection); throw new SpelEvaluationException(getStartPosition(), SpelMessage.COLLECTION_INDEX_OUT_OF_BOUNDS,
this.collection.size(), this.index);
} }
@Override @Override
public void setValue(@Nullable Object newValue) { public void setValue(@Nullable Object newValue) {
growCollectionIfNecessary(); if (!(this.collection instanceof List list)) {
if (this.collection instanceof List list) {
if (this.collectionEntryDescriptor.getElementTypeDescriptor() != null) {
newValue = this.typeConverter.convertValue(newValue, TypeDescriptor.forObject(newValue),
this.collectionEntryDescriptor.getElementTypeDescriptor());
}
list.set(this.index, newValue);
}
else {
throw new SpelEvaluationException(getStartPosition(), SpelMessage.INDEXING_NOT_SUPPORTED_FOR_TYPE, throw new SpelEvaluationException(getStartPosition(), SpelMessage.INDEXING_NOT_SUPPORTED_FOR_TYPE,
this.collectionEntryDescriptor.toString()); this.collectionEntryDescriptor.toString());
} }
growCollectionIfNecessary();
if (this.collectionEntryDescriptor.getElementTypeDescriptor() != null) {
newValue = this.typeConverter.convertValue(newValue, TypeDescriptor.forObject(newValue),
this.collectionEntryDescriptor.getElementTypeDescriptor());
}
list.set(this.index, newValue);
} }
private void growCollectionIfNecessary() { private void growCollectionIfNecessary() {
@ -906,7 +911,7 @@ public class Indexer extends SpelNodeImpl {
@Override @Override
public boolean isWritable() { public boolean isWritable() {
return true; return (this.collection instanceof List);
} }
@Nullable @Nullable