Fix issues and code smells detected by Sonarqube - phase 2

Copyright © Eclipse Foundation, Inc. All Rights Reserved.     Privacy Policy | Terms of Use | Copyright Agent