Fix Either log or rethrow this exception
Fix Extract this nested try block into a separate method
Fix This block of commented-out lines of code should be removed
Fix Replace the type specification in this constructor call with the diamond operator ("<>")
Issue-ID: DMAAP-894
Change-Id: If1009f4d7fd193184f34e29a1fef1ed4ae42ea25
Signed-off-by: Parshad Patel <pars.patel@samsung.com>