Skip to content

Eliminate most unchecked and unsafe operation warnings #108

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

Merged
wumpz merged 1 commit into from
Dec 17, 2020
+14 −14
Merged

Eliminate most unchecked and unsafe operation warnings #108

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: 2 additions & 2 deletions java-diff-utils-jgit/src/test/java/com/github/difflib/algorithm/jgit/HistogramDiffTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand All @@ -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");
Expand Down
2 changes: 1 addition & 1 deletion ...-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 @@ -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");
Expand Down
2 changes: 1 addition & 1 deletion java-diff-utils/src/main/java/com/github/difflib/patch/ChangeDelta.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
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 @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion java-diff-utils/src/main/java/com/github/difflib/patch/DeleteDelta.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
2 changes: 1 addition & 1 deletion java-diff-utils/src/main/java/com/github/difflib/patch/EqualDelta.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
2 changes: 1 addition & 1 deletion java-diff-utils/src/main/java/com/github/difflib/patch/InsertDelta.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
4 changes: 2 additions & 2 deletions java-diff-utils/src/main/java/com/github/difflib/patch/Patch.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)));
}
Expand All @@ -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)));
}
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -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);
}

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

Expand Down