Fix bug. NullPointerException for null string date
Fix bug. Invalid date format
Java code refactoring