3.2
Fix Sonar issue s2293 The diamond operator ('<>') should be used (#14005)
[3.2]Use spotless to format the code (#13320)