Skip to content

Commit 29913cf

Browse files
committed
Support toning down sortPom
1 parent 059523c commit 29913cf

File tree

3 files changed

+16
-2
lines changed

3 files changed

+16
-2
lines changed

lib/src/main/java/com/diffplug/spotless/pom/SortPomCfg.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ public class SortPomCfg implements Serializable {
4545

4646
public String predefinedSortOrder = "recommended_2008_06";
4747

48+
public boolean quiet = false;
49+
4850
public String sortOrderFile = null;
4951

5052
public String sortDependencies = null;

lib/src/sortPom/java/com/diffplug/spotless/glue/pom/SortPomFormatterFunc.java

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,20 +85,28 @@ public String apply(String input) throws Exception {
8585
.setSortEntities(cfg.sortDependencies, cfg.sortDependencyExclusions, cfg.sortDependencyManagement,
8686
cfg.sortPlugins, cfg.sortProperties, cfg.sortModules, cfg.sortExecutions)
8787
.setIgnoreLineSeparators(false);
88-
sortPom.setup(new MySortPomLogger(), builder.build());
88+
sortPom.setup(new MySortPomLogger(cfg.quiet), builder.build());
8989
sortPom.sortPom();
9090
return Files.readString(pom.toPath(), Charset.forName(cfg.encoding));
9191
}
9292

9393
private static class MySortPomLogger implements SortPomLogger {
94+
private final boolean quiet;
95+
96+
public MySortPomLogger(boolean quiet) {
97+
this.quiet = quiet;
98+
}
99+
94100
@Override
95101
public void warn(String content) {
96102
logger.warn(content);
97103
}
98104

99105
@Override
100106
public void info(String content) {
101-
logger.info(content);
107+
if (!quiet) {
108+
logger.info(content);
109+
}
102110
}
103111

104112
@Override

plugin-maven/src/main/java/com/diffplug/spotless/maven/pom/SortPom.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,9 @@ public class SortPom implements FormatterStepFactory {
6262
@Parameter
6363
String predefinedSortOrder = defaultValues.predefinedSortOrder;
6464

65+
@Parameter
66+
boolean quiet = defaultValues.quiet;
67+
6568
@Parameter
6669
String sortOrderFile = defaultValues.sortOrderFile;
6770

@@ -101,6 +104,7 @@ public FormatterStep newFormatterStep(FormatterStepConfig stepConfig) {
101104
cfg.indentSchemaLocation = indentSchemaLocation;
102105
cfg.indentAttribute = indentAttribute;
103106
cfg.predefinedSortOrder = predefinedSortOrder;
107+
cfg.quiet = quiet;
104108
cfg.sortOrderFile = sortOrderFile;
105109
cfg.sortDependencies = sortDependencies;
106110
cfg.sortDependencyManagement = sortDependencyManagement;

0 commit comments

Comments
 (0)