Correct generation of DateTime schema

Author: rjeberhard

docs/domains/Domain.json

@@ -122,6 +122,10 @@
         "clusterName"
       ]
     },
+    "DateTime": {
+      "format": "date-time",
+      "type": "string"
+    },
     "DomainCondition": {
       "type": "object",
       "properties": {
@@ -130,9 +134,8 @@
           "type": "string"
         },
         "lastTransitionTime": {
-          "format": "date-time",
           "description": "Last time the condition transitioned from one status to another.",
-          "type": "string"
+          "$ref": "#/definitions/DateTime"
         },
         "message": {
           "description": "Human-readable message indicating details about last transition.",
@@ -143,9 +146,8 @@
           "type": "string"
         },
         "lastProbeTime": {
-          "format": "date-time",
           "description": "Last time we probed the condition.",
-          "type": "string"
+          "$ref": "#/definitions/DateTime"
         },
         "status": {
           "description": "Status is the status of the condition. Can be True, False, Unknown. Required",
@@ -290,9 +292,8 @@
           "minimum": 0
         },
         "startTime": {
-          "format": "date-time",
           "description": "RFC 3339 date and time at which the operator started the domain. This will be when the operator begins processing and will precede when the various servers or clusters are available.",
-          "type": "string"
+          "$ref": "#/definitions/DateTime"
         },
         "conditions": {
           "description": "Current service state of domain.",
@@ -390,9 +391,8 @@
           "type": "string"
         },
         "activationTime": {
-          "format": "date-time",
           "description": "RFC 3339 date and time at which the server started.",
-          "type": "string"
+          "$ref": "#/definitions/DateTime"
         },
         "subsystems": {
           "description": "Status of unhealthy subsystems, if any.",
@@ -1014,8 +1014,7 @@
           "type": "string"
         },
         "deletionTimestamp": {
-          "format": "date-time",
-          "type": "string"
+          "$ref": "#/definitions/DateTime"
         },
         "labels": {
           "$ref": "#/definitions/Map"
@@ -1042,8 +1041,7 @@
           "type": "string"
         },
         "creationTimestamp": {
-          "format": "date-time",
-          "type": "string"
+          "$ref": "#/definitions/DateTime"
         },
         "name": {
           "type": "string"

docs/domains/index.html

@@ -1043,6 +1043,10 @@
         "clusterName"
       ]
     },
+    "DateTime": {
+      "format": "date-time",
+      "type": "string"
+    },
     "DomainCondition": {
       "type": "object",
       "properties": {
@@ -1051,9 +1055,8 @@
           "type": "string"
         },
         "lastTransitionTime": {
-          "format": "date-time",
           "description": "Last time the condition transitioned from one status to another.",
-          "type": "string"
+          "$ref": "#/definitions/DateTime"
         },
         "message": {
           "description": "Human-readable message indicating details about last transition.",
@@ -1064,9 +1067,8 @@
           "type": "string"
         },
         "lastProbeTime": {
-          "format": "date-time",
           "description": "Last time we probed the condition.",
-          "type": "string"
+          "$ref": "#/definitions/DateTime"
         },
         "status": {
           "description": "Status is the status of the condition. Can be True, False, Unknown. Required",
@@ -1211,9 +1213,8 @@
           "minimum": 0.0
         },
         "startTime": {
-          "format": "date-time",
           "description": "RFC 3339 date and time at which the operator started the domain. This will be when the operator begins processing and will precede when the various servers or clusters are available.",
-          "type": "string"
+          "$ref": "#/definitions/DateTime"
         },
         "conditions": {
           "description": "Current service state of domain.",
@@ -1311,9 +1312,8 @@
           "type": "string"
         },
         "activationTime": {
-          "format": "date-time",
           "description": "RFC 3339 date and time at which the server started.",
-          "type": "string"
+          "$ref": "#/definitions/DateTime"
         },
         "subsystems": {
           "description": "Status of unhealthy subsystems, if any.",
@@ -1935,8 +1935,7 @@
           "type": "string"
         },
         "deletionTimestamp": {
-          "format": "date-time",
-          "type": "string"
+          "$ref": "#/definitions/DateTime"
         },
         "labels": {
           "$ref": "#/definitions/Map"
@@ -1963,8 +1962,7 @@
           "type": "string"
         },
         "creationTimestamp": {
-          "format": "date-time",
-          "type": "string"
+          "$ref": "#/definitions/DateTime"
         },
         "name": {
           "type": "string"

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

@@ -215,7 +215,6 @@ 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;
@@ -285,7 +284,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) || isDateTime(type)) result.put("type", "string");
+      else if (isString(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);
@@ -403,20 +402,25 @@ private boolean satisfiesQualifier(Object enumConstant, Method qualifier) {
   }
 
   private void generateObjectTypeIn(Map<String, Object> result, Class<?> type) {
-    Map<String, Object> properties = new HashMap<>();
-    List<String> requiredFields = new ArrayList<>();
-    result.put("type", "object");
-    if (includeAdditionalProperties) result.put("additionalProperties", "false");
-    result.put("properties", properties);
-
-    for (Field field : getPropertyFields(type)) {
-      if (!isSelfReference(field)) generateFieldIn(properties, field);
-      if (isRequired(field) && includeInSchema(field)) {
-        requiredFields.add(getPropertyName(field));
+    if (isDateTime(type)) {
+      result.put("type", "string");
+      result.put("format", "date-time");
+    } else {
+      Map<String, Object> properties = new HashMap<>();
+      List<String> requiredFields = new ArrayList<>();
+      result.put("type", "object");
+      if (includeAdditionalProperties) result.put("additionalProperties", "false");
+      result.put("properties", properties);
+
+      for (Field field : getPropertyFields(type)) {
+        if (!isSelfReference(field)) generateFieldIn(properties, field);
+        if (isRequired(field) && includeInSchema(field)) {
+          requiredFields.add(getPropertyName(field));
+        }
       }
-    }
 
-    if (!requiredFields.isEmpty()) result.put("required", requiredFields.toArray(new String[0]));
+      if (!requiredFields.isEmpty()) result.put("required", requiredFields.toArray(new String[0]));
+    }
   }
 
   private Collection<Field> getPropertyFields(Class<?> type) {