Fix Sonar Qube Violations

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