diff options
author | Shubham Ajmera <shubhamajmera@google.com> | 2016-03-10 13:06:56 +0000 |
---|---|---|
committer | Przemyslaw Szczepaniak <pszczepaniak@google.com> | 2016-03-15 10:54:56 +0000 |
commit | e091a345b250b1ce4212d4c9d13649fe9c625bbe (patch) | |
tree | 88452f49ea8936170c9f965dee3ceb8f9c35271a | |
parent | 1df8c42a2def6b8f4bb1217c4e73ede1694649ac (diff) | |
download | nist-sip-nougat-mr1-flounder-release.tar.gz |
Fix compatibility issues with Java 1.8 Mapandroid-cts_7.1_r1android-cts-7.1_r9android-cts-7.1_r8android-cts-7.1_r7android-cts-7.1_r6android-cts-7.1_r5android-cts-7.1_r4android-cts-7.1_r3android-cts-7.1_r29android-cts-7.1_r28android-cts-7.1_r27android-cts-7.1_r26android-cts-7.1_r25android-cts-7.1_r24android-cts-7.1_r23android-cts-7.1_r22android-cts-7.1_r21android-cts-7.1_r20android-cts-7.1_r2android-cts-7.1_r19android-cts-7.1_r18android-cts-7.1_r17android-cts-7.1_r16android-cts-7.1_r15android-cts-7.1_r14android-cts-7.1_r13android-cts-7.1_r12android-cts-7.1_r11android-cts-7.1_r10android-cts-7.1_r1android-cts-7.0_r9android-cts-7.0_r8android-cts-7.0_r7android-cts-7.0_r6android-cts-7.0_r5android-cts-7.0_r4android-cts-7.0_r33android-cts-7.0_r32android-cts-7.0_r31android-cts-7.0_r30android-cts-7.0_r3android-cts-7.0_r29android-cts-7.0_r28android-cts-7.0_r27android-cts-7.0_r26android-cts-7.0_r25android-cts-7.0_r24android-cts-7.0_r23android-cts-7.0_r22android-cts-7.0_r21android-cts-7.0_r20android-cts-7.0_r2android-cts-7.0_r19android-cts-7.0_r18android-cts-7.0_r17android-cts-7.0_r16android-cts-7.0_r15android-cts-7.0_r14android-cts-7.0_r13android-cts-7.0_r12android-cts-7.0_r11android-cts-7.0_r10android-cts-7.0_r1android-7.1.2_r9android-7.1.2_r8android-7.1.2_r6android-7.1.2_r5android-7.1.2_r4android-7.1.2_r39android-7.1.2_r38android-7.1.2_r37android-7.1.2_r36android-7.1.2_r33android-7.1.2_r32android-7.1.2_r30android-7.1.2_r3android-7.1.2_r29android-7.1.2_r28android-7.1.2_r27android-7.1.2_r25android-7.1.2_r24android-7.1.2_r23android-7.1.2_r2android-7.1.2_r19android-7.1.2_r18android-7.1.2_r17android-7.1.2_r16android-7.1.2_r15android-7.1.2_r14android-7.1.2_r13android-7.1.2_r12android-7.1.2_r11android-7.1.2_r10android-7.1.2_r1android-7.1.1_r9android-7.1.1_r8android-7.1.1_r7android-7.1.1_r61android-7.1.1_r60android-7.1.1_r6android-7.1.1_r59android-7.1.1_r58android-7.1.1_r57android-7.1.1_r56android-7.1.1_r55android-7.1.1_r54android-7.1.1_r53android-7.1.1_r52android-7.1.1_r51android-7.1.1_r50android-7.1.1_r49android-7.1.1_r48android-7.1.1_r47android-7.1.1_r46android-7.1.1_r45android-7.1.1_r44android-7.1.1_r43android-7.1.1_r42android-7.1.1_r41android-7.1.1_r40android-7.1.1_r4android-7.1.1_r39android-7.1.1_r38android-7.1.1_r35android-7.1.1_r33android-7.1.1_r32android-7.1.1_r31android-7.1.1_r3android-7.1.1_r28android-7.1.1_r27android-7.1.1_r26android-7.1.1_r25android-7.1.1_r24android-7.1.1_r23android-7.1.1_r22android-7.1.1_r21android-7.1.1_r20android-7.1.1_r2android-7.1.1_r17android-7.1.1_r16android-7.1.1_r15android-7.1.1_r14android-7.1.1_r13android-7.1.1_r12android-7.1.1_r11android-7.1.1_r10android-7.1.1_r1android-7.1.0_r7android-7.1.0_r6android-7.1.0_r5android-7.1.0_r4android-7.1.0_r3android-7.1.0_r2android-7.1.0_r1android-7.0.0_r9android-7.0.0_r8android-7.0.0_r7android-7.0.0_r6android-7.0.0_r5android-7.0.0_r4android-7.0.0_r36android-7.0.0_r35android-7.0.0_r34android-7.0.0_r33android-7.0.0_r32android-7.0.0_r31android-7.0.0_r30android-7.0.0_r3android-7.0.0_r29android-7.0.0_r28android-7.0.0_r27android-7.0.0_r24android-7.0.0_r21android-7.0.0_r19android-7.0.0_r17android-7.0.0_r15android-7.0.0_r14android-7.0.0_r13android-7.0.0_r12android-7.0.0_r11android-7.0.0_r10android-7.0.0_r1nougat-releasenougat-mr2.3-releasenougat-mr2.2-releasenougat-mr2.1-releasenougat-mr2-security-releasenougat-mr2-releasenougat-mr2-pixel-releasenougat-mr2-devnougat-mr1.8-releasenougat-mr1.7-releasenougat-mr1.6-releasenougat-mr1.5-releasenougat-mr1.4-releasenougat-mr1.3-releasenougat-mr1.2-releasenougat-mr1.1-releasenougat-mr1-volantis-releasenougat-mr1-security-releasenougat-mr1-releasenougat-mr1-flounder-releasenougat-mr1-devnougat-mr1-cts-releasenougat-mr0.5-releasenougat-dr1-releasenougat-devnougat-cts-releasenougat-bugfix-release
Java 1.8 Map implements default methods - remove(K, V), which conflicts
with the remove(String, V) in gov.nist.core.MultiMapImp. This changes
deletes the method from the interface - gov.nist.core.MultiMap
as well as from the implementation in gov.nist.core.MultiMapImp as no
caller were found for the same.
Bug: 27426743
Change-Id: Ib19c608edcf5c866852bcc48cb18b40972f5e04c
(cherry picked from commit b5fe93bdfa065f73232dae8ba4d9dc152d1af12d)
-rw-r--r-- | java/gov/nist/core/MultiMap.java | 37 | ||||
-rw-r--r-- | java/gov/nist/core/MultiValueMap.java | 3 | ||||
-rw-r--r-- | java/gov/nist/core/MultiValueMapImpl.java | 5 |
3 files changed, 5 insertions, 40 deletions
diff --git a/java/gov/nist/core/MultiMap.java b/java/gov/nist/core/MultiMap.java deleted file mode 100644 index 1bcf845..0000000 --- a/java/gov/nist/core/MultiMap.java +++ /dev/null @@ -1,37 +0,0 @@ -package gov.nist.core; - -/* - * Copyright 1999-2004 The Apache Software Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import java.util.Map; - -/** - * This is simply a Map with slightly different semantics. - * Instead of returning an Object, it returns a Collection. - * So for example, you can put( key, new Integer(1) ); - * and then a Object get( key ); will return you a Collection - * instead of an Integer. - * Thus, this is simply a tag interface. - * - * @since 2.0 - * @author Christopher Berry - * @author <a href="mailto:jstrachan@apache.org">James Strachan</a> - */ -public interface MultiMap extends Map { - - public Object remove( Object key, Object item ); - -} diff --git a/java/gov/nist/core/MultiValueMap.java b/java/gov/nist/core/MultiValueMap.java index 51b8174..8c6920c 100644 --- a/java/gov/nist/core/MultiValueMap.java +++ b/java/gov/nist/core/MultiValueMap.java @@ -5,5 +5,6 @@ import java.util.List; import java.util.Map; public interface MultiValueMap<K,V> extends Map<K,List<V>>, Serializable { - public Object remove( K key, V item ); + // remove(K, V) conflicts with a Map method added in 1.8. http://b/27426743 + /*public Object remove( K key, V item );*/ } diff --git a/java/gov/nist/core/MultiValueMapImpl.java b/java/gov/nist/core/MultiValueMapImpl.java index 04368e8..90ef324 100644 --- a/java/gov/nist/core/MultiValueMapImpl.java +++ b/java/gov/nist/core/MultiValueMapImpl.java @@ -122,14 +122,15 @@ public class MultiValueMapImpl<V> implements MultiValueMap<String, V>, Cloneable return this.map.keySet(); } - public Object remove(String key, V item) { + // remove(K, V) conflicts with a Map method added in 1.8. http://b/27426743 + /*public Object remove(String key, V item) { ArrayList<V> list = this.map.get(key); if (list == null) { return null; } else { return list.remove(item); } - } + }*/ public List<V> get(Object key) { return map.get(key); |