Spring Polishing

Base on SonarLint and IDEA suggestions, polishing the code.

• Reorder the modifiers to comply with the Java Language Specification.
• java:S4276 Refactor this code to use the more specialised Functional Interface 'UnaryOperator'
• Merge this if statement with the enclosing one.
• Use record for immutable classes.