Merge branch 'main' into 1984-npm-install-cache-and-clean

nedtwigg · web-flow · commit 1d515e7e4098 · 2024-05-22T23:43:39.000-07:00
diff --git a/CHANGES.md b/CHANGES.md
@@ -19,13 +19,14 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `shfmt` version to latest `3.7.0` -> `3.8.0`. ([#2050](https://github.com/diffplug/spotless/pull/2050))
 * Bump default `ktlint` version to latest `1.1.1` -> `1.2.1`. ([#2057](https://github.com/diffplug/spotless/pull/2057))
 * Bump default `sortpom` version to latest `3.4.0` -> `3.4.1`. ([#2078](https://github.com/diffplug/spotless/pull/2078))
-* Made ShadowCopy (`npmInstallCache`) more robust by re-creating the cache dir if it goes missing ([#1984](https://github.com/diffplug/spotless/issues/1984),[2096](https://github.com/diffplug/spotless/pull/2096))
+* Bump default `sortpom` version to latest `3.4.1` -> `4.0.0` and support versions back to `3.2.1`. ([#2115](https://github.com/diffplug/spotless/pull/2115))
 ### Removed
 * **BREAKING** Remove `JarState.getMavenCoordinate(String prefix)`. ([#1945](https://github.com/diffplug/spotless/pull/1945))
 * **BREAKING** Replace `PipeStepPair` with `FenceStep`. ([#1954](https://github.com/diffplug/spotless/pull/1954))
 ### Fixed
 * Ignore system git config when running tests ([#1990](https://github.com/diffplug/spotless/issues/1990))
 * Correctly provide EditorConfig property types for Ktlint ([#2052](https://github.com/diffplug/spotless/issues/2052))
+* Made ShadowCopy (`npmInstallCache`) more robust by re-creating the cache dir if it goes missing ([#1984](https://github.com/diffplug/spotless/issues/1984),[2096](https://github.com/diffplug/spotless/pull/2096))
 
 ## [2.45.0] - 2024-01-23
 ### Added
diff --git a/lib/build.gradle b/lib/build.gradle
@@ -128,7 +128,7 @@ dependencies {
 	// scalafmt
 	scalafmtCompileOnly "org.scalameta:scalafmt-core_2.13:3.7.3"
 	// sortPom
-	sortPomCompileOnly 'com.github.ekryd.sortpom:sortpom-sorter:3.4.1'
+	sortPomCompileOnly 'com.github.ekryd.sortpom:sortpom-sorter:4.0.0'
 	sortPomCompileOnly 'org.slf4j:slf4j-api:2.0.12'
 	// zjsonPatch
 	zjsonPatchCompileOnly 'com.flipkart.zjsonpatch:zjsonpatch:0.4.14'
diff --git a/lib/src/main/java/com/diffplug/spotless/DelegateFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/DelegateFormatterStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 DiffPlug
+ * Copyright 2022-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,4 +29,9 @@ abstract class DelegateFormatterStep implements FormatterStep {
 	public final String getName() {
 		return delegateStep.getName();
 	}
+
+	@Override
+	public void close() throws Exception {
+		delegateStep.close();
+	}
 }
diff --git a/lib/src/main/java/com/diffplug/spotless/Formatter.java b/lib/src/main/java/com/diffplug/spotless/Formatter.java
@@ -35,8 +35,6 @@
 
 import javax.annotation.Nullable;
 
-import com.diffplug.spotless.generic.FenceStep;
-
 /** Formatter which performs the full formatting. */
 public final class Formatter implements Serializable, AutoCloseable {
 	private static final long serialVersionUID = 1L;
@@ -304,15 +302,10 @@ public boolean equals(Object obj) {
 	@Override
 	public void close() {
 		for (FormatterStep step : steps) {
-			if (step instanceof DelegateFormatterStep) {
-				step = ((DelegateFormatterStep) step).delegateStep;
-			}
-			if (step instanceof FormatterStepImpl.Standard) {
-				((FormatterStepImpl.Standard) step).cleanupFormatterFunc();
-			} else if (step instanceof FormatterStepEqualityOnStateSerialization) {
-				((FormatterStepEqualityOnStateSerialization) step).cleanupFormatterFunc();
-			} else if (step instanceof FenceStep.BaseStep) {
-				((FenceStep.BaseStep) step).cleanup();
+			try {
+				step.close();
+			} catch (Exception e) {
+				throw ThrowingEx.asRuntime(e);
 			}
 		}
 	}
diff --git a/lib/src/main/java/com/diffplug/spotless/FormatterStep.java b/lib/src/main/java/com/diffplug/spotless/FormatterStep.java
@@ -27,7 +27,7 @@
  * The input is guaranteed to have unix-style newlines, and the output is required
  * to not introduce any windows-style newlines as well.
  */
-public interface FormatterStep extends Serializable {
+public interface FormatterStep extends Serializable, AutoCloseable {
 	/** The name of the step, for debugging purposes. */
 	String getName();
 
diff --git a/lib/src/main/java/com/diffplug/spotless/FormatterStepEqualityOnStateSerialization.java b/lib/src/main/java/com/diffplug/spotless/FormatterStepEqualityOnStateSerialization.java
@@ -64,7 +64,8 @@ public int hashCode() {
 		return Arrays.hashCode(serializedState());
 	}
 
-	void cleanupFormatterFunc() {
+	@Override
+	public void close() {
 		if (formatter instanceof FormatterFunc.Closeable) {
 			((FormatterFunc.Closeable) formatter).close();
 			formatter = null;
diff --git a/lib/src/main/java/com/diffplug/spotless/FormatterStepImpl.java b/lib/src/main/java/com/diffplug/spotless/FormatterStepImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -82,7 +82,8 @@ protected String format(State state, String rawUnix, File file) throws Exception
 			return formatter.apply(rawUnix, file);
 		}
 
-		void cleanupFormatterFunc() {
+		@Override
+		public void close() throws Exception {
 			if (formatter instanceof FormatterFunc.Closeable) {
 				((FormatterFunc.Closeable) formatter).close();
 				formatter = null;
@@ -114,6 +115,14 @@ protected String format(Integer state, String rawUnix, File file) throws Excepti
 			}
 			return formatter.apply(rawUnix, file);
 		}
+
+		@Override
+		public void close() throws Exception {
+			if (formatter instanceof FormatterFunc.Closeable) {
+				((FormatterFunc.Closeable) formatter).close();
+				formatter = null;
+			}
+		}
 	}
 
 	static void checkNotSentinel(File file) {
diff --git a/lib/src/main/java/com/diffplug/spotless/generic/FenceStep.java b/lib/src/main/java/com/diffplug/spotless/generic/FenceStep.java
@@ -247,7 +247,8 @@ public int hashCode() {
 			return Objects.hash(name, regex.pattern(), regex.flags(), steps);
 		}
 
-		public void cleanup() {
+		@Override
+		public void close() {
 			if (formatter != null) {
 				formatter.close();
 				formatter = null;
diff --git a/lib/src/main/java/com/diffplug/spotless/pom/SortPomCfg.java b/lib/src/main/java/com/diffplug/spotless/pom/SortPomCfg.java
@@ -21,7 +21,7 @@
 public class SortPomCfg implements Serializable {
 	private static final long serialVersionUID = 1L;
 
-	public String version = "3.4.1";
+	public String version = "4.0.0";
 
 	public String encoding = "UTF-8";
 
@@ -41,6 +41,8 @@ public class SortPomCfg implements Serializable {
 
 	public boolean indentSchemaLocation = false;
 
+	public String indentAttribute = null;
+
 	public String predefinedSortOrder = "recommended_2008_06";
 
 	public String sortOrderFile = null;
diff --git a/lib/src/sortPom/java/com/diffplug/spotless/glue/pom/SortPomFormatterFunc.java b/lib/src/sortPom/java/com/diffplug/spotless/glue/pom/SortPomFormatterFunc.java
@@ -16,6 +16,7 @@
 package com.diffplug.spotless.glue.pom;
 
 import java.io.*;
+import java.lang.reflect.Method;
 import java.nio.charset.Charset;
 import java.nio.file.Files;
 
@@ -46,17 +47,45 @@ public String apply(String input) throws Exception {
 			writer.write(input);
 		}
 		SortPomImpl sortPom = new SortPomImpl();
-		sortPom.setup(new MySortPomLogger(), PluginParameters.builder()
+		PluginParameters.Builder builder = PluginParameters.builder()
 				.setPomFile(pom)
 				.setFileOutput(false, null, null, false)
-				.setEncoding(cfg.encoding)
-				.setFormatting(cfg.lineSeparator, cfg.expandEmptyElements, cfg.spaceBeforeCloseEmptyElement, cfg.keepBlankLines, cfg.endWithNewline)
-				.setIndent(cfg.nrOfIndentSpace, cfg.indentBlankLines, cfg.indentSchemaLocation)
+				.setEncoding(cfg.encoding);
+		try {
+			builder = builder
+					.setFormatting(cfg.lineSeparator, cfg.expandEmptyElements, cfg.spaceBeforeCloseEmptyElement,
+							cfg.keepBlankLines, cfg.endWithNewline);
+		} catch (NoSuchMethodError e) {
+			try {
+				Method method = PluginParameters.Builder.class
+						.getMethod("setFormatting", String.class, boolean.class, boolean.class, boolean.class);
+				builder = (PluginParameters.Builder) method
+						.invoke(builder, cfg.lineSeparator, cfg.expandEmptyElements, cfg.spaceBeforeCloseEmptyElement,
+								cfg.keepBlankLines);
+			} catch (ReflectiveOperationException | RuntimeException ignore) {
+				throw e;
+			}
+		}
+		try {
+			builder = builder
+					.setIndent(cfg.nrOfIndentSpace, cfg.indentBlankLines, cfg.indentSchemaLocation,
+							cfg.indentAttribute);
+		} catch (NoSuchMethodError e) {
+			try {
+				Method method = PluginParameters.Builder.class
+						.getMethod("setIndent", int.class, boolean.class, boolean.class);
+				builder = (PluginParameters.Builder) method
+						.invoke(builder, cfg.nrOfIndentSpace, cfg.indentBlankLines, cfg.indentSchemaLocation);
+			} catch (ReflectiveOperationException | RuntimeException ignore) {
+				throw e;
+			}
+		}
+		builder = builder
 				.setSortOrder(cfg.sortOrderFile, cfg.predefinedSortOrder)
 				.setSortEntities(cfg.sortDependencies, cfg.sortDependencyExclusions, cfg.sortDependencyManagement,
 						cfg.sortPlugins, cfg.sortProperties, cfg.sortModules, cfg.sortExecutions)
-				.setIgnoreLineSeparators(false)
-				.build());
+				.setIgnoreLineSeparators(false);
+		sortPom.setup(new MySortPomLogger(), builder.build());
 		sortPom.sortPom();
 		return Files.readString(pom.toPath(), Charset.forName(cfg.encoding));
 	}
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
@@ -8,13 +8,14 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Ignore system git config when running tests ([#1990](https://github.com/diffplug/spotless/issues/1990))
 * Correctly provide EditorConfig property types for Ktlint ([#2052](https://github.com/diffplug/spotless/issues/2052))
 * Fixed memory leak introduced in 6.21.0 ([#2067](https://github.com/diffplug/spotless/issues/2067))
+* Made ShadowCopy (`npmInstallCache`) more robust by re-creating the cache dir if it goes missing ([#1984](https://github.com/diffplug/spotless/issues/1984),[2096](https://github.com/diffplug/spotless/pull/2096))
 ### Changes
 * Bump default `ktfmt` version to latest `0.46` -> `0.47`. ([#2045](https://github.com/diffplug/spotless/pull/2045))
 * Bump default `sortpom` version to latest `3.2.1` -> `3.4.0`. ([#2049](https://github.com/diffplug/spotless/pull/2049))
 * Bump default `shfmt` version to latest `3.7.0` -> `3.8.0`. ([#2050](https://github.com/diffplug/spotless/pull/2050))
 * Bump default `ktlint` version to latest `1.1.1` -> `1.2.1`. ([#2057](https://github.com/diffplug/spotless/pull/2057))
 * Bump default `sortpom` version to latest `3.4.0` -> `3.4.1`. ([#2078](https://github.com/diffplug/spotless/pull/2078))
-* Made ShadowCopy (`npmInstallCache`) more robust by re-creating the cache dir if it goes missing ([#1984](https://github.com/diffplug/spotless/issues/1984),[2096](https://github.com/diffplug/spotless/pull/2096))
+* Bump default `sortpom` version to latest `3.4.1` -> `4.0.0` and support versions back to `3.2.1`. ([#2115](https://github.com/diffplug/spotless/pull/2115))
 ### Added
 * Respect `.editorconfig` settings for formatting shell via `shfmt` ([#2031](https://github.com/diffplug/spotless/pull/2031))
 * Add support for formatting and sorting Maven POMs ([#2082](https://github.com/diffplug/spotless/issues/2082))
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
@@ -700,7 +700,7 @@ All configuration settings are optional, they are described in detail [here](htt
 ```gradle
 spotless {
   pom {
-    sortPom('3.4.0')
+    sortPom('4.0.0')
       .encoding('UTF-8') // The encoding of the pom files
       .lineSeparator(System.getProperty('line.separator')) // line separator to use
       .expandEmptyElements(true) // Should empty elements be expanded
@@ -710,6 +710,7 @@ spotless {
       .nrOfIndentSpace(2) // Indentation
       .indentBlankLines(false) // Should empty lines be indented
       .indentSchemaLocation(false) // Should schema locations be indented
+      .indentAttribute(null) // Should the xml attributes be indented
       .predefinedSortOrder('recommended_2008_06') // Sort order of elements: https://github.com/Ekryd/sortpom/wiki/PredefinedSortOrderProfiles
       .sortOrderFile(null) // Custom sort order of elements: https://raw.githubusercontent.com/Ekryd/sortpom/master/sorter/src/main/resources/custom_1.xml
       .sortDependencies(null) // Sort dependencies: https://github.com/Ekryd/sortpom/wiki/SortDependencies
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PomExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PomExtension.java
@@ -107,6 +107,11 @@ public SortPomGradleConfig indentSchemaLocation(boolean indentSchemaLocation) {
 			return this;
 		}
 
+		public SortPomGradleConfig indentAttribute(String indentAttribute) {
+			cfg.indentAttribute = indentAttribute;
+			return this;
+		}
+
 		public SortPomGradleConfig predefinedSortOrder(String predefinedSortOrder) {
 			cfg.predefinedSortOrder = predefinedSortOrder;
 			return this;
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/SortPomGradleTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/SortPomGradleTest.java
@@ -16,6 +16,8 @@
 package com.diffplug.gradle.spotless;
 
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 
 class SortPomGradleTest extends GradleIntegrationHarness {
 	@Test
@@ -63,8 +65,9 @@ void sortPomWithTarget() throws Exception {
 		assertFile("test.xml").sameAsResource("pom/pom_clean_default.xml");
 	}
 
-	@Test
-	void sortPomWithVersion() throws Exception {
+	@ParameterizedTest
+	@ValueSource(strings = {"3.2.1", "3.3.0", "3.4.1", "4.0.0"})
+	void sortPomWithVersion(String version) throws Exception {
 		// given
 		setFile("build.gradle").toLines(
 				"plugins {",
@@ -73,7 +76,7 @@ void sortPomWithVersion() throws Exception {
 				"repositories { mavenCentral() }",
 				"spotless {",
 				"  pom {",
-				"    sortPom '3.4.0'",
+				"    sortPom '" + version + "'",
 				"  }",
 				"}");
 		setFile("pom.xml").toResource("pom/pom_dirty.xml");
@@ -105,6 +108,7 @@ void sortPomWithParameters() throws Exception {
 				"      .nrOfIndentSpace(2)",
 				"      .indentBlankLines(false)",
 				"      .indentSchemaLocation(false)",
+				"      .indentAttribute(null)",
 				"      .predefinedSortOrder('recommended_2008_06')",
 				"      .sortOrderFile(null)",
 				"      .sortDependencies(null)",
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
@@ -6,13 +6,14 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Fixed
 * Ignore system git config when running tests ([#1990](https://github.com/diffplug/spotless/issues/1990))
 * Correctly provide EditorConfig property types for Ktlint ([#2052](https://github.com/diffplug/spotless/issues/2052))
+* Made ShadowCopy (`npmInstallCache`) more robust by re-creating the cache dir if it goes missing ([#1984](https://github.com/diffplug/spotless/issues/1984),[2096](https://github.com/diffplug/spotless/pull/2096))
 ### Changes
 * Bump default `ktfmt` version to latest `0.46` -> `0.47`. ([#2045](https://github.com/diffplug/spotless/pull/2045))
 * Bump default `sortpom` version to latest `3.2.1` -> `3.4.0`. ([#2049](https://github.com/diffplug/spotless/pull/2049))
 * Bump default `shfmt` version to latest `3.7.0` -> `3.8.0`. ([#2050](https://github.com/diffplug/spotless/pull/2050))
 * Bump default `ktlint` version to latest `1.1.1` -> `1.2.1`. ([#2057](https://github.com/diffplug/spotless/pull/2057))
 * Bump default `sortpom` version to latest `3.4.0` -> `3.4.1`. ([#2078](https://github.com/diffplug/spotless/pull/2078))
-* Made ShadowCopy (`npmInstallCache`) more robust by re-creating the cache dir if it goes missing ([#1984](https://github.com/diffplug/spotless/issues/1984),[2096](https://github.com/diffplug/spotless/pull/2096))
+* Bump default `sortpom` version to latest `3.4.1` -> `4.0.0` and support versions back to `3.2.1`. ([#2115](https://github.com/diffplug/spotless/pull/2115))
 ### Added
 * Respect `.editorconfig` settings for formatting shell via `shfmt` ([#2031](https://github.com/diffplug/spotless/pull/2031))
 * Skip execution in M2E (incremental) builds by default ([#1814](https://github.com/diffplug/spotless/issues/1814), [#2037](https://github.com/diffplug/spotless/issues/2037)) 
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
@@ -667,6 +667,8 @@ All configuration settings are optional, they are described in detail [here](htt
 
   <indentSchemaLocation>false</indentSchemaLocation> <!-- Should schema locations be indented -->
 
+  <indentAttribute></indentAttribute> <!-- Should the xml attributes be indented -->
+
   <predefinedSortOrder>recommended_2008_06</predefinedSortOrder> <!-- Sort order of elements: https://github.com/Ekryd/sortpom/wiki/PredefinedSortOrderProfiles-->
 
   <sortOrderFile></sortOrderFile> <!-- Custom sort order of elements: https://raw.githubusercontent.com/Ekryd/sortpom/master/sorter/src/main/resources/custom_1.xml -->
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/pom/SortPom.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/pom/SortPom.java
@@ -56,6 +56,9 @@ public class SortPom implements FormatterStepFactory {
 	@Parameter
 	boolean indentSchemaLocation = defaultValues.indentSchemaLocation;
 
+	@Parameter
+	String indentAttribute = defaultValues.indentAttribute;
+
 	@Parameter
 	String predefinedSortOrder = defaultValues.predefinedSortOrder;
 
@@ -96,6 +99,7 @@ public FormatterStep newFormatterStep(FormatterStepConfig stepConfig) {
 		cfg.nrOfIndentSpace = nrOfIndentSpace;
 		cfg.indentBlankLines = indentBlankLines;
 		cfg.indentSchemaLocation = indentSchemaLocation;
+		cfg.indentAttribute = indentAttribute;
 		cfg.predefinedSortOrder = predefinedSortOrder;
 		cfg.sortOrderFile = sortOrderFile;
 		cfg.sortDependencies = sortDependencies;
diff --git a/testlib/src/test/java/com/diffplug/spotless/generic/FenceStepTest.java b/testlib/src/test/java/com/diffplug/spotless/generic/FenceStepTest.java
@@ -151,5 +151,11 @@ public String format(String rawUnix, File file) throws Exception {
 			return formatterFunc.apply(rawUnix, file);
 		}
 
+		@Override
+		public void close() throws Exception {
+			if (formatterFunc instanceof FormatterFunc.Closeable) {
+				((FormatterFunc.Closeable) formatterFunc).close();
+			}
+		}
 	}
 }
diff --git a/testlib/src/test/java/com/diffplug/spotless/pom/SortPomTest.java b/testlib/src/test/java/com/diffplug/spotless/pom/SortPomTest.java
@@ -16,6 +16,8 @@
 package com.diffplug.spotless.pom;
 
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 
 import com.diffplug.spotless.*;
 
@@ -27,10 +29,11 @@ public void testSortPomWithDefaultConfig() {
 		StepHarness.forStep(step).testResource("pom/pom_dirty.xml", "pom/pom_clean_default.xml");
 	}
 
-	@Test
-	public void testSortPomWithVersion() {
+	@ParameterizedTest
+	@ValueSource(strings = {"3.2.1", "3.3.0", "3.4.1", "4.0.0"})
+	public void testSortPomWithVersion(String version) {
 		SortPomCfg cfg = new SortPomCfg();
-		cfg.version = "3.4.1";
+		cfg.version = version;
 		FormatterStep step = SortPomStep.create(cfg, TestProvisioner.mavenCentral());
 		StepHarness.forStep(step).testResource("pom/pom_dirty.xml", "pom/pom_clean_default.xml");
 	}

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2022 DiffPlug`
	`2`	`+ * Copyright 2022-2024 DiffPlug`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -29,4 +29,9 @@ abstract class DelegateFormatterStep implements FormatterStep {`
`29`	`29`	`public final String getName() {`
`30`	`30`	`return delegateStep.getName();`
`31`	`31`	`}`
	`32`	`+`
	`33`	`+ @Override`
	`34`	`+ public void close() throws Exception {`
	`35`	`+ delegateStep.close();`
	`36`	`+ }`
`32`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,8 @@ public int hashCode() {`
`64`	`64`	`return Arrays.hashCode(serializedState());`
`65`	`65`	`}`
`66`	`66`
`67`		`- void cleanupFormatterFunc() {`
	`67`	`+ @Override`
	`68`	`+ public void close() {`
`68`	`69`	`if (formatter instanceof FormatterFunc.Closeable) {`
`69`	`70`	`((FormatterFunc.Closeable) formatter).close();`
`70`	`71`	`formatter = null;`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2016-2023 DiffPlug`
	`2`	`+ * Copyright 2016-2024 DiffPlug`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -82,7 +82,8 @@ protected String format(State state, String rawUnix, File file) throws Exception`
`82`	`82`	`return formatter.apply(rawUnix, file);`
`83`	`83`	`}`
`84`	`84`
`85`		`- void cleanupFormatterFunc() {`
	`85`	`+ @Override`
	`86`	`+ public void close() throws Exception {`
`86`	`87`	`if (formatter instanceof FormatterFunc.Closeable) {`
`87`	`88`	`((FormatterFunc.Closeable) formatter).close();`
`88`	`89`	`formatter = null;`
`@@ -114,6 +115,14 @@ protected String format(Integer state, String rawUnix, File file) throws Excepti`
`114`	`115`	`}`
`115`	`116`	`return formatter.apply(rawUnix, file);`
`116`	`117`	`}`
	`118`	`+`
	`119`	`+ @Override`
	`120`	`+ public void close() throws Exception {`
	`121`	`+ if (formatter instanceof FormatterFunc.Closeable) {`
	`122`	`+ ((FormatterFunc.Closeable) formatter).close();`
	`123`	`+ formatter = null;`
	`124`	`+ }`
	`125`	`+ }`
`117`	`126`	`}`
`118`	`127`
`119`	`128`	`static void checkNotSentinel(File file) {`
Original file line number	Diff line number	Diff line change
`@@ -247,7 +247,8 @@ public int hashCode() {`
`247`	`247`	`return Objects.hash(name, regex.pattern(), regex.flags(), steps);`
`248`	`248`	`}`
`249`	`249`
`250`		`- public void cleanup() {`
	`250`	`+ @Override`
	`251`	`+ public void close() {`
`251`	`252`	`if (formatter != null) {`
`252`	`253`	`formatter.close();`
`253`	`254`	`formatter = null;`