Fix NPE & other sonar issues

Fix A "NullPointerException" could be thrown
Add the "@Override" annotation above this method signature
Remove the boxing to "Long"; The argument is already of the same type
Replace the type specification in this constructor call with the diamond operator ("<>")

Issue-ID: PORTAL-562
Change-Id: Ib2d7b8a526f3effce13845a3c2b7abedeb78b042
Signed-off-by: Parshad Patel <pars.patel@samsung.com>
2 files changed