[OPENJPA-2955] Do not remove schema generation keys from the caller's properties map - #161
Open
rzo1 wants to merge 1 commit into
Open
[OPENJPA-2955] Do not remove schema generation keys from the caller's properties map#161rzo1 wants to merge 1 commit into
rzo1 wants to merge 1 commit into
Conversation
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.
extractSchemaGenObjectsnow records which of the four script keys held aWriter/Readerand strips them from a copy, so the map handed tofromPropertiesis left untouched — see https://issues.apache.org/jira/browse/OPENJPA-2955. The copy is only made when one of the keys is actually an object, so the common all-strings case allocates nothing.Both halves of the report reproduce.
Map.of(...)really does throwUnsupportedOperationException, and there is an in-tree victim of the mutation as well:DistributedJDBCConfigurationImpl.fromPropertiescallssuper.fromProperties(original)and then keeps usingoriginalto build every slice, so each slice silently lost its scriptWriter/Reader.New
TestSchemaGenObjectPropertiescovers capture, caller-map immutability, an unmodifiable input map and the plain string path. Three of its four tests fail against master (2 failures plus theUnsupportedOperationException); all four pass here, as doTestSchemaGenDrop,TestSchemaGenAnnotations,TestSchemaGenerationScriptsandTestSchemaGenerationProperties(34 tests). The test lives inopenjpa-jdbcrather thanopenjpa-kernelbecause constructing anOpenJPAConfigurationImplneeds aProductDerivationon the classpath, andopenjpa-kernelhas none in its own test scope.