fixed sonar violation : Major - should be final class. #106

#106 using cherry-pick 7422163b9b3a1835d2de8ef9ed6fe4acdc05d164 from master.
please, merge 1.0.x