Skip to content

Commit 4162569

Browse files
committed
Moved license header config handling to FormatterFactory
License header is a generic step that is applicable to both `Java` and `Scala`. This commit moves adder for it to `FormatterFactory`, which is super class of both `Java` and `Scala`. Code duplication is thus a bit reduced.
1 parent a934a73 commit 4162569

File tree

3 files changed

+5
-10
lines changed

3 files changed

+5
-10
lines changed

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

+5
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import com.diffplug.spotless.Formatter;
3333
import com.diffplug.spotless.FormatterStep;
3434
import com.diffplug.spotless.LineEnding;
35+
import com.diffplug.spotless.maven.generic.LicenseHeader;
3536

3637
public abstract class FormatterFactory {
3738
@Parameter
@@ -82,6 +83,10 @@ public final Formatter newFormatter(List<File> filesToFormat, FormatterConfig co
8283
.build();
8384
}
8485

86+
public final void addLicenseHeader(LicenseHeader licenseHeader) {
87+
addStepFactory(licenseHeader);
88+
}
89+
8590
protected void addStepFactory(FormatterStepFactory stepFactory) {
8691
Objects.requireNonNull(stepFactory);
8792
stepFactories.add(stepFactory);

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

-5
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import java.util.Set;
2222

2323
import com.diffplug.spotless.maven.FormatterFactory;
24-
import com.diffplug.spotless.maven.generic.LicenseHeader;
2524

2625
public class Java extends FormatterFactory {
2726
private static final Set<String> DEFAULT_INCLUDES = unmodifiableSet(newHashSet("src/main/java/**/*.java",
@@ -38,10 +37,6 @@ public String licenseHeaderDelimiter() {
3837
return LICENSE_HEADER_DELIMITER;
3938
}
4039

41-
public void addLicenseHeader(LicenseHeader licenseHeader) {
42-
addStepFactory(licenseHeader);
43-
}
44-
4540
public void addEclipse(Eclipse eclipse) {
4641
addStepFactory(eclipse);
4742
}

plugin-maven/src/main/java/com/diffplug/spotless/maven/scala/Scala.java

-5
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import java.util.Set;
2222

2323
import com.diffplug.spotless.maven.FormatterFactory;
24-
import com.diffplug.spotless.maven.generic.LicenseHeader;
2524

2625
public class Scala extends FormatterFactory {
2726
private static final Set<String> DEFAULT_INCLUDES = unmodifiableSet(newHashSet("src/main/scala/**/*.scala",
@@ -38,10 +37,6 @@ public String licenseHeaderDelimiter() {
3837
return LICENSE_HEADER_DELIMITER;
3938
}
4039

41-
public void addLicenseHeader(LicenseHeader licenseHeader) {
42-
addStepFactory(licenseHeader);
43-
}
44-
4540
public void addScalafmt(Scalafmt scalafmt) {
4641
addStepFactory(scalafmt);
4742
}

0 commit comments

Comments
 (0)