migrate to java 1.7