Fix rubocop issues

[#59314610]
Merge 59314610-tomcat-datasource to master

[#59314610]