Skip to content

Commit 3cc73ba

Browse files
committed
Fix up some generics warnings as best we can
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/codec/trunk@1465689 13f79535-47bb-0310-9956-ffa450edef68
1 parent 4276e7b commit 3cc73ba

1 file changed

Lines changed: 5 additions & 2 deletions

File tree

src/main/java/org/apache/commons/codec/StringEncoderComparator.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
*
2929
* @version $Id$
3030
*/
31+
@SuppressWarnings("rawtypes") // TODO ought to implement Comparator<String> but that's not possible whilst maintaining binary compatibility
3132
public class StringEncoderComparator implements Comparator {
3233

3334
/**
@@ -75,8 +76,10 @@ public int compare(final Object o1, final Object o2) {
7576
int compareCode = 0;
7677

7778
try {
78-
final Comparable s1 = (Comparable) this.stringEncoder.encode(o1);
79-
final Comparable s2 = (Comparable) this.stringEncoder.encode(o2);
79+
@SuppressWarnings("unchecked") // May fail with CCE if encode returns something that is not Comparable
80+
// However this was always the case.
81+
final Comparable<Comparable<?>> s1 = (Comparable<Comparable<?>>) this.stringEncoder.encode(o1);
82+
final Comparable<?> s2 = (Comparable<?>) this.stringEncoder.encode(o2);
8083
compareCode = s1.compareTo(s2);
8184
} catch (final EncoderException ee) {
8285
compareCode = 0;

0 commit comments

Comments
 (0)