CAL-672 fix build test failure reduce critical sonar issue