PDI-11615 : Keep code in line with Pentaho CheckStyle rules