Fix Sonar Qube Violations

Issue-ID: CPS-475
Signed-off-by: lukegleeson <luke.gleeson@est.tech>
Change-Id: I9673fe8ff5373a1ea50df148ac2a3d8af235e508
4 files changed