move code in Java9 which can safely run in Java8
2 files changed