javaee7 refactor