fixed some issues from sonar

Issue-ID: PORTAL-865
Change-Id: I310d08614f54b931a21585e702b1e58b50e1fcf6
Signed-off-by: Rupinder <rupinsi1@in.ibm.com>
5 files changed