Eliminate most unchecked and unsafe operation warnings (#108)

jamesjer · web-flow · commit ab76d7229a17 · 2020-12-17T23:08:59.000+01:00
Thx for improving java-diff-utils.
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
@@ -41,7 +41,7 @@ public HistogramDiffTest() {
     public void testDiff() throws PatchFailedException {
         List<String> orgList = Arrays.asList("A", "B", "C", "A", "B", "B", "A");
         List<String> revList = Arrays.asList("C", "B", "A", "B", "A", "C");
-        final Patch<String> patch = Patch.generate(orgList, revList, new HistogramDiff().computeDiff(orgList, revList, null));
+        final Patch<String> patch = Patch.generate(orgList, revList, new HistogramDiff<String>().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<String> revList = Arrays.asList("C", "B", "A", "B", "A", "C");
         
         List<String> logdata = new ArrayList<>();
-        final Patch<String> patch = Patch.generate(orgList, revList, new HistogramDiff().computeDiff(orgList, revList, new DiffAlgorithmListener() {
+        final Patch<String> patch = Patch.generate(orgList, revList, new HistogramDiff<String>().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
@@ -45,7 +45,7 @@ public void testPossibleDiffHangOnLargeDatasetDnaumenkoIssue26() throws IOExcept
         List<String> revised = readStringListFromInputStream(zip.getInputStream(zip.getEntry("tb")));
 
         List<String> logdata = new ArrayList<>();
-        Patch<String> patch = Patch.generate(original, revised, new HistogramDiff().computeDiff(original, revised, new DiffAlgorithmListener() {
+        Patch<String> patch = Patch.generate(original, revised, new HistogramDiff<String>().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
@@ -75,6 +75,6 @@ public String toString() {
 
     @Override
     public AbstractDelta<T> withChunks(Chunk<T> original, Chunk<T> revised) {
-        return new ChangeDelta(original, revised);
+        return new ChangeDelta<T>(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
@@ -156,7 +156,7 @@ public boolean equals(Object obj) {
         if (getClass() != obj.getClass()) {
             return false;
         }
-        Chunk<T> 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
@@ -62,6 +62,6 @@ public String toString() {
     
     @Override
     public AbstractDelta<T> withChunks(Chunk<T> original, Chunk<T> revised) {
-        return new DeleteDelta(original, revised);
+        return new DeleteDelta<T>(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
@@ -44,6 +44,6 @@ public String toString() {
     
     @Override
     public AbstractDelta<T> withChunks(Chunk<T> original, Chunk<T> revised) {
-        return new EqualDelta(original, revised);
+        return new EqualDelta<T>(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
@@ -62,6 +62,6 @@ public String toString() {
     
     @Override
     public AbstractDelta<T> withChunks(Chunk<T> original, Chunk<T> revised) {
-        return new InsertDelta(original, revised);
+        return new InsertDelta<T>(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
@@ -125,7 +125,7 @@ public static <T> Patch<T> generate(List<T> original, List<T> revised, List<Chan
         for (Change change : changes) {
 
             if (includeEquals && startOriginal < change.startOriginal) {
-                patch.addDelta(new EqualDelta(
+                patch.addDelta(new EqualDelta<T>(
                         buildChunk(startOriginal, change.startOriginal, original),
                         buildChunk(startRevised, change.startRevised, revised)));
             }
@@ -150,7 +150,7 @@ public static <T> Patch<T> generate(List<T> original, List<T> revised, List<Chan
         }
 
         if (includeEquals && startOriginal < original.size()) {
-            patch.addDelta(new EqualDelta(
+            patch.addDelta(new EqualDelta<T>(
                     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
@@ -112,7 +112,7 @@ public void testDiffIntegerList() {
 
         final Patch<Integer> patch = DiffUtils.diff(original, revised);
 
-        for (AbstractDelta delta : patch.getDeltas()) {
+        for (AbstractDelta<Integer> 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
@@ -147,7 +147,7 @@ public void testChagngePosition() throws IOException {
 
     private void validateChangePosition(Patch<String> patch, int index, List<Integer> realRemoveList,
                                         List<Integer> realAddList ) {
-        final Chunk originChunk = patch.getDeltas().get(index).getSource();
+        final Chunk<String> originChunk = patch.getDeltas().get(index).getSource();
         List<Integer> removeList = originChunk.getChangePosition();
         assertEquals(realRemoveList.size(), removeList.size());
         for (Integer ele: realRemoveList) {
@@ -156,7 +156,7 @@ private void validateChangePosition(Patch<String> patch, int index, List<Integer
         for (Integer ele: removeList) {
             assertTrue(realAddList.contains(ele));
         }
-        final Chunk targetChunk = patch.getDeltas().get(index).getTarget();
+        final Chunk<String> targetChunk = patch.getDeltas().get(index).getTarget();
         List<Integer> 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
@@ -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());
     }
     

Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,6 @@ public String toString() {`
`75`	`75`
`76`	`76`	`@Override`
`77`	`77`	`public AbstractDelta<T> withChunks(Chunk<T> original, Chunk<T> revised) {`
`78`		`- return new ChangeDelta(original, revised);`
	`78`	`+ return new ChangeDelta<T>(original, revised);`
`79`	`79`	`}`
`80`	`80`	`}`
Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ public boolean equals(Object obj) {`
`156`	`156`	`if (getClass() != obj.getClass()) {`
`157`	`157`	`return false;`
`158`	`158`	`}`
`159`		`- Chunk<T> other = (Chunk) obj;`
	`159`	`+ Chunk<?> other = (Chunk<?>) obj;`
`160`	`160`	`if (lines == null) {`
`161`	`161`	`if (other.lines != null) {`
`162`	`162`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,6 @@ public String toString() {`
`62`	`62`
`63`	`63`	`@Override`
`64`	`64`	`public AbstractDelta<T> withChunks(Chunk<T> original, Chunk<T> revised) {`
`65`		`- return new DeleteDelta(original, revised);`
	`65`	`+ return new DeleteDelta<T>(original, revised);`
`66`	`66`	`}`
`67`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,6 @@ public String toString() {`
`44`	`44`
`45`	`45`	`@Override`
`46`	`46`	`public AbstractDelta<T> withChunks(Chunk<T> original, Chunk<T> revised) {`
`47`		`- return new EqualDelta(original, revised);`
	`47`	`+ return new EqualDelta<T>(original, revised);`
`48`	`48`	`}`
`49`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ public static <T> Patch<T> generate(List<T> original, List<T> revised, List<Chan`
`125`	`125`	`for (Change change : changes) {`
`126`	`126`
`127`	`127`	`if (includeEquals && startOriginal < change.startOriginal) {`
`128`		`- patch.addDelta(new EqualDelta(`
	`128`	`+ patch.addDelta(new EqualDelta<T>(`
`129`	`129`	`buildChunk(startOriginal, change.startOriginal, original),`
`130`	`130`	`buildChunk(startRevised, change.startRevised, revised)));`
`131`	`131`	`}`
`@@ -150,7 +150,7 @@ public static <T> Patch<T> generate(List<T> original, List<T> revised, List<Chan`
`150`	`150`	`}`
`151`	`151`
`152`	`152`	`if (includeEquals && startOriginal < original.size()) {`
`153`		`- patch.addDelta(new EqualDelta(`
	`153`	`+ patch.addDelta(new EqualDelta<T>(`
`154`	`154`	`buildChunk(startOriginal, original.size(), original),`
`155`	`155`	`buildChunk(startRevised, revised.size(), revised)));`
`156`	`156`	`}`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ public void testDiffIntegerList() {`
`112`	`112`
`113`	`113`	`final Patch<Integer> patch = DiffUtils.diff(original, revised);`
`114`	`114`
`115`		`- for (AbstractDelta delta : patch.getDeltas()) {`
	`115`	`+ for (AbstractDelta<Integer> delta : patch.getDeltas()) {`
`116`	`116`	`System.out.println(delta);`
`117`	`117`	`}`
`118`	`118`