Skip to content

Commit e69a02e

Browse files
committed
Remove unbalanced dedent. Improve condition check in processSymbol method in TraitCodegenWriter.java.
1 parent f5686cc commit e69a02e

File tree

2 files changed

+1
-7
lines changed

2 files changed

+1
-7
lines changed

smithy-trait-codegen/src/main/java/software/amazon/smithy/traitcodegen/generators/FromNodeMapperVisitor.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@ public Void mapShape(MapShape shape) {
128128
nestedLevel + 1)));
129129
writer.dedent();
130130
writer.write("))");
131-
writer.dedent();
132131
}
133132
return null;
134133
}

smithy-trait-codegen/src/main/java/software/amazon/smithy/traitcodegen/writer/TraitCodegenWriter.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
public class TraitCodegenWriter extends SymbolWriter<TraitCodegenWriter, TraitCodegenImportContainer> {
4747
private static final int MAX_LINE_LENGTH = 120;
4848
private static final Pattern PATTERN = Pattern.compile("<([a-z]+)*>.*?</\\1>", Pattern.DOTALL);
49-
private static final Set<String> PARAMETERIZED_TYPE_NAMES = SetUtils.of("List", "Map", "Set", "Collection");
5049
private final String namespace;
5150
private final String fileName;
5251
private final TraitCodegenSettings settings;
@@ -234,14 +233,10 @@ private String getPlaceholder(Symbol symbol) {
234233
return format("$${$L:L}", normalizedSymbol.getFullName());
235234
}
236235

237-
private boolean isParametrized(Symbol symbol) {
238-
return PARAMETERIZED_TYPE_NAMES.contains(symbol.getName());
239-
}
240-
241236
// Recursively process the symbols using Java Type.
242237
private void processSymbol(Symbol symbol, StringBuilder builder) {
243238
builder.append(getPlaceholder(symbol));
244-
if (isParametrized(symbol)) {
239+
if (!symbol.getReferences().isEmpty()) { // If current symbol does not have any references we should stop.
245240
builder.append("<");
246241
for (SymbolReference reference : symbol.getReferences()) {
247242
Symbol referenceSymbol = reference.getSymbol();

0 commit comments

Comments
 (0)