We can't use diamonds because we still support JDK6 for sailthru-java-client