fixed some sonar code smells

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