Apache/commons-collections
1
0
Fork 0
mirror of https://github.com/apache/commons-collections.git synced 2025-02-17 15:35:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update the MapUtils to output 'null' if null map

Browse Source 
bug 20740


git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@131125 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Stephen Colebourne 2003-08-31 17:52:13 +00:00
parent 13dcac086e
commit 43b14025a5
2 changed files with 38 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/java/org/apache/commons/collections/MapUtils.java
View File

@ -1,5 +1,5 @@
/* /*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/MapUtils.java,v 1.31 2003/08/31 17:26:43 scolebourne Exp $ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/MapUtils.java,v 1.32 2003/08/31 17:52:13 scolebourne Exp $
* ==================================================================== * ====================================================================
* *
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
@ -105,7 +105,7 @@ import org.apache.commons.collections.decorators.TypedSortedMap;
* </ul> * </ul>
* *
* @since Commons Collections 1.0 * @since Commons Collections 1.0
* @version $Revision: 1.31 $ $Date: 2003/08/31 17:26:43 $ * @version $Revision: 1.32 $ $Date: 2003/08/31 17:52:13 $
* *
* @author <a href="mailto:jstrachan@apache.org">James Strachan</a> * @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
* @author <a href="mailto:nissim@nksystems.com">Nissim Karpenstein</a> * @author <a href="mailto:nissim@nksystems.com">Nissim Karpenstein</a>
@ -686,11 +686,11 @@ public class MapUtils {
* When the value is a Map, recursive behaviour occurs. * When the value is a Map, recursive behaviour occurs.
* *
* @param out the stream to print to, must not be null * @param out the stream to print to, must not be null
* @param label the label to be applied to the output generated. This * @param label The label to be used, may be <code>null</code>.
* may well be the key associated with this map within a * If <code>null</code>, the label is not output.
* surrounding map in which this is nested. If the label is * It typically represents the name of the property in a bean or similar.
* <code>null</code> then no label is output. * @param map The map to print, may be <code>null</code>.
* @param map the map to print, may be <code>null</code> * If <code>null</code>, the text 'null' is output.
* @throws NullPointerException if the stream is <code>null</code> * @throws NullPointerException if the stream is <code>null</code>
*/ */
public static synchronized void verbosePrint( public static synchronized void verbosePrint(
@ -710,11 +710,11 @@ public class MapUtils {
* When the value is a Map, recursive behaviour occurs. * When the value is a Map, recursive behaviour occurs.
* *
* @param out the stream to print to, must not be null * @param out the stream to print to, must not be null
* @param label the label to be applied to the output generated. This * @param label The label to be used, may be <code>null</code>.
* may well be the key associated with this map within a * If <code>null</code>, the label is not output.
* surrounding map in which this is nested. If the label is * It typically represents the name of the property in a bean or similar.
* <code>null</code> then no label is output. * @param map The map to print, may be <code>null</code>.
* @param map the map to print, may be <code>null</code> * If <code>null</code>, the text 'null' is output.
* @throws NullPointerException if the stream is <code>null</code> * @throws NullPointerException if the stream is <code>null</code>
*/ */
public static synchronized void debugPrint( public static synchronized void debugPrint(
@ -756,11 +756,11 @@ public class MapUtils {
* value. * value.
* *
* @param out the stream to print to * @param out the stream to print to
* @param label the label to be applied to the output generated. This * @param label The label to be used, may be <code>null</code>.
* may well be the key associated with this map within a * If <code>null</code>, the label is not output.
* surrounding map in which this is nested. If the label is * It typically represents the name of the property in a bean or similar.
* <code>null</code>, then it is not output. * @param map The map to print, may be <code>null</code>.
* @param map the map to print, may be <code>null</code> * If <code>null</code>, the text 'null' is output.
* @param debug flag indicating whether type names should be output. * @param debug flag indicating whether type names should be output.
* @throws NullPointerException if the stream is <code>null</code> * @throws NullPointerException if the stream is <code>null</code>
*/ */
@ -772,13 +772,17 @@ public class MapUtils {
printIndent(out); printIndent(out);
if (map == null) {
if (label != null) {
out.print(label);
out.print(" = ");
}
out.println("null");
return;
}
if (label != null) { if (label != null) {
out.print(label); out.print(label);
out.print(" = "); out.println(" = ");
out.println(map == null ? "null" : "");
}
if (map == null) {
return;
} }
printIndent(out); printIndent(out);

16
src/test/org/apache/commons/collections/TestMapUtils.java
View File

@ -1,5 +1,5 @@
/* /*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestMapUtils.java,v 1.9 2003/08/31 17:28:43 scolebourne Exp $ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestMapUtils.java,v 1.10 2003/08/31 17:52:13 scolebourne Exp $
* ==================================================================== * ====================================================================
* *
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
@ -73,7 +73,7 @@ import junit.framework.Test;
/** /**
* Tests for MapUtils. * Tests for MapUtils.
* *
* @version $Revision: 1.9 $ $Date: 2003/08/31 17:28:43 $ * @version $Revision: 1.10 $ $Date: 2003/08/31 17:52:13 $
* *
* @author Stephen Colebourne * @author Stephen Colebourne
* @author Arun Mammen Thomas * @author Arun Mammen Thomas
@ -400,17 +400,25 @@ public class TestMapUtils extends BulkTest {
public void testVerbosePrintNullLabelAndMap() { public void testVerbosePrintNullLabelAndMap() {
final ByteArrayOutputStream out = new ByteArrayOutputStream(); final ByteArrayOutputStream out = new ByteArrayOutputStream();
final PrintStream outPrint = new PrintStream(out); final PrintStream outPrint = new PrintStream(out);
outPrint.println("null");
final String EXPECTED_OUT = out.toString();
out.reset();
MapUtils.verbosePrint(outPrint, null, null); MapUtils.verbosePrint(outPrint, null, null);
assertEquals("", out.toString()); assertEquals(EXPECTED_OUT, out.toString());
} }
public void testDebugPrintNullLabelAndMap() { public void testDebugPrintNullLabelAndMap() {
final ByteArrayOutputStream out = new ByteArrayOutputStream(); final ByteArrayOutputStream out = new ByteArrayOutputStream();
final PrintStream outPrint = new PrintStream(out); final PrintStream outPrint = new PrintStream(out);
outPrint.println("null");
final String EXPECTED_OUT = out.toString();
out.reset();
MapUtils.debugPrint(outPrint, null, null); MapUtils.debugPrint(outPrint, null, null);
assertEquals("", out.toString()); assertEquals(EXPECTED_OUT, out.toString());
} }
public void testVerbosePrintNullStream() { public void testVerbosePrintNullStream() {