Skip to content

Commit a61bf71

Browse files
authored
fix(codegen): add doc trait conditionally (#6002)
1 parent 0ad6f05 commit a61bf71

File tree

1 file changed

+9
-5
lines changed
  • codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen

1 file changed

+9
-5
lines changed

codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AddS3Config.java

+9-5
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import java.util.HashSet;
2424
import java.util.List;
2525
import java.util.Map;
26+
import java.util.Optional;
2627
import java.util.Set;
2728
import java.util.function.Consumer;
2829
import java.util.logging.Logger;
@@ -158,7 +159,11 @@ public Model preprocessModel(Model model, TypeScriptSettings settings) {
158159
String memberName = entry.getKey();
159160
MemberShape memberShape = entry.getValue();
160161

161-
if (memberShape.getTarget().equals(expiresShape.getId())) {
162+
Optional<HttpHeaderTrait> httpHeader = memberShape.getTrait(HttpHeaderTrait.class);
163+
Optional<DocumentationTrait> doc = memberShape.getTrait(DocumentationTrait.class);
164+
165+
if (memberShape.getTarget().equals(expiresShape.getId())
166+
&& httpHeader.isPresent()) {
162167
structureShapeBuilder
163168
.removeMember(memberName)
164169
.addMember(
@@ -167,17 +172,16 @@ public Model preprocessModel(Model model, TypeScriptSettings settings) {
167172
(m) -> {
168173
m
169174
.addTrait(new DocumentationTrait("Deprecated in favor of ExpiresString."))
170-
.addTrait(memberShape.getTrait(HttpHeaderTrait.class).get())
175+
.addTrait(httpHeader.get())
171176
.addTrait(DeprecatedTrait.builder().build());
172177
}
173178
)
174179
.addMember(
175180
"ExpiresString",
176181
expiresStringShape.getId(),
177182
(m) -> {
178-
m
179-
.addTrait(memberShape.getTrait(DocumentationTrait.class).get())
180-
.addTrait(new HttpHeaderTrait("ExpiresString"));
183+
m.addTrait(new HttpHeaderTrait("ExpiresString"));
184+
doc.ifPresent(m::addTrait);
181185
}
182186
);
183187
} else {

0 commit comments

Comments
 (0)