Repository navigation
fix(WebUI): GadgetRegistry modern-preferred load hardening (#3025) - #3071
Merged
Merged
Conversation
Prefer modern gadget-catalog.json with legacy GadgetRegistry.xml fallback retained (#2852). Add INFO selection metrics (modern/legacyRegistryXml/none), getLastLoadEntryCount(), and edge-case tests for empty/unreadable modern catalog and successive last-load source updates. Refresh dual-run residual notes under definition-xml-shim-removal-criteria. Parent: #2630. Fixes #3025. > Co-Authored by Grok Build using grok-4.5 with agent main.
natechadwick-intsof
added
operator:grok
This was referenced Aug 11, 2026
natechadwick
approved these changes
Aug 11, 2026
5 tasks done
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
2 participants
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.
Summary
Hardens WebUI
GadgetRegistrymodern-preferred dual-load (parent #2630 residual of #2788) without removing the legacy fallback (#2852).gadget-catalog.json; fall back toGadgetRegistry.xmlwhen modern is absent, empty, or unreadablemodern=/legacyRegistryXml=/none=/entries=/source=(parity withPSWidgetDaoissue 2630 residual: wire PSWidgetDao modern-first selection (keep shim) #3024)getLastLoadSource()+ newgetLastLoadEntryCount()definition-xml-shim-removal-criteria.md,dual-run-legacy-definition-xml-shim.md,gadget-definition-inventory.mdOut of scope: shim/customer path deletion (#2852); Widget DAO (#3024 sibling).
Parent
Test plan
WebUI: standalone..\mvnw.cmd clean install(includes Surefire)GadgetRegistryTest: 15 tests, 0 failuresGadgetRegistry.xmlstill on classpath and dual-load path unchanged for customer installsGates evidence
WebUIcd WebUI; ..\mvnw.cmd clean install→ BUILD SUCCESS;GadgetRegistryTestTests run: 15, Failures: 0, Errors: 0getLastLoadEntryCount(); class alreadyfinal; no signature breaks; no reverse-dep callers required)Operator
Operator: Grok: night-issue-prs (model grok-4.5)