Skip to content

chore(codegen): remove checks for deprecated SetShape #7403

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
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

chore(codegen): remove checks for deprecated SetShape #7403

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
3 changes: 2 additions & 1 deletion ...en/src/main/java/software/amazon/smithy/aws/typescript/codegen/JsonShapeDeserVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import software.amazon.smithy.model.traits.MediaTypeTrait;
import software.amazon.smithy.model.traits.SparseTrait;
import software.amazon.smithy.model.traits.TimestampFormatTrait.Format;
import software.amazon.smithy.model.traits.UniqueItemsTrait;
import software.amazon.smithy.typescript.codegen.CodegenUtils;
import software.amazon.smithy.typescript.codegen.TypeScriptDependency;
import software.amazon.smithy.typescript.codegen.TypeScriptSettings.ArtifactType;
Expand Down Expand Up @@ -123,7 +124,7 @@ protected void deserializeCollection(GenerationContext context, CollectionShape
);
}

if (shape.isSetShape() && artifactType.equals(ArtifactType.SSDK)) {
if (shape.isListShape() && shape.hasTrait(UniqueItemsTrait.ID) && artifactType.equals(ArtifactType.SSDK)) {
writer.addDependency(TypeScriptDependency.SERVER_COMMON);
writer.addImport("findDuplicates", "__findDuplicates", "@aws-smithy/server-common");
writer.openBlock("if (__findDuplicates(retVal).length > 0) {", "}", () -> {
Expand Down
2 changes: 1 addition & 1 deletion ...en/src/main/java/software/amazon/smithy/aws/typescript/codegen/QueryMemberSerVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ final class QueryMemberSerVisitor extends DocumentMemberSerVisitor {

boolean visitSuppliesEntryList(Shape shape) {
return shape.isStructureShape() || shape.isUnionShape()
|| shape.isMapShape() || shape.isListShape() || shape.isSetShape();
|| shape.isMapShape() || shape.isListShape();
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion ...gen/src/main/java/software/amazon/smithy/aws/typescript/codegen/QueryShapeSerVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ private void serializeNamedMemberEntryList(

Shape targetShape = context.getModel().expectShape(memberShape.getTarget());

if ((targetShape.isListShape() || targetShape.isSetShape()) && serializeEmptyLists) {
if (targetShape.isListShape() && serializeEmptyLists) {
writer.openBlock(
"if ($L?.length === 0) {",
"}",
Expand Down
6 changes: 0 additions & 6 deletions ...c/main/java/software/amazon/smithy/aws/typescript/codegen/visitor/MemberDeserVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
import software.amazon.smithy.model.shapes.OperationShape;
import software.amazon.smithy.model.shapes.ResourceShape;
import software.amazon.smithy.model.shapes.ServiceShape;
import software.amazon.smithy.model.shapes.SetShape;
import software.amazon.smithy.model.shapes.Shape;
import software.amazon.smithy.model.shapes.ShapeVisitor;
import software.amazon.smithy.model.shapes.ShortShape;
Expand Down Expand Up @@ -199,11 +198,6 @@ public final String mapShape(MapShape shape) {
return getDelegateDeserializer(shape);
}

@Override
public final String setShape(SetShape shape) {
return getDelegateDeserializer(shape);
}

@Override
public final String structureShape(StructureShape shape) {
return getDelegateDeserializer(shape);
Expand Down
Loading