diff --git a/src/converters/generated/io/vertx/test/codegen/converter/ChildInheritingDataObjectConverter.java b/src/converters/generated/io/vertx/test/codegen/converter/ChildInheritingDataObjectConverter.java index 209dde109..8b38aa6ca 100644 --- a/src/converters/generated/io/vertx/test/codegen/converter/ChildInheritingDataObjectConverter.java +++ b/src/converters/generated/io/vertx/test/codegen/converter/ChildInheritingDataObjectConverter.java @@ -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; diff --git a/src/converters/generated/io/vertx/test/codegen/converter/ChildNotInheritingDataObjectConverter.java b/src/converters/generated/io/vertx/test/codegen/converter/ChildNotInheritingDataObjectConverter.java index 02bed0ccf..82f048933 100644 --- a/src/converters/generated/io/vertx/test/codegen/converter/ChildNotInheritingDataObjectConverter.java +++ b/src/converters/generated/io/vertx/test/codegen/converter/ChildNotInheritingDataObjectConverter.java @@ -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; diff --git a/src/converters/generated/io/vertx/test/codegen/converter/ConverterGeneratesDeserializerWithFromJsonDataObjectConverter.java b/src/converters/generated/io/vertx/test/codegen/converter/ConverterGeneratesDeserializerWithFromJsonDataObjectConverter.java index bc95597b4..9650b7b2b 100644 --- a/src/converters/generated/io/vertx/test/codegen/converter/ConverterGeneratesDeserializerWithFromJsonDataObjectConverter.java +++ b/src/converters/generated/io/vertx/test/codegen/converter/ConverterGeneratesDeserializerWithFromJsonDataObjectConverter.java @@ -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; diff --git a/src/converters/generated/io/vertx/test/codegen/converter/ConverterGeneratesSerializerWithToJsonDataObjectConverter.java b/src/converters/generated/io/vertx/test/codegen/converter/ConverterGeneratesSerializerWithToJsonDataObjectConverter.java index 6b1c52120..5a4ceac7b 100644 --- a/src/converters/generated/io/vertx/test/codegen/converter/ConverterGeneratesSerializerWithToJsonDataObjectConverter.java +++ b/src/converters/generated/io/vertx/test/codegen/converter/ConverterGeneratesSerializerWithToJsonDataObjectConverter.java @@ -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; diff --git a/src/converters/generated/io/vertx/test/codegen/converter/ParentDataObjectConverter.java b/src/converters/generated/io/vertx/test/codegen/converter/ParentDataObjectConverter.java index 20c742aad..4c09f67d5 100644 --- a/src/converters/generated/io/vertx/test/codegen/converter/ParentDataObjectConverter.java +++ b/src/converters/generated/io/vertx/test/codegen/converter/ParentDataObjectConverter.java @@ -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; diff --git a/src/converters/generated/io/vertx/test/codegen/converter/SetterAdderDataObjectConverter.java b/src/converters/generated/io/vertx/test/codegen/converter/SetterAdderDataObjectConverter.java index 76c80e1f4..a69eb629e 100644 --- a/src/converters/generated/io/vertx/test/codegen/converter/SetterAdderDataObjectConverter.java +++ b/src/converters/generated/io/vertx/test/codegen/converter/SetterAdderDataObjectConverter.java @@ -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; diff --git a/src/converters/generated/io/vertx/test/codegen/converter/SnakeFormattedDataObjectConverter.java b/src/converters/generated/io/vertx/test/codegen/converter/SnakeFormattedDataObjectConverter.java index 0241787f9..c0446a346 100644 --- a/src/converters/generated/io/vertx/test/codegen/converter/SnakeFormattedDataObjectConverter.java +++ b/src/converters/generated/io/vertx/test/codegen/converter/SnakeFormattedDataObjectConverter.java @@ -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; diff --git a/src/converters/generated/io/vertx/test/codegen/converter/TestDataObjectBase64BasicConverter.java b/src/converters/generated/io/vertx/test/codegen/converter/TestDataObjectBase64BasicConverter.java index 47b8b2ea6..1d8d9e6b4 100644 --- a/src/converters/generated/io/vertx/test/codegen/converter/TestDataObjectBase64BasicConverter.java +++ b/src/converters/generated/io/vertx/test/codegen/converter/TestDataObjectBase64BasicConverter.java @@ -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; diff --git a/src/converters/generated/io/vertx/test/codegen/converter/TestDataObjectBase64URLConverter.java b/src/converters/generated/io/vertx/test/codegen/converter/TestDataObjectBase64URLConverter.java index 3a14d7f73..bd657d22e 100644 --- a/src/converters/generated/io/vertx/test/codegen/converter/TestDataObjectBase64URLConverter.java +++ b/src/converters/generated/io/vertx/test/codegen/converter/TestDataObjectBase64URLConverter.java @@ -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; diff --git a/src/converters/generated/io/vertx/test/codegen/converter/TestDataObjectConverter.java b/src/converters/generated/io/vertx/test/codegen/converter/TestDataObjectConverter.java index edbbeeb79..9535a832d 100644 --- a/src/converters/generated/io/vertx/test/codegen/converter/TestDataObjectConverter.java +++ b/src/converters/generated/io/vertx/test/codegen/converter/TestDataObjectConverter.java @@ -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; diff --git a/src/main/java/io/vertx/codegen/DataObjectModel.java b/src/main/java/io/vertx/codegen/DataObjectModel.java index d7a136253..f21f00d3f 100644 --- a/src/main/java/io/vertx/codegen/DataObjectModel.java +++ b/src/main/java/io/vertx/codegen/DataObjectModel.java @@ -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; @@ -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; diff --git a/src/main/java/io/vertx/codegen/generators/dataobjecthelper/DataObjectHelperGen.java b/src/main/java/io/vertx/codegen/generators/dataobjecthelper/DataObjectHelperGen.java index 22dba92e9..e83337c0d 100644 --- a/src/main/java/io/vertx/codegen/generators/dataobjecthelper/DataObjectHelperGen.java +++ b/src/main/java/io/vertx/codegen/generators/dataobjecthelper/DataObjectHelperGen.java @@ -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.*; /** @@ -66,6 +71,11 @@ public String render(DataObjectModel model, int index, int size, Map dataObjectClass, PropertyKin .registerConverter(ApiObjectWithMapper.class, ApiObjectWithMapper.class, "toJson") .generateDataObject(dataObjectClass, ApiObjectWithMapper.class); assertNotNull(model); - assertEquals(13, model.getPropertyMap().size()); + assertEquals(18, model.getPropertyMap().size()); assertProperty(model.getPropertyMap().get("extraClassPath"), "extraClassPath", "setExtraClassPath", null, null, TypeReflectionFactory.create(String.class), true, expectedKind, true); assertProperty(model.getPropertyMap().get("strings"), "strings", "setStrings", null, null, TypeReflectionFactory.create(String.class), true, expectedKind, true); assertProperty(model.getPropertyMap().get("instants"), "instants", "setInstants", null, null, TypeReflectionFactory.create(Instant.class), true, expectedKind, true); @@ -159,6 +169,11 @@ private void testPropertyCollectionSetters(Class dataObjectClass, PropertyKin assertProperty(model.getPropertyMap().get("jsonObjects"), "jsonObjects", "setJsonObjects", null, null, TypeReflectionFactory.create(JsonObject.class), true, expectedKind, true); assertProperty(model.getPropertyMap().get("jsonArrays"), "jsonArrays", "setJsonArrays", null, null, TypeReflectionFactory.create(JsonArray.class), true, expectedKind, true); assertProperty(model.getPropertyMap().get("enumerateds"), "enumerateds", "setEnumerateds", null, null, TypeReflectionFactory.create(Enumerated.class), true, expectedKind, true); + assertProperty(model.getPropertyMap().get("localDates"), "localDates", "setLocalDates", null, null, TypeReflectionFactory.create(LocalDate.class), true, expectedKind, true); + assertProperty(model.getPropertyMap().get("localDateTimes"), "localDateTimes", "setLocalDateTimes", null, null, TypeReflectionFactory.create(LocalDateTime.class), true, expectedKind, true); + assertProperty(model.getPropertyMap().get("localTimes"), "localTimes", "setLocalTimes", null, null, TypeReflectionFactory.create(LocalTime.class), true, expectedKind, true); + assertProperty(model.getPropertyMap().get("offsetDateTimes"), "offsetDateTimes", "setOffsetDateTimes", null, null, TypeReflectionFactory.create(OffsetDateTime.class), true, expectedKind, true); + assertProperty(model.getPropertyMap().get("zonedDateTimes"), "zonedDateTimes", "setZonedDateTimes", null, null, TypeReflectionFactory.create(ZonedDateTime.class), true, expectedKind, true); } @Test @@ -177,7 +192,7 @@ private void testPropertyCollectionGettersSetters(Class dataObjectClass, Prop .registerConverter(ApiObjectWithMapper.class, ApiObjectWithMapper.class, "toJson") .generateDataObject(dataObjectClass, ApiObjectWithMapper.class); assertNotNull(model); - assertEquals(13, model.getPropertyMap().size()); + assertEquals(18, model.getPropertyMap().size()); assertProperty(model.getPropertyMap().get("extraClassPath"), "extraClassPath", "setExtraClassPath", null, "getExtraClassPath", TypeReflectionFactory.create(String.class), true, expectedKind, true); assertProperty(model.getPropertyMap().get("strings"), "strings", "setStrings", null, "getStrings", TypeReflectionFactory.create(String.class), true, expectedKind, true); assertProperty(model.getPropertyMap().get("instants"), "instants", "setInstants", null, "getInstants", TypeReflectionFactory.create(Instant.class), true, expectedKind, true); @@ -191,6 +206,11 @@ private void testPropertyCollectionGettersSetters(Class dataObjectClass, Prop assertProperty(model.getPropertyMap().get("jsonObjects"), "jsonObjects", "setJsonObjects", null, "getJsonObjects", TypeReflectionFactory.create(JsonObject.class), true, expectedKind, true); assertProperty(model.getPropertyMap().get("jsonArrays"), "jsonArrays", "setJsonArrays", null, "getJsonArrays", TypeReflectionFactory.create(JsonArray.class), true, expectedKind, true); assertProperty(model.getPropertyMap().get("enumerateds"), "enumerateds", "setEnumerateds", null, "getEnumerateds", TypeReflectionFactory.create(Enumerated.class), true, expectedKind, true); + assertProperty(model.getPropertyMap().get("localDates"), "localDates", "setLocalDates", null, "getLocalDates", TypeReflectionFactory.create(LocalDate.class), true, expectedKind, true); + assertProperty(model.getPropertyMap().get("localDateTimes"), "localDateTimes", "setLocalDateTimes", null, "getLocalDateTimes", TypeReflectionFactory.create(LocalDateTime.class), true, expectedKind, true); + assertProperty(model.getPropertyMap().get("localTimes"), "localTimes", "setLocalTimes", null, "getLocalTimes", TypeReflectionFactory.create(LocalTime.class), true, expectedKind, true); + assertProperty(model.getPropertyMap().get("offsetDateTimes"), "offsetDateTimes", "setOffsetDateTimes", null, "getOffsetDateTimes", TypeReflectionFactory.create(OffsetDateTime.class), true, expectedKind, true); + assertProperty(model.getPropertyMap().get("zonedDateTimes"), "zonedDateTimes", "setZonedDateTimes", null, "getZonedDateTimes", TypeReflectionFactory.create(ZonedDateTime.class), true, expectedKind, true); } @Test @@ -204,7 +224,7 @@ public void testPropertyMapGettersSetters() throws Exception { .registerConverter(ApiObjectWithMapper.class, ApiObjectWithMapper.class, "toJson") .generateDataObject(PropertyMapGettersSetters.class, ApiObjectWithMapper.class); assertNotNull(model); - assertEquals(13, model.getPropertyMap().size()); + assertEquals(18, model.getPropertyMap().size()); assertProperty(model.getPropertyMap().get("stringMap"), "stringMap", "setStringMap", null, "getStringMap", TypeReflectionFactory.create(String.class), true, PropertyKind.MAP, true); assertProperty(model.getPropertyMap().get("instantMap"), "instantMap", "setInstantMap", null, "getInstantMap", TypeReflectionFactory.create(Instant.class), true, PropertyKind.MAP, true); assertProperty(model.getPropertyMap().get("boxedIntegerMap"), "boxedIntegerMap", "setBoxedIntegerMap", null, "getBoxedIntegerMap", TypeReflectionFactory.create(Integer.class), true, PropertyKind.MAP, true); @@ -218,6 +238,11 @@ public void testPropertyMapGettersSetters() throws Exception { assertProperty(model.getPropertyMap().get("jsonArrayMap"), "jsonArrayMap", "setJsonArrayMap", null, "getJsonArrayMap", TypeReflectionFactory.create(JsonArray.class), true, PropertyKind.MAP, true); assertProperty(model.getPropertyMap().get("enumeratedMap"), "enumeratedMap", "setEnumeratedMap", null, "getEnumeratedMap", TypeReflectionFactory.create(Enumerated.class), true, PropertyKind.MAP, true); assertProperty(model.getPropertyMap().get("objectMap"), "objectMap", "setObjectMap", null, "getObjectMap", TypeReflectionFactory.create(Object.class), true, PropertyKind.MAP, true); + assertProperty(model.getPropertyMap().get("localDateMap"), "localDateMap", "setLocalDateMap", null, "getLocalDateMap", TypeReflectionFactory.create(LocalDate.class), true, PropertyKind.MAP, true); + assertProperty(model.getPropertyMap().get("localDateTimeMap"), "localDateTimeMap", "setLocalDateTimeMap", null, "getLocalDateTimeMap", TypeReflectionFactory.create(LocalDateTime.class), true, PropertyKind.MAP, true); + assertProperty(model.getPropertyMap().get("localTimeMap"), "localTimeMap", "setLocalTimeMap", null, "getLocalTimeMap", TypeReflectionFactory.create(LocalTime.class), true, PropertyKind.MAP, true); + assertProperty(model.getPropertyMap().get("offsetDateTimeMap"), "offsetDateTimeMap", "setOffsetDateTimeMap", null, "getOffsetDateTimeMap", TypeReflectionFactory.create(OffsetDateTime.class), true, PropertyKind.MAP, true); + assertProperty(model.getPropertyMap().get("zonedDateTimeMap"), "zonedDateTimeMap", "setZonedDateTimeMap", null, "getZonedDateTimeMap", TypeReflectionFactory.create(ZonedDateTime.class), true, PropertyKind.MAP, true); } @Test @@ -226,7 +251,7 @@ public void testPropertyMapAdders() throws Exception { .registerConverter(ApiObjectWithMapper.class, ApiObjectWithMapper.class, "toJson") .generateDataObject(PropertyMapAdders.class, ApiObjectWithMapper.class); assertNotNull(model); - assertEquals(16, model.getPropertyMap().size()); + assertEquals(21, model.getPropertyMap().size()); assertProperty(model.getPropertyMap().get("strings"), "strings", null, "addString", null, TypeReflectionFactory.create(String.class), true, PropertyKind.MAP, true); assertProperty(model.getPropertyMap().get("instants"), "instants", null, "addInstant", null, TypeReflectionFactory.create(Instant.class), true, PropertyKind.MAP, true); assertProperty(model.getPropertyMap().get("boxedIntegers"), "boxedIntegers", null, "addBoxedInteger", null, TypeReflectionFactory.create(Integer.class), true, PropertyKind.MAP, true); @@ -243,6 +268,11 @@ public void testPropertyMapAdders() throws Exception { assertProperty(model.getPropertyMap().get("jsonArrays"), "jsonArrays", null, "addJsonArray", null, TypeReflectionFactory.create(JsonArray.class), true, PropertyKind.MAP, true); assertProperty(model.getPropertyMap().get("enumerateds"), "enumerateds", null, "addEnumerated", null, TypeReflectionFactory.create(Enumerated.class), true, PropertyKind.MAP, true); assertProperty(model.getPropertyMap().get("objects"), "objects", null, "addObject", null, TypeReflectionFactory.create(Object.class), true, PropertyKind.MAP, true); + assertProperty(model.getPropertyMap().get("localDates"), "localDates", null, "addLocalDate", null, TypeReflectionFactory.create(LocalDate.class), true, PropertyKind.MAP, true); + assertProperty(model.getPropertyMap().get("localDateTimes"), "localDateTimes", null, "addLocalDateTime", null, TypeReflectionFactory.create(LocalDateTime.class), true, PropertyKind.MAP, true); + assertProperty(model.getPropertyMap().get("localTimes"), "localTimes", null, "addLocalTime", null, TypeReflectionFactory.create(LocalTime.class), true, PropertyKind.MAP, true); + assertProperty(model.getPropertyMap().get("offsetDateTimes"), "offsetDateTimes", null, "addOffsetDateTime", null, TypeReflectionFactory.create(OffsetDateTime.class), true, PropertyKind.MAP, true); + assertProperty(model.getPropertyMap().get("zonedDateTimes"), "zonedDateTimes", null, "addZonedDateTime", null, TypeReflectionFactory.create(ZonedDateTime.class), true, PropertyKind.MAP, true); } @Test @@ -251,7 +281,7 @@ public void testPropertyMapSetters() throws Exception { .registerConverter(ApiObjectWithMapper.class, ApiObjectWithMapper.class, "toJson") .generateDataObject(PropertyMapSetters.class, ApiObjectWithMapper.class); assertNotNull(model); - assertEquals(13, model.getPropertyMap().size()); + assertEquals(18, model.getPropertyMap().size()); assertProperty(model.getPropertyMap().get("stringMap"), "stringMap", "setStringMap", null, null, TypeReflectionFactory.create(String.class), true, PropertyKind.MAP, true); assertProperty(model.getPropertyMap().get("instantMap"), "instantMap", "setInstantMap", null, null, TypeReflectionFactory.create(Instant.class), true, PropertyKind.MAP, true); assertProperty(model.getPropertyMap().get("boxedIntegerMap"), "boxedIntegerMap", "setBoxedIntegerMap", null, null, TypeReflectionFactory.create(Integer.class), true, PropertyKind.MAP, true); @@ -265,6 +295,11 @@ public void testPropertyMapSetters() throws Exception { assertProperty(model.getPropertyMap().get("jsonArrayMap"), "jsonArrayMap", "setJsonArrayMap", null, null, TypeReflectionFactory.create(JsonArray.class), true, PropertyKind.MAP, true); assertProperty(model.getPropertyMap().get("enumeratedMap"), "enumeratedMap", "setEnumeratedMap", null, null, TypeReflectionFactory.create(Enumerated.class), true, PropertyKind.MAP, true); assertProperty(model.getPropertyMap().get("objectMap"), "objectMap", "setObjectMap", null, null, TypeReflectionFactory.create(Object.class), true, PropertyKind.MAP, true); + assertProperty(model.getPropertyMap().get("localDateMap"), "localDateMap", "setLocalDateMap", null, null, TypeReflectionFactory.create(LocalDate.class), true, PropertyKind.MAP, true); + assertProperty(model.getPropertyMap().get("localDateTimeMap"), "localDateTimeMap", "setLocalDateTimeMap", null, null, TypeReflectionFactory.create(LocalDateTime.class), true, PropertyKind.MAP, true); + assertProperty(model.getPropertyMap().get("localTimeMap"), "localTimeMap", "setLocalTimeMap", null, null, TypeReflectionFactory.create(LocalTime.class), true, PropertyKind.MAP, true); + assertProperty(model.getPropertyMap().get("offsetDateTimeMap"), "offsetDateTimeMap", "setOffsetDateTimeMap", null, null, TypeReflectionFactory.create(OffsetDateTime.class), true, PropertyKind.MAP, true); + assertProperty(model.getPropertyMap().get("zonedDateTimeMap"), "zonedDateTimeMap", "setZonedDateTimeMap", null, null, TypeReflectionFactory.create(ZonedDateTime.class), true, PropertyKind.MAP, true); } @Test @@ -273,7 +308,7 @@ public void testPropertyMapSetterAdders() throws Exception { .registerConverter(ApiObjectWithMapper.class, ApiObjectWithMapper.class, "toJson") .generateDataObject(PropertyMapGettersAdders.class, ApiObjectWithMapper.class); assertNotNull(model); - assertEquals(13, model.getPropertyMap().size()); + assertEquals(18, model.getPropertyMap().size()); assertProperty(model.getPropertyMap().get("strings"), "strings", null, "addString", "getStrings", TypeReflectionFactory.create(String.class), true, PropertyKind.MAP, true); assertProperty(model.getPropertyMap().get("instants"), "instants", null, "addInstant", "getInstants", TypeReflectionFactory.create(Instant.class), true, PropertyKind.MAP, true); assertProperty(model.getPropertyMap().get("boxedIntegers"), "boxedIntegers", null, "addBoxedInteger", "getBoxedIntegers", TypeReflectionFactory.create(Integer.class), true, PropertyKind.MAP, true); @@ -287,6 +322,11 @@ public void testPropertyMapSetterAdders() throws Exception { assertProperty(model.getPropertyMap().get("jsonArrays"), "jsonArrays", null, "addJsonArray", "getJsonArrays", TypeReflectionFactory.create(JsonArray.class), true, PropertyKind.MAP, true); assertProperty(model.getPropertyMap().get("enumerateds"), "enumerateds", null, "addEnumerated", "getEnumerateds", TypeReflectionFactory.create(Enumerated.class), true, PropertyKind.MAP, true); assertProperty(model.getPropertyMap().get("objects"), "objects", null, "addObject", "getObjects", TypeReflectionFactory.create(Object.class), true, PropertyKind.MAP, true); + assertProperty(model.getPropertyMap().get("localDates"), "localDates", null, "addLocalDate", "getLocalDates", TypeReflectionFactory.create(LocalDate.class), true, PropertyKind.MAP, true); + assertProperty(model.getPropertyMap().get("localDateTimes"), "localDateTimes", null, "addLocalDateTime", "getLocalDateTimes", TypeReflectionFactory.create(LocalDateTime.class), true, PropertyKind.MAP, true); + assertProperty(model.getPropertyMap().get("localTimes"), "localTimes", null, "addLocalTime", "getLocalTimes", TypeReflectionFactory.create(LocalTime.class), true, PropertyKind.MAP, true); + assertProperty(model.getPropertyMap().get("offsetDateTimes"), "offsetDateTimes", null, "addOffsetDateTime", "getOffsetDateTimes", TypeReflectionFactory.create(OffsetDateTime.class), true, PropertyKind.MAP, true); + assertProperty(model.getPropertyMap().get("zonedDateTimes"), "zonedDateTimes", null, "addZonedDateTime", "getZonedDateTimes", TypeReflectionFactory.create(ZonedDateTime.class), true, PropertyKind.MAP, true); } @Test @@ -295,7 +335,7 @@ public void testPropertyGetters() throws Exception { .registerConverter(ApiObjectWithMapper.class, ApiObjectWithMapper.class, "toJson") .generateDataObject(PropertyGetters.class, ApiObjectWithMapper.class); assertNotNull(model); - assertEquals(15, model.getPropertyMap().size()); + assertEquals(20, model.getPropertyMap().size()); assertProperty(model.getPropertyMap().get("string"), "string", null, null, "getString", TypeReflectionFactory.create(String.class), true, PropertyKind.VALUE, true); assertProperty(model.getPropertyMap().get("boxedInteger"), "boxedInteger", null, null, "getBoxedInteger", TypeReflectionFactory.create(Integer.class), true, PropertyKind.VALUE, true); assertProperty(model.getPropertyMap().get("primitiveInteger"), "primitiveInteger", null, null, "getPrimitiveInteger", TypeReflectionFactory.create(int.class), true, PropertyKind.VALUE, true); @@ -311,6 +351,11 @@ public void testPropertyGetters() throws Exception { assertProperty(model.getPropertyMap().get("jsonObject"), "jsonObject", null, null, "getJsonObject", TypeReflectionFactory.create(JsonObject.class), true, PropertyKind.VALUE, true); assertProperty(model.getPropertyMap().get("jsonArray"), "jsonArray", null, null, "getJsonArray", TypeReflectionFactory.create(JsonArray.class), true, PropertyKind.VALUE, true); assertProperty(model.getPropertyMap().get("enumerated"), "enumerated", null, null, "getEnumerated", TypeReflectionFactory.create(Enumerated.class), true, PropertyKind.VALUE, true); + assertProperty(model.getPropertyMap().get("localDate"), "localDate", null, null, "getLocalDate", TypeReflectionFactory.create(LocalDate.class), true, PropertyKind.VALUE, true); + assertProperty(model.getPropertyMap().get("localDateTime"), "localDateTime", null, null, "getLocalDateTime", TypeReflectionFactory.create(LocalDateTime.class), true, PropertyKind.VALUE, true); + assertProperty(model.getPropertyMap().get("localTime"), "localTime", null, null, "getLocalTime", TypeReflectionFactory.create(LocalTime.class), true, PropertyKind.VALUE, true); + assertProperty(model.getPropertyMap().get("offsetDateTime"), "offsetDateTime", null, null, "getOffsetDateTime", TypeReflectionFactory.create(OffsetDateTime.class), true, PropertyKind.VALUE, true); + assertProperty(model.getPropertyMap().get("zonedDateTime"), "zonedDateTime", null, null, "getZonedDateTime", TypeReflectionFactory.create(ZonedDateTime.class), true, PropertyKind.VALUE, true); } @Test @@ -320,7 +365,7 @@ public void testPropertyGettersSetters() throws Exception { .registerConverter(ApiObjectWithMapper.class, ApiObjectWithMapper.class, "toJson") .generateDataObject(PropertyGettersSetters.class, ApiObjectWithMapper.class); assertNotNull(model); - assertEquals(15, model.getPropertyMap().size()); + assertEquals(20, model.getPropertyMap().size()); assertProperty(model.getPropertyMap().get("string"), "string", "setString", null, "getString", TypeReflectionFactory.create(String.class), true, PropertyKind.VALUE, true); assertProperty(model.getPropertyMap().get("instant"), "instant", "setInstant", null, "getInstant", TypeReflectionFactory.create(Instant.class), true, PropertyKind.VALUE, true); assertProperty(model.getPropertyMap().get("boxedInteger"), "boxedInteger", "setBoxedInteger", null, "getBoxedInteger", TypeReflectionFactory.create(Integer.class), true, PropertyKind.VALUE, true); @@ -336,6 +381,11 @@ public void testPropertyGettersSetters() throws Exception { assertProperty(model.getPropertyMap().get("jsonObject"), "jsonObject", "setJsonObject", null, "getJsonObject", TypeReflectionFactory.create(JsonObject.class), true, PropertyKind.VALUE, true); assertProperty(model.getPropertyMap().get("jsonArray"), "jsonArray", "setJsonArray", null, "getJsonArray", TypeReflectionFactory.create(JsonArray.class), true, PropertyKind.VALUE, true); assertProperty(model.getPropertyMap().get("enumerated"), "enumerated", "setEnumerated", null, "getEnumerated", TypeReflectionFactory.create(Enumerated.class), true, PropertyKind.VALUE, true); + assertProperty(model.getPropertyMap().get("localDate"), "localDate", "setLocalDate", null, "getLocalDate", TypeReflectionFactory.create(LocalDate.class), true, PropertyKind.VALUE, true); + assertProperty(model.getPropertyMap().get("localDateTime"), "localDateTime", "setLocalDateTime", null, "getLocalDateTime", TypeReflectionFactory.create(LocalDateTime.class), true, PropertyKind.VALUE, true); + assertProperty(model.getPropertyMap().get("localTime"), "localTime", "setLocalTime", null, "getLocalTime", TypeReflectionFactory.create(LocalTime.class), true, PropertyKind.VALUE, true); + assertProperty(model.getPropertyMap().get("offsetDateTime"), "offsetDateTime", "setOffsetDateTime", null, "getOffsetDateTime", TypeReflectionFactory.create(OffsetDateTime.class), true, PropertyKind.VALUE, true); + assertProperty(model.getPropertyMap().get("zonedDateTime"), "zonedDateTime", "setZonedDateTime", null, "getZonedDateTime", TypeReflectionFactory.create(ZonedDateTime.class), true, PropertyKind.VALUE, true); } @Test @@ -352,7 +402,7 @@ public void testPropertyListAdders() throws Exception { .registerConverter(ApiObjectWithMapper.class, ApiObjectWithMapper.class, "toJson") .generateDataObject(PropertyListAdders.class, ApiObjectWithMapper.class); assertNotNull(model); - assertEquals(15, model.getPropertyMap().size()); + assertEquals(20, model.getPropertyMap().size()); assertProperty(model.getPropertyMap().get("strings"), "strings", null, "addString", null, TypeReflectionFactory.create(String.class), true, PropertyKind.LIST, true); assertProperty(model.getPropertyMap().get("instants"), "instants", null, "addInstant", null, TypeReflectionFactory.create(Instant.class), true, PropertyKind.LIST, true); assertProperty(model.getPropertyMap().get("boxedIntegers"), "boxedIntegers", null, "addBoxedInteger", null, TypeReflectionFactory.create(Integer.class), true, PropertyKind.LIST, true); @@ -368,6 +418,11 @@ public void testPropertyListAdders() throws Exception { assertProperty(model.getPropertyMap().get("jsonObjects"), "jsonObjects", null, "addJsonObject", null, TypeReflectionFactory.create(JsonObject.class), true, PropertyKind.LIST, true); assertProperty(model.getPropertyMap().get("jsonArrays"), "jsonArrays", null, "addJsonArray", null, TypeReflectionFactory.create(JsonArray.class), true, PropertyKind.LIST, true); assertProperty(model.getPropertyMap().get("enumerateds"), "enumerateds", null, "addEnumerated", null, TypeReflectionFactory.create(Enumerated.class), true, PropertyKind.LIST, true); + assertProperty(model.getPropertyMap().get("localDates"), "localDates", null, "addLocalDate", null, TypeReflectionFactory.create(LocalDate.class), true, PropertyKind.LIST, true); + assertProperty(model.getPropertyMap().get("localDateTimes"), "localDateTimes", null, "addLocalDateTime", null, TypeReflectionFactory.create(LocalDateTime.class), true, PropertyKind.LIST, true); + assertProperty(model.getPropertyMap().get("localTimes"), "localTimes", null, "addLocalTime", null, TypeReflectionFactory.create(LocalTime.class), true, PropertyKind.LIST, true); + assertProperty(model.getPropertyMap().get("offsetDateTimes"), "offsetDateTimes", null, "addOffsetDateTime", null, TypeReflectionFactory.create(OffsetDateTime.class), true, PropertyKind.LIST, true); + assertProperty(model.getPropertyMap().get("zonedDateTimes"), "zonedDateTimes", null, "addZonedDateTime", null, TypeReflectionFactory.create(ZonedDateTime.class), true, PropertyKind.LIST, true); } @Test @@ -377,7 +432,7 @@ public void testPropertyListGettersAdders() throws Exception { .registerConverter(ApiObjectWithMapper.class, ApiObjectWithMapper.class, "toJson") .generateDataObject(PropertyListGettersAdders.class, ApiObjectWithMapper.class); assertNotNull(model); - assertEquals(12, model.getPropertyMap().size()); + assertEquals(17, model.getPropertyMap().size()); assertProperty(model.getPropertyMap().get("strings"), "strings", null, "addString", "getStrings", TypeReflectionFactory.create(String.class), true, PropertyKind.LIST, true); assertProperty(model.getPropertyMap().get("instants"), "instants", null, "addInstant", "getInstants", TypeReflectionFactory.create(Instant.class), true, PropertyKind.LIST, true); assertProperty(model.getPropertyMap().get("boxedIntegers"), "boxedIntegers", null, "addBoxedInteger", "getBoxedIntegers", TypeReflectionFactory.create(Integer.class), true, PropertyKind.LIST, true); @@ -390,6 +445,11 @@ public void testPropertyListGettersAdders() throws Exception { assertProperty(model.getPropertyMap().get("jsonObjects"), "jsonObjects", null, "addJsonObject", "getJsonObjects", TypeReflectionFactory.create(JsonObject.class), true, PropertyKind.LIST, true); assertProperty(model.getPropertyMap().get("jsonArrays"), "jsonArrays", null, "addJsonArray", "getJsonArrays", TypeReflectionFactory.create(JsonArray.class), true, PropertyKind.LIST, true); assertProperty(model.getPropertyMap().get("enumerateds"), "enumerateds", null, "addEnumerated", "getEnumerateds", TypeReflectionFactory.create(Enumerated.class), true, PropertyKind.LIST, true); + assertProperty(model.getPropertyMap().get("localDates"), "localDates", null, "addLocalDate", "getLocalDates", TypeReflectionFactory.create(LocalDate.class), true, PropertyKind.LIST, true); + assertProperty(model.getPropertyMap().get("localDateTimes"), "localDateTimes", null, "addLocalDateTime", "getLocalDateTimes", TypeReflectionFactory.create(LocalDateTime.class), true, PropertyKind.LIST, true); + assertProperty(model.getPropertyMap().get("localTimes"), "localTimes", null, "addLocalTime", "getLocalTimes", TypeReflectionFactory.create(LocalTime.class), true, PropertyKind.LIST, true); + assertProperty(model.getPropertyMap().get("offsetDateTimes"), "offsetDateTimes", null, "addOffsetDateTime", "getOffsetDateTimes", TypeReflectionFactory.create(OffsetDateTime.class), true, PropertyKind.LIST, true); + assertProperty(model.getPropertyMap().get("zonedDateTimes"), "zonedDateTimes", null, "addZonedDateTime", "getZonedDateTimes", TypeReflectionFactory.create(ZonedDateTime.class), true, PropertyKind.LIST, true); } @Test diff --git a/src/test/java/io/vertx/test/codegen/generator/CodeGeneratorTest.java b/src/test/java/io/vertx/test/codegen/generator/CodeGeneratorTest.java index 92e6b992f..ccf7d0294 100644 --- a/src/test/java/io/vertx/test/codegen/generator/CodeGeneratorTest.java +++ b/src/test/java/io/vertx/test/codegen/generator/CodeGeneratorTest.java @@ -13,6 +13,11 @@ import io.vertx.test.codegen.testenum.ValidEnum; import io.vertx.test.codegen.testmodule.modulescoped.ModuleScopedApi; import io.vertx.test.codegen.testmodule.modulescoped.sub.ModuleScopedSubApi; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.time.OffsetDateTime; +import java.time.ZonedDateTime; import org.junit.Assume; import org.junit.Before; import org.junit.Rule; @@ -95,9 +100,25 @@ public void testDataObjectGen() throws Exception { assertEquals("true", props.remove("publicConverter")); assertEquals("false", props.remove("concrete")); assertEquals("false", props.remove("isClass")); - assertEquals("[" + JsonArray.class.getName() + ", " + JsonObject.class.getName() + ", " + Boolean.class.getName() + ", " - + Integer.class.getName() + ", " + Long.class.getName() + ", " + String.class.getName() + ", " + Instant.class.getName() - + "]", props.remove("importedTypes")); + assertEquals("false", props.remove("deprecated")); + assertEquals("null", props.remove("deprecatedDesc")); + assertEquals("false", props.remove("hasStringConstructor")); + + List classNames = Arrays.asList( + JsonArray.class.getName(), + JsonObject.class.getName(), + Boolean.class.getName(), + Integer.class.getName(), + Long.class.getName(), + String.class.getName(), + Instant.class.getName(), + LocalDate.class.getName(), + LocalDateTime.class.getName(), + LocalTime.class.getName(), + OffsetDateTime.class.getName(), + ZonedDateTime.class.getName() + ); + assertEquals("[" + String.join(", ", classNames) + "]", props.remove("importedTypes")); assertEquals("[]", props.remove("superTypes")); assertEquals("[]", props.remove("abstractSuperTypes")); assertEquals("null", props.remove("superType")); @@ -115,12 +136,20 @@ public void testDataObjectGen() throws Exception { assertEquals("long", props.remove("property.primitiveLong")); assertEquals("java.lang.String", props.remove("property.string")); assertEquals("java.time.Instant", props.remove("property.instant")); + assertEquals("java.time.LocalDate", props.remove("property.localDate")); + assertEquals("java.time.LocalDateTime", props.remove("property.localDateTime")); + assertEquals("java.time.LocalTime", props.remove("property.localTime")); + assertEquals("java.time.OffsetDateTime", props.remove("property.offsetDateTime")); + assertEquals("java.time.ZonedDateTime", props.remove("property.zonedDateTime")); assertEquals("io.vertx.test.codegen.testdataobject.ToJsonDataObject", props.remove("property.toJsonDataObject")); assertEquals("false", props.remove("hasEmptyConstructor")); assertEquals("false", props.remove("hasJsonConstructor")); assertEquals("false", props.remove("hasToJsonMethod")); assertEquals("false", props.remove("serializable")); assertEquals("false", props.remove("deserializable")); + + int numberOfIgnoredProps = 4; + assertEquals(numberOfIgnoredProps, props.size()); } @Test diff --git a/src/test/java/io/vertx/test/codegen/testdataobject/PropertyGetters.java b/src/test/java/io/vertx/test/codegen/testdataobject/PropertyGetters.java index b5157939d..a17b5996e 100644 --- a/src/test/java/io/vertx/test/codegen/testdataobject/PropertyGetters.java +++ b/src/test/java/io/vertx/test/codegen/testdataobject/PropertyGetters.java @@ -5,6 +5,11 @@ import io.vertx.core.json.JsonObject; import java.time.Instant; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.time.OffsetDateTime; +import java.time.ZonedDateTime; /** * @author Julien Viet @@ -33,6 +38,12 @@ public PropertyGetters(JsonObject json) { public long getPrimitiveLong() { throw new UnsupportedOperationException(); } public Instant getInstant() { throw new UnsupportedOperationException(); } + public LocalDate getLocalDate() { throw new UnsupportedOperationException(); } + public LocalDateTime getLocalDateTime() { throw new UnsupportedOperationException(); } + public LocalTime getLocalTime() { throw new UnsupportedOperationException(); } + public OffsetDateTime getOffsetDateTime() { throw new UnsupportedOperationException(); } + public ZonedDateTime getZonedDateTime() { throw new UnsupportedOperationException(); } + public ApiObject getApiObject() { throw new UnsupportedOperationException(); } public ApiObjectWithMapper getApiObjectWithMapper() { throw new UnsupportedOperationException(); } public EmptyDataObject getDataObject() { throw new UnsupportedOperationException(); } diff --git a/src/test/java/io/vertx/test/codegen/testdataobject/PropertyGettersSetters.java b/src/test/java/io/vertx/test/codegen/testdataobject/PropertyGettersSetters.java index 07c225628..19ce849f6 100644 --- a/src/test/java/io/vertx/test/codegen/testdataobject/PropertyGettersSetters.java +++ b/src/test/java/io/vertx/test/codegen/testdataobject/PropertyGettersSetters.java @@ -5,6 +5,11 @@ import io.vertx.core.json.JsonObject; 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.Map; /** @@ -25,6 +30,16 @@ static PropertyGettersSetters dataObjectFromJson(JsonObject obj) { String getString(); void setInstant(Instant i); Instant getInstant(); + void setLocalDate(LocalDate l); + LocalDate getLocalDate(); + void setLocalDateTime(LocalDateTime l); + LocalDateTime getLocalDateTime(); + void setLocalTime(LocalTime l); + LocalTime getLocalTime(); + void setOffsetDateTime(OffsetDateTime o); + OffsetDateTime getOffsetDateTime(); + void setZonedDateTime(ZonedDateTime z); + ZonedDateTime getZonedDateTime(); void setBoxedInteger(Integer i); Integer getBoxedInteger(); void setPrimitiveInteger(int i); diff --git a/src/test/java/io/vertx/test/codegen/testdataobject/PropertyListAdders.java b/src/test/java/io/vertx/test/codegen/testdataobject/PropertyListAdders.java index 94fa803bc..db2e19995 100644 --- a/src/test/java/io/vertx/test/codegen/testdataobject/PropertyListAdders.java +++ b/src/test/java/io/vertx/test/codegen/testdataobject/PropertyListAdders.java @@ -5,6 +5,12 @@ import io.vertx.core.json.JsonObject; 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.Set; /** * @author Julien Viet @@ -22,6 +28,11 @@ public static PropertyListAdders dataObjectFromJson(JsonObject obj) { PropertyListAdders addString(String s); PropertyListAdders addInstant(Instant i); + PropertySetSetters addLocalDate(LocalDate localDate); + PropertySetSetters addLocalDateTime(LocalDateTime localDateTime); + PropertySetSetters addLocalTime(LocalTime localTime); + PropertySetSetters addOffsetDateTime(OffsetDateTime offsetDateTime); + PropertySetSetters addZonedDateTime(ZonedDateTime zonedDateTime); PropertyListAdders addBoxedInteger(Integer i); PropertyListAdders addPrimitiveInteger(int i); PropertyListAdders addBoxedBoolean(Boolean b); diff --git a/src/test/java/io/vertx/test/codegen/testdataobject/PropertyListGettersAdders.java b/src/test/java/io/vertx/test/codegen/testdataobject/PropertyListGettersAdders.java index af14fa4bb..ae6252eb9 100644 --- a/src/test/java/io/vertx/test/codegen/testdataobject/PropertyListGettersAdders.java +++ b/src/test/java/io/vertx/test/codegen/testdataobject/PropertyListGettersAdders.java @@ -5,6 +5,11 @@ import io.vertx.core.json.JsonObject; 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.List; /** @@ -25,6 +30,16 @@ public static PropertyListGettersAdders dataObjectFromJson(JsonObject obj) { PropertyListGettersAdders addString(String s); List getInstants(); PropertyListGettersAdders addInstant(Instant i); + List getLocalDates(); + PropertyListGettersAdders addLocalDate(LocalDate l); + List getLocalDateTimes(); + PropertyListGettersAdders addLocalDateTime(LocalDateTime l); + List getLocalTimes(); + PropertyListGettersAdders addLocalTime(LocalTime l); + List getOffsetDateTimes(); + PropertyListGettersAdders addOffsetDateTime(OffsetDateTime o); + List getZonedDateTimes(); + PropertyListGettersAdders addZonedDateTime(ZonedDateTime z); List getBoxedIntegers(); PropertyListGettersAdders addBoxedInteger(Integer i); List getBoxedBooleans(); diff --git a/src/test/java/io/vertx/test/codegen/testdataobject/PropertyListGettersSetters.java b/src/test/java/io/vertx/test/codegen/testdataobject/PropertyListGettersSetters.java index 80051d30e..a70229d8f 100644 --- a/src/test/java/io/vertx/test/codegen/testdataobject/PropertyListGettersSetters.java +++ b/src/test/java/io/vertx/test/codegen/testdataobject/PropertyListGettersSetters.java @@ -5,6 +5,11 @@ import io.vertx.core.json.JsonObject; 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.List; /** @@ -30,6 +35,16 @@ public static PropertyListGettersSetters dataObjectFromJson(JsonObject obj) { PropertyListGettersSetters setStrings(List s); List getInstants(); PropertyListGettersSetters setInstants(List s); + List getLocalDates(); + PropertyListGettersSetters setLocalDates(List l); + List getLocalDateTimes(); + PropertyListGettersSetters setLocalDateTimes(List l); + List getLocalTimes(); + PropertyListGettersSetters setLocalTimes(List l); + List getOffsetDateTimes(); + PropertyListGettersSetters setOffsetDateTimes(List o); + List getZonedDateTimes(); + PropertyListGettersSetters setZonedDateTimes(List z); List getBoxedIntegers(); PropertyListGettersSetters setBoxedIntegers(List i); List getBoxedBooleans(); diff --git a/src/test/java/io/vertx/test/codegen/testdataobject/PropertyListSetters.java b/src/test/java/io/vertx/test/codegen/testdataobject/PropertyListSetters.java index 13cd75fde..bd762980a 100644 --- a/src/test/java/io/vertx/test/codegen/testdataobject/PropertyListSetters.java +++ b/src/test/java/io/vertx/test/codegen/testdataobject/PropertyListSetters.java @@ -5,6 +5,11 @@ import io.vertx.core.json.JsonObject; 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.List; /** @@ -27,6 +32,11 @@ public static PropertyListSetters dataObjectFromJson(JsonObject obj) { // Regular case PropertyListSetters setStrings(List s); PropertyListSetters setInstants(List s); + PropertyListSetters setLocalDates(List l); + PropertyListSetters setLocalDateTimes(List l); + PropertyListSetters setLocalTimes(List l); + PropertyListSetters setOffsetDateTimes(List o); + PropertyListSetters setZonedDateTimes(List z); PropertyListSetters setBoxedIntegers(List i); PropertyListSetters setBoxedBooleans(List b); PropertyListSetters setBoxedLongs(List b); diff --git a/src/test/java/io/vertx/test/codegen/testdataobject/PropertyMapAdders.java b/src/test/java/io/vertx/test/codegen/testdataobject/PropertyMapAdders.java index a703b8a8d..9d373b474 100644 --- a/src/test/java/io/vertx/test/codegen/testdataobject/PropertyMapAdders.java +++ b/src/test/java/io/vertx/test/codegen/testdataobject/PropertyMapAdders.java @@ -5,6 +5,11 @@ import io.vertx.core.json.JsonObject; 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.Map; /** @@ -24,6 +29,11 @@ static PropertyMapAdders dataObjectFromJson(JsonObject obj) { // Regular case PropertyMapAdders addString(String key, String s); PropertyMapAdders addInstant(String key, Instant i); + PropertyMapAdders addLocalDate(String key, LocalDate l); + PropertyMapAdders addLocalDateTime(String key, LocalDateTime i); + PropertyMapAdders addLocalTime(String key, LocalTime i); + PropertyMapAdders addOffsetDateTime(String key, OffsetDateTime i); + PropertyMapAdders addZonedDateTime(String key, ZonedDateTime i); PropertyMapAdders addBoxedInteger(String key, Integer i); PropertyMapAdders addPrimitiveInteger(String key, int i); PropertyMapAdders addBoxedBoolean(String key, Boolean b); diff --git a/src/test/java/io/vertx/test/codegen/testdataobject/PropertyMapGettersAdders.java b/src/test/java/io/vertx/test/codegen/testdataobject/PropertyMapGettersAdders.java index 8856699a0..da3cf72a8 100644 --- a/src/test/java/io/vertx/test/codegen/testdataobject/PropertyMapGettersAdders.java +++ b/src/test/java/io/vertx/test/codegen/testdataobject/PropertyMapGettersAdders.java @@ -5,6 +5,11 @@ import io.vertx.core.json.JsonObject; 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.Map; /** @@ -26,6 +31,16 @@ static PropertyMapGettersAdders dataObjectFromJson(JsonObject obj) { PropertyMapGettersAdders addString(String key, String s); Map getInstants(); PropertyMapGettersAdders addInstant(String key, Instant i); + Map getLocalDates(); + PropertyMapGettersAdders addLocalDate(String key, LocalDate l); + Map getLocalDateTimes(); + PropertyMapGettersAdders addLocalDateTime(String key, LocalDateTime l); + Map getLocalTimes(); + PropertyMapGettersAdders addLocalTime(String key, LocalTime l); + Map getOffsetDateTimes(); + PropertyMapGettersAdders addOffsetDateTime(String key, OffsetDateTime o); + Map getZonedDateTimes(); + PropertyMapGettersAdders addZonedDateTime(String key, ZonedDateTime z); Map getBoxedIntegers(); PropertyMapGettersAdders addBoxedInteger(String key, Integer i); Map getBoxedBooleans(); diff --git a/src/test/java/io/vertx/test/codegen/testdataobject/PropertyMapGettersSetters.java b/src/test/java/io/vertx/test/codegen/testdataobject/PropertyMapGettersSetters.java index e9893f5ae..327b8b32b 100644 --- a/src/test/java/io/vertx/test/codegen/testdataobject/PropertyMapGettersSetters.java +++ b/src/test/java/io/vertx/test/codegen/testdataobject/PropertyMapGettersSetters.java @@ -5,6 +5,11 @@ import io.vertx.core.json.JsonObject; 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.List; import java.util.Map; @@ -27,6 +32,16 @@ public static PropertyMapGettersSetters dataObjectFromJson(JsonObject obj) { PropertyMapGettersSetters setStringMap(Map s); Map getInstantMap(); PropertyMapGettersSetters setInstantMap(Map i); + Map getLocalDateMap(); + PropertyMapGettersSetters setLocalDateMap(Map l); + Map getLocalDateTimeMap(); + PropertyMapGettersSetters setLocalDateTimeMap(Map l); + Map getLocalTimeMap(); + PropertyMapGettersSetters setLocalTimeMap(Map l); + Map getOffsetDateTimeMap(); + PropertyMapGettersSetters setOffsetDateTimeMap(Map o); + Map getZonedDateTimeMap(); + PropertyMapGettersSetters setZonedDateTimeMap(Map z); Map getBoxedIntegerMap(); PropertyMapGettersSetters setBoxedIntegerMap(Map i); Map getBoxedBooleanMap(); diff --git a/src/test/java/io/vertx/test/codegen/testdataobject/PropertyMapSetters.java b/src/test/java/io/vertx/test/codegen/testdataobject/PropertyMapSetters.java index 7019d3d47..ddb32ddd0 100644 --- a/src/test/java/io/vertx/test/codegen/testdataobject/PropertyMapSetters.java +++ b/src/test/java/io/vertx/test/codegen/testdataobject/PropertyMapSetters.java @@ -5,6 +5,11 @@ import io.vertx.core.json.JsonObject; 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.List; import java.util.Map; @@ -25,6 +30,11 @@ static PropertyMapSetters dataObjectFromJson(JsonObject obj) { // Regular case PropertyMapSetters setStringMap(Map s); PropertyMapSetters setInstantMap(Map i); + PropertyMapSetters setLocalDateMap(Map l); + PropertyMapSetters setLocalDateTimeMap(Map l); + PropertyMapSetters setLocalTimeMap(Map l); + PropertyMapSetters setOffsetDateTimeMap(Map o); + PropertyMapSetters setZonedDateTimeMap(Map z); PropertyMapSetters setBoxedIntegerMap(Map i); PropertyMapSetters setBoxedBooleanMap(Map b); PropertyMapSetters setBoxedLongMap(Map b); diff --git a/src/test/java/io/vertx/test/codegen/testdataobject/PropertySetGettersSetters.java b/src/test/java/io/vertx/test/codegen/testdataobject/PropertySetGettersSetters.java index 81d7db399..7ffc668a4 100644 --- a/src/test/java/io/vertx/test/codegen/testdataobject/PropertySetGettersSetters.java +++ b/src/test/java/io/vertx/test/codegen/testdataobject/PropertySetGettersSetters.java @@ -5,6 +5,11 @@ import io.vertx.core.json.JsonObject; 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.Set; /** @@ -30,6 +35,16 @@ public static PropertySetGettersSetters dataObjectFromJson(JsonObject obj) { PropertySetGettersSetters setStrings(Set s); Set getInstants(); PropertySetGettersSetters setInstants(Set i); + Set getLocalDates(); + PropertySetGettersSetters setLocalDates(Set l); + Set getLocalDateTimes(); + PropertySetGettersSetters setLocalDateTimes(Set l); + Set getLocalTimes(); + PropertySetGettersSetters setLocalTimes(Set l); + Set getOffsetDateTimes(); + PropertySetGettersSetters setOffsetDateTimes(Set o); + Set getZonedDateTimes(); + PropertySetGettersSetters setZonedDateTimes(Set z); Set getBoxedIntegers(); PropertySetGettersSetters setBoxedIntegers(Set i); Set getBoxedBooleans(); diff --git a/src/test/java/io/vertx/test/codegen/testdataobject/PropertySetSetters.java b/src/test/java/io/vertx/test/codegen/testdataobject/PropertySetSetters.java index dec560d95..96b46af0b 100644 --- a/src/test/java/io/vertx/test/codegen/testdataobject/PropertySetSetters.java +++ b/src/test/java/io/vertx/test/codegen/testdataobject/PropertySetSetters.java @@ -5,6 +5,11 @@ import io.vertx.core.json.JsonObject; 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.Set; /** @@ -27,6 +32,11 @@ public static PropertySetSetters dataObjectFromJson(JsonObject obj) { // Regular case PropertySetSetters setStrings(Set s); PropertySetSetters setInstants(Set i); + PropertySetSetters setLocalDates(Set localDates); + PropertySetSetters setLocalDateTimes(Set localDateTimes); + PropertySetSetters setLocalTimes(Set localTimes); + PropertySetSetters setOffsetDateTimes(Set offsetDateTimes); + PropertySetSetters setZonedDateTimes(Set zonedDateTimes); PropertySetSetters setBoxedIntegers(Set i); PropertySetSetters setBoxedBooleans(Set b); PropertySetSetters setBoxedLongs(Set b); diff --git a/src/test/java/io/vertx/test/codegen/testdataobject/PropertySetters.java b/src/test/java/io/vertx/test/codegen/testdataobject/PropertySetters.java index 47a300ab4..96308dacc 100644 --- a/src/test/java/io/vertx/test/codegen/testdataobject/PropertySetters.java +++ b/src/test/java/io/vertx/test/codegen/testdataobject/PropertySetters.java @@ -5,6 +5,11 @@ import io.vertx.core.json.JsonObject; import java.time.Instant; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.time.OffsetDateTime; +import java.time.ZonedDateTime; /** * @author Julien Viet @@ -32,6 +37,11 @@ public static PropertySetters dataObjectFromJson(JsonObject obj) { public PropertySetters setBoxedLong(Long b) { throw new UnsupportedOperationException(); } public PropertySetters setPrimitiveLong(long b) { throw new UnsupportedOperationException(); } public PropertySetters setInstant(Instant i) { throw new UnsupportedOperationException(); } + public PropertySetters setLocalDate(LocalDate l) { throw new UnsupportedOperationException(); } + public PropertySetters setLocalDateTime(LocalDateTime l) { throw new UnsupportedOperationException(); } + public PropertySetters setLocalTime(LocalTime l) { throw new UnsupportedOperationException(); } + public PropertySetters setOffsetDateTime(OffsetDateTime o) { throw new UnsupportedOperationException(); } + public PropertySetters setZonedDateTime(ZonedDateTime z) { throw new UnsupportedOperationException(); } public PropertySetters setApiObject(ApiObject s) { throw new UnsupportedOperationException(); } public PropertySetters setApiObjectWithMapper(ApiObjectWithMapper s) { throw new UnsupportedOperationException(); }