add some java 8 magic.
fix some java 8 magic.