Upversion to jdk 8. Use diamond operator where possible.