[Client] Removed java 7 dependency