You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ni...@apache.org on 2008/12/16 05:23:10 UTC
svn commit: r726946 - in /cxf/branches/2.0.x-fixes: ./
rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/
rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/
rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/...
Author: ningjiang
Date: Mon Dec 15 20:23:09 2008
New Revision: 726946
URL: http://svn.apache.org/viewvc?rev=726946&view=rev
Log:
Merged revisions 726758 via svnmerge from
https://svn.apache.org/repos/asf/cxf/branches/2.1.x-fixes
................
r726758 | dkulp | 2008-12-16 02:25:12 +0800 (Tue, 16 Dec 2008) | 13 lines
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.0.x-fixes/ (props changed)
cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BooleanType.java
cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/StringType.java
cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/MapType.java
cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/stax/ElementReader.java
cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/MapsTest.java
cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/fortest/MapTestImpl.java
Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 15 20:23:09 2008
@@ -1,3 +1,3 @@
-/cxf/branches/2.1.x-fixes:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318,684099,684790-684793,684842,684862,684895-684918,685205,685253,686237,686283,686299,686333-686364,686765,686827,687097,687464-687465,689109,689112,689122,691316,691357,691491,691711,691715,691745,692162-692163,692468,692500,694466-694469,694472,694717,694748-694749,694870,695503,695509,695553,695555,695563,695875-695877,695940,695980,696436,696455,696721,697086,698129,701526,701634,702275,702443,702527,702582,702604,702610,702642-702643,702649,702760,702870,702873,702959,703193,703242,703523,704303,704587,704738,704998,705153,705280-705449,705455,709357,709641,709644,710177,710184,711736,712199,712225,712275,712600,712896,713083,713410,713413,713594,713599,713808,713901,714169-714171,718622,718929,719211,719221-719223,7192
96,719300-719301,719303,719308,719332,719356,719363,719369-719383,719650,719695,720124,723545,724403-724404,724421,724448,724451,724486-724487,724714,725367,725371,725763,725774,726754
-/cxf/trunk:651669-686342,686344-686363,686764,686820,687096,687387,687463,688086,688102,688735,691271,691355,691488,691602,691706,691728,692116,692157,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694869,695396,695484,695537,695552,695561,695619,695684,695835,695935,695977,696094,696433,696720,697085,698128,700261,700602,701783,701830,701862,702267,702580,702602,702609,702616,702656,702957,703191,703239,703501,704584,704997,705150,705274,705340,705446,708550,708554,709353-709354,709425,710150,712194,712198,712272,712312,712670,712893,713082,713584,713597,713804,713899,714167-714168,718281,718565,718620,718640,718665,719017,719210,719215-719218,719222,719273,719327-719354,719362,719368,719382,719649,719680,720119-720217,723338,723717-723791,724334-724371,724433-724438,724449,724481,724485,724668,724782,724795,725754,725773,726637
+/cxf/branches/2.1.x-fixes:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318,684099,684790-684793,684842,684862,684895-684918,685205,685253,686237,686283,686299,686333-686364,686765,686827,687097,687464-687465,689109,689112,689122,691316,691357,691491,691711,691715,691745,692162-692163,692468,692500,694466-694469,694472,694717,694748-694749,694870,695503,695509,695553,695555,695563,695875-695877,695940,695980,696436,696455,696721,697086,698129,701526,701634,702275,702443,702527,702582,702604,702610,702642-702643,702649,702760,702870,702873,702959,703193,703242,703523,704303,704587,704738,704998,705153,705280-705449,705455,709357,709641,709644,710177,710184,711736,712199,712225,712275,712600,712896,713083,713410,713413,713594,713599,713808,713901,714169-714171,718622,718929,719211,719221-719223,7192
96,719300-719301,719303,719308,719332,719356,719363,719369-719383,719650,719695,720124,723545,724403-724404,724421,724448,724451,724486-724487,724714,725367,725371,725763,725774,726754,726758
+/cxf/trunk:651669-686342,686344-686363,686764,686820,687096,687387,687463,688086,688102,688735,691271,691355,691488,691602,691706,691728,692116,692157,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694869,695396,695484,695537,695552,695561,695619,695684,695835,695935,695977,696094,696433,696720,697085,698128,700261,700602,701783,701830,701862,702267,702580,702602,702609,702616,702656,702957,703191,703239,703501,704584,704997,705150,705274,705340,705446,708550,708554,709353-709354,709425,710150,712194,712198,712272,712312,712670,712893,713082,713584,713597,713804,713899,714167-714168,718281,718565,718620,718640,718665,719017,719210,719215-719218,719222,719273,719327-719354,719362,719368,719382,719649,719680,720119-720217,723338,723717-723791,724334-724371,724433-724438,724449,724481,724485,724668,724782,724795,725754,725773,726637,726724
/incubator/cxf/trunk:434594-651668
Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.0.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.0.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BooleanType.java?rev=726946&r1=726945&r2=726946&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BooleanType.java (original)
+++ cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BooleanType.java Mon Dec 15 20:23:09 2008
@@ -24,16 +24,24 @@
import org.apache.cxf.aegis.xml.MessageWriter;
/**
- * @author <a href="mailto:dan@envoisolutions.com">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.0.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.0.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/StringType.java?rev=726946&r1=726945&r2=726946&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/StringType.java (original)
+++ cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/StringType.java Mon Dec 15 20:23:09 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.0.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.0.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/MapType.java?rev=726946&r1=726945&r2=726946&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/MapType.java (original)
+++ cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/MapType.java Mon Dec 15 20:23:09 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.0.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.0.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/stax/ElementReader.java?rev=726946&r1=726945&r2=726946&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/stax/ElementReader.java (original)
+++ cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/stax/ElementReader.java Mon Dec 15 20:23:09 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.0.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.0.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/MapsTest.java?rev=726946&r1=726945&r2=726946&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/MapsTest.java (original)
+++ cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/MapsTest.java Mon Dec 15 20:23:09 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.0.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.0.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/fortest/MapTestImpl.java?rev=726946&r1=726945&r2=726946&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/fortest/MapTestImpl.java (original)
+++ cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/fortest/MapTestImpl.java Mon Dec 15 20:23:09 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;
}