sonar noted cleanup

added default statements to case statements - just using break there.
So nothing special.