Java 8 re-factor & retry logic