From c09adc453908fc5b55ab8f5163f7e3b4168479b9 Mon Sep 17 00:00:00 2001 From: Ganesh Subramanian Date: Thu, 21 Aug 2014 12:01:44 +0530 Subject: [PATCH 1/3] Fix for issue #226 --- .../scala/com/wordnik/swagger/codegen/BasicJavaGenerator.scala | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/scala/com/wordnik/swagger/codegen/BasicJavaGenerator.scala b/src/main/scala/com/wordnik/swagger/codegen/BasicJavaGenerator.scala index b1cd65a7102..62eee39f1b1 100644 --- a/src/main/scala/com/wordnik/swagger/codegen/BasicJavaGenerator.scala +++ b/src/main/scala/com/wordnik/swagger/codegen/BasicJavaGenerator.scala @@ -87,6 +87,7 @@ class BasicJavaGenerator extends BasicGenerator { "Array" -> "java.util.*", "ArrayList" -> "java.util.*", "List" -> "java.util.*", + "Set" -> "java.util.*", "DateTime" -> "org.joda.time.*", "LocalDateTime" -> "org.joda.time.*", "LocalDate" -> "org.joda.time.*", From 608718163411dadcc4a8cf21f03437a778923148 Mon Sep 17 00:00:00 2001 From: Ganesh Subramanian Date: Thu, 21 Aug 2014 12:10:14 +0530 Subject: [PATCH 2/3] Added import mapping for Timestamp --- .../scala/com/wordnik/swagger/codegen/BasicJavaGenerator.scala | 1 + src/test/scala/BasicJavaGeneratorTest.scala | 2 ++ 2 files changed, 3 insertions(+) diff --git a/src/main/scala/com/wordnik/swagger/codegen/BasicJavaGenerator.scala b/src/main/scala/com/wordnik/swagger/codegen/BasicJavaGenerator.scala index 62eee39f1b1..12a95ca0c5e 100644 --- a/src/main/scala/com/wordnik/swagger/codegen/BasicJavaGenerator.scala +++ b/src/main/scala/com/wordnik/swagger/codegen/BasicJavaGenerator.scala @@ -84,6 +84,7 @@ class BasicJavaGenerator extends BasicGenerator { override def importMapping = Map( "File" -> "java.io.File", "Date" -> "java.util.Date", + "Timestamp" -> "java.sql.Timestamp", "Array" -> "java.util.*", "ArrayList" -> "java.util.*", "List" -> "java.util.*", diff --git a/src/test/scala/BasicJavaGeneratorTest.scala b/src/test/scala/BasicJavaGeneratorTest.scala index b9d54bd03d9..e1bb958f4cb 100644 --- a/src/test/scala/BasicJavaGeneratorTest.scala +++ b/src/test/scala/BasicJavaGeneratorTest.scala @@ -123,6 +123,8 @@ class BasicJavaGeneratorTest extends FlatSpec with ShouldMatchers { it should "honor the import mapping" in { config.importMapping("Date") should be ("java.util.Date") config.importMapping("DateTime") should be ("org.joda.time.*") + config.importMapping("TimeStamp") should be ("java.sql.Timestamp") + config.importMapping("Set") should be ("java.util.*") } /* From 3ad1ecf153a98e84dc1b01f99714e3062c9f70b3 Mon Sep 17 00:00:00 2001 From: Ganesh Subramanian Date: Thu, 21 Aug 2014 12:11:19 +0530 Subject: [PATCH 3/3] Added import mapping for Timestamp --- src/test/scala/BasicJavaGeneratorTest.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/scala/BasicJavaGeneratorTest.scala b/src/test/scala/BasicJavaGeneratorTest.scala index e1bb958f4cb..6b0afd79705 100644 --- a/src/test/scala/BasicJavaGeneratorTest.scala +++ b/src/test/scala/BasicJavaGeneratorTest.scala @@ -123,7 +123,7 @@ class BasicJavaGeneratorTest extends FlatSpec with ShouldMatchers { it should "honor the import mapping" in { config.importMapping("Date") should be ("java.util.Date") config.importMapping("DateTime") should be ("org.joda.time.*") - config.importMapping("TimeStamp") should be ("java.sql.Timestamp") + config.importMapping("Timestamp") should be ("java.sql.Timestamp") config.importMapping("Set") should be ("java.util.*") }