[Java][RestClient][WebClient] refactor: use CollectionFormat helper method in query generation - #24781
Merged
wing328 merged 1 commit intoAug 26, 2026
Conversation
…ethod in query generation
rar91279
added a commit
to rar91279/openapi-generator
that referenced
this pull request
Sep 4, 2026
…t separator helper Port two changes from master into the okhttp library: - generateInsecureTlsHook (OpenAPITools#24786): when set to false, the okhttp ApiClient omits the verifyingSsl field, setVerifyingSsl/isVerifyingSsl and the trust-all X509TrustManager/HostnameVerifier, for consumers whose static analysis flags that code. The verifying TLS setup moves into trustedTrustManagers()/trustedHostnameVerifier() so both template variants share it. - CollectionFormat helper (OpenAPITools#24781): deduplicate the collection-format delimiter lookup in parameterToPairs and collectionPathParameterToString into a collectionFormatSeparator method.
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.
When I previously added Json-query serialization to the
RestClientandWebClient, I constructed the formatting withStringUtils.collectionToDelimitedString(values, collectionFormat.separator), this is superfluous, sinceCollectionFormatitself is already designed to already do exactly this withThis PR changes so that the helper is properly used for the query construction.
I have also changed the
CollectionFormatacccessability, since a previous PR that wanted to make everything extendable has made led to there being enum variables that areprotected(which does not make sense since an enum isfinal).The visibility should either be
privateorpublic, and since it a helper method that cannot be extended, I have elected to change it back to private (and that the helper method that uses the variable ispublic).PR checklist
Commit all changed files.
This is important, as CI jobs will verify all generator outputs of your HEAD commit as it would merge with master.
These must match the expectations made by your contribution.
You may regenerate an individual generator by passing the relevant config(s) as an argument to the script, for example
./bin/generate-samples.sh bin/configs/java*.IMPORTANT: Do NOT purge/delete any folders/files (e.g. tests) when regenerating the samples as manually written tests may be removed.