Skip to content

Make union members implicitly type-cast in getValue #1008

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

Open
adwsingh wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Make union members implicitly type-cast in getValue #1008

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
8 changes: 4 additions & 4 deletions ...gen-core/src/main/java/software/amazon/smithy/java/codegen/generators/UnionGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,8 @@ public void serializeMembers(${shapeSerializer:N} serializer) {

@Override
@SuppressWarnings("unchecked")
public <T> T getValue() {
return (T)${?hasBoxed}(${member:B})${/hasBoxed} ${^unit}${memberName:L}${/unit}${?unit}null${/unit};
public ${?hasBoxed}${member:B}${/hasBoxed}${^hasBoxed}${member:N}${/hasBoxed} getValue() {
return ${^unit}${memberName:L}${/unit}${?unit}null${/unit};
}

${toString:C|}
Expand Down Expand Up @@ -192,8 +192,8 @@ public void serializeMembers(${shapeSerializer:T} serializer) {}

@Override
@SuppressWarnings("unchecked")
public <T> T getValue() {
return (T) memberName;
public String getValue() {
return memberName;
}

private record $$Hidden() implements ${shape:T} {
Expand Down
8 changes: 4 additions & 4 deletions ...on/smithy/java/codegen/types/test-cases/naming-conflict/expected/UnionWithTypeMember.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ public void serializeMembers(ShapeSerializer serializer) {

@Override
@SuppressWarnings("unchecked")
public <T> T getValue() {
return (T) type;
public Type getValue() {
return type;
}

@Override
Expand All @@ -65,8 +65,8 @@ public void serializeMembers(ShapeSerializer serializer) {}

@Override
@SuppressWarnings("unchecked")
public <T> T getValue() {
return (T) memberName;
public String getValue() {
return memberName;
}

private record $Hidden() implements UnionWithTypeMember {
Expand Down
80 changes: 40 additions & 40 deletions ...s/software/amazon/smithy/java/codegen/types/test-cases/union-type/expected/UnionType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ public void serializeMembers(ShapeSerializer serializer) {

@Override
@SuppressWarnings("unchecked")
public <T> T getValue() {
return (T) blobValue;
public ByteBuffer getValue() {
return blobValue;
}

@Override
Expand All @@ -72,8 +72,8 @@ public void serializeMembers(ShapeSerializer serializer) {

@Override
@SuppressWarnings("unchecked")
public <T> T getValue() {
return (T)(Boolean) booleanValue;
public Boolean getValue() {
return booleanValue;
}

@Override
Expand All @@ -96,8 +96,8 @@ public void serializeMembers(ShapeSerializer serializer) {

@Override
@SuppressWarnings("unchecked")
public <T> T getValue() {
return (T) listValue;
public List<String> getValue() {
return listValue;
}

@Override
Expand All @@ -120,8 +120,8 @@ public void serializeMembers(ShapeSerializer serializer) {

@Override
@SuppressWarnings("unchecked")
public <T> T getValue() {
return (T) mapValue;
public Map<String, String> getValue() {
return mapValue;
}

@Override
Expand All @@ -144,8 +144,8 @@ public void serializeMembers(ShapeSerializer serializer) {

@Override
@SuppressWarnings("unchecked")
public <T> T getValue() {
return (T) bigDecimalValue;
public BigDecimal getValue() {
return bigDecimalValue;
}

@Override
Expand All @@ -168,8 +168,8 @@ public void serializeMembers(ShapeSerializer serializer) {

@Override
@SuppressWarnings("unchecked")
public <T> T getValue() {
return (T) bigIntegerValue;
public BigInteger getValue() {
return bigIntegerValue;
}

@Override
Expand All @@ -189,8 +189,8 @@ public void serializeMembers(ShapeSerializer serializer) {

@Override
@SuppressWarnings("unchecked")
public <T> T getValue() {
return (T)(Byte) byteValue;
public Byte getValue() {
return byteValue;
}

@Override
Expand All @@ -210,8 +210,8 @@ public void serializeMembers(ShapeSerializer serializer) {

@Override
@SuppressWarnings("unchecked")
public <T> T getValue() {
return (T)(Double) doubleValue;
public Double getValue() {
return doubleValue;
}

@Override
Expand All @@ -231,8 +231,8 @@ public void serializeMembers(ShapeSerializer serializer) {

@Override
@SuppressWarnings("unchecked")
public <T> T getValue() {
return (T)(Float) floatValue;
public Float getValue() {
return floatValue;
}

@Override
Expand All @@ -252,8 +252,8 @@ public void serializeMembers(ShapeSerializer serializer) {

@Override
@SuppressWarnings("unchecked")
public <T> T getValue() {
return (T)(Integer) integerValue;
public Integer getValue() {
return integerValue;
}

@Override
Expand All @@ -273,8 +273,8 @@ public void serializeMembers(ShapeSerializer serializer) {

@Override
@SuppressWarnings("unchecked")
public <T> T getValue() {
return (T)(Long) longValue;
public Long getValue() {
return longValue;
}

@Override
Expand All @@ -294,8 +294,8 @@ public void serializeMembers(ShapeSerializer serializer) {

@Override
@SuppressWarnings("unchecked")
public <T> T getValue() {
return (T)(Short) shortValue;
public Short getValue() {
return shortValue;
}

@Override
Expand All @@ -318,8 +318,8 @@ public void serializeMembers(ShapeSerializer serializer) {

@Override
@SuppressWarnings("unchecked")
public <T> T getValue() {
return (T) stringValue;
public String getValue() {
return stringValue;
}

@Override
Expand All @@ -342,8 +342,8 @@ public void serializeMembers(ShapeSerializer serializer) {

@Override
@SuppressWarnings("unchecked")
public <T> T getValue() {
return (T) structureValue;
public NestedStruct getValue() {
return structureValue;
}

@Override
Expand All @@ -366,8 +366,8 @@ public void serializeMembers(ShapeSerializer serializer) {

@Override
@SuppressWarnings("unchecked")
public <T> T getValue() {
return (T) timestampValue;
public Instant getValue() {
return timestampValue;
}

@Override
Expand All @@ -390,8 +390,8 @@ public void serializeMembers(ShapeSerializer serializer) {

@Override
@SuppressWarnings("unchecked")
public <T> T getValue() {
return (T) unionValue;
public NestedUnion getValue() {
return unionValue;
}

@Override
Expand All @@ -414,8 +414,8 @@ public void serializeMembers(ShapeSerializer serializer) {

@Override
@SuppressWarnings("unchecked")
public <T> T getValue() {
return (T) enumValue;
public NestedEnum getValue() {
return enumValue;
}

@Override
Expand All @@ -438,8 +438,8 @@ public void serializeMembers(ShapeSerializer serializer) {

@Override
@SuppressWarnings("unchecked")
public <T> T getValue() {
return (T) intEnumValue;
public NestedIntEnum getValue() {
return intEnumValue;
}

@Override
Expand All @@ -459,8 +459,8 @@ public void serializeMembers(ShapeSerializer serializer) {

@Override
@SuppressWarnings("unchecked")
public <T> T getValue() {
return (T) null;
public Unit getValue() {
return null;
}

@Override
Expand All @@ -481,8 +481,8 @@ public void serializeMembers(ShapeSerializer serializer) {}

@Override
@SuppressWarnings("unchecked")
public <T> T getValue() {
return (T) memberName;
public String getValue() {
return memberName;
}

private record $Hidden() implements UnionType {
Expand Down