Skip to content

Cleanup code #216

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Cleanup code #216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions ...-diff-utils-jgit/src/test/java/com/github/difflib/algorithm/jgit/LRHistogramDiffTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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());
}
Expand Down
4 changes: 1 addition & 3 deletions java-diff-utils/src/main/java/com/github/difflib/UnifiedDiffUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/PathNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion java-diff-utils/src/main/java/com/github/difflib/patch/Chunk.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 1 addition & 2 deletions java-diff-utils/src/main/java/com/github/difflib/patch/ConflictOutput.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
6 changes: 2 additions & 4 deletions java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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());
}

/**
Expand Down
4 changes: 2 additions & 2 deletions java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
Expand All @@ -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;
}
}
Expand Down
4 changes: 1 addition & 3 deletions java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

/**
Expand Down
4 changes: 1 addition & 3 deletions java-diff-utils/src/test/java/com/github/difflib/DiffUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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());
}
Expand Down
26 changes: 13 additions & 13 deletions java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
import static java.util.stream.Collectors.joining;
import static java.util.stream.Collectors.toList;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.*;

import com.github.difflib.DiffUtils;
import com.github.difflib.algorithm.myers.MyersDiffWithLinearSpace;
Expand All @@ -13,7 +12,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;
Expand Down Expand Up @@ -94,10 +92,10 @@ public void testGenerator_IgnoreWhitespaces() {
print(rows);

assertEquals(4, rows.size());
assertEquals(rows.get(0).getTag(), DiffRow.Tag.EQUAL);
assertEquals(rows.get(1).getTag(), DiffRow.Tag.EQUAL);
assertEquals(rows.get(2).getTag(), DiffRow.Tag.EQUAL);
assertEquals(rows.get(3).getTag(), DiffRow.Tag.CHANGE);
assertEquals(DiffRow.Tag.EQUAL, rows.get(0).getTag());
assertEquals(DiffRow.Tag.EQUAL, rows.get(1).getTag());
assertEquals(DiffRow.Tag.EQUAL, rows.get(2).getTag());
assertEquals(DiffRow.Tag.CHANGE, rows.get(3).getTag());
}

private List<String> split(String content) {
Expand Down Expand Up @@ -500,7 +498,7 @@ public void testIgnoreWhitespaceIssue64() {
Arrays.asList("A new text line\n\nanother one".split("\n")));

assertThat(rows)
.extracting(item -> item.getOldLine())
.extracting(DiffRow::getOldLine)
.containsExactly("~test~**A new text line**", "", "~testline~**another one**");
}

Expand Down Expand Up @@ -738,7 +736,7 @@ public void testIssue129WithDeltaDecompression() {
"banana1",
"banana2",
"banana3");
int[] entry = {1};

String txt = DiffRowGenerator.create()
.showInlineDiffs(true)
.oldTag((tag, isOpening) -> isOpening ? "==old" + tag + "==>" : "<==old==")
Expand Down Expand Up @@ -776,7 +774,7 @@ public void testIssue129SkipDeltaDecompression() {
"banana1",
"banana2",
"banana3");
int[] entry = {1};

String txt = DiffRowGenerator.create()
.showInlineDiffs(true)
.decompressDeltas(false)
Expand Down Expand Up @@ -874,13 +872,13 @@ private void assertInlineDiffResult(DiffRowGenerator generator, String original,
print(rows);

assertEquals(1, rows.size());
assertEquals(expected, rows.get(0).getOldLine().toString());
assertEquals(expected, rows.get(0).getOldLine());
}

@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"));

Expand All @@ -899,6 +897,8 @@ public void testIssue188HangOnExamples() throws IOException, URISyntaxException
original, DiffUtils.diff(original, revised, new MyersDiffWithLinearSpace<>()));

System.out.println(rows);

assertFalse(false); //codacy
}
}
}
4 changes: 2 additions & 2 deletions java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffRoundTripTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()));
Expand All @@ -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()));
Expand Down
4 changes: 2 additions & 2 deletions java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffWriterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

/**
Expand All @@ -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");

Expand Down
38 changes: 19 additions & 19 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -191,7 +191,7 @@
<version>2.30.0</version>
<configuration>
<java>
<palantirJavaFormat />
<palantirJavaFormat/>
<indent>
<tabs>true</tabs>
<spacesPerTab>2</spacesPerTab>
Expand Down