Author: ebourg-guest Date: 2014-04-11 11:05:38 +0000 (Fri, 11 Apr 2014) New Revision: 18018
Added: trunk/libcommons-collections3-java/debian/patches/java8-compatibility.patch Modified: trunk/libcommons-collections3-java/debian/changelog trunk/libcommons-collections3-java/debian/control trunk/libcommons-collections3-java/debian/patches/series Log: Renamed the MultiMap.remove() and MultiKeyMap.remove() methods to fix the Java 8 compatibility Modified: trunk/libcommons-collections3-java/debian/changelog =================================================================== --- trunk/libcommons-collections3-java/debian/changelog 2014-04-11 04:21:48 UTC (rev 18017) +++ trunk/libcommons-collections3-java/debian/changelog 2014-04-11 11:05:38 UTC (rev 18018) @@ -1,3 +1,13 @@ +libcommons-collections3-java (3.2.1-7) UNRELEASED; urgency=medium + + * Renamed the MultiMap.remove(Object, Object) method to removeMapping() + and MultiKeyMap.remove(Object, Object) to removeMultiKey(). This avoids + a conflict with the new Map.remove(Object, Object) method introduced in + Java 8. + * Standards-Version updated to 3.9.5 (no changes) + + -- Emmanuel Bourg <[email protected]> Fri, 11 Apr 2014 10:48:39 +0200 + libcommons-collections3-java (3.2.1-6) unstable; urgency=low * debian/control: Modified: trunk/libcommons-collections3-java/debian/control =================================================================== --- trunk/libcommons-collections3-java/debian/control 2014-04-11 04:21:48 UTC (rev 18017) +++ trunk/libcommons-collections3-java/debian/control 2014-04-11 11:05:38 UTC (rev 18018) @@ -5,7 +5,7 @@ Uploaders: Varun Hiremath <[email protected]>, Emmanuel Bourg <[email protected]> Build-Depends: debhelper (>= 9), cdbs, default-jdk Build-Depends-Indep: default-jdk-doc, maven-repo-helper, ant, ant-optional, junit -Standards-Version: 3.9.4 +Standards-Version: 3.9.5 Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/libcommons-collections3-java Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/libcommons-collections3-java Homepage: http://commons.apache.org/collections/ Added: trunk/libcommons-collections3-java/debian/patches/java8-compatibility.patch =================================================================== --- trunk/libcommons-collections3-java/debian/patches/java8-compatibility.patch (rev 0) +++ trunk/libcommons-collections3-java/debian/patches/java8-compatibility.patch 2014-04-11 11:05:38 UTC (rev 18018) @@ -0,0 +1,166 @@ +Description: Renames the MultiMap.remove(Object, Object) method to removeMapping() + and MultiKeyMap.remove(Object, Object) to removeMultiKey(). This avoids a conflict + with the new Map.remove(Object, Object) method introduced in Java 8. The new names + are those used by Commons Collections 4 (packaged as libcommons-collections4-java). +Author: Emmanuel Bourg <[email protected]> +Forwarded: not-needed +--- a/src/java/org/apache/commons/collections/map/MultiValueMap.java ++++ b/src/java/org/apache/commons/collections/map/MultiValueMap.java +@@ -153,7 +153,7 @@ + * @param value the value to remove + * @return the value removed (which was passed in), null if nothing removed + */ +- public Object remove(Object key, Object value) { ++ public Object removeMapping(Object key, Object value) { + Collection valuesForKey = getCollection(key); + if (valuesForKey == null) { + return null; +--- a/src/java/org/apache/commons/collections/MultiHashMap.java ++++ b/src/java/org/apache/commons/collections/MultiHashMap.java +@@ -331,7 +331,7 @@ + * @param item the value to remove + * @return the value removed (which was passed in), null if nothing removed + */ +- public Object remove(Object key, Object item) { ++ public Object removeMapping(Object key, Object item) { + Collection valuesForKey = getCollection(key); + if (valuesForKey == null) { + return null; +--- a/src/java/org/apache/commons/collections/MultiMap.java ++++ b/src/java/org/apache/commons/collections/MultiMap.java +@@ -66,7 +66,7 @@ + * @throws ClassCastException if the key or value is of an invalid type + * @throws NullPointerException if the key or value is null and null is invalid + */ +- public Object remove(Object key, Object item); ++ public Object removeMapping(Object key, Object item); + + //----------------------------------------------------------------------- + /** +--- a/src/test/org/apache/commons/collections/map/TestMultiValueMap.java ++++ b/src/test/org/apache/commons/collections/map/TestMultiValueMap.java +@@ -160,7 +160,7 @@ + MultiValueMap one = new MultiValueMap(); + Integer value = new Integer(1); + one.put("One", value); +- one.remove("One", value); ++ one.removeMapping("One", value); + + MultiValueMap two = new MultiValueMap(); + assertEquals(two, one); +@@ -186,7 +186,7 @@ + assertEquals(4, map.totalSize()); + map.remove("A"); + assertEquals(3, map.totalSize()); +- map.remove("B", "BC"); ++ map.removeMapping("B", "BC"); + assertEquals(2, map.totalSize()); + } + +@@ -203,7 +203,7 @@ + assertEquals(2, map.size()); + map.remove("A"); + assertEquals(2, map.size()); +- map.remove("B", "BC"); ++ map.removeMapping("B", "BC"); + assertEquals(2, map.size()); + } + +@@ -226,7 +226,7 @@ + map.remove("A"); + assertEquals(0, map.size("A")); + assertEquals(3, map.size("B")); +- map.remove("B", "BC"); ++ map.removeMapping("B", "BC"); + assertEquals(0, map.size("A")); + assertEquals(2, map.size("B")); + } +@@ -327,11 +327,11 @@ + map.put("A", "AA"); + map.put("A", "AB"); + map.put("A", "AC"); +- assertEquals(null, map.remove("C", "CA")); +- assertEquals(null, map.remove("A", "AD")); +- assertEquals("AC", map.remove("A", "AC")); +- assertEquals("AB", map.remove("A", "AB")); +- assertEquals("AA", map.remove("A", "AA")); ++ assertEquals(null, map.removeMapping("C", "CA")); ++ assertEquals(null, map.removeMapping("A", "AD")); ++ assertEquals("AC", map.removeMapping("A", "AC")); ++ assertEquals("AB", map.removeMapping("A", "AB")); ++ assertEquals("AA", map.removeMapping("A", "AA")); + assertEquals(new MultiValueMap(), map); + } + +--- a/src/test/org/apache/commons/collections/TestMultiHashMap.java ++++ b/src/test/org/apache/commons/collections/TestMultiHashMap.java +@@ -217,7 +217,7 @@ + MultiHashMap one = new MultiHashMap(); + Integer value = new Integer(1); + one.put("One", value); +- one.remove("One", value); ++ one.removeMapping("One", value); + + MultiHashMap two = new MultiHashMap(); + assertEquals(two, one); +@@ -269,7 +269,7 @@ + assertEquals(4, map.totalSize()); + map.remove("A"); + assertEquals(3, map.totalSize()); +- map.remove("B", "BC"); ++ map.removeMapping("B", "BC"); + assertEquals(2, map.totalSize()); + } + +@@ -292,7 +292,7 @@ + map.remove("A"); + assertEquals(0, map.size("A")); + assertEquals(3, map.size("B")); +- map.remove("B", "BC"); ++ map.removeMapping("B", "BC"); + assertEquals(0, map.size("A")); + assertEquals(2, map.size("B")); + } +@@ -464,11 +464,11 @@ + map.put("A", "AA"); + map.put("A", "AB"); + map.put("A", "AC"); +- assertEquals(null, map.remove("C", "CA")); +- assertEquals(null, map.remove("A", "AD")); +- assertEquals("AC", map.remove("A", "AC")); +- assertEquals("AB", map.remove("A", "AB")); +- assertEquals("AA", map.remove("A", "AA")); ++ assertEquals(null, map.removeMapping("C", "CA")); ++ assertEquals(null, map.removeMapping("A", "AD")); ++ assertEquals("AC", map.removeMapping("A", "AC")); ++ assertEquals("AB", map.removeMapping("A", "AB")); ++ assertEquals("AA", map.removeMapping("A", "AA")); + assertEquals(new MultiHashMap(), map); + } + +--- a/src/java/org/apache/commons/collections/map/MultiKeyMap.java ++++ b/src/java/org/apache/commons/collections/map/MultiKeyMap.java +@@ -197,7 +197,7 @@ + * @param key2 the second key + * @return the value mapped to the removed key, null if key not in map + */ +- public Object remove(Object key1, Object key2) { ++ public Object removeMultiKey(Object key1, Object key2) { + int hashCode = hash(key1, key2); + int index = map.hashIndex(hashCode, map.data.length); + AbstractHashedMap.HashEntry entry = map.data[index]; +--- a/src/test/org/apache/commons/collections/map/TestMultiKeyMap.java ++++ b/src/test/org/apache/commons/collections/map/TestMultiKeyMap.java +@@ -315,10 +315,10 @@ + switch (key.size()) { + case 2: + assertEquals(true, multimap.containsKey(key.getKey(0), key.getKey(1))); +- assertEquals(value, multimap.remove(key.getKey(0), key.getKey(1))); ++ assertEquals(value, multimap.removeMultiKey(key.getKey(0), key.getKey(1))); + assertEquals(false, multimap.containsKey(key.getKey(0), key.getKey(1))); + assertEquals(size - 1, multimap.size()); +- assertEquals(null, multimap.remove(key.getKey(0), key.getKey(1))); ++ assertEquals(null, multimap.removeMultiKey(key.getKey(0), key.getKey(1))); + assertEquals(false, multimap.containsKey(key.getKey(0), key.getKey(1))); + break; + case 3: Modified: trunk/libcommons-collections3-java/debian/patches/series =================================================================== --- trunk/libcommons-collections3-java/debian/patches/series 2014-04-11 04:21:48 UTC (rev 18017) +++ trunk/libcommons-collections3-java/debian/patches/series 2014-04-11 11:05:38 UTC (rev 18018) @@ -1 +1,2 @@ OSGI_Manifest.diff +java8-compatibility.patch _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
