loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

[Java] Fix okhttp-gson datetime converter compilation (#6230)

Browse Source
This commit is contained in:
Lars Wander
2017-08-14 04:50:02 -04:00
committed by wing328
parent d39b1ff76f
commit 23d0fedc9c
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/JSON.mustache
+7 -5
View File
@@ -13,6 +13,7 @@ import com.google.gson.stream.JsonWriter;
import org.joda.time.DateTime;
import org.joda.time.LocalDate;
import org.joda.time.format.DateTimeFormatter;
import org.joda.time.format.DateTimeFormatterBuilder;
import org.joda.time.format.ISODateTimeFormat;
{{/joda}}
{{#threetenbp}}
@@ -132,11 +133,12 @@ public class JSON {
*/
public static class DateTimeTypeAdapter extends TypeAdapter<DateTime> {
private final DateTimeFormatter parseFormatter = ISODateTimeFormat.dateOptionalTimeParser();
private final DateTimeFormatter printFormatter = ISODateTimeFormat.dateTime();
private DateTimeFormatter formatter;
public DateTimeTypeAdapter() {
this(ISODateTimeFormat.dateTime().withOffsetParsed());
this(new DateTimeFormatterBuilder()
.append(ISODateTimeFormat.dateTime().getPrinter(), ISODateTimeFormat.dateOptionalTimeParser().getParser())
.toFormatter());
}
public DateTimeTypeAdapter(DateTimeFormatter formatter) {
@@ -152,7 +154,7 @@ public class JSON {
if (date == null) {
out.nullValue();
} else {
out.value(printFormatter.print(date));
out.value(formatter.print(date));
}
}
@@ -164,7 +166,7 @@ public class JSON {
return null;
default:
String date = in.nextString();
return parseFormatter.parseDateTime(date);
return formatter.parseDateTime(date);
}
}
}
modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/JSON.mustache
+4 -1
View File
@@ -13,6 +13,7 @@ import com.google.gson.stream.JsonWriter;
import org.joda.time.DateTime;
import org.joda.time.LocalDate;
import org.joda.time.format.DateTimeFormatter;
import org.joda.time.format.DateTimeFormatterBuilder;
import org.joda.time.format.ISODateTimeFormat;
{{/joda}}
{{#threetenbp}}
@@ -91,7 +92,9 @@ public class JSON {
private DateTimeFormatter formatter;
public DateTimeTypeAdapter() {
this(ISODateTimeFormat.dateTime().withOffsetParsed());
this(new DateTimeFormatterBuilder()
.append(ISODateTimeFormat.dateTime().getPrinter(), ISODateTimeFormat.dateOptionalTimeParser().getParser())
.toFormatter());
}
public DateTimeTypeAdapter(DateTimeFormatter formatter) {