Skip to content

Commit 8fcce07

Browse files
committed
Apply suggestions
1 parent b0d1619 commit 8fcce07

File tree

3 files changed

+21
-22
lines changed

3 files changed

+21
-22
lines changed

lib/src/main/java/com/diffplug/spotless/Formatter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ public static Formatter.Builder builder() {
113113

114114
public static class Builder {
115115
// optional parameters
116-
private String name = "misc";
116+
private String name = "unnamed";
117117
// required parameters
118118
private LineEnding.Policy lineEndingsPolicy;
119119
private Charset encoding;

plugin-maven/src/main/java/com/diffplug/spotless/maven/ImpactedFilesTracker.java

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,41 +15,39 @@
1515
*/
1616
package com.diffplug.spotless.maven;
1717

18-
import java.util.concurrent.atomic.AtomicInteger;
19-
2018
/**
2119
* Tracks the number of processed files, typically by a single Formatter for a whole repository
2220
*/
23-
public class ImpactedFilesTracker {
24-
protected final AtomicInteger nbSkipped = new AtomicInteger();
25-
protected final AtomicInteger nbChecked = new AtomicInteger();
26-
protected final AtomicInteger nbCleaned = new AtomicInteger();
21+
class ImpactedFilesTracker {
22+
protected int nbskippedAsCleanCache = 0;
23+
protected int nbCheckedButAlreadyClean = 0;
24+
protected int nbCleaned = 0;
2725

2826
/**
2927
* Some cache mechanism may indicate some content is clean, without having to execute the cleaning process
3028
*/
3129
public void skippedAsCleanCache() {
32-
nbSkipped.incrementAndGet();
30+
nbskippedAsCleanCache++;
3331
}
3432

35-
public int getSkipped() {
36-
return nbSkipped.get();
33+
public int getSkippedAsCleanCache() {
34+
return nbskippedAsCleanCache;
3735
}
3836

39-
public void checked() {
40-
nbChecked.incrementAndGet();
37+
public void checkedButAlreadyClean() {
38+
nbCheckedButAlreadyClean++;
4139
}
4240

43-
public int getChecked() {
44-
return nbChecked.get();
41+
public int getCheckedButAlreadyClean() {
42+
return nbCheckedButAlreadyClean;
4543
}
4644

4745
public void cleaned() {
48-
nbCleaned.incrementAndGet();
46+
nbCleaned++;
4947
}
5048

5149
public int getCleaned() {
52-
return nbCleaned.get();
50+
return nbCleaned;
5351
}
5452

5553
}

plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessApplyMojo.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,14 @@ protected void process(Iterable<File> files, Formatter formatter, UpToDateChecke
4545
}
4646

4747
try {
48-
impactedFilesTracker.checked();
4948
PaddedCell.DirtyState dirtyState = PaddedCell.calculateDirtyState(formatter, file);
5049
if (!dirtyState.isClean() && !dirtyState.didNotConverge()) {
5150
getLog().info(String.format("Writing clean file: %s", file));
5251
dirtyState.writeCanonicalTo(file);
5352
buildContext.refresh(file);
5453
impactedFilesTracker.cleaned();
54+
} else {
55+
impactedFilesTracker.checkedButAlreadyClean();
5556
}
5657
} catch (IOException e) {
5758
throw new MojoExecutionException("Unable to format file " + file, e);
@@ -61,11 +62,11 @@ protected void process(Iterable<File> files, Formatter formatter, UpToDateChecke
6162
}
6263

6364
// We print the number of considered files which is useful when ratchetFrom is setup
64-
int nbSkipped = impactedFilesTracker.getSkipped();
65-
int nbChecked = impactedFilesTracker.getChecked();
66-
int nbCleaned = impactedFilesTracker.getCleaned();
67-
int totalProcessed = nbSkipped + nbChecked + nbCleaned;
65+
int skippedAsCleanCache = impactedFilesTracker.getSkippedAsCleanCache();
66+
int checkedButAlreadyClean = impactedFilesTracker.getCheckedButAlreadyClean();
67+
int cleaned = impactedFilesTracker.getCleaned();
68+
int totalProcessed = skippedAsCleanCache + checkedButAlreadyClean + cleaned;
6869
getLog().info(String.format("Spotless.%s is keeping %s files clean - %s were changed to be clean, %s were already clean, %s were skipped because caching determined they were already clean",
69-
formatter.getName(), totalProcessed, nbCleaned, nbChecked, nbSkipped));
70+
formatter.getName(), totalProcessed, cleaned, checkedButAlreadyClean, skippedAsCleanCache));
7071
}
7172
}

0 commit comments

Comments
 (0)