Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@
import io.vertx.core.json.JsonArray;
import io.vertx.core.json.impl.JsonUtil;
import java.time.Instant;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.OffsetDateTime;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Base64;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@
import io.vertx.core.json.JsonArray;
import io.vertx.core.json.impl.JsonUtil;
import java.time.Instant;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.OffsetDateTime;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Base64;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@
import io.vertx.core.json.JsonArray;
import io.vertx.core.json.impl.JsonUtil;
import java.time.Instant;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.OffsetDateTime;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Base64;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@
import io.vertx.core.json.JsonArray;
import io.vertx.core.json.impl.JsonUtil;
import java.time.Instant;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.OffsetDateTime;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Base64;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@
import io.vertx.core.json.JsonArray;
import io.vertx.core.json.impl.JsonUtil;
import java.time.Instant;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.OffsetDateTime;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Base64;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@
import io.vertx.core.json.JsonArray;
import io.vertx.core.json.impl.JsonUtil;
import java.time.Instant;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.OffsetDateTime;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Base64;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@
import io.vertx.core.json.JsonArray;
import io.vertx.core.json.impl.JsonUtil;
import java.time.Instant;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.OffsetDateTime;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Base64;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@
import io.vertx.core.json.JsonArray;
import io.vertx.core.json.impl.JsonUtil;
import java.time.Instant;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.OffsetDateTime;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Base64;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@
import io.vertx.core.json.JsonArray;
import io.vertx.core.json.impl.JsonUtil;
import java.time.Instant;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.OffsetDateTime;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Base64;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@
import io.vertx.core.json.JsonArray;
import io.vertx.core.json.impl.JsonUtil;
import java.time.Instant;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.OffsetDateTime;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Base64;

Expand Down
16 changes: 13 additions & 3 deletions src/main/java/io/vertx/codegen/DataObjectModel.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@
import io.vertx.codegen.doc.Token;
import io.vertx.codegen.type.*;

import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.OffsetDateTime;
import java.time.ZonedDateTime;
import javax.annotation.processing.ProcessingEnvironment;
import javax.lang.model.element.*;
import javax.lang.model.type.DeclaredType;
Expand Down Expand Up @@ -555,9 +560,14 @@ private void processMethod(String name, ExecutableElement getterElt, ExecutableE
break;
case API:
case OTHER:
jsonifiable = propType.getName().equals(Instant.class.getName()) ||
propType.getName().equals("io.vertx.core.buffer.Buffer") ||
(propType.isDataObjectHolder() && propType.getDataObject().isSerializable());
jsonifiable = propType.getName().equals(Instant.class.getName())
|| propType.getName().equals(LocalDate.class.getName())
|| propType.getName().equals(LocalDateTime.class.getName())
|| propType.getName().equals(LocalTime.class.getName())
|| propType.getName().equals(OffsetDateTime.class.getName())
|| propType.getName().equals(ZonedDateTime.class.getName())
|| propType.getName().equals("io.vertx.core.buffer.Buffer")
|| (propType.isDataObjectHolder() && propType.getDataObject().isSerializable());
break;
default:
return;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@
import java.io.StringWriter;
import java.lang.annotation.Annotation;
import java.time.Instant;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.OffsetDateTime;
import java.time.ZonedDateTime;
import java.util.*;

/**
Expand Down Expand Up @@ -66,6 +71,11 @@ public String render(DataObjectModel model, int index, int size, Map<String, Obj
writer.print("import io.vertx.core.json.JsonArray;\n");
writer.print("import io.vertx.core.json.impl.JsonUtil;\n");
writer.print("import java.time.Instant;\n");
writer.print("import java.time.LocalDate;\n");
writer.print("import java.time.LocalDateTime;\n");
writer.print("import java.time.LocalTime;\n");
writer.print("import java.time.OffsetDateTime;\n");
writer.print("import java.time.ZonedDateTime;\n");
writer.print("import java.time.format.DateTimeFormatter;\n");
writer.print("import java.util.Base64;\n");
writer.print("\n");
Expand Down Expand Up @@ -169,6 +179,16 @@ private void genToJson(String visibility, boolean inheritConverter, DataObjectMo
case OTHER:
if (prop.getType().getName().equals(Instant.class.getName())) {
genPropToJson("DateTimeFormatter.ISO_INSTANT.format(", ")", prop, writer);
} else if (prop.getType().getName().equals(LocalDate.class.getName())) {
genPropToJson("DateTimeFormatter.ISO_LOCAL_DATE.format(", ")", prop, writer);
} else if (prop.getType().getName().equals(LocalTime.class.getName())) {
genPropToJson("DateTimeFormatter.ISO_LOCAL_TIME.format(", ")", prop, writer);
} else if (prop.getType().getName().equals(LocalDateTime.class.getName())) {
genPropToJson("DateTimeFormatter.ISO_LOCAL_DATE_TIME.format(", ")", prop, writer);
} else if (prop.getType().getName().equals(OffsetDateTime.class.getName())) {
genPropToJson("DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(", ")", prop, writer);
} else if (prop.getType().getName().equals(ZonedDateTime.class.getName())) {
genPropToJson("DateTimeFormatter.ISO_ZONED_DATE_TIME.format(", ")", prop, writer);
}
break;
}
Expand Down Expand Up @@ -306,6 +326,16 @@ private void genFromJson(String visibility, boolean inheritConverter, DataObject
case OTHER:
if (prop.getType().getName().equals(Instant.class.getName())) {
genPropFromJson("String", "Instant.from(DateTimeFormatter.ISO_INSTANT.parse((String)", "))", prop, writer);
} else if (prop.getType().getName().equals(LocalDate.class.getName())) {
genPropFromJson("String", "LocalDate.from(DateTimeFormatter.ISO_LOCAL_DATE.parse((String)", "))", prop, writer);
} else if (prop.getType().getName().equals(LocalTime.class.getName())) {
genPropFromJson("String", "LocalTime.from(DateTimeFormatter.ISO_LOCAL_TIME.parse((String)", "))", prop, writer);
} else if (prop.getType().getName().equals(LocalDateTime.class.getName())) {
genPropFromJson("String", "LocalDateTime.from(DateTimeFormatter.ISO_LOCAL_DATE_TIME.parse((String)", "))", prop, writer);
} else if (prop.getType().getName().equals(OffsetDateTime.class.getName())) {
genPropFromJson("String", "OffsetDateTime.from(DateTimeFormatter.ISO_OFFSET_DATE_TIME.parse((String)", "))", prop, writer);
} else if (prop.getType().getName().equals(ZonedDateTime.class.getName())) {
genPropFromJson("String", "ZonedDateTime.from(DateTimeFormatter.ISO_ZONED_DATE_TIME.parse((String)", "))", prop, writer);
}
break;
default:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@
import io.vertx.core.json.JsonArray;
import io.vertx.core.json.impl.JsonUtil;
import java.time.Instant;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.OffsetDateTime;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Base64;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@
import io.vertx.core.json.JsonArray;
import io.vertx.core.json.impl.JsonUtil;
import java.time.Instant;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.OffsetDateTime;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Base64;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@
import io.vertx.core.json.JsonArray;
import io.vertx.core.json.impl.JsonUtil;
import java.time.Instant;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.OffsetDateTime;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Base64;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@
import io.vertx.core.json.JsonArray;
import io.vertx.core.json.impl.JsonUtil;
import java.time.Instant;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.OffsetDateTime;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Base64;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@
import io.vertx.core.json.JsonArray;
import io.vertx.core.json.impl.JsonUtil;
import java.time.Instant;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.OffsetDateTime;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Base64;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@
import io.vertx.core.json.JsonArray;
import io.vertx.core.json.impl.JsonUtil;
import java.time.Instant;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.OffsetDateTime;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Base64;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@
import io.vertx.core.json.JsonArray;
import io.vertx.core.json.impl.JsonUtil;
import java.time.Instant;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.OffsetDateTime;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Base64;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@
import io.vertx.core.json.JsonArray;
import io.vertx.core.json.impl.JsonUtil;
import java.time.Instant;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.OffsetDateTime;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Base64;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@
import io.vertx.core.json.JsonArray;
import io.vertx.core.json.impl.JsonUtil;
import java.time.Instant;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.OffsetDateTime;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Base64;

Expand Down
Loading