Avoid java.sql.Date vs. java.util.Date mixup

Avoid java.sql.Date vs. java.util.Date mixup #2661