Skip to content

Commit 497b994

Browse files
committed
fix: formatters regression bug
1 parent 5ea658b commit 497b994

File tree

4 files changed

+9
-7
lines changed

4 files changed

+9
-7
lines changed

zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/formatters/GoogleJavaFormatter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ public GoogleJavaFormatter(boolean skipFormatting, boolean haltOnFailFormatting)
2929
}
3030

3131
public void format(GeneratedProjectFiles generatedProjectFiles) {
32-
generatedProjectFiles.getAllTemplateOutputs().stream()
33-
.map(t -> format(t)).collect(Collectors.toList());
32+
generatedProjectFiles.getAllTemplateOutputs()
33+
.forEach(t -> t.merge(format(t)));
3434
}
3535

3636
public TemplateOutput format(TemplateOutput templateOutput) {

zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/formatters/KotlinFormatter.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,11 @@ public class KotlinFormatter implements io.zenwave360.sdk.formatters.Formatter {
2424
private final FormattingOptions formattingOptions = new FormattingOptions(120, 4, 4, true, true, false);
2525

2626
public void format(GeneratedProjectFiles generatedProjectFiles) {
27-
generatedProjectFiles.getAllTemplateOutputs().stream().map(t -> format(t)).collect(Collectors.toList());
27+
generatedProjectFiles.getAllTemplateOutputs()
28+
.forEach(t -> t.merge(format(t)));
2829
}
2930

31+
3032
public TemplateOutput format(TemplateOutput templateOutput) {
3133
if (skipFormatting) {
3234
log.debug("Skipping kotlin formatting");

zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/formatters/PalantirJavaFormatter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ public PalantirJavaFormatter(boolean skipFormatting, boolean haltOnFailFormattin
3636
com.palantir.javaformat.java.Formatter.createFormatter(JavaFormatterOptions.builder().style(JavaFormatterOptions.Style.PALANTIR).build());
3737

3838
public void format(GeneratedProjectFiles generatedProjectFiles) {
39-
generatedProjectFiles.getAllTemplateOutputs().stream()
40-
.map(t -> format(t)).collect(Collectors.toList());
39+
generatedProjectFiles.getAllTemplateOutputs()
40+
.forEach(t -> t.merge(format(t)));
4141
}
4242

4343
public TemplateOutput format(TemplateOutput templateOutput) {

zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/formatters/SpringJavaFormatter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ public SpringJavaFormatter(boolean skipFormatting, boolean haltOnFailFormatting)
3737
// com.palantir.javaformat.java.Formatter.createFormatter(JavaFormatterOptions.builder().style(JavaFormatterOptions.Style.PALANTIR).build());
3838

3939
public void format(GeneratedProjectFiles generatedProjectFiles) {
40-
generatedProjectFiles.getAllTemplateOutputs().stream()
41-
.map(t -> format(t)).collect(Collectors.toList());
40+
generatedProjectFiles.getAllTemplateOutputs()
41+
.forEach(t -> t.merge(format(t)));
4242
}
4343

4444
public TemplateOutput format(TemplateOutput templateOutput) {

0 commit comments

Comments
 (0)