Adding optional support for joda-time's DateTime class

- we check, if JavaTime is available in class path
- if it is, we handle it exactly like java.util.Date

Author: Johannes Thoenes

typescript-generator-core/pom.xml

@@ -73,7 +73,13 @@
             <artifactId>swagger-annotations</artifactId>
             <version>1.5.10</version>
             <scope>test</scope>
-        </dependency>        
+        </dependency>
+        <dependency>
+            <groupId>joda-time</groupId>
+            <artifactId>joda-time</artifactId>
+            <version>2.9.7</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

typescript-generator-core/src/main/java/cz/habarta/typescript/generator/DefaultTypeProcessor.java

@@ -120,6 +120,14 @@ private static Map<Type, TsType> getKnownTypes() {
         knownTypes.put(BigInteger.class, TsType.Number);
         knownTypes.put(Date.class, TsType.Date);
         knownTypes.put(UUID.class, TsType.String);
+
+        // joda time (if present)
+        try {
+            final Class<?> jodaTimeClass = Class.forName("org.joda.time.DateTime");
+            knownTypes.put(jodaTimeClass, TsType.Date);
+        } catch (ClassNotFoundException e) {
+            // ignore if joda time is not present
+        }
         return knownTypes;
     }
 

typescript-generator-core/src/test/java/cz/habarta/typescript/generator/DateTest.java

@@ -1,25 +1,49 @@
 
 package cz.habarta.typescript.generator;
 
-import java.io.*;
 import java.util.*;
+
+import org.joda.time.DateTime;
 import org.junit.*;
 
 
 public class DateTest {
 
     @Test
-    public void testDate() {
-        final String dts = new TypeScriptGenerator(settings(DateMapping.asDate, "AsDate")).generateTypeScript(Input.from(Dates.class));
+    public void testDate_forJavaUtilDate() {
+        final String dts = new TypeScriptGenerator(settings(DateMapping.asDate, "AsDate"))
+                .generateTypeScript(Input.from(Dates.class));
         Assert.assertTrue(dts.contains("date: Date;"));
         Assert.assertTrue(dts.contains("dateList: Date[];"));
         Assert.assertTrue(dts.contains("datesMap: { [index: string]: Date[] };"));
         Assert.assertTrue(dts.contains("dates: Date[];"));
     }
 
     @Test
-    public void testDateAsNumber() {
-        final String dts = new TypeScriptGenerator(settings(DateMapping.asNumber, "AsNumber")).generateTypeScript(Input.from(Dates.class));
+    public void testDate_forJodaDateTime() {
+        final String dts = new TypeScriptGenerator(settings(DateMapping.asDate, "AsDate"))
+                .generateTypeScript(Input.from(JodaDates.class));
+        Assert.assertTrue(dts.contains("date: Date;"));
+        Assert.assertTrue(dts.contains("dateList: Date[];"));
+        Assert.assertTrue(dts.contains("datesMap: { [index: string]: Date[] };"));
+        Assert.assertTrue(dts.contains("dates: Date[];"));
+    }
+
+    @Test
+    public void testDateAsNumber_forJavaUtilDate() {
+        final String dts = new TypeScriptGenerator(settings(DateMapping.asNumber, "AsNumber"))
+                .generateTypeScript(Input.from(Dates.class));
+        Assert.assertTrue(dts.contains("date: DateAsNumber;"));
+        Assert.assertTrue(dts.contains("dateList: DateAsNumber[];"));
+        Assert.assertTrue(dts.contains("datesMap: { [index: string]: DateAsNumber[] };"));
+        Assert.assertTrue(dts.contains("dates: DateAsNumber[];"));
+        Assert.assertTrue(dts.contains("type DateAsNumber = number;"));
+    }
+
+    @Test
+    public void testDateAsNumber_forJodaDateTime() {
+        final String dts = new TypeScriptGenerator(settings(DateMapping.asNumber, "AsNumber"))
+                .generateTypeScript(Input.from(JodaDates.class));
         Assert.assertTrue(dts.contains("date: DateAsNumber;"));
         Assert.assertTrue(dts.contains("dateList: DateAsNumber[];"));
         Assert.assertTrue(dts.contains("datesMap: { [index: string]: DateAsNumber[] };"));
@@ -28,8 +52,20 @@ public void testDateAsNumber() {
     }
 
     @Test
-    public void testDateAsString() {
-        final String dts = new TypeScriptGenerator(settings(DateMapping.asString, "AsString")).generateTypeScript(Input.from(Dates.class));
+    public void testDateAsString_forJavaUtilDate() {
+        final String dts = new TypeScriptGenerator(settings(DateMapping.asString, "AsString"))
+                .generateTypeScript(Input.from(Dates.class));
+        Assert.assertTrue(dts.contains("date: DateAsString;"));
+        Assert.assertTrue(dts.contains("dateList: DateAsString[];"));
+        Assert.assertTrue(dts.contains("datesMap: { [index: string]: DateAsString[] };"));
+        Assert.assertTrue(dts.contains("dates: DateAsString[];"));
+        Assert.assertTrue(dts.contains("type DateAsString = string;"));
+    }
+
+    @Test
+    public void testDateAsString_forJodaDateTime() {
+        final String dts = new TypeScriptGenerator(settings(DateMapping.asString, "AsString"))
+                .generateTypeScript(Input.from(JodaDates.class));
         Assert.assertTrue(dts.contains("date: DateAsString;"));
         Assert.assertTrue(dts.contains("dateList: DateAsString[];"));
         Assert.assertTrue(dts.contains("datesMap: { [index: string]: DateAsString[] };"));
@@ -52,3 +88,10 @@ class Dates {
     public Map<String, List<Date>> datesMap;
     public Date[] dates;
 }
+
+class JodaDates {
+    public DateTime date;
+    public List<DateTime> dateList;
+    public Map<String, List<DateTime>> datesMap;
+    public DateTime[] dates;
+}