Skip to content

Fix trait codegen for timestamp member with timestampformat trait #2744

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
joewyz merged 1 commit into from
Aug 18, 2025
Merged

Fix trait codegen for timestamp member with timestampformat trait #2744

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 11 additions & 0 deletions ...-trait-codegen/src/it/java/software/amazon/smithy/traitcodegen/test/CreatesTraitTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
import com.example.traits.structures.BasicAnnotationTrait;
import com.example.traits.structures.NestedA;
import com.example.traits.structures.NestedB;
import com.example.traits.structures.StructMemberWithTimestampFormatTrait;
import com.example.traits.structures.StructWithIdrefMemberTrait;
import com.example.traits.structures.StructWithListOfMapTrait;
import com.example.traits.structures.StructWithUniqueItemsListTrait;
Expand All @@ -53,6 +54,8 @@
import com.example.traits.uniqueitems.SetMember;
import com.example.traits.uniqueitems.StringSetTrait;
import com.example.traits.uniqueitems.StructureSetTrait;
import java.time.Instant;
import java.time.format.DateTimeFormatter;
import java.util.stream.Stream;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
Expand Down Expand Up @@ -210,6 +213,14 @@ static Stream<Arguments> createTraitTests() {
.idRefMemberB(ShapeId.from("test.smithy.traitcodegen#b"))
.build()
.toNode()),
Arguments.of(StructMemberWithTimestampFormatTrait.ID,
StructMemberWithTimestampFormatTrait.builder()
.memberDateTime(Instant.parse("1985-04-12T23:20:50.52Z"))
.memberHttpDate(Instant.from(
DateTimeFormatter.RFC_1123_DATE_TIME.parse("Tue, 29 Apr 2014 18:30:38 GMT")))
.memberEpochSeconds(Instant.ofEpochSecond((long) 1515531081.123))
.build()
.toNode()),
// Timestamps
Arguments.of(TimestampTrait.ID, Node.from("1985-04-12T23:20:50.52Z")),
Arguments.of(DateTimeTimestampTrait.ID, Node.from("1985-04-12T23:20:50.52Z")),
Expand Down
11 changes: 11 additions & 0 deletions ...rait-codegen/src/it/java/software/amazon/smithy/traitcodegen/test/LoadsFromModelTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
import com.example.traits.structures.BasicAnnotationTrait;
import com.example.traits.structures.NestedA;
import com.example.traits.structures.NestedB;
import com.example.traits.structures.StructMemberWithTimestampFormatTrait;
import com.example.traits.structures.StructWithIdrefMemberTrait;
import com.example.traits.structures.StructWithListOfMapTrait;
import com.example.traits.structures.StructWithUniqueItemsListTrait;
Expand Down Expand Up @@ -332,6 +333,16 @@ static Stream<Arguments> loadsModelTests() {
Optional.of(ShapeId.from("test.smithy.traitcodegen#a")),
"getIdRefMemberB",
Optional.of(ShapeId.from("test.smithy.traitcodegen#b")))),
Arguments.of("structures/struct-member-with-timestamp-format-trait.smithy",
StructMemberWithTimestampFormatTrait.class,
MapUtils.of(
"getMemberDateTime",
Optional.of(Instant.parse("1985-04-12T23:20:50.52Z")),
"getMemberHttpDate",
Optional.of(Instant.from(
DateTimeFormatter.RFC_1123_DATE_TIME.parse("Tue, 29 Apr 2014 18:30:38 GMT"))),
"getMemberEpochSeconds",
Optional.of(Instant.ofEpochSecond((long) 1515531081.123)))),
// Timestamps
Arguments.of("timestamps/struct-with-nested-timestamps.smithy",
StructWithNestedTimestampsTrait.class,
Expand Down
12 changes: 12 additions & 0 deletions ...azon/smithy/traitcodegen/test/structures/struct-member-with-timestamp-format-trait.smithy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
$version: "2.0"

namespace test.smithy.traitcodegen

use test.smithy.traitcodegen.structures#StructMemberWithTimestampFormat

@StructMemberWithTimestampFormat(
memberDateTime: "1985-04-12T23:20:50.52Z"
memberHttpDate: "Tue, 29 Apr 2014 18:30:38 GMT"
memberEpochSeconds: 1515531081.123
)
structure myStruct {}
25 changes: 11 additions & 14 deletions ...degen/src/main/java/software/amazon/smithy/traitcodegen/generators/FromNodeGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,12 +247,8 @@ private MemberGenerator(MemberShape member) {

@Override
public Void memberShape(MemberShape shape) {
if (shape.hasTrait(IdRefTrait.ID)) {
writer.writeInline(memberPrefix + "Member($1S, n -> $3C, builder::$2L)",
fieldName,
memberName,
(Runnable) () -> shape
.accept(new FromNodeMapperVisitor(writer, model, "n", 1, symbolProvider)));
if (shape.hasTrait(IdRefTrait.ID) || shape.hasTrait(TimestampFormatTrait.ID)) {
writeObjectNodeMember(shape);
return null;
}
return model.expectShape(shape.getTarget()).accept(this);
Expand Down Expand Up @@ -413,19 +409,13 @@ public Void enumShape(EnumShape shape) {

@Override
public Void structureShape(StructureShape shape) {
writer.writeInline(memberPrefix + "Member($1S, n -> $3C, builder::$2L)",
fieldName,
memberName,
(Runnable) () -> shape.accept(new FromNodeMapperVisitor(writer, model, "n", symbolProvider)));
writeObjectNodeMember(shape);
return null;
}

@Override
public Void timestampShape(TimestampShape shape) {
writer.writeInline(memberPrefix + "Member($1S, n -> $3C, builder::$2L)",
fieldName,
memberName,
(Runnable) () -> shape.accept(new FromNodeMapperVisitor(writer, model, "n", symbolProvider)));
writeObjectNodeMember(shape);
return null;
}

Expand All @@ -438,5 +428,12 @@ public Void unionShape(UnionShape shape) {
public Void blobShape(BlobShape shape) {
throw new UnsupportedOperationException("Shape not supported " + shape);
}

private void writeObjectNodeMember(Shape shape) {
writer.writeInline(memberPrefix + "Member($1S, n -> $3C, builder::$2L)",
fieldName,
memberName,
(Runnable) () -> shape.accept(new FromNodeMapperVisitor(writer, model, "n", symbolProvider)));
}
}
}
41 changes: 24 additions & 17 deletions ...n/src/main/java/software/amazon/smithy/traitcodegen/generators/FromNodeMapperVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,24 +269,10 @@ public Void structureShape(StructureShape shape) {
@Override
public Void timestampShape(TimestampShape shape) {
if (shape.hasTrait(TimestampFormatTrait.ID)) {
switch (shape.expectTrait(TimestampFormatTrait.class).getFormat()) {
case EPOCH_SECONDS:
writer.writeInline("$2T.ofEpochSecond($1L.expectNumberNode().getValue().longValue())",
varName,
Instant.class);
return null;
case HTTP_DATE:
writer.writeInline("$2T.from($3T.RFC_1123_DATE_TIME.parse($1L.expectStringNode().getValue()))",
varName,
Instant.class,
DateTimeFormatter.class);
return null;
default:
// Fall through on default
break;
}
writeForTimestampFormat(shape);
} else {
writer.writeInline("$2T.parse($1L.expectStringNode().getValue())", varName, Instant.class);
}
writer.writeInline("$2T.parse($1L.expectStringNode().getValue())", varName, Instant.class);
return null;
}

Expand All @@ -304,6 +290,8 @@ public Void blobShape(BlobShape shape) {
public Void memberShape(MemberShape shape) {
if (shape.hasTrait(IdRefTrait.ID)) {
writer.write("$T.fromNode($L)", ShapeId.class, varName);
} else if (shape.hasTrait(TimestampFormatTrait.ID)) {
writeForTimestampFormat(shape);
} else {
model.expectShape(shape.getTarget()).accept(this);
}
Expand All @@ -321,4 +309,23 @@ public Void intEnumShape(IntEnumShape shape) {
writer.write("$L.expectNumberNode().getValue().intValue()", varName);
return null;
}

private void writeForTimestampFormat(Shape shape) {
switch (shape.expectTrait(TimestampFormatTrait.class).getFormat()) {
case EPOCH_SECONDS:
writer.writeInline("$2T.ofEpochSecond($1L.expectNumberNode().getValue().longValue())",
varName,
Instant.class);
break;
case HTTP_DATE:
writer.writeInline("$2T.from($3T.RFC_1123_DATE_TIME.parse($1L.expectStringNode().getValue()))",
varName,
Instant.class,
DateTimeFormatter.class);
break;
default:
// Fall through on default
writer.writeInline("$2T.parse($1L.expectStringNode().getValue())", varName, Instant.class);
}
}
}
39 changes: 24 additions & 15 deletions ...codegen/src/main/java/software/amazon/smithy/traitcodegen/generators/ToNodeGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,6 +352,8 @@ public Void mapShape(MapShape shape) {
public Void memberShape(MemberShape shape) {
if (shape.hasTrait(IdRefTrait.ID)) {
toStringMapper();
} else if (shape.hasTrait(TimestampFormatTrait.ID)) {
writeForTimestampFormat(shape);
} else {
model.expectShape(shape.getTarget()).accept(this);
}
Expand Down Expand Up @@ -391,22 +393,10 @@ public Void structureShape(StructureShape shape) {
@Override
public Void timestampShape(TimestampShape shape) {
if (shape.hasTrait(TimestampFormatTrait.ID)) {
switch (shape.expectTrait(TimestampFormatTrait.class).getFormat()) {
case EPOCH_SECONDS:
writer.write("$T.from($L.getEpochSecond())", Node.class, varName);
return null;
case HTTP_DATE:
writer.write("$T.from($T.RFC_1123_DATE_TIME.format($L))",
Node.class,
DateTimeFormatter.class,
varName);
return null;
default:
// Fall through on default
break;
}
writeForTimestampFormat(shape);
} else {
toStringMapper();
}
toStringMapper();
return null;
}

Expand All @@ -417,5 +407,24 @@ private void fromNodeMapper() {
private void toStringMapper() {
writer.write("$T.from($L.toString())", Node.class, varName);
}

private void writeForTimestampFormat(Shape shape) {
switch (shape.expectTrait(TimestampFormatTrait.class).getFormat()) {
case EPOCH_SECONDS:
writer.write("$T.from($L.getEpochSecond())", Node.class, varName);
break;
case HTTP_DATE:
writer.write("$T.from($T.RFC_1123_DATE_TIME.format($T.ofInstant($L, $T.UTC)))",
Node.class,
DateTimeFormatter.class,
ZonedDateTime.class,
varName,
ZoneOffset.class);
break;
default:
// Fall through on default
toStringMapper();
}
}
}
}
2 changes: 1 addition & 1 deletion ...ait-codegen/src/test/java/software/amazon/smithy/traitcodegen/TraitCodegenPluginTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
import software.amazon.smithy.model.node.ObjectNode;

public class TraitCodegenPluginTest {
private static final int EXPECTED_NUMBER_OF_FILES = 68;
private static final int EXPECTED_NUMBER_OF_FILES = 69;

private MockManifest manifest;
private Model model;
Expand Down
1 change: 1 addition & 0 deletions smithy-trait-codegen/src/test/resources/META-INF/smithy/manifest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ structures/structure-trait.smithy
structures/struct-with-listofmap-trait.smithy
structures/struct-with-uniqueitems-list-trait.smithy
structures/struct-with-idref-member-trait.smithy
structures/struct-member-with-timestamp-format-trait.smithy
timestamps/date-time-format-timestamp-trait.smithy
timestamps/epoch-seconds-format-timestamp-trait.smithy
timestamps/http-date-format-timestamp-trait.smithy
Expand Down
32 changes: 32 additions & 0 deletions ...est/resources/META-INF/smithy/structures/struct-member-with-timestamp-format-trait.smithy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
$version: "2.0"

namespace test.smithy.traitcodegen.structures

@trait
structure StructMemberWithTimestampFormat {
@timestampFormat("date-time")
memberDateTime: Timestamp

@timestampFormat("http-date")
memberHttpDate: Timestamp

memberEpochSeconds: MemberEpochSeconds

memberList: TimeStampList

memberMap: StringTimeStampMap
}

@timestampFormat("epoch-seconds")
timestamp MemberEpochSeconds

list TimeStampList {
@timestampFormat("http-date")
member: Timestamp
}

map StringTimeStampMap {
key: String
@timestampFormat("http-date")
value:Timestamp
}
Loading