Fix some major sonar issues

Fix some major sonar issues

*Use collection.isEmpty() instead of collection.size
*Remove unnecessary commented line
 This is done for increasing code readability
*Pass the string object directly
 Instead of wrapping the returned object and
 creating a new object, passing the object itself will save
 memory

Issue-Id: SO-118
Change-Id: I24c15e9270ec3422d35d3910a8aff9fcf8d632d9
Signed-off-by: surya-huawei <a.u.surya@huawei.com>