From 3a2f969374fabefaa1f6e5cb1c295a96cb8e631b Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 15 Dec 2020 08:43:18 -0700 Subject: [PATCH] Eliminate most unchecked and unsafe operation warnings --- .../com/github/difflib/algorithm/jgit/HistogramDiffTest.java | 4 ++-- .../github/difflib/algorithm/jgit/LRHistogramDiffTest.java | 2 +- .../src/main/java/com/github/difflib/patch/ChangeDelta.java | 2 +- .../src/main/java/com/github/difflib/patch/Chunk.java | 2 +- .../src/main/java/com/github/difflib/patch/DeleteDelta.java | 2 +- .../src/main/java/com/github/difflib/patch/EqualDelta.java | 2 +- .../src/main/java/com/github/difflib/patch/InsertDelta.java | 2 +- .../src/main/java/com/github/difflib/patch/Patch.java | 4 ++-- .../src/test/java/com/github/difflib/DiffUtilsTest.java | 2 +- .../test/java/com/github/difflib/GenerateUnifiedDiffTest.java | 4 ++-- .../com/github/difflib/unifieddiff/UnifiedDiffWriterTest.java | 2 +- 11 files changed, 14 insertions(+), 14 deletions(-) diff --git a/java-diff-utils-jgit/src/test/java/com/github/difflib/algorithm/jgit/HistogramDiffTest.java b/java-diff-utils-jgit/src/test/java/com/github/difflib/algorithm/jgit/HistogramDiffTest.java index 4a06ef9f..ac85f985 100644 --- a/java-diff-utils-jgit/src/test/java/com/github/difflib/algorithm/jgit/HistogramDiffTest.java +++ b/java-diff-utils-jgit/src/test/java/com/github/difflib/algorithm/jgit/HistogramDiffTest.java @@ -41,7 +41,7 @@ public HistogramDiffTest() { public void testDiff() throws PatchFailedException { List orgList = Arrays.asList("A", "B", "C", "A", "B", "B", "A"); List revList = Arrays.asList("C", "B", "A", "B", "A", "C"); - final Patch patch = Patch.generate(orgList, revList, new HistogramDiff().computeDiff(orgList, revList, null)); + final Patch patch = Patch.generate(orgList, revList, new HistogramDiff().computeDiff(orgList, revList, null)); System.out.println(patch); assertNotNull(patch); assertEquals(3, patch.getDeltas().size()); @@ -57,7 +57,7 @@ public void testDiffWithListener() throws PatchFailedException { List revList = Arrays.asList("C", "B", "A", "B", "A", "C"); List logdata = new ArrayList<>(); - final Patch patch = Patch.generate(orgList, revList, new HistogramDiff().computeDiff(orgList, revList, new DiffAlgorithmListener() { + final Patch patch = Patch.generate(orgList, revList, new HistogramDiff().computeDiff(orgList, revList, new DiffAlgorithmListener() { @Override public void diffStart() { logdata.add("start"); 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 index 9bb0a8f4..ccbc2f30 100644 --- 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 @@ -45,7 +45,7 @@ public void testPossibleDiffHangOnLargeDatasetDnaumenkoIssue26() throws IOExcept List revised = readStringListFromInputStream(zip.getInputStream(zip.getEntry("tb"))); List logdata = new ArrayList<>(); - Patch patch = Patch.generate(original, revised, new HistogramDiff().computeDiff(original, revised, new DiffAlgorithmListener() { + Patch patch = Patch.generate(original, revised, new HistogramDiff().computeDiff(original, revised, new DiffAlgorithmListener() { @Override public void diffStart() { logdata.add("start"); diff --git a/java-diff-utils/src/main/java/com/github/difflib/patch/ChangeDelta.java b/java-diff-utils/src/main/java/com/github/difflib/patch/ChangeDelta.java index eddb279d..39b82a55 100644 --- a/java-diff-utils/src/main/java/com/github/difflib/patch/ChangeDelta.java +++ b/java-diff-utils/src/main/java/com/github/difflib/patch/ChangeDelta.java @@ -75,6 +75,6 @@ public String toString() { @Override public AbstractDelta withChunks(Chunk original, Chunk revised) { - return new ChangeDelta(original, revised); + return new ChangeDelta(original, revised); } } 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 index f45bbb4f..f108bf5e 100644 --- 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 @@ -156,7 +156,7 @@ public boolean equals(Object obj) { if (getClass() != obj.getClass()) { return false; } - Chunk other = (Chunk) obj; + Chunk other = (Chunk) obj; if (lines == null) { if (other.lines != null) { return false; diff --git a/java-diff-utils/src/main/java/com/github/difflib/patch/DeleteDelta.java b/java-diff-utils/src/main/java/com/github/difflib/patch/DeleteDelta.java index b33114fe..f4ee14c4 100644 --- a/java-diff-utils/src/main/java/com/github/difflib/patch/DeleteDelta.java +++ b/java-diff-utils/src/main/java/com/github/difflib/patch/DeleteDelta.java @@ -62,6 +62,6 @@ public String toString() { @Override public AbstractDelta withChunks(Chunk original, Chunk revised) { - return new DeleteDelta(original, revised); + return new DeleteDelta(original, revised); } } diff --git a/java-diff-utils/src/main/java/com/github/difflib/patch/EqualDelta.java b/java-diff-utils/src/main/java/com/github/difflib/patch/EqualDelta.java index dbfdf46a..167b0b70 100644 --- a/java-diff-utils/src/main/java/com/github/difflib/patch/EqualDelta.java +++ b/java-diff-utils/src/main/java/com/github/difflib/patch/EqualDelta.java @@ -44,6 +44,6 @@ public String toString() { @Override public AbstractDelta withChunks(Chunk original, Chunk revised) { - return new EqualDelta(original, revised); + return new EqualDelta(original, revised); } } diff --git a/java-diff-utils/src/main/java/com/github/difflib/patch/InsertDelta.java b/java-diff-utils/src/main/java/com/github/difflib/patch/InsertDelta.java index 16742d25..0f6a65fb 100644 --- a/java-diff-utils/src/main/java/com/github/difflib/patch/InsertDelta.java +++ b/java-diff-utils/src/main/java/com/github/difflib/patch/InsertDelta.java @@ -62,6 +62,6 @@ public String toString() { @Override public AbstractDelta withChunks(Chunk original, Chunk revised) { - return new InsertDelta(original, revised); + return new InsertDelta(original, revised); } } diff --git a/java-diff-utils/src/main/java/com/github/difflib/patch/Patch.java b/java-diff-utils/src/main/java/com/github/difflib/patch/Patch.java index 0247c5bc..8e8066d7 100644 --- a/java-diff-utils/src/main/java/com/github/difflib/patch/Patch.java +++ b/java-diff-utils/src/main/java/com/github/difflib/patch/Patch.java @@ -125,7 +125,7 @@ public static Patch generate(List original, List revised, List( buildChunk(startOriginal, change.startOriginal, original), buildChunk(startRevised, change.startRevised, revised))); } @@ -150,7 +150,7 @@ public static Patch generate(List original, List revised, List( buildChunk(startOriginal, original.size(), original), buildChunk(startRevised, revised.size(), revised))); } 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 index c02c4446..000b095a 100644 --- a/java-diff-utils/src/test/java/com/github/difflib/DiffUtilsTest.java +++ b/java-diff-utils/src/test/java/com/github/difflib/DiffUtilsTest.java @@ -112,7 +112,7 @@ public void testDiffIntegerList() { final Patch patch = DiffUtils.diff(original, revised); - for (AbstractDelta delta : patch.getDeltas()) { + for (AbstractDelta delta : patch.getDeltas()) { System.out.println(delta); } diff --git a/java-diff-utils/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java b/java-diff-utils/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java index 8febc309..c1674108 100644 --- a/java-diff-utils/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java +++ b/java-diff-utils/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java @@ -147,7 +147,7 @@ public void testChagngePosition() throws IOException { private void validateChangePosition(Patch patch, int index, List realRemoveList, List realAddList ) { - final Chunk originChunk = patch.getDeltas().get(index).getSource(); + final Chunk originChunk = patch.getDeltas().get(index).getSource(); List removeList = originChunk.getChangePosition(); assertEquals(realRemoveList.size(), removeList.size()); for (Integer ele: realRemoveList) { @@ -156,7 +156,7 @@ private void validateChangePosition(Patch patch, int index, List targetChunk = patch.getDeltas().get(index).getTarget(); List addList = targetChunk.getChangePosition(); assertEquals(realAddList.size(), addList.size()); for (Integer ele: realAddList) { 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 index 5527fe17..af48d485 100644 --- 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 @@ -46,7 +46,7 @@ public void testWrite() throws URISyntaxException, IOException { UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(new ByteArrayInputStream(str.getBytes())); StringWriter writer = new StringWriter(); - UnifiedDiffWriter.write(diff, f -> Collections.EMPTY_LIST, writer, 5); + UnifiedDiffWriter.write(diff, f -> Collections.emptyList(), writer, 5); System.out.println(writer.toString()); }