Repository navigation
refactor(search)!: PropertiesListResolver hands out Map.Entry, and silly-bean goes (#53) - #57
Merged
Merged
Conversation
…ir today (#53) PropertiesListResolver hands out its result as List<KeyValuePair<File, Locale>>, a type of silly-bean, which is archived (astrapi69/silly-bean#37). Its getter moves to the JDK's Map.Entry in the next commit. No test read the list so far: the two tests check the constructor only. The test builds a tree at runtime and pins what resolve() finds: each properties file, also in a subdirectory, with the locale of its name (messages_de to German, messages_de_DE to Germany), the default locale for a file without one, and no entry for a file of another kind. It reads the entries through the element type of today, so the next commit shows the change of the getter's type in this test.
…lly-bean goes (#53) silly-bean is archived (astrapi69/silly-bean#37): the JDK covers what it was for, and its users migrate in their own repositories. This repository used it in one place: PropertiesListResolver kept its result as List<KeyValuePair<File, Locale>>, which Lombok's @Getter makes public as getPropertiesList(). The list holds Map.Entry<File, Locale> now, each an AbstractMap.SimpleImmutableEntry, as the library rule takes the JDK first; unlike Map.entry it does not refuse a null value. getKey() and getValue() stay as they were, so a caller changes only the element type it names. The direct dependency on silly-bean goes from dependencies.gradle, the version catalog and module-info.java. silly-bean 2 stays on the runtime class path through silly-collection 28 and file-worker 17.4 until those are raised. BREAKING CHANGE: getPropertiesList() returns List<Map.Entry<File, Locale>> instead of List<KeyValuePair<File, Locale>>.
getPropertiesList() of PropertiesListResolver changes its type with the commit before, a change of the public API, so the next release is a major (RL-060), not 6.2. The form follows the last major of this repository, 6.0. Closes #53
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## develop #57 +/- ##
=============================================
- Coverage 74.84% 74.81% -0.04%
Complexity 205 205
=============================================
Files 25 25
Lines 831 830 -1
Branches 140 140
=============================================
- Hits 622 621 -1
Misses 130 130
Partials 79 79 ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
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.
Closes #53
silly-bean is archived (astrapi69/silly-bean#37, the maintainer's decision of 2026-11-06); its users migrate in their own repositories. resourcebundle-core used it in one place:
PropertiesListResolverkept its result asList<KeyValuePair<File, Locale>>, public through Lombok's@GetterasgetPropertiesList(). It hands out the JDK'sMap.Entrynow, which changes the getter's type, sodevelopopens the major 7.0.What changes
test(search): pin what PropertiesListResolver resolves, as KeyValuePair today (#53)(e716281)testResolve: a tree built at runtime; each properties file, also in a subdirectory, comes with the locale of its name (messages_deGerman,messages_de_DEGermany), the default locale for a file without one, no entry forreadme.txt. It reads the entries through today's element type, so the next commit shows the type change in the test.refactor(search)!: PropertiesListResolver hands out Map.Entry, and silly-bean goes (#53)(1865131)List<Map.Entry<File, Locale>>, each anAbstractMap.SimpleImmutableEntry(JDK first; unlikeMap.entryit does not refuse a null value);getKey()andgetValue()staygradle/dependencies.gradle,gradle/libs.versions.tomlandmodule-info.java(requires io.github.astrapisixtynine.silly.bean)build: develop opens the major 7.0, for the getter type of #53(f03ce9d)projectVersion6.2-SNAPSHOT to 7.0-SNAPSHOT, the form of the last major, 6.0 (RL-060)Who has to change
git grepover the local checkouts' default branches: bundle-app-ui (on resourcebundle-core 5) names the type inApplicationDashboardContentPanel(260),ImportWizardPanel(171),ConvertExtensions(29, 34, 53) andBundleFileTableModel(46); it changesKeyValuePair<File, Locale>toMap.Entry<File, Locale>when it moves to 7.0. No other caller ofPropertiesListResolver(the inventory of #53).Still on the runtime class path
./gradlew dependencies --configuration runtimeClasspath: silly-bean 2 comes through silly-collection 28 and file-worker 17.4; this repository neither declares nor uses it any more. It goes when those two are raised to versions without it.Evidence
JDK 17.0.20 (Temurin; the workflow sets up
'17'),./gradlew spotlessApply build --console=plainthrough the build-slot script; counts summed overbuild/test-results/test/TEST-*.xml:git grep -n "silly.bean\|silly-bean\|KeyValuePair" -- src gradle build.gradleon 1865131: nothing.