Skip to content

Commit 8addd74

Browse files
committed
formatting
1 parent 9b99695 commit 8addd74

File tree

2 files changed

+48
-48
lines changed

2 files changed

+48
-48
lines changed

smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/StructureGenerator.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -174,12 +174,11 @@ private void renderNonErrorStructure() {
174174
}
175175

176176
StructuredMemberWriter config = new StructuredMemberWriter(
177-
model,
178-
symbolProvider,
179-
shape.getAllMembers().values(),
180-
this.requiredMemberMode,
181-
sensitiveDataFinder
182-
);
177+
model,
178+
symbolProvider,
179+
shape.getAllMembers().values(),
180+
this.requiredMemberMode,
181+
sensitiveDataFinder);
183182
config.writeMembers(writer, shape);
184183
writer.closeBlock("}");
185184
writer.write("");

smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/UnionGenerator.java

Lines changed: 43 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -30,19 +30,22 @@
3030
/**
3131
* Renders a TypeScript union.
3232
*
33-
* <p>Smithy tagged unions are rendered as a set of TypeScript interfaces
33+
* <p>
34+
* Smithy tagged unions are rendered as a set of TypeScript interfaces
3435
* and functionality used to visit each variant. Only a single member
3536
* can be set at any given time. A member that contains unknown variants
3637
* is automatically added to each tagged union. If set, it contains the
3738
* name of the property that was set and its value stored as an
3839
* {@code any}.
3940
*
40-
* <p>A {@code Visitor} interface and a method used to dispatch to the
41+
* <p>
42+
* A {@code Visitor} interface and a method used to dispatch to the
4143
* visitor is generated for each tagged union. This allows for working
4244
* with tagged unions functionally and account for each variant in a
4345
* typed way.
4446
*
45-
* <p>For example, given the following Smithy model:
47+
* <p>
48+
* For example, given the following Smithy model:
4649
*
4750
* <pre>{@code
4851
* union Attacker {
@@ -52,7 +55,8 @@
5255
* }
5356
* }</pre>
5457
*
55-
* <p>The following code is generated:
58+
* <p>
59+
* The following code is generated:
5660
*
5761
* <pre>{@code
5862
* export type Attacker =
@@ -122,7 +126,8 @@
122126
*
123127
* }</pre>
124128
*
125-
* <p>Important: Tagged unions in TypeScript are intentionally designed
129+
* <p>
130+
* Important: Tagged unions in TypeScript are intentionally designed
126131
* so that it is forward-compatible to change a structure with optional
127132
* and mutually exclusive members to a tagged union.
128133
*/
@@ -146,10 +151,10 @@ final class UnionGenerator implements Runnable {
146151
}
147152

148153
UnionGenerator(Model model,
149-
SymbolProvider symbolProvider,
150-
TypeScriptWriter writer,
151-
UnionShape shape,
152-
boolean includeValidation) {
154+
SymbolProvider symbolProvider,
155+
TypeScriptWriter writer,
156+
UnionShape shape,
157+
boolean includeValidation) {
153158
this.shape = shape;
154159
this.symbol = symbolProvider.toSymbol(shape);
155160
this.model = model;
@@ -199,7 +204,7 @@ private void writeUnionMemberInterfaces() {
199204
for (MemberShape variantMember : shape.getAllMembers().values()) {
200205
if (variantMember.getMemberName().equals(member.getMemberName())) {
201206
writer.write("$L: $T;", symbolProvider.toMemberName(variantMember),
202-
symbolProvider.toSymbol(variantMember));
207+
symbolProvider.toSymbol(variantMember));
203208
} else {
204209
writer.write("$L?: never;", symbolProvider.toMemberName(variantMember));
205210
}
@@ -223,7 +228,7 @@ private void writeVisitorType() {
223228
writer.openBlock("export interface Visitor<T> {", "}", () -> {
224229
for (MemberShape member : shape.getAllMembers().values()) {
225230
writer.write("$L: (value: $T) => T;",
226-
symbolProvider.toMemberName(member), symbolProvider.toSymbol(member));
231+
symbolProvider.toMemberName(member), symbolProvider.toSymbol(member));
227232
}
228233
writer.write("_: (name: string, value: any) => T;");
229234
});
@@ -250,40 +255,37 @@ private void writeFilterSensitiveLog(String namespace) {
250255
String objectParam = "obj";
251256
writer.writeDocs("@internal");
252257
writer.openBlock("export const $LFilterSensitiveLog = ($L: $L): any => {", "}",
253-
namespace,
254-
objectParam, symbol.getName(),
255-
() -> {
256-
for (MemberShape member : shape.getAllMembers().values()) {
257-
String memberName = symbolProvider.toMemberName(member);
258-
StructuredMemberWriter structuredMemberWriter = new StructuredMemberWriter(
259-
model,
260-
symbolProvider,
261-
shape.getAllMembers().values(),
262-
RequiredMemberMode.NULLABLE,
263-
sensitiveDataFinder
264-
);
265-
writer.openBlock("if (${1L}.${2L} !== undefined) return {${2L}: ", "};",
266-
objectParam, memberName, () -> {
267-
String memberParam = String.format("%s.%s", objectParam, memberName);
268-
structuredMemberWriter.writeMemberFilterSensitiveLog(writer, member, memberParam);
269-
}
270-
);
271-
}
272-
writer.write("if (${1L}.$$unknown !== undefined) return {[${1L}.$$unknown[0]]: 'UNKNOWN'};",
273-
objectParam);
274-
}
275-
);
258+
namespace,
259+
objectParam, symbol.getName(),
260+
() -> {
261+
for (MemberShape member : shape.getAllMembers().values()) {
262+
String memberName = symbolProvider.toMemberName(member);
263+
StructuredMemberWriter structuredMemberWriter = new StructuredMemberWriter(
264+
model,
265+
symbolProvider,
266+
shape.getAllMembers().values(),
267+
RequiredMemberMode.NULLABLE,
268+
sensitiveDataFinder);
269+
writer.openBlock("if (${1L}.${2L} !== undefined) return {${2L}: ", "};",
270+
objectParam, memberName, () -> {
271+
String memberParam = String.format("%s.%s", objectParam, memberName);
272+
structuredMemberWriter.writeMemberFilterSensitiveLog(writer, member,
273+
memberParam);
274+
});
275+
}
276+
writer.write("if (${1L}.$$unknown !== undefined) return {[${1L}.$$unknown[0]]: 'UNKNOWN'};",
277+
objectParam);
278+
});
276279
}
277280
}
278281

279282
private void writeValidate() {
280283
StructuredMemberWriter structuredMemberWriter = new StructuredMemberWriter(
281-
model,
282-
symbolProvider,
283-
shape.getAllMembers().values(),
284-
RequiredMemberMode.NULLABLE,
285-
sensitiveDataFinder
286-
);
284+
model,
285+
symbolProvider,
286+
shape.getAllMembers().values(),
287+
RequiredMemberMode.NULLABLE,
288+
sensitiveDataFinder);
287289

288290
structuredMemberWriter.writeMemberValidatorCache(writer, "memberValidators");
289291

@@ -294,7 +296,6 @@ private void writeValidate() {
294296
() -> {
295297
structuredMemberWriter.writeMemberValidatorFactory(writer, "memberValidators");
296298
structuredMemberWriter.writeValidateMethodContents(writer, "obj");
297-
}
298-
);
299+
});
299300
}
300301
}

0 commit comments

Comments
 (0)