sonar "final class" fix