General sonar fixes

+) removed unused imports and done formatting

Issue-ID: PORTAL-680
Change-Id: I1f6ceca61dfc59726cc9e5f7ad802e5c9b0f4d6e
Signed-off-by: arindamm <arind.mondal@samsung.com>
2 files changed