Return-Path: X-Original-To: apmail-commons-commits-archive@minotaur.apache.org Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 380B417FD8 for ; Mon, 1 Jun 2015 22:41:32 +0000 (UTC) Received: (qmail 14253 invoked by uid 500); 1 Jun 2015 22:41:32 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 14158 invoked by uid 500); 1 Jun 2015 22:41:32 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 14149 invoked by uid 99); 1 Jun 2015 22:41:32 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Jun 2015 22:41:31 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id DCBE9AC026E for ; Mon, 1 Jun 2015 22:41:31 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1683018 - in /commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4: MapUtils.java MultiMap.java collection/IndexedCollection.java map/MultiValueMap.java Date: Mon, 01 Jun 2015 22:41:31 -0000 To: commits@commons.apache.org From: tn@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150601224131.DCBE9AC026E@hades.apache.org> Author: tn Date: Mon Jun 1 22:41:31 2015 New Revision: 1683018 URL: http://svn.apache.org/r1683018 Log: Deprecate MultiValueMap and MultiMap, replaced by MultiValuedMap. Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/MapUtils.java commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/MultiMap.java commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/collection/IndexedCollection.java commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/map/MultiValueMap.java Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/MapUtils.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/MapUtils.java?rev=1683018&r1=1683017&r2=1683018&view=diff ============================================================================== --- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/MapUtils.java (original) +++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/MapUtils.java Mon Jun 1 22:41:31 2015 @@ -74,6 +74,7 @@ import org.apache.commons.collections4.m * @since 1.0 * @version $Id$ */ +@SuppressWarnings("deprecation") public class MapUtils { /** @@ -916,7 +917,6 @@ public class MapUtils { * If null, the text 'null' is output. * @throws NullPointerException if the stream is null */ - @SuppressWarnings("deprecation") public static void verbosePrint(final PrintStream out, final Object label, final Map map) { verbosePrintInternal(out, label, map, new ArrayStack>(), false); } @@ -939,7 +939,6 @@ public class MapUtils { * If null, the text 'null' is output. * @throws NullPointerException if the stream is null */ - @SuppressWarnings("deprecation") public static void debugPrint(final PrintStream out, final Object label, final Map map) { verbosePrintInternal(out, label, map, new ArrayStack>(), true); } @@ -969,7 +968,6 @@ public class MapUtils { * @param debug flag indicating whether type names should be output. * @throws NullPointerException if the stream is null */ - @SuppressWarnings("deprecation") private static void verbosePrintInternal(final PrintStream out, final Object label, final Map map, final ArrayStack> lineage, final boolean debug) { printIndent(out, lineage.size()); @@ -1440,7 +1438,9 @@ public class MapUtils { * @return a multi-value map backed by the given map which returns ArrayLists of values. * @see MultiValueMap * @since 3.2 + * @deprecated since 4.1, use {@link MultiValuedMap} instead */ + @Deprecated public static MultiValueMap multiValueMap(final Map> map) { return MultiValueMap.multiValueMap(map); } @@ -1453,12 +1453,14 @@ public class MapUtils { * @param the value type * @param the collection class type * @param map the map to decorate - * @param collectionClass the type of collections to return from the map (must contain public no-arg constructor - * and extend Collection). + * @param collectionClass the type of collections to return from the map + * (must contain public no-arg constructor and extend Collection) * @return a multi-value map backed by the given map which returns collections of the specified type * @see MultiValueMap * @since 3.2 + * @deprecated since 4.1, use {@link MultiValuedMap} instead */ + @Deprecated public static > MultiValueMap multiValueMap(final Map map, final Class collectionClass) { return MultiValueMap.multiValueMap(map, collectionClass); @@ -1477,7 +1479,9 @@ public class MapUtils { * created by the specified collection factory * @see MultiValueMap * @since 3.2 + * @deprecated since 4.1, use {@link MultiValuedMap} instead */ + @Deprecated public static > MultiValueMap multiValueMap(final Map map, final Factory collectionFactory) { return MultiValueMap.multiValueMap(map, collectionFactory); Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/MultiMap.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/MultiMap.java?rev=1683018&r1=1683017&r2=1683018&view=diff ============================================================================== --- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/MultiMap.java (original) +++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/MultiMap.java Mon Jun 1 22:41:31 2015 @@ -41,7 +41,9 @@ import java.util.Collection; * * @since 2.0 * @version $Id$ + * @deprecated since 4.1, use {@link MultiValuedMap} instead */ +@Deprecated public interface MultiMap extends IterableMap { /** Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/collection/IndexedCollection.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/collection/IndexedCollection.java?rev=1683018&r1=1683017&r2=1683018&view=diff ============================================================================== --- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/collection/IndexedCollection.java (original) +++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/collection/IndexedCollection.java Mon Jun 1 22:41:31 2015 @@ -43,6 +43,8 @@ import org.apache.commons.collections4.m */ public class IndexedCollection extends AbstractCollectionDecorator { + // TODO: replace with MultiValuedMap + /** Serialization version */ private static final long serialVersionUID = -5512610452568370038L; Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/map/MultiValueMap.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/map/MultiValueMap.java?rev=1683018&r1=1683017&r2=1683018&view=diff ============================================================================== --- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/map/MultiValueMap.java (original) +++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/map/MultiValueMap.java Mon Jun 1 22:41:31 2015 @@ -62,7 +62,9 @@ import org.apache.commons.collections4.i * * @since 3.2 * @version $Id$ + * @deprecated since 4.1, use {@link org.apache.commons.collections4.MultiValuedMap MultiValuedMap} instead */ +@Deprecated public class MultiValueMap extends AbstractMapDecorator implements MultiMap, Serializable { /** Serialization version */