Added time and date-time type check

Author: jiachen1120

src/main/java/com/networknt/schema/DateTimeValidator.java

@@ -31,13 +31,18 @@
 public class DateTimeValidator extends BaseJsonValidator implements JsonValidator {
     private static final Logger logger = LoggerFactory.getLogger(DateTimeValidator.class);
 
+    private final String formatName;
+    private final String DATE = "date";
+    private final String DATETIME = "date-time";
+
     private static final Pattern RFC3339_PATTERN = Pattern.compile(
             "^(\\d{4})-(\\d{2})-(\\d{2})" // yyyy-MM-dd
                     + "([Tt](\\d{2}):(\\d{2}):(\\d{2})(\\.\\d+)?)?" // 'T'HH:mm:ss.milliseconds
                     + "([Zz]|([+-])(\\d{2}):(\\d{2}))?");
 
-    public DateTimeValidator(String schemaPath, JsonNode schemaNode, JsonSchema parentSchema, ValidationContext validationContext) {
+    public DateTimeValidator(String schemaPath, JsonNode schemaNode, JsonSchema parentSchema, ValidationContext validationContext, String formatName) {
         super(schemaPath, schemaNode, parentSchema, ValidatorTypeCode.DATETIME, validationContext);
+        this.formatName = formatName;
         parseErrorCode(getValidatorType().getErrorCodeKey());
     }
 
@@ -82,9 +87,15 @@ private boolean isLegalDateTime(String string) {
         String timeShiftHour = null;
         String timeShiftMinute = null;
 
+        if (!isTimeGiven && DATETIME.equals(formatName) || (isTimeGiven && DATE.equals(formatName))) {
+            logger.error("The supplied date/time format type does not match the specification, expected: " + formatName);
+            return false;
+        }
+
         if (!isTimeGiven && isTimeZoneShiftGiven) {
-            throw new NumberFormatException("Invalid date/time format, cannot specify time zone shift" +
+            logger.error("Invalid date/time format, cannot specify time zone shift" +
                     " without specifying time: " + string);
+            return false;
         }
 
         if (isTimeGiven) {

src/main/java/com/networknt/schema/FormatKeyword.java

@@ -47,7 +47,7 @@ public JsonValidator newValidator(String schemaPath, JsonNode schemaNode, JsonSc
             format = formats.get(formatName);
             // Validate date and time separately
             if (formatName.equals(DATE) || formatName.equals(DATE_TIME)) {
-                return new DateTimeValidator(schemaPath, schemaNode, parentSchema, validationContext);
+                return new DateTimeValidator(schemaPath, schemaNode, parentSchema, validationContext, formatName);
             }
         }
         return new FormatValidator(schemaPath, schemaNode, parentSchema, validationContext, format);

src/test/resources/tests/optional/format.json

@@ -97,6 +97,21 @@
                 "description": "a valid date-time string",
                 "data": "2019-02-28T08:30:59.99999z",
                 "valid": true
+            },
+            {
+                "description": "an incomplete date-time string",
+                "data": "2019-02-28",
+                "valid": false
+            },
+            {
+                "description": "an incomplete date-time string",
+                "data": "2019-02-28-08:00",
+                "valid": false
+            },
+            {
+                "description": "an incomplete date-time string",
+                "data": "2019-02-28Z",
+                "valid": false
             }
         ]
     },
@@ -114,6 +129,11 @@
                 "data": "1963-12-35",
                 "valid": false
             },
+            {
+                "description": "an invalid date string",
+                "data": "2019-02-28T08:30:59.99999z",
+                "valid": false
+            },
             {
                 "description": "a valid date string",
                 "data": "1963-12-31",