Update snapshot versions

Apicurio · Nov 28, 2023 · 9b49ae8 · 9b49ae8
1 parent 5fcfb56
commit 9b49ae8
Show file tree

Hide file tree

Showing 23 changed files with 49 additions and 49 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>io.apicurio</groupId>
         <artifactId>apicurio-codegen-parent</artifactId>
-        <version>1.0.13</version>
+        <version>1.1.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/core/src/main/java/io/apicurio/hub/api/codegen/OpenApi2JaxRs.java b/core/src/main/java/io/apicurio/hub/api/codegen/OpenApi2JaxRs.java
@@ -47,6 +47,8 @@
 
 import javax.lang.model.SourceVersion;
 
+import com.sun.codemodel.JDefinedClass;
+import com.sun.codemodel.JFieldVar;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
 import org.commonmark.parser.Parser;
@@ -133,6 +135,11 @@ public boolean isIncludeAdditionalProperties() {
         public boolean isIncludeToString() {
             return false;
         }
+
+        @Override
+        public boolean isFormatDateTimes() {
+            return false;
+        }
     };
     protected static JavaBeanPostProcessor postProcessor = new JavaBeanPostProcessor();
 
@@ -858,7 +865,7 @@ private void generateJavaBean(CodegenJavaBean bean, CodegenInfo info, IndexedCod
         String generatedBeanFQCN = generatedBeanPackage + "." + generatedBeanName;
 
         SchemaMapper schemaMapper = new SchemaMapper(
-                new JaxRsRuleFactory(config, new Jackson2Annotator(config), new SchemaStore() {
+                new JaxRsRuleFactory(config, new JaxRsJackson2Annotator(info, config), new SchemaStore() {
                     @Override
                     public Schema create(Schema parent, String path, String refFragmentPathDelimiters) {
                         String beanClassname = schemaRefToFQCN(path);
@@ -993,4 +1000,23 @@ public Rule<JClassContainer, JType> getEnumRule() {
         }
     }
 
+    public static class JaxRsJackson2Annotator extends Jackson2Annotator {
+
+        private CodegenInfo codegenInfo;
+
+        /**
+         * Constructor.
+         */
+        public JaxRsJackson2Annotator(CodegenInfo codegenInfo, GenerationConfig generationConfig) {
+            super(generationConfig);
+            this.codegenInfo = codegenInfo;
+        }
+
+        @Override
+        public void dateTimeField(JFieldVar field, JDefinedClass clazz, JsonNode node) {
+            if (!codegenInfo.getSuppressDateTimeFormats()) {
+                super.dateTimeField(field, clazz, node);
+            }
+        }
+    }
 }
diff --git a/core/src/main/java/io/apicurio/hub/api/codegen/beans/CodegenInfo.java b/core/src/main/java/io/apicurio/hub/api/codegen/beans/CodegenInfo.java
@@ -31,6 +31,7 @@ public class CodegenInfo {
     private List<CodegenJavaBean> beans = new ArrayList<>();
     private String contextRoot = "";
     private List<CodegenBeanAnnotationDirective> beanAnnotations = new ArrayList<>();
+    private Boolean suppressDateTimeFormats = Boolean.FALSE;
 
     /**
      * Constructor.
@@ -136,4 +137,11 @@ public void setBeanAnnotations(List<CodegenBeanAnnotationDirective> beanAnnotati
         this.beanAnnotations = beanAnnotations;
     }
 
+    public Boolean getSuppressDateTimeFormats() {
+        return suppressDateTimeFormats;
+    }
+
+    public void setSuppressDateTimeFormats(Boolean suppressDateTimeFormats) {
+        this.suppressDateTimeFormats = suppressDateTimeFormats;
+    }
 }
diff --git a/core/src/main/java/io/apicurio/hub/api/codegen/jaxrs/OpenApi2CodegenVisitor.java b/core/src/main/java/io/apicurio/hub/api/codegen/jaxrs/OpenApi2CodegenVisitor.java
@@ -404,6 +404,12 @@ private void processCodegenConfig(Map<String, Object> codegen) {
         if (cr != null) {
             this.codegenInfo.setContextRoot(cr);
         }
+
+        //process suppress date-time formats
+        Boolean suppressDateTimeFormat = (Boolean) codegen.get("suppress-date-time-formatting");
+        if (suppressDateTimeFormat != null) {
+            this.codegenInfo.setSuppressDateTimeFormats(suppressDateTimeFormat);
+        }
     }
 
     /**

diff --git a/...full-different-ns/generated-api-11/src/main/java/my/other/pkg/beans/ArtifactMetaData.java b/...full-different-ns/generated-api-11/src/main/java/my/other/pkg/beans/ArtifactMetaData.java
@@ -6,7 +6,6 @@
 import java.util.List;
 import java.util.Map;
 import javax.annotation.processing.Generated;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyDescription;
@@ -64,7 +63,6 @@ public class ArtifactMetaData {
      * (Required)
      * 
      */
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss'Z'", timezone = "UTC")
     @JsonProperty("createdOn")
     private Date createdOn;
     /**
@@ -79,7 +77,6 @@ public class ArtifactMetaData {
      * (Required)
      * 
      */
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss'Z'", timezone = "UTC")
     @JsonProperty("modifiedOn")
     private Date modifiedOn;
     /**

diff --git a/...expected-full-different-ns/generated-api-11/src/main/java/my/other/pkg/beans/Comment.java b/...expected-full-different-ns/generated-api-11/src/main/java/my/other/pkg/beans/Comment.java
@@ -3,7 +3,6 @@
 
 import java.util.Date;
 import javax.annotation.processing.Generated;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyDescription;
@@ -40,11 +39,10 @@ public class Comment {
     @JsonProperty("value")
     private String value;
     /**
-     * 
+     *
      * (Required)
-     * 
+     *
      */
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss'Z'", timezone = "UTC")
     @JsonProperty("createdOn")
     private Date createdOn;
     /**

diff --git a/...ed-full-different-ns/generated-api-11/src/main/java/my/other/pkg/beans/GroupMetaData.java b/...ed-full-different-ns/generated-api-11/src/main/java/my/other/pkg/beans/GroupMetaData.java
@@ -4,7 +4,6 @@
 import java.util.Date;
 import java.util.Map;
 import javax.annotation.processing.Generated;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyDescription;
@@ -63,7 +62,6 @@ public class GroupMetaData {
      * (Required)
      * 
      */
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss'Z'", timezone = "UTC")
     @JsonProperty("createdOn")
     private Date createdOn;
     /**
@@ -78,7 +76,6 @@ public class GroupMetaData {
      * (Required)
      * 
      */
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss'Z'", timezone = "UTC")
     @JsonProperty("modifiedOn")
     private Date modifiedOn;
     /**

diff --git a/...full-different-ns/generated-api-11/src/main/java/my/other/pkg/beans/SearchedArtifact.java b/...full-different-ns/generated-api-11/src/main/java/my/other/pkg/beans/SearchedArtifact.java
@@ -5,7 +5,6 @@
 import java.util.Date;
 import java.util.List;
 import javax.annotation.processing.Generated;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyDescription;
@@ -65,7 +64,6 @@ public class SearchedArtifact {
      * (Required)
      * 
      */
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss'Z'", timezone = "UTC")
     @JsonProperty("createdOn")
     @JsonPropertyDescription("")
     private Date createdOn;
@@ -108,7 +106,6 @@ public class SearchedArtifact {
     /**
      * 
      */
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss'Z'", timezone = "UTC")
     @JsonProperty("modifiedOn")
     @JsonPropertyDescription("")
     private Date modifiedOn;

diff --git a/...ed-full-different-ns/generated-api-11/src/main/java/my/other/pkg/beans/SearchedGroup.java b/...ed-full-different-ns/generated-api-11/src/main/java/my/other/pkg/beans/SearchedGroup.java
@@ -3,7 +3,6 @@
 
 import java.util.Date;
 import javax.annotation.processing.Generated;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyDescription;
@@ -53,7 +52,6 @@ public class SearchedGroup {
      * (Required)
      * 
      */
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss'Z'", timezone = "UTC")
     @JsonProperty("createdOn")
     @JsonPropertyDescription("")
     private Date createdOn;
@@ -70,7 +68,6 @@ public class SearchedGroup {
      * (Required)
      * 
      */
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss'Z'", timezone = "UTC")
     @JsonProperty("modifiedOn")
     @JsonPropertyDescription("")
     private Date modifiedOn;

diff --git a/...-full-different-ns/generated-api-11/src/main/java/my/other/pkg/beans/SearchedVersion.java b/...-full-different-ns/generated-api-11/src/main/java/my/other/pkg/beans/SearchedVersion.java
@@ -6,7 +6,6 @@
 import java.util.List;
 import java.util.Map;
 import javax.annotation.processing.Generated;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyDescription;
@@ -59,7 +58,6 @@ public class SearchedVersion {
      * (Required)
      * 
      */
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss'Z'", timezone = "UTC")
     @JsonProperty("createdOn")
     @JsonPropertyDescription("")
     private Date createdOn;

diff --git a/...ected-full-different-ns/generated-api-11/src/main/java/my/other/pkg/beans/SystemInfo.java b/...ected-full-different-ns/generated-api-11/src/main/java/my/other/pkg/beans/SystemInfo.java
@@ -3,7 +3,6 @@
 
 import java.util.Date;
 import javax.annotation.processing.Generated;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
@@ -37,7 +36,6 @@ public class SystemInfo {
     private String description;
     @JsonProperty("version")
     private String version;
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss'Z'", timezone = "UTC")
     @JsonProperty("builtOn")
     private Date builtOn;
 

diff --git a/...-full-different-ns/generated-api-11/src/main/java/my/other/pkg/beans/VersionMetaData.java b/...-full-different-ns/generated-api-11/src/main/java/my/other/pkg/beans/VersionMetaData.java
@@ -6,7 +6,6 @@
 import java.util.List;
 import java.util.Map;
 import javax.annotation.processing.Generated;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyDescription;
@@ -68,7 +67,6 @@ public class VersionMetaData {
      * (Required)
      * 
      */
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss'Z'", timezone = "UTC")
     @JsonProperty("createdOn")
     private Date createdOn;
     /**

diff --git a/...full-different-ns/generated-api-17/src/main/java/my/other/pkg/beans/ArtifactMetaData.java b/...full-different-ns/generated-api-17/src/main/java/my/other/pkg/beans/ArtifactMetaData.java
@@ -6,7 +6,6 @@
 import java.util.List;
 import java.util.Map;
 import javax.annotation.processing.Generated;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyDescription;
@@ -64,7 +63,6 @@ public class ArtifactMetaData {
      * (Required)
      * 
      */
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss'Z'", timezone = "UTC")
     @JsonProperty("createdOn")
     private Date createdOn;
     /**
@@ -79,7 +77,6 @@ public class ArtifactMetaData {
      * (Required)
      * 
      */
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss'Z'", timezone = "UTC")
     @JsonProperty("modifiedOn")
     private Date modifiedOn;
     /**

diff --git a/...expected-full-different-ns/generated-api-17/src/main/java/my/other/pkg/beans/Comment.java b/...expected-full-different-ns/generated-api-17/src/main/java/my/other/pkg/beans/Comment.java
@@ -3,7 +3,6 @@
 
 import java.util.Date;
 import javax.annotation.processing.Generated;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyDescription;
@@ -40,11 +39,10 @@ public class Comment {
     @JsonProperty("value")
     private String value;
     /**
-     * 
+     *
      * (Required)
-     * 
+     *
      */
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss'Z'", timezone = "UTC")
     @JsonProperty("createdOn")
     private Date createdOn;
     /**

diff --git a/...ed-full-different-ns/generated-api-17/src/main/java/my/other/pkg/beans/GroupMetaData.java b/...ed-full-different-ns/generated-api-17/src/main/java/my/other/pkg/beans/GroupMetaData.java
@@ -4,7 +4,6 @@
 import java.util.Date;
 import java.util.Map;
 import javax.annotation.processing.Generated;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyDescription;
@@ -63,7 +62,6 @@ public class GroupMetaData {
      * (Required)
      * 
      */
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss'Z'", timezone = "UTC")
     @JsonProperty("createdOn")
     private Date createdOn;
     /**
@@ -78,7 +76,6 @@ public class GroupMetaData {
      * (Required)
      * 
      */
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss'Z'", timezone = "UTC")
     @JsonProperty("modifiedOn")
     private Date modifiedOn;
     /**

diff --git a/...full-different-ns/generated-api-17/src/main/java/my/other/pkg/beans/SearchedArtifact.java b/...full-different-ns/generated-api-17/src/main/java/my/other/pkg/beans/SearchedArtifact.java
@@ -5,7 +5,6 @@
 import java.util.Date;
 import java.util.List;
 import javax.annotation.processing.Generated;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyDescription;
@@ -65,7 +64,6 @@ public class SearchedArtifact {
      * (Required)
      * 
      */
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss'Z'", timezone = "UTC")
     @JsonProperty("createdOn")
     @JsonPropertyDescription("")
     private Date createdOn;
@@ -108,7 +106,6 @@ public class SearchedArtifact {
     /**
      * 
      */
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss'Z'", timezone = "UTC")
     @JsonProperty("modifiedOn")
     @JsonPropertyDescription("")
     private Date modifiedOn;

diff --git a/...ed-full-different-ns/generated-api-17/src/main/java/my/other/pkg/beans/SearchedGroup.java b/...ed-full-different-ns/generated-api-17/src/main/java/my/other/pkg/beans/SearchedGroup.java
@@ -3,7 +3,6 @@
 
 import java.util.Date;
 import javax.annotation.processing.Generated;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyDescription;
@@ -53,7 +52,6 @@ public class SearchedGroup {
      * (Required)
      * 
      */
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss'Z'", timezone = "UTC")
     @JsonProperty("createdOn")
     @JsonPropertyDescription("")
     private Date createdOn;
@@ -70,7 +68,6 @@ public class SearchedGroup {
      * (Required)
      * 
      */
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss'Z'", timezone = "UTC")
     @JsonProperty("modifiedOn")
     @JsonPropertyDescription("")
     private Date modifiedOn;

diff --git a/...-full-different-ns/generated-api-17/src/main/java/my/other/pkg/beans/SearchedVersion.java b/...-full-different-ns/generated-api-17/src/main/java/my/other/pkg/beans/SearchedVersion.java
@@ -6,7 +6,6 @@
 import java.util.List;
 import java.util.Map;
 import javax.annotation.processing.Generated;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyDescription;
@@ -59,7 +58,6 @@ public class SearchedVersion {
      * (Required)
      * 
      */
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss'Z'", timezone = "UTC")
     @JsonProperty("createdOn")
     @JsonPropertyDescription("")
     private Date createdOn;