Author: dkulp
Date: Mon Dec 15 10:25:12 2008
New Revision: 726758
URL: http://svn.apache.org/viewvc?rev=726758&view=rev
Log:
Merged revisions 726724 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r726724 | bimargulies | 2008-12-15 11:09:43 -0500 (Mon, 15 Dec 2008) | 6 lines
CXF-1947
Fix Boolean and String types to handle xsi:nil correctly. Amazing that
no one noticed this. Also fix original report of messing up nil values
in maps.
........
Modified:
cxf/branches/2.1.x-fixes/ (props changed)
cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BooleanType.java
cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/StringType.java
cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/MapType.java
cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/stax/ElementReader.java
cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/MapsTest.java
cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/fortest/MapTestImpl.java
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 15 10:25:12 2008
@@ -1 +1 @@
-/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705548,705614,705692,705708,706482,706631,706675,706900,706909,707034,707089,707100,707902,708035,708044,708074,708410,708417,708550,708554,709353-709354,709425,710076,710150,71015
4,711193,711388,711410,711490,711635,711949,711975,712194,712198,712238,712272,712299,712312,712670,712893,713082,713095-713096,713099,713584,713597,713737,713804,713899,714167-714168,714245,714255,717937-717961,718281-718448,718565,718620,718640,718665,718970,719017,719210,719215-719218,719222-719273,719305,719327-719680,720053,720119-720218,720238,720293-720316,720497,721221,721241,721501,722117,722129,722412,722988,723024,723338,723378,723716-723791,724333-724372,724433-724438,724449,724481,724485,724668,724780,724782,724785,724793,724795,724940,725071,725316,725332,725335,725348,725364,725418,725425-725426,725455,725506,725554,725562,725651,725671,725688,725754,725773,725799,725839,726342,726524,726631,726634,726637,726639,726692
+/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705548,705614,705692,705708,706482,706631,706675,706900,706909,707034,707089,707100,707902,708035,708044,708074,708410,708417,708550,708554,709353-709354,709425,710076,710150,71015
4,711193,711388,711410,711490,711635,711949,711975,712194,712198,712238,712272,712299,712312,712670,712893,713082,713095-713096,713099,713584,713597,713737,713804,713899,714167-714168,714245,714255,717937-717961,718281-718448,718565,718620,718640,718665,718970,719017,719210,719215-719218,719222-719273,719305,719327-719680,720053,720119-720218,720238,720293-720316,720497,721221,721241,721501,722117,722129,722412,722988,723024,723338,723378,723716-723791,724333-724372,724433-724438,724449,724481,724485,724668,724780,724782,724785,724793,724795,724940,725071,725316,725332,725335,725348,725364,725418,725425-725426,725455,725506,725554,725562,725651,725671,725688,725754,725773,725799,725839,726342,726524,726631,726634,726637,726639,726692,726724
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BooleanType.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BooleanType.java?rev=726758&r1=726757&r2=726758&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BooleanType.java
(original)
+++
cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BooleanType.java
Mon Dec 15 10:25:12 2008
@@ -24,16 +24,24 @@
import org.apache.cxf.aegis.xml.MessageWriter;
/**
- * @author <a href="mailto:[email protected]";>Dan Diephouse</a>
+ * Aegis type for {...@link java.lang.Boolean}. These can be null.
*/
public class BooleanType extends Type {
@Override
public Object readObject(MessageReader reader, Context context) {
+ if (reader.isXsiNil()) {
+ reader.readToEnd();
+ return null;
+ }
return Boolean.valueOf(reader.getValueAsBoolean());
}
@Override
public void writeObject(Object object, MessageWriter writer, Context
context) {
- writer.writeValueAsBoolean(((Boolean)object).booleanValue());
+ if (object == null) {
+ writer.writeXsiNil();
+ } else {
+ writer.writeValueAsBoolean(((Boolean)object).booleanValue());
+ }
}
}
Modified:
cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/StringType.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/StringType.java?rev=726758&r1=726757&r2=726758&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/StringType.java
(original)
+++
cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/StringType.java
Mon Dec 15 10:25:12 2008
@@ -38,6 +38,10 @@
@Override
public void writeObject(Object object, MessageWriter writer, Context
context) {
- writer.writeValue(object);
+ if (object == null && isNillable()) {
+ writer.writeXsiNil();
+ } else {
+ writer.writeValue(object);
+ }
}
}
Modified:
cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/MapType.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/MapType.java?rev=726758&r1=726757&r2=726758&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/MapType.java
(original)
+++
cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/MapType.java
Mon Dec 15 10:25:12 2008
@@ -64,14 +64,15 @@
Type kType = getKeyType();
Type vType = getValueType();
- Object key = null;
- Object value = null;
-
while (reader.hasMoreElementReaders()) {
MessageReader entryReader = reader.getNextElementReader();
if (entryReader.getName().equals(getEntryName())) {
+ Object key = null;
+ Object value = null;
+
while (entryReader.hasMoreElementReaders()) {
+
MessageReader evReader =
entryReader.getNextElementReader();
if (evReader.getName().equals(getKeyName())) {
Modified:
cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/stax/ElementReader.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/stax/ElementReader.java?rev=726758&r1=726757&r2=726758&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/stax/ElementReader.java
(original)
+++
cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/stax/ElementReader.java
Mon Dec 15 10:25:12 2008
@@ -124,6 +124,10 @@
public String getValue() {
if (value == null) {
try {
+ if (isXsiNil()) {
+ readToEnd();
+ return null;
+ }
value = root.getElementText();
hasCheckedChildren = true;
Modified:
cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/MapsTest.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/MapsTest.java?rev=726758&r1=726757&r2=726758&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/MapsTest.java
(original)
+++
cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/MapsTest.java
Mon Dec 15 10:25:12 2008
@@ -86,6 +86,16 @@
}
@Test
+ public void testNull() throws Exception {
+ ObjectWithAMap obj1 = clientInterface.returnObjectWithAMap();
+ assertNull(obj1.getTheMap().get("raw"));
+ Map<Long, String> m = clientInterface.getMapLongToString();
+ String str2 = m.get(Long.valueOf(2));
+ assertNull("value for 2 should be null, was " + str2, str2);
+
+ }
+
+ @Test
public void testObjectsWithMaps() throws Exception {
ObjectWithAMap obj1 = clientInterface.returnObjectWithAMap();
ObjectWithAMapNs2 obj2 = clientInterface.returnObjectWithAMapNs2();
@@ -95,7 +105,7 @@
assertNotNull(obj1.getTheMap());
assertNotNull(obj2.getTheMap());
- assertEquals(2, obj1.getTheMap().size());
+ assertEquals(3, obj1.getTheMap().size());
assertEquals(3, obj2.getTheMap().size());
assertTrue(obj1.getTheMap().get("rainy"));
Modified:
cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/fortest/MapTestImpl.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/fortest/MapTestImpl.java?rev=726758&r1=726757&r2=726758&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/fortest/MapTestImpl.java
(original)
+++
cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/fortest/MapTestImpl.java
Mon Dec 15 10:25:12 2008
@@ -39,6 +39,7 @@
public ObjectWithAMap returnObjectWithAMap() {
ObjectWithAMap ret = new ObjectWithAMap();
ret.getTheMap().put("rainy", Boolean.TRUE);
+ ret.getTheMap().put("raw", null);
ret.getTheMap().put("sunny", Boolean.FALSE);
return ret;
}
@@ -46,6 +47,7 @@
public Map<Long, String> getMapLongToString() {
Map<Long, String> map = new HashMap<Long, String>();
map.put(Long.valueOf(1), "one");
+ map.put(Long.valueOf(2), null);
map.put(Long.valueOf(27), "twenty-seven");
return map;
}
