Changed SonarMetrics class and SonarDecorator class.