[scala][templates] java 8 dates support

docs/generators/scala-akka.md

@@ -7,6 +7,7 @@ sidebar_label: scala-akka
 | ------ | ----------- | ------ | ------- |
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
 |apiPackage|package for generated api classes| |null|
+|dateLibrary|Option. Date library to use|<dl><dt>**joda**</dt><dd>Joda (for legacy app)</dd><dt>**java8**</dt><dd>Java 8 native JSR310 (prefered for JDK 1.8+)</dd></dl>|java8|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |mainPackage|Top-level package name, which defines 'apiPackage', 'modelPackage', 'invokerPackage'| |org.openapitools.client|
 |modelPackage|package for generated models| |null|
@@ -23,7 +24,7 @@ sidebar_label: scala-akka
 |Array|java.util.List|
 |ArrayList|java.util.ArrayList|
 |Date|java.util.Date|
-|DateTime|org.joda.time.DateTime|
+|DateTime|org.joda.time.*|
 |File|java.io.File|
 |HashMap|java.util.HashMap|
 |ListBuffer|scala.collection.mutable.ListBuffer|

docs/generators/scala-gatling.md

@@ -7,6 +7,7 @@ sidebar_label: scala-gatling
 | ------ | ----------- | ------ | ------- |
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
 |apiPackage|package for generated api classes| |null|
+|dateLibrary|Option. Date library to use|<dl><dt>**joda**</dt><dd>Joda (for legacy app)</dd><dt>**java8**</dt><dd>Java 8 native JSR310 (prefered for JDK 1.8+)</dd></dl>|java8|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |modelPackage|package for generated models| |null|
 |modelPropertyNaming|Naming convention for the property: 'camelCase', 'PascalCase', 'snake_case' and 'original', which keeps the original name| |camelCase|

docs/generators/scala-httpclient-deprecated.md

@@ -7,6 +7,7 @@ sidebar_label: scala-httpclient-deprecated
 | ------ | ----------- | ------ | ------- |
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
 |apiPackage|package for generated api classes| |null|
+|dateLibrary|Option. Date library to use|<dl><dt>**joda**</dt><dd>Joda (for legacy app)</dd><dt>**java8**</dt><dd>Java 8 native JSR310 (prefered for JDK 1.8+)</dd></dl>|java8|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |modelPackage|package for generated models| |null|
 |modelPropertyNaming|Naming convention for the property: 'camelCase', 'PascalCase', 'snake_case' and 'original', which keeps the original name| |camelCase|

docs/generators/scala-lagom-server.md

@@ -7,6 +7,7 @@ sidebar_label: scala-lagom-server
 | ------ | ----------- | ------ | ------- |
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
 |apiPackage|package for generated api classes| |null|
+|dateLibrary|Option. Date library to use|<dl><dt>**joda**</dt><dd>Joda (for legacy app)</dd><dt>**java8**</dt><dd>Java 8 native JSR310 (prefered for JDK 1.8+)</dd></dl>|java8|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |modelPackage|package for generated models| |null|
 |modelPropertyNaming|Naming convention for the property: 'camelCase', 'PascalCase', 'snake_case' and 'original', which keeps the original name| |camelCase|

docs/generators/scala-sttp.md

@@ -7,6 +7,7 @@ sidebar_label: scala-sttp
 | ------ | ----------- | ------ | ------- |
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
 |apiPackage|package for generated api classes| |null|
+|dateLibrary|Option. Date library to use|<dl><dt>**joda**</dt><dd>Joda (for legacy app)</dd><dt>**java8**</dt><dd>Java 8 native JSR310 (prefered for JDK 1.8+)</dd></dl>|java8|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |mainPackage|Top-level package name, which defines 'apiPackage', 'modelPackage', 'invokerPackage'| |org.openapitools.client|
 |modelPackage|package for generated models| |null|
@@ -23,7 +24,7 @@ sidebar_label: scala-sttp
 |Array|java.util.List|
 |ArrayList|java.util.ArrayList|
 |Date|java.util.Date|
-|DateTime|org.joda.time.DateTime|
+|DateTime|org.joda.time.*|
 |File|java.io.File|
 |HashMap|java.util.HashMap|
 |ListBuffer|scala.collection.mutable.ListBuffer|

docs/generators/scalatra.md

@@ -7,6 +7,7 @@ sidebar_label: scalatra
 | ------ | ----------- | ------ | ------- |
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
 |apiPackage|package for generated api classes| |null|
+|dateLibrary|Option. Date library to use|<dl><dt>**joda**</dt><dd>Joda (for legacy app)</dd><dt>**java8**</dt><dd>Java 8 native JSR310 (prefered for JDK 1.8+)</dd></dl>|java8|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |modelPackage|package for generated models| |null|
 |modelPropertyNaming|Naming convention for the property: 'camelCase', 'PascalCase', 'snake_case' and 'original', which keeps the original name| |camelCase|

docs/generators/scalaz.md

@@ -7,6 +7,7 @@ sidebar_label: scalaz
 | ------ | ----------- | ------ | ------- |
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
 |apiPackage|package for generated api classes| |null|
+|dateLibrary|Option. Date library to use|<dl><dt>**joda**</dt><dd>Joda (for legacy app)</dd><dt>**java8**</dt><dd>Java 8 native JSR310 (prefered for JDK 1.8+)</dd></dl>|java8|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |modelPackage|package for generated models| |null|
 |modelPropertyNaming|Naming convention for the property: 'camelCase', 'PascalCase', 'snake_case' and 'original', which keeps the original name| |camelCase|

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractScalaCodegen.java

@@ -31,6 +31,7 @@
 import java.io.File;
 import java.util.*;
 
+import static org.openapitools.codegen.languages.AbstractJavaCodegen.DATE_LIBRARY;
 import static org.openapitools.codegen.utils.StringUtils.camelize;
 import static org.openapitools.codegen.utils.StringUtils.underscore;
 
@@ -41,6 +42,19 @@ public abstract class AbstractScalaCodegen extends DefaultCodegen {
     protected String invokerPackage = "org.openapitools.client";
     protected String sourceFolder = "src/main/scala";
     protected boolean stripPackageName = true;
+    protected String dateLibrary = DateLibraries.java8.name();
+
+    protected enum DateLibraries {
+        java8("Java 8 native JSR310 (prefered for JDK 1.8+)"),
+        joda( "Joda (for legacy app)"),
+        legacy( "Backport to http-client (deprecated)");
+
+        private final String description;
+
+        DateLibraries(String description) {
+            this.description = description;
+        }
+    }
 
     public AbstractScalaCodegen() {
         super();
@@ -131,6 +145,13 @@ public AbstractScalaCodegen() {
         cliOptions.add(new CliOption(CodegenConstants.SOURCE_FOLDER, CodegenConstants.SOURCE_FOLDER_DESC));
         cliOptions.add(new CliOption(CodegenConstants.MODEL_PROPERTY_NAMING, CodegenConstants.MODEL_PROPERTY_NAMING_DESC).defaultValue(modelPropertyNaming));
 
+        CliOption dateLibrary = new CliOption(DATE_LIBRARY, "Option. Date library to use").defaultValue(this.dateLibrary);
+        Map<String, String> dateOptions = new HashMap<>();
+        dateOptions.put(DateLibraries.java8.name(), DateLibraries.java8.description);
+        dateOptions.put(DateLibraries.joda.name(), DateLibraries.joda.description);
+        dateLibrary.setEnum(dateOptions);
+        cliOptions.add(dateLibrary);
+
     }
 
     @Override
@@ -156,6 +177,43 @@ public void processOpts() {
             setModelPropertyNaming(
                     (String) additionalProperties.get(CodegenConstants.MODEL_PROPERTY_NAMING));
         }
+
+        if (additionalProperties.containsKey(DATE_LIBRARY)) {
+            this.setDateLibrary(additionalProperties.get(DATE_LIBRARY).toString(), false);
+        }
+        if (DateLibraries.java8.name().equals(dateLibrary)) {
+            this.importMapping.put("LocalDate", "java.time.LocalDate");
+            this.importMapping.put("OffsetDateTime", "java.time.OffsetDateTime");
+            this.typeMapping.put("date", "LocalDate");
+            this.typeMapping.put("DateTime", "OffsetDateTime");
+            additionalProperties.put("java8", "true");
+        } else if (DateLibraries.joda.name().equals(dateLibrary)) {
+            this.importMapping.put("LocalDate", "org.joda.time.LocalDate");
+            this.importMapping.put("DateTime", "org.joda.time.DateTime");
+            this.importMapping.put("LocalDateTime", "org.joda.time.LocalDateTime");
+            this.importMapping.put("LocalTime", "org.joda.time.LocalTime");
+            this.typeMapping.put("date", "LocalDate");
+            this.typeMapping.put("DateTime", "DateTime");
+            additionalProperties.put("joda", "true");
+        }
+    }
+
+    public void setDateLibrary(String dateLibrary, boolean withLegacy) {
+        if (withLegacy && dateLibrary.equals(DateLibraries.legacy.name())) {
+            this.dateLibrary = dateLibrary;
+            return;
+        }
+        for ( DateLibraries dateLib : DateLibraries.values()) {
+            if (dateLib.name().equals(dateLibrary)) {
+                this.dateLibrary = dateLibrary;
+                return;
+            }
+        }
+        throw new IllegalArgumentException("Invalid dateLibrary. Must be 'java8' or 'joda'");
+    }
+
+    public String getDateLibrary() {
+        return this.dateLibrary;
     }
 
     public void setModelPropertyNaming(String naming) {

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaAkkaClientCodegen.java

@@ -35,6 +35,7 @@
 import java.io.Writer;
 import java.util.*;
 
+import static org.openapitools.codegen.languages.AbstractJavaCodegen.DATE_LIBRARY;
 import static org.openapitools.codegen.utils.StringUtils.camelize;
 
 public class ScalaAkkaClientCodegen extends AbstractScalaCodegen implements CodegenConfig {
@@ -49,8 +50,6 @@ public class ScalaAkkaClientCodegen extends AbstractScalaCodegen implements Code
     protected boolean registerNonStandardStatusCodes = true;
     protected boolean renderJavadoc = true;
     protected boolean removeOAuthSecurities = true;
-   // protected boolean stripPackageName = false;
-
 
     @SuppressWarnings("hiding")
     protected Logger LOGGER = LoggerFactory.getLogger(ScalaAkkaClientCodegen.class);
@@ -121,8 +120,6 @@ public ScalaAkkaClientCodegen() {
         importMapping.remove("Set");
         importMapping.remove("Map");
 
-        importMapping.put("DateTime", "org.joda.time.DateTime");
-
         typeMapping = new HashMap<>();
         typeMapping.put("array", "Seq");
         typeMapping.put("set", "Set");
@@ -172,6 +169,7 @@ public void processOpts() {
         supportingFiles.add(new SupportingFile("apiSettings.mustache", invokerFolder, "ApiSettings.scala"));
         final String apiFolder = (sourceFolder + File.separator + apiPackage).replace(".", File.separator);
         supportingFiles.add(new SupportingFile("enumsSerializers.mustache", apiFolder, "EnumsSerializers.scala"));
+        supportingFiles.add(new SupportingFile("serializers.mustache", invokerFolder, "Serializers.scala"));
     }
 
     @Override

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaHttpClientCodegen.java

@@ -131,6 +131,7 @@ public ScalaHttpClientCodegen() {
         importMapping.remove("Set");
         importMapping.remove("Map");
 
+        setDateLibrary("legacy",true);
         importMapping.put("Date", "java.util.Date");
 
         typeMapping = new HashMap<String, String>();

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaPlayFrameworkServerCodegen.java

@@ -35,6 +35,7 @@
 import java.util.stream.Collectors;
 
 import static org.apache.commons.lang3.StringUtils.rightPad;
+import static org.openapitools.codegen.languages.AbstractJavaCodegen.DATE_LIBRARY;
 import static org.openapitools.codegen.utils.OnceLogger.once;
 import static org.openapitools.codegen.utils.StringUtils.camelize;
 
@@ -102,6 +103,7 @@ public ScalaPlayFrameworkServerCodegen() {
         importMapping.remove("BigDecimal");
         importMapping.put("TemporaryFile", "play.api.libs.Files.TemporaryFile");
 
+        cliOptions.removeIf(opt -> DATE_LIBRARY.equals(opt.getOpt()));
         cliOptions.add(new CliOption(ROUTES_FILE_NAME, "Name of the routes file to generate.").defaultValue(routesFileName));
         cliOptions.add(new CliOption(BASE_PACKAGE, "Base package in which supporting classes are generated.").defaultValue(basePackage));
 

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaSttpClientCodegen.java

@@ -53,10 +53,6 @@ public void processOpts() {
             additionalProperties.put("modelPackage", modelPackage);
         }
 
-        if (!additionalProperties.containsKey("java8")) {
-            additionalProperties.put("joda", "true");
-        }
-
         supportingFiles.clear();
         supportingFiles.add(new SupportingFile("README.mustache", "", "README.md"));
         supportingFiles.add(new SupportingFile("build.sbt.mustache", "", "build.sbt"));

modules/openapi-generator/src/main/resources/scala-akka-client/apiInvoker.mustache

@@ -15,9 +15,6 @@ import akka.stream.ActorMaterializer
 import akka.stream.scaladsl.Source
 import akka.util.{ ByteString, Timeout }
 import de.heikoseeberger.akkahttpjson4s.Json4sSupport
-import org.joda.time.DateTime
-import org.joda.time.format.ISODateTimeFormat
-import org.json4s.JsonAST.JString
 import org.json4s._
 import org.json4s.jackson.JsonMethods._
 import org.json4s.jackson.Serialization
@@ -29,10 +26,10 @@ import scala.reflect.ClassTag
 object ApiInvoker {
 
   def apply()(implicit system: ActorSystem): ApiInvoker =
-    apply(DefaultFormats + DateTimeSerializer)
+    apply(DefaultFormats ++ Serializers.all)
 
   def apply(serializers: Iterable[Serializer[_]])(implicit system: ActorSystem): ApiInvoker =
-    apply(DefaultFormats + DateTimeSerializer ++ serializers)
+    apply(DefaultFormats ++ Serializers.all ++ serializers)
 
   def apply(formats: Formats)(implicit system: ActorSystem): ApiInvoker = new ApiInvoker(formats)
 
@@ -67,15 +64,6 @@ object ApiInvoker {
     def toAkkaHttpMethod: HttpMethod = HttpMethods.getForKey(method.value).getOrElse(HttpMethods.GET)
   }
 
-  case object DateTimeSerializer extends CustomSerializer[DateTime](_ => ( {
-    case JString(s) =>
-      ISODateTimeFormat.dateOptionalTimeParser().parseDateTime(s)
-  }, {
-    case d: DateTime =>
-      JString(ISODateTimeFormat.dateTime().print(d))
-  })
-  )
-
 }
 
 trait UnitJSONSupport {

modules/openapi-generator/src/main/resources/scala-akka-client/build.sbt.mustache

@@ -8,7 +8,9 @@ libraryDependencies ++= Seq(
   "com.typesafe.akka" %% "akka-actor" % "2.5.21",
   "com.typesafe.akka" %% "akka-stream" % "2.5.21",
   "com.typesafe.akka" %% "akka-http" % "10.1.7",
+{{#joda}}
   "joda-time" % "joda-time" % "2.10.1",
+{{/joda}}
   "org.json4s" %% "json4s-jackson" % "3.6.5",
   "org.json4s" %% "json4s-ext" % "3.6.5",
   "de.heikoseeberger" %% "akka-http-json4s" % "1.25.2",

modules/openapi-generator/src/main/resources/scala-akka-client/pom.mustache

@@ -20,7 +20,9 @@
     <json4s.ext.version>3.2.11</json4s.ext.version>
     <akka.version>2.5.21</akka.version>
     <akka.http.version>10.1.7</akka.http.version>
+{{#joda}}
     <joda.time.version>2.10.1</joda.time.version>
+{{/joda}}
     <typesafeconfig.version>1.3.3</typesafeconfig.version>
     <akka.http.json4s.version>1.25.2</akka.http.json4s.version>
     <junit.version>4.13</junit.version>
@@ -36,11 +38,13 @@
       <version>${scala.version}</version>
       <scope>provided</scope>
     </dependency>
+{{#joda}}
     <dependency>
       <groupId>joda-time</groupId>
       <artifactId>joda-time</artifactId>
       <version>${joda.time.version}</version>
     </dependency>
+{{/joda}}
     <dependency>
       <groupId>com.typesafe</groupId>
       <artifactId>config</artifactId>

modules/openapi-generator/src/main/resources/scala-akka-client/serializers.mustache

@@ -0,0 +1,51 @@
+package {{invokerPackage}}
+
+{{#java8}}
+import java.time.{LocalDate, LocalDateTime, OffsetDateTime, ZoneId}
+import java.time.format.DateTimeFormatter
+{{/java8}}
+{{#joda}}
+import org.joda.time.format.ISODateTimeFormat
+import org.joda.time.{LocalDate, DateTime}
+{{/joda}}
+import org.json4s.{Serializer, CustomSerializer, JNull}
+import org.json4s.JsonAST.JString
+
+import scala.util.Try
+
+object Serializers {
+
+{{#java8}}
+  case object DateTimeSerializer extends CustomSerializer[OffsetDateTime]( _ => ( {
+    case JString(s) =>
+      Try(OffsetDateTime.parse(s, DateTimeFormatter.ISO_OFFSET_DATE_TIME)) orElse
+        Try(LocalDateTime.parse(s).atZone(ZoneId.systemDefault()).toOffsetDateTime) getOrElse null
+  }, {
+    case d: OffsetDateTime =>
+      JString(d.format(DateTimeFormatter.ISO_OFFSET_DATE_TIME))
+  }))
+
+  case object LocalDateSerializer extends CustomSerializer[LocalDate]( _ => ( {
+    case JString(s) => LocalDate.parse(s)
+  }, {
+    JString(d.format(DateTimeFormatter.ISO_LOCAL_DATE))
+  }))
+{{/java8}}
+{{#joda}}
+  case object DateTimeSerializer extends CustomSerializer[DateTime](_ => ( {
+    case JString(s) =>
+      ISODateTimeFormat.dateOptionalTimeParser().parseDateTime(s)
+  }, {
+    case d: DateTime => JString(ISODateTimeFormat.dateTime().print(d))
+  }))
+
+  case object LocalDateSerializer extends CustomSerializer[LocalDate]( _ => ( {
+    case JString(s) => ISODateTimeFormat.localDateParser().parseLocalDate(s)
+    }, {
+    case d: LocalDate => JString(ISODateTimeFormat.date().print(d))
+  }))
+{{/joda}}
+
+ def all: Seq[Serializer[_]] = Seq[Serializer[_]]() :+ DateTimeSerializer :+ LocalDateSerializer
+
+}

modules/openapi-generator/src/main/resources/scalaz/dateTimeCodecs.mustache

@@ -7,13 +7,26 @@ import argonaut.DecodeJson._
 import org.http4s._
 import org.http4s.{EntityDecoder, EntityEncoder}
 import org.http4s.argonaut._
-
+{{#joda}}
 import org.joda.time.DateTime
+{{/joda}}
+{{#java8}}
+import java.time.OffsetDateTime
+{{/java8}}
 
 object DateTimeCodecs {
+{{#joda}}
   implicit def dateTimeEncodeJson: EncodeJson[DateTime] =
     EncodeJson[DateTime](dt => StringEncodeJson(dt.toString))
 
   implicit def dateTimeDecodeJson: DecodeJson[DateTime] =
     DecodeJson.of[String].map(DateTime.parse(_)) setName "org.joda.time.DateTime"
+{{/joda}}
+{{#java8}}
+  implicit def dateTimeEncodeJson: EncodeJson[OffsetDateTime] =
+    EncodeJson[OffsetDateTime](dt => StringEncodeJson(dt.toString))
+
+  implicit def dateTimeDecodeJson: DecodeJson[OffsetDateTime] =
+    DecodeJson.of[String].map(OffsetDateTime.parse(_)) setName "java.time.OffsetDateTime"
+{{/java8}}
 }

modules/openapi-generator/src/test/java/org/openapitools/codegen/options/ScalaAkkaClientOptionsProvider.java

@@ -33,6 +33,7 @@ public class ScalaAkkaClientOptionsProvider implements OptionsProvider {
     public static final String PREPEND_FORM_OR_BODY_PARAMETERS_VALUE = "true";
     public static final String MAIN_PACKAGE_VALUE = "net.test";
     public static final String MODEL_PROPERTY_NAMING = "camelCase";
+    public static final String DATE_LIBRARY = "joda";
 
 
     @Override
@@ -53,6 +54,7 @@ public Map<String, String> createOptions() {
                 .put(CodegenConstants.PREPEND_FORM_OR_BODY_PARAMETERS, PREPEND_FORM_OR_BODY_PARAMETERS_VALUE)
                 .put("mainPackage", MAIN_PACKAGE_VALUE)
                 .put(CodegenConstants.MODEL_PROPERTY_NAMING, MODEL_PROPERTY_NAMING)
+                .put("dateLibrary", DATE_LIBRARY)
                 .build();
     }