Skip to content

[Scala][Java][okhttp] Fix Gson parsing of Joda DateTime without millis #4473

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wing328 merged 2 commits into from
Jan 7, 2017
Merged

[Scala][Java][okhttp] Fix Gson parsing of Joda DateTime without millis #4473

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f0caed
Fix Gson parsing of Joda DateTime without millis
kevinoid Dec 30, 2016
5765cd5
Fix akka-scala date-time parser with Joda
kevinoid Dec 30, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/JSON.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,14 +172,15 @@ class DateAdapter implements JsonSerializer<Date>, JsonDeserializer<Date> {
*/
class DateTimeTypeAdapter extends TypeAdapter<DateTime> {

private final DateTimeFormatter formatter = ISODateTimeFormat.dateTime();
private final DateTimeFormatter parseFormatter = ISODateTimeFormat.dateOptionalTimeParser();
private final DateTimeFormatter printFormatter = ISODateTimeFormat.dateTime();

@Override
public void write(JsonWriter out, DateTime date) throws IOException {
if (date == null) {
out.nullValue();
} else {
out.value(formatter.print(date));
out.value(printFormatter.print(date));
}
}

Expand All @@ -191,7 +192,7 @@ class DateTimeTypeAdapter extends TypeAdapter<DateTime> {
return null;
default:
String date = in.nextString();
return formatter.parseDateTime(date);
return parseFormatter.parseDateTime(date);
}
}
}
Expand Down
7 changes: 4 additions & 3 deletions modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/ApiClient.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,14 +354,15 @@ class GsonConverterWrapper implements Converter {
*/
class DateTimeTypeAdapter extends TypeAdapter<DateTime> {

private final DateTimeFormatter formatter = ISODateTimeFormat.dateTime();
private final DateTimeFormatter parseFormatter = ISODateTimeFormat.dateOptionalTimeParser();
private final DateTimeFormatter printFormatter = ISODateTimeFormat.dateTime();

@Override
public void write(JsonWriter out, DateTime date) throws IOException {
if (date == null) {
out.nullValue();
} else {
out.value(formatter.print(date));
out.value(printFormatter.print(date));
}
}

Expand All @@ -373,7 +374,7 @@ class DateTimeTypeAdapter extends TypeAdapter<DateTime> {
return null;
default:
String date = in.nextString();
return formatter.parseDateTime(date);
return parseFormatter.parseDateTime(date);
}
}
}
Expand Down
7 changes: 4 additions & 3 deletions modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/ApiClient.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,14 +374,15 @@ class GsonCustomConverterFactory extends Converter.Factory
*/
class DateTimeTypeAdapter extends TypeAdapter<DateTime> {

private final DateTimeFormatter formatter = ISODateTimeFormat.dateTime();
private final DateTimeFormatter parseFormatter = ISODateTimeFormat.dateOptionalTimeParser();
private final DateTimeFormatter printFormatter = ISODateTimeFormat.dateTime();

@Override
public void write(JsonWriter out, DateTime date) throws IOException {
if (date == null) {
out.nullValue();
} else {
out.value(formatter.print(date));
out.value(printFormatter.print(date));
}
}

Expand All @@ -393,7 +394,7 @@ class DateTimeTypeAdapter extends TypeAdapter<DateTime> {
return null;
default:
String date = in.nextString();
return formatter.parseDateTime(date);
return parseFormatter.parseDateTime(date);
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions modules/swagger-codegen/src/main/resources/akka-scala/apiInvoker.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,10 @@ object ApiInvoker {

case object DateTimeSerializer extends CustomSerializer[DateTime](format => ( {
case JString(s) =>
ISODateTimeFormat.dateTimeParser().parseDateTime(s)
ISODateTimeFormat.dateOptionalTimeParser().parseDateTime(s)
}, {
case d: DateTime =>
JString(ISODateTimeFormat.dateTimeParser().print(d))
JString(ISODateTimeFormat.dateTime().print(d))
}))
}

Expand Down
7 changes: 4 additions & 3 deletions .../client/petstore-security-test/java/okhttp-gson/src/main/java/io/swagger/client/JSON.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,14 +170,15 @@ public Date deserialize(JsonElement json, Type date, JsonDeserializationContext
*/
class DateTimeTypeAdapter extends TypeAdapter<DateTime> {

private final DateTimeFormatter formatter = ISODateTimeFormat.dateTime();
private final DateTimeFormatter parseFormatter = ISODateTimeFormat.dateOptionalTimeParser();
private final DateTimeFormatter printFormatter = ISODateTimeFormat.dateTime();

@Override
public void write(JsonWriter out, DateTime date) throws IOException {
if (date == null) {
out.nullValue();
} else {
out.value(formatter.print(date));
out.value(printFormatter.print(date));
}
}

Expand All @@ -189,7 +190,7 @@ public DateTime read(JsonReader in) throws IOException {
return null;
default:
String date = in.nextString();
return formatter.parseDateTime(date);
return parseFormatter.parseDateTime(date);
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/core/ApiInvoker.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,10 @@ object ApiInvoker {

case object DateTimeSerializer extends CustomSerializer[DateTime](format => ( {
case JString(s) =>
ISODateTimeFormat.dateTimeParser().parseDateTime(s)
ISODateTimeFormat.dateOptionalTimeParser().parseDateTime(s)
}, {
case d: DateTime =>
JString(ISODateTimeFormat.dateTimeParser().print(d))
JString(ISODateTimeFormat.dateTime().print(d))
}))
}

Expand Down
7 changes: 4 additions & 3 deletions ...lient/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/JSON.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,14 +182,15 @@ public Date deserialize(JsonElement json, Type date, JsonDeserializationContext
*/
class DateTimeTypeAdapter extends TypeAdapter<DateTime> {

private final DateTimeFormatter formatter = ISODateTimeFormat.dateTime();
private final DateTimeFormatter parseFormatter = ISODateTimeFormat.dateOptionalTimeParser();
private final DateTimeFormatter printFormatter = ISODateTimeFormat.dateTime();

@Override
public void write(JsonWriter out, DateTime date) throws IOException {
if (date == null) {
out.nullValue();
} else {
out.value(formatter.print(date));
out.value(printFormatter.print(date));
}
}

Expand All @@ -201,7 +202,7 @@ public DateTime read(JsonReader in) throws IOException {
return null;
default:
String date = in.nextString();
return formatter.parseDateTime(date);
return parseFormatter.parseDateTime(date);
}
}
}
Expand Down
7 changes: 4 additions & 3 deletions samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/JSON.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,14 +170,15 @@ public Date deserialize(JsonElement json, Type date, JsonDeserializationContext
*/
class DateTimeTypeAdapter extends TypeAdapter<DateTime> {

private final DateTimeFormatter formatter = ISODateTimeFormat.dateTime();
private final DateTimeFormatter parseFormatter = ISODateTimeFormat.dateOptionalTimeParser();
private final DateTimeFormatter printFormatter = ISODateTimeFormat.dateTime();

@Override
public void write(JsonWriter out, DateTime date) throws IOException {
if (date == null) {
out.nullValue();
} else {
out.value(formatter.print(date));
out.value(printFormatter.print(date));
}
}

Expand All @@ -189,7 +190,7 @@ public DateTime read(JsonReader in) throws IOException {
return null;
default:
String date = in.nextString();
return formatter.parseDateTime(date);
return parseFormatter.parseDateTime(date);
}
}
}
Expand Down
7 changes: 4 additions & 3 deletions samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/ApiClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,14 +362,15 @@ public Converter<?, RequestBody> requestBodyConverter(Type type, Annotation[] pa
*/
class DateTimeTypeAdapter extends TypeAdapter<DateTime> {

private final DateTimeFormatter formatter = ISODateTimeFormat.dateTime();
private final DateTimeFormatter parseFormatter = ISODateTimeFormat.dateOptionalTimeParser();
private final DateTimeFormatter printFormatter = ISODateTimeFormat.dateTime();

@Override
public void write(JsonWriter out, DateTime date) throws IOException {
if (date == null) {
out.nullValue();
} else {
out.value(formatter.print(date));
out.value(printFormatter.print(date));
}
}

Expand All @@ -381,7 +382,7 @@ public DateTime read(JsonReader in) throws IOException {
return null;
default:
String date = in.nextString();
return formatter.parseDateTime(date);
return parseFormatter.parseDateTime(date);
}
}
}
Expand Down
7 changes: 4 additions & 3 deletions samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/ApiClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,14 +362,15 @@ public Converter<?, RequestBody> requestBodyConverter(Type type, Annotation[] pa
*/
class DateTimeTypeAdapter extends TypeAdapter<DateTime> {

private final DateTimeFormatter formatter = ISODateTimeFormat.dateTime();
private final DateTimeFormatter parseFormatter = ISODateTimeFormat.dateOptionalTimeParser();
private final DateTimeFormatter printFormatter = ISODateTimeFormat.dateTime();

@Override
public void write(JsonWriter out, DateTime date) throws IOException {
if (date == null) {
out.nullValue();
} else {
out.value(formatter.print(date));
out.value(printFormatter.print(date));
}
}

Expand All @@ -381,7 +382,7 @@ public DateTime read(JsonReader in) throws IOException {
return null;
default:
String date = in.nextString();
return formatter.parseDateTime(date);
return parseFormatter.parseDateTime(date);
}
}
}
Expand Down