review

Author: andreaTP

java-generator/core/src/main/java/io/fabric8/java/generator/nodes/AbstractJSONSchema2Pojo.java

@@ -49,6 +49,7 @@ public static final AnnotationExpr newGeneratedAnnotation() {
         new StringLiteralExpr("io.fabric8.java.generator.CRGeneratorRunner"));
   }
 
+  // RFC 3339 - from: https://swagger.io/docs/specification/data-models/data-types/
   public static final String DATETIME_FORMAT = "yyyy-MM-dd'T'HH:mm:ssX";
 
   protected final String description;

java-generator/core/src/test/resources/crontab-crd.yml

@@ -39,7 +39,7 @@ spec:
                   type: string
                 replicas:
                   type: integer
-                datetime:
+                issuedAt:
                   format: date-time
                   type: string
             status:

java-generator/core/src/test/resources/io/fabric8/java/generator/approvals/ApprovalTest.generate_withValidCrd_shouldGeneratePojos.testCrontabCrd.approved.txt

@@ -11,7 +11,7 @@ public class CronTab extends io.fabric8.kubernetes.client.CustomResource<org.tes
 CrontabJavaCr[1] = package org.test.v1;
 
 @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL)
-@com.fasterxml.jackson.annotation.JsonPropertyOrder({"cronSpec","datetime","image","replicas"})
+@com.fasterxml.jackson.annotation.JsonPropertyOrder({"cronSpec","image","issuedAt","replicas"})
 @com.fasterxml.jackson.databind.annotation.JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
 @javax.annotation.processing.Generated("io.fabric8.java.generator.CRGeneratorRunner")
 public class CronTabSpec implements io.fabric8.kubernetes.api.model.KubernetesResource {
@@ -28,19 +28,6 @@ public class CronTabSpec implements io.fabric8.kubernetes.api.model.KubernetesRe
         this.cronSpec = cronSpec;
     }
 
-    @com.fasterxml.jackson.annotation.JsonProperty("datetime")
-    @com.fasterxml.jackson.annotation.JsonFormat(timezone = "UTC", pattern = "yyyy-MM-dd'T'HH:mm:ssX")
-    @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SKIP)
-    private java.time.ZonedDateTime datetime;
-
-    public java.time.ZonedDateTime getDatetime() {
-        return datetime;
-    }
-
-    public void setDatetime(java.time.ZonedDateTime datetime) {
-        this.datetime = datetime;
-    }
-
     @com.fasterxml.jackson.annotation.JsonProperty("image")
     @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SKIP)
     private String image;
@@ -53,6 +40,19 @@ public class CronTabSpec implements io.fabric8.kubernetes.api.model.KubernetesRe
         this.image = image;
     }
 
+    @com.fasterxml.jackson.annotation.JsonProperty("issuedAt")
+    @com.fasterxml.jackson.annotation.JsonFormat(timezone = "UTC", pattern = "yyyy-MM-dd'T'HH:mm:ssX")
+    @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SKIP)
+    private java.time.ZonedDateTime issuedAt;
+
+    public java.time.ZonedDateTime getIssuedAt() {
+        return issuedAt;
+    }
+
+    public void setIssuedAt(java.time.ZonedDateTime issuedAt) {
+        this.issuedAt = issuedAt;
+    }
+
     @com.fasterxml.jackson.annotation.JsonProperty("replicas")
     @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SKIP)
     private Long replicas;

java-generator/core/src/test/resources/io/fabric8/java/generator/approvals/ApprovalTest.generate_withValidCrd_shouldGeneratePojos.testCrontabExtraAnnotationsCrd.approved.txt

@@ -28,7 +28,7 @@ public class CronTab extends io.fabric8.kubernetes.client.CustomResource<org.tes
 CrontabJavaExtraAnnotationsCr[1] = package org.test.v1;
 
 @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL)
-@com.fasterxml.jackson.annotation.JsonPropertyOrder({"cronSpec","datetime","image","replicas"})
+@com.fasterxml.jackson.annotation.JsonPropertyOrder({"cronSpec","image","issuedAt","replicas"})
 @com.fasterxml.jackson.databind.annotation.JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
 @javax.annotation.processing.Generated("io.fabric8.java.generator.CRGeneratorRunner")
 @lombok.ToString()
@@ -62,19 +62,6 @@ public class CronTabSpec implements io.fabric8.kubernetes.api.model.KubernetesRe
         this.cronSpec = cronSpec;
     }
 
-    @com.fasterxml.jackson.annotation.JsonProperty("datetime")
-    @com.fasterxml.jackson.annotation.JsonFormat(timezone = "UTC", pattern = "yyyy-MM-dd'T'HH:mm:ssX")
-    @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SKIP)
-    private java.time.ZonedDateTime datetime;
-
-    public java.time.ZonedDateTime getDatetime() {
-        return datetime;
-    }
-
-    public void setDatetime(java.time.ZonedDateTime datetime) {
-        this.datetime = datetime;
-    }
-
     @com.fasterxml.jackson.annotation.JsonProperty("image")
     @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SKIP)
     private String image;
@@ -87,6 +74,19 @@ public class CronTabSpec implements io.fabric8.kubernetes.api.model.KubernetesRe
         this.image = image;
     }
 
+    @com.fasterxml.jackson.annotation.JsonProperty("issuedAt")
+    @com.fasterxml.jackson.annotation.JsonFormat(timezone = "UTC", pattern = "yyyy-MM-dd'T'HH:mm:ssX")
+    @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SKIP)
+    private java.time.ZonedDateTime issuedAt;
+
+    public java.time.ZonedDateTime getIssuedAt() {
+        return issuedAt;
+    }
+
+    public void setIssuedAt(java.time.ZonedDateTime issuedAt) {
+        this.issuedAt = issuedAt;
+    }
+
     @com.fasterxml.jackson.annotation.JsonProperty("replicas")
     @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SKIP)
     private Long replicas;