Fix Eclipse warnings - Remove redundant type arguments - Remove empty statement - Use try-with-resources to close repository - Replace EasyMock deprecated method Change-Id: I9c75e621db8e3a6b5427df05e0ea3ba2f67f2ffc