Fix sonar code maintainability issues

Sonar code maintainability issues resolved.

Issue-ID: NONRTRIC-872
Change-Id: I94bbf5088f2808c9f9df5468ae4fef4a369723c5
Signed-off-by: aravind.est <aravindhan.a@est.tech>
6 files changed