Replaced nulls with with default value.

nedtwigg · nedtwigg · commit fa95810862e6 · 2018-02-09T11:14:42.000-08:00
diff --git a/lib/src/main/java/com/diffplug/spotless/generic/LicenseHeaderStep.java b/lib/src/main/java/com/diffplug/spotless/generic/LicenseHeaderStep.java
@@ -25,8 +25,6 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import javax.annotation.Nullable;
-
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.LineEnding;
 
@@ -47,13 +45,13 @@ public final class LicenseHeaderStep implements Serializable {
 
 	/** Creates a FormatterStep which forces the start of each file to match a license header. */
 	public static FormatterStep createFromHeader(String licenseHeader, String delimiter) {
-		return createFromHeader(licenseHeader, delimiter, null);
+		return createFromHeader(licenseHeader, delimiter, DEFAULT_YEAR_DELIMITER);
 	}
 
-	public static FormatterStep createFromHeader(String licenseHeader, String delimiter,
-			@Nullable String yearSeparator) {
+	public static FormatterStep createFromHeader(String licenseHeader, String delimiter, String yearSeparator) {
 		Objects.requireNonNull(licenseHeader, "licenseHeader");
 		Objects.requireNonNull(delimiter, "delimiter");
+		Objects.requireNonNull(yearSeparator, "yearSeparator");
 		return FormatterStep.create(LicenseHeaderStep.NAME,
 				new LicenseHeaderStep(licenseHeader, delimiter, yearSeparator),
 				step -> step::format);
@@ -64,18 +62,18 @@ public static FormatterStep createFromHeader(String licenseHeader, String delimi
 	 * contained in the given file.
 	 */
 	public static FormatterStep createFromFile(File licenseHeaderFile, Charset encoding, String delimiter) {
-		return createFromFile(licenseHeaderFile, encoding, delimiter, null);
+		return createFromFile(licenseHeaderFile, encoding, delimiter, DEFAULT_YEAR_DELIMITER);
 	}
 
 	/**
 	 * Creates a FormatterStep which forces the start of each file to match the license header
 	 * contained in the given file.
 	 */
-	public static FormatterStep createFromFile(File licenseHeaderFile, Charset encoding, String delimiter,
-			@Nullable String yearSeparator) {
+	public static FormatterStep createFromFile(File licenseHeaderFile, Charset encoding, String delimiter, String yearSeparator) {
 		Objects.requireNonNull(licenseHeaderFile, "licenseHeaderFile");
 		Objects.requireNonNull(encoding, "encoding");
 		Objects.requireNonNull(delimiter, "delimiter");
+		Objects.requireNonNull(yearSeparator, "yearSeparator");
 		return FormatterStep.createLazy(LicenseHeaderStep.NAME,
 				() -> new LicenseHeaderStep(licenseHeaderFile, encoding, delimiter, yearSeparator),
 				step -> step::format);
@@ -90,10 +88,7 @@ public static String defaultYearDelimiter() {
 	}
 
 	/** The license that we'd like enforced. */
-	private LicenseHeaderStep(String licenseHeader, String delimiter, @Nullable String yearSeparator) {
-		if (yearSeparator == null) {
-			yearSeparator = defaultYearDelimiter();
-		}
+	private LicenseHeaderStep(String licenseHeader, String delimiter, String yearSeparator) {
 		if (delimiter.contains("\n")) {
 			throw new IllegalArgumentException("The delimiter must not contain any newlines.");
 		}
@@ -115,7 +110,7 @@ private LicenseHeaderStep(String licenseHeader, String delimiter, @Nullable Stri
 	}
 
 	/** Reads the license file from the given file. */
-	private LicenseHeaderStep(File licenseFile, Charset encoding, String delimiter, @Nullable String yearSeparator) throws IOException {
+	private LicenseHeaderStep(File licenseFile, Charset encoding, String delimiter, String yearSeparator) throws IOException {
 		this(new String(Files.readAllBytes(licenseFile.toPath()), encoding), delimiter, yearSeparator);
 	}
 
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
@@ -346,9 +346,8 @@ public void indentWithTabs() {
 	}
 
 	abstract class LicenseHeaderConfig {
-
 		String delimiter;
-		String yearSeparator;
+		String yearSeparator = LicenseHeaderStep.defaultYearDelimiter();
 
 		public LicenseHeaderConfig(String delimiter) {
 			this.delimiter = Objects.requireNonNull(delimiter, "delimiter");

Original file line number	Diff line number	Diff line change
`@@ -346,9 +346,8 @@ public void indentWithTabs() {`
`346`	`346`	`}`
`347`	`347`
`348`	`348`	`abstract class LicenseHeaderConfig {`
`349`		`-`
`350`	`349`	`String delimiter;`
`351`		`- String yearSeparator;`
	`350`	`+ String yearSeparator = LicenseHeaderStep.defaultYearDelimiter();`
`352`	`351`
`353`	`352`	`public LicenseHeaderConfig(String delimiter) {`
`354`	`353`	`this.delimiter = Objects.requireNonNull(delimiter, "delimiter");`