Sonar fix: ServiceCatalogV3.java