Support varargs invocations in SpEL for varargs array subtype in compiled expressions #32804
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
spring-projects-issues
added
the
status: waiting-for-triage
sbrannen
added
in: core
sbrannen
reviewed
May 13, 2024
spring-expression/src/main/java/org/springframework/expression/spel/ast/SpelNodeImpl.java
Show resolved
Hide resolved
sbrannen
reviewed
May 13, 2024
spring-expression/src/main/java/org/springframework/expression/spel/ast/SpelNodeImpl.java
Show resolved
Hide resolved
sbrannen
reviewed
May 13, 2024
spring-expression/src/main/java/org/springframework/expression/spel/ast/SpelNodeImpl.java
Show resolved
Hide resolved
sbrannen
reviewed
May 13, 2024
...pression/src/test/java/org/springframework/expression/spel/SpelCompilationCoverageTests.java
Show resolved
Hide resolved
sbrannen
approved these changes
May 13, 2024
Thank you for the comments! I'll keep an eye out for the final fix. |
sbrannen
added a commit
to sbrannen/spring-framework
that referenced
this pull request
May 13, 2024
See spring-projectsgh-32804 Co-authored-by: Mikaël Francoeur <mikael.francoeur@ticketmaster.com>
sbrannen
pushed a commit
to sbrannen/spring-framework
that referenced
this pull request
May 13, 2024
This commit introduces support for compiling SpEL expressions that contain varargs invocations where the supplied array is a subtype of the declared varargs array type. See spring-projectsgh-32804
sbrannen
added a commit
to sbrannen/spring-framework
that referenced
this pull request
May 13, 2024
This commit partially reverts changes to SpelNodeImpl in order to reduce the scope of the overall change set. In addition, this commit revises the previous commit to support type-safe checks for array subtype compatibility. In order to support backward compatibility, this commit also reintroduces generateCodeForArguments(MethodVisitor, CodeFlow, Member, SpelNodeImpl[]) in deprecated form. Closes spring-projectsgh-32804
|
Current work on this issue can be viewed in the following feature branch which is based on this PR. main...sbrannen:spring-framework:issues/gh-32804-spel-varargs-array-subtype-compilation |
sbrannen
added a commit
to sbrannen/spring-framework
that referenced
this pull request
May 13, 2024
This commit partially reverts changes to SpelNodeImpl in order to reduce the scope of the overall change set. In addition, this commit revises the previous commit to support type-safe checks for array subtype compatibility. In order to support backward compatibility, this commit also reintroduces generateCodeForArguments(MethodVisitor, CodeFlow, Member, SpelNodeImpl[]) in deprecated form. Closes spring-projectsgh-32804
sbrannen
added a commit
to sbrannen/spring-framework
that referenced
this pull request
May 13, 2024
This commit partially reverts changes to SpelNodeImpl in order to reduce the scope of the overall change set. In addition, this commit revises the previous commit to support type-safe checks for array subtype compatibility. In order to support backward compatibility, this commit also reintroduces generateCodeForArguments(MethodVisitor, CodeFlow, Member, SpelNodeImpl[]) in deprecated form. Closes spring-projectsgh-32804
sbrannen
added a commit
that referenced
this pull request
May 14, 2024
See gh-32804 Co-authored-by: Mikaël Francoeur <mikael.francoeur@ticketmaster.com>
sbrannen
pushed a commit
that referenced
this pull request
May 14, 2024
This commit introduces support for compiling SpEL expressions that contain varargs invocations where the supplied array is a subtype of the declared varargs array type. See gh-32804
sbrannen
added a commit
that referenced
this pull request
May 14, 2024
This commit first reverts changes to SpelNodeImpl from the previous commit in order to reduce the scope of the overall change set. This commit then implements a different approach to support type-safe checks for array subtype compatibility. In order to support backward compatibility, this commit also reintroduces generateCodeForArguments(MethodVisitor, CodeFlow, Member, SpelNodeImpl[]) in deprecated form. See gh-32804
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR adds support for varargs invocations where the varargs argument is an array with a component type that is a subtype of the parameter varargs component type. For example, the method accepts an
Object... argsparameter, and it is passed aString[]argument. #32704 already added support for this in interpreted expressions. There were a few tests that were commented out because compiled expressions didn't support this yet, so I uncommented them and added more tests for functions, methods, and constructors.I will be happy to address any comments on this PR.