[type:refeactor] refeactor 2.6.1

[moremind]

Make sure that:

• You have read the contribution guidelines.
• You submit test cases (unit or integration tests) that back your changes.
• Your local test passed ./mvnw clean install -Dmaven.javadoc.skip=true.

[codecov-commenter]

Codecov Report

Merging #4995 (97e951b) into master (7711d77) will increase coverage by 0.02%.
The diff coverage is n/a.

@@             Coverage Diff              @@
##             master    #4995      +/-   ##
============================================
+ Coverage     63.91%   63.94%   +0.02%     
- Complexity     8529     8538       +9     
============================================
  Files          1208     1208              
  Lines         35899    35899              
  Branches       3217     3217              
============================================
+ Hits          22946    22955       +9     
+ Misses        11104    11091      -13     
- Partials       1849     1853       +4     

see 3 files with indirect coverage changes

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more