sonar rules corrected

Change-Id: Idb45d9f03256ad5a4bc66eb255258d65c1d305ce