Fix handling of onmatch and onmismatch#4116
Open
ramanathan1504 wants to merge 11 commits intoapache:2.xfrom
Open
Fix handling of onmatch and onmismatch#4116ramanathan1504 wants to merge 11 commits intoapache:2.xfrom
ramanathan1504 wants to merge 11 commits intoapache:2.xfrom
Conversation
…Attributte (apache#2791) + more appropriate method name
+ made all Default***Builder implementations @ProviderrType + added setXXXAttribute method to some component builder interfaces with default implementations + added JSpecify @NullMarked to packages and @nullable where approrpiate to fields/mehods (per last PR review) + deprecated ComponentBuilder#addAttribute(...) methods and replaced with ComponentBuilder#setAttribute(...) methods in line with other builders (i.e. Plugins) - also since they don't just add but also remove if the value is null + reorganized ConfigurationBuilder to group getters, setters, builder factory methods + incremented package-info.java @Version annoations + added some null-guards in BuiltConfiguration#setup() + moved DeffaultConfigurationBuilder XML generation code from top to bottom of source file + removed "extra" attributes in Default***Builder constructors and replaced with setXXXAttribute chained calls in DefaultConfigurrationBuilder#newXXX(...) convenience methods + javadoc'd both packages (fixing documentation errors)
…instead of void (apache#2791) + added @BaselineIgnore due to API change (but breaks no code)
…lve builder conflicts
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.
Fixes #3505 Issue #2791
Addressed review feedback in this update:
Properties builder robustness (
log4j-core/.../PropertiesConfigurationBuilder.java)rootPropertiesinbuild().Long.parseLong(...)forshutdownTimeoutwith validated parsing (parseShutdownTimeout(...)) that throws aConfigurationExceptionwith a clear message.setLevelAttribute(...),setAdditivityAttribute(...)) to avoid regressions.Properties consumption correctness (
log4j-core/.../PropertiesConfigurationBuilder.java)levelAndRefsreads to remove the consumed key (properties.remove("")) to avoid stale/unprocessed entries.processRemainingProperties(...)before returning, so extra nested attributes/components are not dropped.Null/empty check cleanup (
log4j-core/.../PropertiesConfigurationBuilder.java)Strings.isEmpty(type)increateComponent(...).Changelog typo fix (
src/changelog/.2.x.x/2791_rework_ComponentBuilder_API.xml)JVerify->JSpecify.