@@ -98,8 +98,8 @@ public AbstractJavaCodegen() {
98
98
modelDocTemplateFiles .put ("model_doc.mustache" , ".md" );
99
99
apiDocTemplateFiles .put ("api_doc.mustache" , ".md" );
100
100
101
- hideGenerationTimestamp = false ;
102
-
101
+ hideGenerationTimestamp = false ;
102
+
103
103
setReservedWordsLowerCase (
104
104
Arrays .asList (
105
105
// used as internal variables, can collide with parameter names
@@ -167,6 +167,7 @@ public AbstractJavaCodegen() {
167
167
dateOptions .put ("java8" , "Java 8 native JSR310 (preferred for jdk 1.8+) - note: this also sets \" " + JAVA8_MODE + "\" to true" );
168
168
dateOptions .put ("threetenbp" , "Backport of JSR310 (preferred for jdk < 1.8)" );
169
169
dateOptions .put ("java8-localdatetime" , "Java 8 using LocalDateTime (for legacy app only)" );
170
+ dateOptions .put ("java8-instant" , "Java 8 using Instant" );
170
171
dateOptions .put ("joda" , "Joda (for legacy app only)" );
171
172
dateOptions .put ("legacy" , "Legacy java.util.Date (if you really have a good reason not to use threetenbp" );
172
173
dateLibrary .setEnum (dateOptions );
@@ -440,13 +441,19 @@ public void processOpts() {
440
441
} else if (dateLibrary .startsWith ("java8" )) {
441
442
additionalProperties .put ("java8" , "true" );
442
443
additionalProperties .put ("jsr310" , "true" );
443
- typeMapping .put ("date" , "LocalDate" );
444
- importMapping .put ("LocalDate" , "java.time.LocalDate" );
445
444
if ("java8-localdatetime" .equals (dateLibrary )) {
445
+ typeMapping .put ("date" , "LocalDate" );
446
446
typeMapping .put ("DateTime" , "LocalDateTime" );
447
+ importMapping .put ("LocalDate" , "java.time.LocalDate" );
447
448
importMapping .put ("LocalDateTime" , "java.time.LocalDateTime" );
449
+ } else if ("java8-instant" .equals (dateLibrary )) {
450
+ typeMapping .put ("date" , "Instant" );
451
+ typeMapping .put ("DateTime" , "Instant" );
452
+ importMapping .put ("Instant" , "java.time.Instant" );
448
453
} else {
454
+ typeMapping .put ("date" , "LocalDate" );
449
455
typeMapping .put ("DateTime" , "OffsetDateTime" );
456
+ importMapping .put ("LocalDate" , "java.time.LocalDate" );
450
457
importMapping .put ("OffsetDateTime" , "java.time.OffsetDateTime" );
451
458
}
452
459
} else if (dateLibrary .equals ("legacy" )) {
0 commit comments