Fix sonar issues

Change-Id: I4aff14b6afc5faaf95f28286dc6f2f741191e403
Issue-ID: DCAEGEN2-991
Signed-off-by: elinuxhenrik <henrik.b.andersson@est.tech>
8 files changed