projects/guix·blob python-team · refs

299 lines · 15.1 KiB

1From e760d181abd20ecb98654af63faec7b2a4d61189 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?G=C3=A1bor=20Boskovits?= <[email protected]>
3Date: Mon, 25 Jun 2018 15:02:25 +0200
4Subject: [PATCH] Rename removes in maps to fix java8.
5
6* src/java/org/apache/commons/collections/MultiHashMap.java:
7Rename "V MultiHashMap#remove(K, V)"
8to "boolean MulitHashMap#removeMapping(K, V)".
9* src/java/org/apache/commons/collections/MultiMap.java:
10Rename "V MultiMap#remove(K, V)"
11to "boolean MultiMap#removeMapping(K, V)".
12* src/java/org/apache/commons/collections/map/MultiKeyMap.java:
13Rename "V MultiKeyMap#remove(...)"
14to "V MultiKeyMap#removeMultiKey(...)".
15* src/java/org/apache/commons/collections/map/MultiValueMap.java:
16Rename "V MultiValueMap#remove(K, V)"
17to "boolean MultiValueMap#removeMapping(K, V)".
18* src/test/org/apache/commons/collections/TestMultiHashMap.java:
19Adjust accordingly.
20* src/test/org/apache/commons/collections/map/TestMultiKeyMap.java:
21Adjust accordingly.
22* src/test/org/apache/commons/collections/map/TestMultiValueMap.java:
23Adjust accordingly.
24---
25 .../commons/collections/MultiHashMap.java | 8 ++++----
26 .../apache/commons/collections/MultiMap.java | 2 +-
27 .../commons/collections/map/MultiKeyMap.java | 8 ++++----
28 .../commons/collections/map/MultiValueMap.java | 8 ++++----
29 .../commons/collections/TestMultiHashMap.java | 16 ++++++++--------
30 .../collections/map/TestMultiKeyMap.java | 16 ++++++++--------
31 .../collections/map/TestMultiValueMap.java | 18 +++++++++---------
32 7 files changed, 38 insertions(+), 38 deletions(-)
33
34diff --git a/src/java/org/apache/commons/collections/MultiHashMap.java b/src/java/org/apache/commons/collections/MultiHashMap.java
35index 7fec9af..482ecbd 100644
36--- a/src/java/org/apache/commons/collections/MultiHashMap.java
37+++ b/src/java/org/apache/commons/collections/MultiHashMap.java
38@@ -331,21 +331,21 @@ public class MultiHashMap extends HashMap implements MultiMap {
39 * @param item the value to remove
40 * @return the value removed (which was passed in), null if nothing removed
41 */
42- public Object remove(Object key, Object item) {
43+ public boolean removeMapping(Object key, Object item) {
44 Collection valuesForKey = getCollection(key);
45 if (valuesForKey == null) {
46- return null;
47+ return false;
48 }
49 boolean removed = valuesForKey.remove(item);
50 if (removed == false) {
51- return null;
52+ return false;
53 }
54 // remove the list if it is now empty
55 // (saves space, and allows equals to work)
56 if (valuesForKey.isEmpty()){
57 remove(key);
58 }
59- return item;
60+ return true;
61 }
62
63 /**
64diff --git a/src/java/org/apache/commons/collections/MultiMap.java b/src/java/org/apache/commons/collections/MultiMap.java
65index be9455b..fe54234 100644
66--- a/src/java/org/apache/commons/collections/MultiMap.java
67+++ b/src/java/org/apache/commons/collections/MultiMap.java
68@@ -66,7 +66,7 @@ public interface MultiMap extends Map {
69 * @throws ClassCastException if the key or value is of an invalid type
70 * @throws NullPointerException if the key or value is null and null is invalid
71 */
72- public Object remove(Object key, Object item);
73+ public boolean removeMapping(Object key, Object item);
74
75 //-----------------------------------------------------------------------
76 /**
77diff --git a/src/java/org/apache/commons/collections/map/MultiKeyMap.java b/src/java/org/apache/commons/collections/map/MultiKeyMap.java
78index 9e3e02d..0b99b65 100644
79--- a/src/java/org/apache/commons/collections/map/MultiKeyMap.java
80+++ b/src/java/org/apache/commons/collections/map/MultiKeyMap.java
81@@ -197,7 +197,7 @@ public class MultiKeyMap
82 * @param key2 the second key
83 * @return the value mapped to the removed key, null if key not in map
84 */
85- public Object remove(Object key1, Object key2) {
86+ public Object removeMultiKey(Object key1, Object key2) {
87 int hashCode = hash(key1, key2);
88 int index = map.hashIndex(hashCode, map.data.length);
89 AbstractHashedMap.HashEntry entry = map.data[index];
90@@ -327,7 +327,7 @@ public class MultiKeyMap
91 * @param key3 the third key
92 * @return the value mapped to the removed key, null if key not in map
93 */
94- public Object remove(Object key1, Object key2, Object key3) {
95+ public Object removeMultiKey(Object key1, Object key2, Object key3) {
96 int hashCode = hash(key1, key2, key3);
97 int index = map.hashIndex(hashCode, map.data.length);
98 AbstractHashedMap.HashEntry entry = map.data[index];
99@@ -467,7 +467,7 @@ public class MultiKeyMap
100 * @param key4 the fourth key
101 * @return the value mapped to the removed key, null if key not in map
102 */
103- public Object remove(Object key1, Object key2, Object key3, Object key4) {
104+ public Object removeMultiKey(Object key1, Object key2, Object key3, Object key4) {
105 int hashCode = hash(key1, key2, key3, key4);
106 int index = map.hashIndex(hashCode, map.data.length);
107 AbstractHashedMap.HashEntry entry = map.data[index];
108@@ -617,7 +617,7 @@ public class MultiKeyMap
109 * @param key5 the fifth key
110 * @return the value mapped to the removed key, null if key not in map
111 */
112- public Object remove(Object key1, Object key2, Object key3, Object key4, Object key5) {
113+ public Object removeMultiKey(Object key1, Object key2, Object key3, Object key4, Object key5) {
114 int hashCode = hash(key1, key2, key3, key4, key5);
115 int index = map.hashIndex(hashCode, map.data.length);
116 AbstractHashedMap.HashEntry entry = map.data[index];
117diff --git a/src/java/org/apache/commons/collections/map/MultiValueMap.java b/src/java/org/apache/commons/collections/map/MultiValueMap.java
118index f44999b..86eaeb0 100644
119--- a/src/java/org/apache/commons/collections/map/MultiValueMap.java
120+++ b/src/java/org/apache/commons/collections/map/MultiValueMap.java
121@@ -153,19 +153,19 @@ public class MultiValueMap extends AbstractMapDecorator implements MultiMap {
122 * @param value the value to remove
123 * @return the value removed (which was passed in), null if nothing removed
124 */
125- public Object remove(Object key, Object value) {
126+ public boolean removeMapping(Object key, Object value) {
127 Collection valuesForKey = getCollection(key);
128 if (valuesForKey == null) {
129- return null;
130+ return false;
131 }
132 boolean removed = valuesForKey.remove(value);
133 if (removed == false) {
134- return null;
135+ return false;
136 }
137 if (valuesForKey.isEmpty()) {
138 remove(key);
139 }
140- return value;
141+ return true;
142 }
143
144 /**
145diff --git a/src/test/org/apache/commons/collections/TestMultiHashMap.java b/src/test/org/apache/commons/collections/TestMultiHashMap.java
146index eca833a..a1de943 100644
147--- a/src/test/org/apache/commons/collections/TestMultiHashMap.java
148+++ b/src/test/org/apache/commons/collections/TestMultiHashMap.java
149@@ -217,7 +217,7 @@ public class TestMultiHashMap extends AbstractTestMap {
150 MultiHashMap one = new MultiHashMap();
151 Integer value = new Integer(1);
152 one.put("One", value);
153- one.remove("One", value);
154+ one.removeMapping("One", value);
155
156 MultiHashMap two = new MultiHashMap();
157 assertEquals(two, one);
158@@ -269,7 +269,7 @@ public class TestMultiHashMap extends AbstractTestMap {
159 assertEquals(4, map.totalSize());
160 map.remove("A");
161 assertEquals(3, map.totalSize());
162- map.remove("B", "BC");
163+ map.removeMapping("B", "BC");
164 assertEquals(2, map.totalSize());
165 }
166
167@@ -292,7 +292,7 @@ public class TestMultiHashMap extends AbstractTestMap {
168 map.remove("A");
169 assertEquals(0, map.size("A"));
170 assertEquals(3, map.size("B"));
171- map.remove("B", "BC");
172+ map.removeMapping("B", "BC");
173 assertEquals(0, map.size("A"));
174 assertEquals(2, map.size("B"));
175 }
176@@ -464,11 +464,11 @@ public class TestMultiHashMap extends AbstractTestMap {
177 map.put("A", "AA");
178 map.put("A", "AB");
179 map.put("A", "AC");
180- assertEquals(null, map.remove("C", "CA"));
181- assertEquals(null, map.remove("A", "AD"));
182- assertEquals("AC", map.remove("A", "AC"));
183- assertEquals("AB", map.remove("A", "AB"));
184- assertEquals("AA", map.remove("A", "AA"));
185+ assertEquals(false, map.removeMapping("C", "CA"));
186+ assertEquals(false, map.removeMapping("A", "AD"));
187+ assertEquals(true, map.removeMapping("A", "AC"));
188+ assertEquals(true, map.removeMapping("A", "AB"));
189+ assertEquals(true, map.removeMapping("A", "AA"));
190 assertEquals(new MultiHashMap(), map);
191 }
192
193diff --git a/src/test/org/apache/commons/collections/map/TestMultiKeyMap.java b/src/test/org/apache/commons/collections/map/TestMultiKeyMap.java
194index b1ee3d0..b18f480 100644
195--- a/src/test/org/apache/commons/collections/map/TestMultiKeyMap.java
196+++ b/src/test/org/apache/commons/collections/map/TestMultiKeyMap.java
197@@ -315,34 +315,34 @@ public class TestMultiKeyMap extends AbstractTestIterableMap {
198 switch (key.size()) {
199 case 2:
200 assertEquals(true, multimap.containsKey(key.getKey(0), key.getKey(1)));
201- assertEquals(value, multimap.remove(key.getKey(0), key.getKey(1)));
202+ assertEquals(value, multimap.removeMultiKey(key.getKey(0), key.getKey(1)));
203 assertEquals(false, multimap.containsKey(key.getKey(0), key.getKey(1)));
204 assertEquals(size - 1, multimap.size());
205- assertEquals(null, multimap.remove(key.getKey(0), key.getKey(1)));
206+ assertEquals(null, multimap.removeMultiKey(key.getKey(0), key.getKey(1)));
207 assertEquals(false, multimap.containsKey(key.getKey(0), key.getKey(1)));
208 break;
209 case 3:
210 assertEquals(true, multimap.containsKey(key.getKey(0), key.getKey(1), key.getKey(2)));
211- assertEquals(value, multimap.remove(key.getKey(0), key.getKey(1), key.getKey(2)));
212+ assertEquals(value, multimap.removeMultiKey(key.getKey(0), key.getKey(1), key.getKey(2)));
213 assertEquals(false, multimap.containsKey(key.getKey(0), key.getKey(1), key.getKey(2)));
214 assertEquals(size - 1, multimap.size());
215- assertEquals(null, multimap.remove(key.getKey(0), key.getKey(1), key.getKey(2)));
216+ assertEquals(null, multimap.removeMultiKey(key.getKey(0), key.getKey(1), key.getKey(2)));
217 assertEquals(false, multimap.containsKey(key.getKey(0), key.getKey(1), key.getKey(2)));
218 break;
219 case 4:
220 assertEquals(true, multimap.containsKey(key.getKey(0), key.getKey(1), key.getKey(2), key.getKey(3)));
221- assertEquals(value, multimap.remove(key.getKey(0), key.getKey(1), key.getKey(2), key.getKey(3)));
222+ assertEquals(value, multimap.removeMultiKey(key.getKey(0), key.getKey(1), key.getKey(2), key.getKey(3)));
223 assertEquals(false, multimap.containsKey(key.getKey(0), key.getKey(1), key.getKey(2), key.getKey(3)));
224 assertEquals(size - 1, multimap.size());
225- assertEquals(null, multimap.remove(key.getKey(0), key.getKey(1), key.getKey(2), key.getKey(3)));
226+ assertEquals(null, multimap.removeMultiKey(key.getKey(0), key.getKey(1), key.getKey(2), key.getKey(3)));
227 assertEquals(false, multimap.containsKey(key.getKey(0), key.getKey(1), key.getKey(2), key.getKey(3)));
228 break;
229 case 5:
230 assertEquals(true, multimap.containsKey(key.getKey(0), key.getKey(1), key.getKey(2), key.getKey(3), key.getKey(4)));
231- assertEquals(value, multimap.remove(key.getKey(0), key.getKey(1), key.getKey(2), key.getKey(3), key.getKey(4)));
232+ assertEquals(value, multimap.removeMultiKey(key.getKey(0), key.getKey(1), key.getKey(2), key.getKey(3), key.getKey(4)));
233 assertEquals(false, multimap.containsKey(key.getKey(0), key.getKey(1), key.getKey(2), key.getKey(3), key.getKey(4)));
234 assertEquals(size - 1, multimap.size());
235- assertEquals(null, multimap.remove(key.getKey(0), key.getKey(1), key.getKey(2), key.getKey(3), key.getKey(4)));
236+ assertEquals(null, multimap.removeMultiKey(key.getKey(0), key.getKey(1), key.getKey(2), key.getKey(3), key.getKey(4)));
237 assertEquals(false, multimap.containsKey(key.getKey(0), key.getKey(1), key.getKey(2), key.getKey(3), key.getKey(4)));
238 break;
239 default:
240diff --git a/src/test/org/apache/commons/collections/map/TestMultiValueMap.java b/src/test/org/apache/commons/collections/map/TestMultiValueMap.java
241index b9a5ac8..9ecc269 100644
242--- a/src/test/org/apache/commons/collections/map/TestMultiValueMap.java
243+++ b/src/test/org/apache/commons/collections/map/TestMultiValueMap.java
244@@ -161,7 +161,7 @@ public class TestMultiValueMap extends TestCase {
245 MultiValueMap one = new MultiValueMap();
246 Integer value = new Integer(1);
247 one.put("One", value);
248- one.remove("One", value);
249+ one.removeMapping("One", value);
250
251 MultiValueMap two = new MultiValueMap();
252 assertEquals(two, one);
253@@ -187,7 +187,7 @@ public class TestMultiValueMap extends TestCase {
254 assertEquals(4, map.totalSize());
255 map.remove("A");
256 assertEquals(3, map.totalSize());
257- map.remove("B", "BC");
258+ map.removeMapping("B", "BC");
259 assertEquals(2, map.totalSize());
260 }
261
262@@ -204,7 +204,7 @@ public class TestMultiValueMap extends TestCase {
263 assertEquals(2, map.size());
264 map.remove("A");
265 assertEquals(2, map.size());
266- map.remove("B", "BC");
267+ map.removeMapping("B", "BC");
268 assertEquals(2, map.size());
269 }
270
271@@ -227,7 +227,7 @@ public class TestMultiValueMap extends TestCase {
272 map.remove("A");
273 assertEquals(0, map.size("A"));
274 assertEquals(3, map.size("B"));
275- map.remove("B", "BC");
276+ map.removeMapping("B", "BC");
277 assertEquals(0, map.size("A"));
278 assertEquals(2, map.size("B"));
279 }
280@@ -338,11 +338,11 @@ public class TestMultiValueMap extends TestCase {
281 map.put("A", "AA");
282 map.put("A", "AB");
283 map.put("A", "AC");
284- assertEquals(null, map.remove("C", "CA"));
285- assertEquals(null, map.remove("A", "AD"));
286- assertEquals("AC", map.remove("A", "AC"));
287- assertEquals("AB", map.remove("A", "AB"));
288- assertEquals("AA", map.remove("A", "AA"));
289+ assertEquals(false, map.removeMapping("C", "CA"));
290+ assertEquals(false, map.removeMapping("A", "AD"));
291+ assertEquals(true, map.removeMapping("A", "AC"));
292+ assertEquals(true, map.removeMapping("A", "AB"));
293+ assertEquals(true, map.removeMapping("A", "AA"));
294 assertEquals(new MultiValueMap(), map);
295 }
296
297--
2982.18.0
299