Cleanup code

AlexanderNikitin · AlexanderNikitin · commit c6a87a835f83 · 2025-08-01T08:57:07.000+03:00
diff --git a/java-diff-utils-jgit/src/test/java/com/github/difflib/algorithm/jgit/LRHistogramDiffTest.java b/java-diff-utils-jgit/src/test/java/com/github/difflib/algorithm/jgit/LRHistogramDiffTest.java
@@ -26,7 +26,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
@@ -75,8 +74,7 @@ public void diffEnd() {
 		}
 
 		public static List<String> readStringListFromInputStream(InputStream is) throws IOException {
-				try (BufferedReader reader =
-								new BufferedReader(new InputStreamReader(is, Charset.forName(StandardCharsets.UTF_8.name())))) {
+				try (BufferedReader reader = new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8))) {
 
 						return reader.lines().collect(toList());
 				}
diff --git a/java-diff-utils/src/main/java/com/github/difflib/UnifiedDiffUtils.java b/java-diff-utils/src/main/java/com/github/difflib/UnifiedDiffUtils.java
@@ -428,9 +428,7 @@ private static void insertOrig(List<List<String>> diffList, List<String> result,
 
 		// Insert the unchanged content in the source file into result
 		private static void insert(List<String> result, List<String> noChangeContent) {
-				for (String ins : noChangeContent) {
-						result.add(ins);
-				}
+				result.addAll(noChangeContent);
 		}
 
 		// Parse the line containing @@ to get the modified line number to delete or add a few lines
diff --git a/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/PathNode.java b/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/PathNode.java
@@ -79,7 +79,7 @@ public boolean isBootstrap() {
 		 *
 		 * @return The next first {@link PathNode} or bootstrap node in the path, or <code>null</code> if none found.
 		 */
-		public final PathNode previousSnake() {
+		public PathNode previousSnake() {
 				if (isBootstrap()) {
 						return null;
 				}
diff --git a/java-diff-utils/src/main/java/com/github/difflib/patch/Chunk.java b/java-diff-utils/src/main/java/com/github/difflib/patch/Chunk.java
@@ -107,7 +107,7 @@ public VerifyChunk verifyChunk(List<T> target) throws PatchFailedException {
 		 * @param position the position of target
 		 * @throws com.github.difflib.patch.PatchFailedException
 		 */
-		public VerifyChunk verifyChunk(List<T> target, int fuzz, int position) throws PatchFailedException {
+		public VerifyChunk verifyChunk(List<T> target, int fuzz, int position) {
 				//noinspection UnnecessaryLocalVariable
 				int startIndex = fuzz;
 				int lastIndex = size() - fuzz;
diff --git a/java-diff-utils/src/main/java/com/github/difflib/patch/ConflictOutput.java b/java-diff-utils/src/main/java/com/github/difflib/patch/ConflictOutput.java
@@ -29,6 +29,5 @@
 @FunctionalInterface
 public interface ConflictOutput<T> extends Serializable {
 
-		public void processConflict(VerifyChunk verifyChunk, AbstractDelta<T> delta, List<T> result)
-						throws PatchFailedException;
+		void processConflict(VerifyChunk verifyChunk, AbstractDelta<T> delta, List<T> result) throws PatchFailedException;
 }
diff --git a/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java b/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java
@@ -98,7 +98,7 @@ private static String adjustWhitespace(String raw) {
 				return WHITESPACE_PATTERN.matcher(raw.trim()).replaceAll(" ");
 		}
 
-		protected static final List<String> splitStringPreserveDelimiter(String str, Pattern SPLIT_PATTERN) {
+		protected static List<String> splitStringPreserveDelimiter(String str, Pattern SPLIT_PATTERN) {
 				List<String> list = new ArrayList<>();
 				if (str != null) {
 						Matcher matcher = SPLIT_PATTERN.matcher(str);
@@ -374,9 +374,7 @@ private DiffRow buildDiffRowWithoutNormalizing(Tag type, String orgline, String
 		}
 
 		List<String> normalizeLines(List<String> list) {
-				return reportLinesUnchanged
-								? list
-								: list.stream().map(lineNormalizer::apply).collect(toList());
+				return reportLinesUnchanged ? list : list.stream().map(lineNormalizer).collect(toList());
 		}
 
 		/**
diff --git a/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java
@@ -241,7 +241,7 @@ private boolean processLine(String line, UnifiedDiffLine... rules) throws Unifie
 				}
 				for (UnifiedDiffLine rule : rules) {
 						if (rule.processLine(line)) {
-								LOG.fine("  >>> processed rule " + rule.toString());
+								LOG.fine("  >>> processed rule " + rule);
 								return true;
 						}
 				}
@@ -256,7 +256,7 @@ private boolean validLine(String line, UnifiedDiffLine... rules) {
 				}
 				for (UnifiedDiffLine rule : rules) {
 						if (rule.validLine(line)) {
-								LOG.fine("  >>> accepted rule " + rule.toString());
+								LOG.fine("  >>> accepted rule " + rule);
 								return true;
 						}
 				}
diff --git a/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffWriter.java b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffWriter.java
@@ -198,9 +198,7 @@ private static void processDeltas(
 				// Create and insert the block header, conforming to the Unified Diff
 				// standard
 				writer.accept("@@ -" + origStart + "," + origTotal + " +" + revStart + "," + revTotal + " @@");
-				buffer.forEach(txt -> {
-						writer.accept(txt);
-				});
+				buffer.forEach(writer);
 		}
 
 		/**
diff --git a/java-diff-utils/src/test/java/com/github/difflib/DiffUtilsTest.java b/java-diff-utils/src/test/java/com/github/difflib/DiffUtilsTest.java
@@ -17,7 +17,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Paths;
@@ -154,8 +153,7 @@ public void testPossibleDiffHangOnLargeDatasetDnaumenkoIssue26() throws IOExcept
 		}
 
 		public static List<String> readStringListFromInputStream(InputStream is) throws IOException {
-				try (BufferedReader reader =
-								new BufferedReader(new InputStreamReader(is, Charset.forName(StandardCharsets.UTF_8.name())))) {
+				try (BufferedReader reader = new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8))) {
 
 						return reader.lines().collect(toList());
 				}
diff --git a/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java b/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java
@@ -13,7 +13,6 @@
 import com.github.difflib.text.deltamerge.InlineDeltaMergeInfo;
 import java.io.File;
 import java.io.IOException;
-import java.net.URISyntaxException;
 import java.nio.file.FileSystem;
 import java.nio.file.FileSystems;
 import java.nio.file.Files;
@@ -878,9 +877,9 @@ private void assertInlineDiffResult(DiffRowGenerator generator, String original,
 		}
 
 		@Test
-		public void testIssue188HangOnExamples() throws IOException, URISyntaxException {
+		public void testIssue188HangOnExamples() throws IOException {
 				try (FileSystem zipFs = FileSystems.newFileSystem(
-								Paths.get("target/test-classes/com/github/difflib/text/test.zip"), (ClassLoader) null); ) {
+								Paths.get("target/test-classes/com/github/difflib/text/test.zip"), (ClassLoader) null)) {
 						List<String> original = Files.readAllLines(zipFs.getPath("old.html"));
 						List<String> revised = Files.readAllLines(zipFs.getPath("new.html"));
 
diff --git a/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffRoundTripTest.java b/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffRoundTripTest.java
@@ -122,7 +122,7 @@ public void testDiffWithHeaderLineInText() throws IOException {
 								writer,
 								10);
 
-				System.out.println(writer.toString());
+				System.out.println(writer);
 
 				UnifiedDiff unifiedDiff = UnifiedDiffReader.parseUnifiedDiff(
 								new ByteArrayInputStream(writer.toString().getBytes()));
@@ -139,7 +139,7 @@ private void verify(List<String> origLines, List<String> revLines, String origin
 								writer,
 								10);
 
-				System.out.println(writer.toString());
+				System.out.println(writer);
 
 				UnifiedDiff unifiedDiff = UnifiedDiffReader.parseUnifiedDiff(
 								new ByteArrayInputStream(writer.toString().getBytes()));
diff --git a/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffWriterTest.java b/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffWriterTest.java
@@ -51,7 +51,7 @@ public void testWrite() throws URISyntaxException, IOException {
 
 				StringWriter writer = new StringWriter();
 				UnifiedDiffWriter.write(diff, f -> Collections.emptyList(), writer, 5);
-				System.out.println(writer.toString());
+				System.out.println(writer);
 		}
 
 		/**
@@ -72,7 +72,7 @@ public void testWriteWithNewFile() throws URISyntaxException, IOException {
 
 				StringWriter writer = new StringWriter();
 				UnifiedDiffWriter.write(diff, f -> original, writer, 5);
-				System.out.println(writer.toString());
+				System.out.println(writer);
 
 				String[] lines = writer.toString().split("\\n");
 
diff --git a/pom.xml b/pom.xml
@@ -132,28 +132,28 @@
           <sourceDirectories>${project.build.sourceDirectory}</sourceDirectories>
           <checkstyleRules>
             <module name="Checker">
-              <module name="SuppressWarningsFilter" />
+              <module name="SuppressWarningsFilter"/>
               <module name="TreeWalker">
-                <module name="SuppressionCommentFilter" />
-                <module name="AvoidNestedBlocks" />
-                <module name="ConstantName" />
-                <module name="EmptyCatchBlock" />
-                <module name="EmptyStatement" />
-                <module name="MissingOverride" />
-                <module name="MultipleVariableDeclarations" />
-                <module name="ParameterAssignment" />
-                <module name="StringLiteralEquality" />
-                <module name="RedundantImport" />
-                <module name="UnusedImports" />
+                <module name="SuppressionCommentFilter"/>
+                <module name="AvoidNestedBlocks"/>
+                <module name="ConstantName"/>
+                <module name="EmptyCatchBlock"/>
+                <module name="EmptyStatement"/>
+                <module name="MissingOverride"/>
+                <module name="MultipleVariableDeclarations"/>
+                <module name="ParameterAssignment"/>
+                <module name="StringLiteralEquality"/>
+                <module name="RedundantImport"/>
+                <module name="UnusedImports"/>
 
-                <module name="WhitespaceAfter" />
+                <module name="WhitespaceAfter"/>
 
-                <module name="NeedBraces" />
-                <module name="UnnecessaryParentheses" />
-                <module name="LeftCurly" />
-                <module name="RightCurly" />
+                <module name="NeedBraces"/>
+                <module name="UnnecessaryParentheses"/>
+                <module name="LeftCurly"/>
+                <module name="RightCurly"/>
 
-                <module name="SuppressWarningsHolder" />
+                <module name="SuppressWarningsHolder"/>
               </module>
             </module>
           </checkstyleRules>
@@ -191,7 +191,7 @@
         <version>2.30.0</version>
         <configuration>
           <java>
-            <palantirJavaFormat />
+            <palantirJavaFormat/>
             <indent>
               <tabs>true</tabs>
               <spacesPerTab>2</spacesPerTab>

Original file line number	Diff line number	Diff line change
`@@ -428,9 +428,7 @@ private static void insertOrig(List<List<String>> diffList, List<String> result,`
`428`	`428`
`429`	`429`	`// Insert the unchanged content in the source file into result`
`430`	`430`	`private static void insert(List<String> result, List<String> noChangeContent) {`
`431`		`- for (String ins : noChangeContent) {`
`432`		`- result.add(ins);`
`433`		`- }`
	`431`	`+ result.addAll(noChangeContent);`
`434`	`432`	`}`
`435`	`433`
`436`	`434`	`// Parse the line containing @@ to get the modified line number to delete or add a few lines`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ public boolean isBootstrap() {`
`79`	`79`	`*`
`80`	`80`	`* @return The next first {@link PathNode} or bootstrap node in the path, or <code>null</code> if none found.`
`81`	`81`	`*/`
`82`		`- public final PathNode previousSnake() {`
	`82`	`+ public PathNode previousSnake() {`
`83`	`83`	`if (isBootstrap()) {`
`84`	`84`	`return null;`
`85`	`85`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,5 @@`
`29`	`29`	`@FunctionalInterface`
`30`	`30`	`public interface ConflictOutput<T> extends Serializable {`
`31`	`31`
`32`		`- public void processConflict(VerifyChunk verifyChunk, AbstractDelta<T> delta, List<T> result)`
`33`		`- throws PatchFailedException;`
	`32`	`+ void processConflict(VerifyChunk verifyChunk, AbstractDelta<T> delta, List<T> result) throws PatchFailedException;`
`34`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ private static String adjustWhitespace(String raw) {`
`98`	`98`	`return WHITESPACE_PATTERN.matcher(raw.trim()).replaceAll(" ");`
`99`	`99`	`}`
`100`	`100`
`101`		`- protected static final List<String> splitStringPreserveDelimiter(String str, Pattern SPLIT_PATTERN) {`
	`101`	`+ protected static List<String> splitStringPreserveDelimiter(String str, Pattern SPLIT_PATTERN) {`
`102`	`102`	`List<String> list = new ArrayList<>();`
`103`	`103`	`if (str != null) {`
`104`	`104`	`Matcher matcher = SPLIT_PATTERN.matcher(str);`
`@@ -374,9 +374,7 @@ private DiffRow buildDiffRowWithoutNormalizing(Tag type, String orgline, String`
`374`	`374`	`}`
`375`	`375`
`376`	`376`	`List<String> normalizeLines(List<String> list) {`
`377`		`- return reportLinesUnchanged`
`378`		`- ? list`
`379`		`- : list.stream().map(lineNormalizer::apply).collect(toList());`
	`377`	`+ return reportLinesUnchanged ? list : list.stream().map(lineNormalizer).collect(toList());`
`380`	`378`	`}`
`381`	`379`
`382`	`380`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -241,7 +241,7 @@ private boolean processLine(String line, UnifiedDiffLine... rules) throws Unifie`
`241`	`241`	`}`
`242`	`242`	`for (UnifiedDiffLine rule : rules) {`
`243`	`243`	`if (rule.processLine(line)) {`
`244`		`- LOG.fine(" >>> processed rule " + rule.toString());`
	`244`	`+ LOG.fine(" >>> processed rule " + rule);`
`245`	`245`	`return true;`
`246`	`246`	`}`
`247`	`247`	`}`
`@@ -256,7 +256,7 @@ private boolean validLine(String line, UnifiedDiffLine... rules) {`
`256`	`256`	`}`
`257`	`257`	`for (UnifiedDiffLine rule : rules) {`
`258`	`258`	`if (rule.validLine(line)) {`
`259`		`- LOG.fine(" >>> accepted rule " + rule.toString());`
	`259`	`+ LOG.fine(" >>> accepted rule " + rule);`
`260`	`260`	`return true;`
`261`	`261`	`}`
`262`	`262`	`}`