Replace java.util.Date with java.time based objects