Correct for date-time

Author: rjeberhard

docs/domains/Domain.json

@@ -68,10 +68,6 @@
         "channelName"
       ]
     },
-    "Chronology": {
-      "type": "object",
-      "properties": {}
-    },
     "Cluster": {
       "type": "object",
       "properties": {
@@ -126,28 +122,15 @@
         "clusterName"
       ]
     },
-    "DateTime": {
-      "type": "object",
-      "properties": {
-        "iChronology": {
-          "$ref": "#/definitions/Chronology"
-        },
-        "iMillis": {
-          "type": "number"
-        }
-      },
-      "required": [
-        "iMillis"
-      ]
-    },
     "DomainCondition": {
       "type": "object",
       "properties": {
         "reason": {
           "type": "string"
         },
         "lastTransitionTime": {
-          "$ref": "#/definitions/DateTime"
+          "format": "date-time",
+          "type": "string"
         },
         "message": {
           "type": "string"
@@ -156,7 +139,8 @@
           "type": "string"
         },
         "lastProbeTime": {
-          "$ref": "#/definitions/DateTime"
+          "format": "date-time",
+          "type": "string"
         },
         "status": {
           "type": "string"
@@ -297,7 +281,8 @@
           "minimum": 0
         },
         "startTime": {
-          "$ref": "#/definitions/DateTime"
+          "format": "date-time",
+          "type": "string"
         },
         "conditions": {
           "type": "array",
@@ -392,7 +377,8 @@
           "type": "string"
         },
         "activationTime": {
-          "$ref": "#/definitions/DateTime"
+          "format": "date-time",
+          "type": "string"
         },
         "subsystems": {
           "type": "array",
@@ -1005,7 +991,8 @@
           "type": "string"
         },
         "deletionTimestamp": {
-          "$ref": "#/definitions/DateTime"
+          "format": "date-time",
+          "type": "string"
         },
         "labels": {
           "$ref": "#/definitions/Map"
@@ -1032,7 +1019,8 @@
           "type": "string"
         },
         "creationTimestamp": {
-          "$ref": "#/definitions/DateTime"
+          "format": "date-time",
+          "type": "string"
         },
         "name": {
           "type": "string"

docs/domains/index.html

@@ -988,10 +988,6 @@
         "channelName"
       ]
     },
-    "Chronology": {
-      "type": "object",
-      "properties": {}
-    },
     "Cluster": {
       "type": "object",
       "properties": {
@@ -1046,28 +1042,15 @@
         "clusterName"
       ]
     },
-    "DateTime": {
-      "type": "object",
-      "properties": {
-        "iChronology": {
-          "$ref": "#/definitions/Chronology"
-        },
-        "iMillis": {
-          "type": "number"
-        }
-      },
-      "required": [
-        "iMillis"
-      ]
-    },
     "DomainCondition": {
       "type": "object",
       "properties": {
         "reason": {
           "type": "string"
         },
         "lastTransitionTime": {
-          "$ref": "#/definitions/DateTime"
+          "format": "date-time",
+          "type": "string"
         },
         "message": {
           "type": "string"
@@ -1076,7 +1059,8 @@
           "type": "string"
         },
         "lastProbeTime": {
-          "$ref": "#/definitions/DateTime"
+          "format": "date-time",
+          "type": "string"
         },
         "status": {
           "type": "string"
@@ -1217,7 +1201,8 @@
           "minimum": 0.0
         },
         "startTime": {
-          "$ref": "#/definitions/DateTime"
+          "format": "date-time",
+          "type": "string"
         },
         "conditions": {
           "type": "array",
@@ -1312,7 +1297,8 @@
           "type": "string"
         },
         "activationTime": {
-          "$ref": "#/definitions/DateTime"
+          "format": "date-time",
+          "type": "string"
         },
         "subsystems": {
           "type": "array",
@@ -1925,7 +1911,8 @@
           "type": "string"
         },
         "deletionTimestamp": {
-          "$ref": "#/definitions/DateTime"
+          "format": "date-time",
+          "type": "string"
         },
         "labels": {
           "$ref": "#/definitions/Map"
@@ -1952,7 +1939,8 @@
           "type": "string"
         },
         "creationTimestamp": {
-          "$ref": "#/definitions/DateTime"
+          "format": "date-time",
+          "type": "string"
         },
         "name": {
           "type": "string"

json-schema/src/main/java/oracle/kubernetes/json/SchemaGenerator.java

@@ -18,6 +18,7 @@
 import java.net.URL;
 import java.util.*;
 import javax.annotation.Nonnull;
+import org.joda.time.DateTime;
 
 @SuppressWarnings("WeakerAccess")
 public class SchemaGenerator {
@@ -200,6 +201,7 @@ private Object getSubSchema(Field field) {
     String description = getDescription(field);
     if (description != null) result.put("description", description);
     if (isString(field.getType())) addStringRestrictions(result, field);
+    if (isDateTime(field.getType())) result.put("format", "date-time");
     if (isNumeric(field.getType())) addRange(result, field);
 
     return result;
@@ -209,6 +211,10 @@ private boolean isString(Class<?> type) {
     return type.equals(String.class);
   }
 
+  private boolean isDateTime(Class<?> type) {
+    return type.equals(DateTime.class);
+  }
+
   private boolean isNumeric(Class<?> type) {
     return Number.class.isAssignableFrom(type) || PRIMITIVE_NUMBERS.contains(type);
   }
@@ -265,7 +271,7 @@ private class SubSchemaGenerator {
     private void generateTypeIn(Map<String, Object> result, Class<?> type) {
       if (type.equals(Boolean.class) || type.equals(Boolean.TYPE)) result.put("type", "boolean");
       else if (isNumeric(type)) result.put("type", "number");
-      else if (isString(type)) result.put("type", "string");
+      else if (isString(type) || isDateTime(type)) result.put("type", "string");
       else if (type.isEnum()) generateEnumTypeIn(result, (Class<? extends Enum>) type);
       else if (type.isArray()) this.generateArrayTypeIn(result, type);
       else if (Collection.class.isAssignableFrom(type)) generateCollectionTypeIn(result);