Sonar Fixes

Issue-ID: AAF-1040 Ticket for Sonar Fixes
Change-Id: I0b9ea7dcb1d91dc262ec64128d1ca1f9b98baa0c
Signed-off-by: HelenaLydon <helena.lydon@est.tech>
12 files changed