Refactor Converter type dispatch to remove chained instanceof tests#303
Merged
vharseko merged 1 commit intoJul 24, 2026
Merged
Conversation
Resolve both java/chained-type-tests alerts in Converter: - wrap(Parameter, Request, Scriptable): dispatch via Request.accept( RequestVisitor) instead of an instanceof chain over the Request subtypes - wrap(Parameter, Object, Scriptable, boolean): dispatch via an ordered Class -> strategy registry, iterated in the same precedence as the previous if/else-if chain Behaviour is unchanged; the javascript module tests pass.
maximthomas
approved these changes
Jul 24, 2026
This file contains hidden or 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
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.
Resolves both
java/chained-type-testsCodeQL alerts inConverter(script/javascript). No behaviour changes; the module's 26 tests pass.Changes
wrap(Parameter, Request, Scriptable)— replace theinstanceofchain over theRequestsubtypes withRequest.accept(RequestVisitor). This reuses the existing json-resource visitor API, drops the repeatedsetBuiltinProtoAndParentcall, and lets the compiler enforce that everyRequestsubtype is handled. The original "we shouldn't get here" fallback is preserved via a null check.wrap(Parameter, Object, Scriptable, boolean)— replace theinstanceofchain over unrelated types (Map,List,Function,JsonValue,JsonPointer,Request,Context) with an orderedClass -> strategyregistry (LinkedHashMap), iterated in the same precedence as the previousif/else ifchain.nullhandling and theContext.javaToJS(...)fallback are unchanged.Notes
These types share no common hierarchy, so the second method is table-driven dispatch rather than true polymorphism — it removes the flagged
instanceofchain while preserving the exact evaluation order and behaviour.Verification
mvn -pl script/javascript -am test—RhinoScriptTest: 26 run, 0 failures, 0 errors.