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 2009/02/02 04:18:32 UTC
svn commit: r739913 - in /cxf/branches/2.1.x-fixes: ./
rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/
rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/
Author: ningjiang
Date: Mon Feb 2 03:18:32 2009
New Revision: 739913
URL: http://svn.apache.org/viewvc?rev=739913&view=rev
Log:
Merged revisions 739451 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r739451 | bimargulies | 2009-01-31 07:41:24 +0800 (Sat, 31 Jan 2009) | 2 lines
CXF-2017
........
Added:
cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/BeanWithGregorianDate.java
- copied unchanged from r739451, cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/BeanWithGregorianDate.java
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/java5/Java5TypeCreator.java
cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionServiceInterface.java
cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionTest.java
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 2 03:18:32 2009
@@ -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,726724,726769,726992,727096,727445,727521,727568,727692,727754,727781,727792,728070,728087,728696,728897,729051,729430,729449,729460,729863,730082,730139,730889,730891,731598,731604,731615,731631,731635,732036,732050,732320,732363,732411,732450,
732710,732773,732827,732829,733512,733582,733901,734367,734462,734666,734762,734772,734812,734836,734965,735113,735252,735722-735723,735729,735734,735751,735782,735787,735987,736332,736343,736352,736358-736362,736408,736423,736448,736491,736621,736726,736736,736738-736739,736766,736825,736852,737032,737046,737061,737069,737124,737237,737246,737299,737356,737494,737498,737761,737817,737849,737855,737994,738166,738178,738201,738210,738242,738244,738265,738516,738583,738863,738937,738983,739367
+/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,726769,726992,727096,727445,727521,727568,727692,727754,727781,727792,728070,728087,728696,728897,729051,729430,729449,729460,729863,730082,730139,730889,730891,731598,731604,731615,731631,731635,732036,732050,732320,732363,732411,732450,
732710,732773,732827,732829,733512,733582,733901,734367,734462,734666,734762,734772,734812,734836,734965,735113,735252,735722-735723,735729,735734,735751,735782,735787,735987,736332,736343,736352,736358-736362,736408,736423,736448,736491,736621,736726,736736,736738-736739,736766,736825,736852,737032,737046,737061,737069,737124,737237,737246,737299,737356,737494,737498,737761,737817,737849,737855,737994,738166,738178,738201,738210,738242,738244,738265,738516,738583,738863,738937,738983,739367,739451
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/java5/Java5TypeCreator.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/Java5TypeCreator.java?rev=739913&r1=739912&r2=739913&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/Java5TypeCreator.java (original)
+++ cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/Java5TypeCreator.java Mon Feb 2 03:18:32 2009
@@ -23,6 +23,8 @@
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.WildcardType;
import java.util.Collection;
+import java.util.Map;
+
import javax.xml.namespace.QName;
import org.apache.cxf.aegis.type.AbstractTypeCreator;
@@ -137,7 +139,7 @@
return createObjectType();
}
- if (!Collection.class.isAssignableFrom(clazz)) {
+ if (!Collection.class.isAssignableFrom(clazz) && !Map.class.isAssignableFrom(clazz)) {
return getTopCreator().createType(clazz);
}
Modified: cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionServiceInterface.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionServiceInterface.java?rev=739913&r1=739912&r2=739913&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionServiceInterface.java (original)
+++ cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionServiceInterface.java Mon Feb 2 03:18:32 2009
@@ -22,6 +22,7 @@
import java.util.Collection;
import java.util.HashSet;
import java.util.List;
+import java.util.Map;
import java.util.SortedSet;
import java.util.Stack;
@@ -47,5 +48,7 @@
//CHECKSTYLE:ON
void method1(List<String> headers1);
+
+ void mapOfMapWithStringAndPojo(Map<String, Map<String, BeanWithGregorianDate>> bigParam);
}
Modified: cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionTest.java?rev=739913&r1=739912&r2=739913&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionTest.java (original)
+++ cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionTest.java Mon Feb 2 03:18:32 2009
@@ -23,8 +23,10 @@
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
+import java.util.Map;
import java.util.Set;
import java.util.SortedSet;
import java.util.Stack;
@@ -41,6 +43,7 @@
import org.apache.cxf.aegis.type.Type;
import org.apache.cxf.aegis.type.TypeCreationOptions;
import org.apache.cxf.aegis.type.collection.CollectionType;
+import org.apache.cxf.aegis.type.collection.MapType;
import org.apache.cxf.aegis.type.java5.dto.CollectionDTO;
import org.apache.cxf.aegis.type.java5.dto.DTOService;
import org.apache.cxf.aegis.type.java5.dto.ObjectDTO;
@@ -214,6 +217,13 @@
}
+
+ /**
+ * CXF-1833 complained of a bizarre schema when @@WebParaming a parameter of List<String>. This regression
+ * test captures the fact that we don't, in fact, have this problem with correct use of JAX-WS.
+ * @throws Exception
+ */
+
@Test
public void testListTypes() throws Exception {
createService(CollectionServiceInterface.class, new CollectionService(), null);
@@ -240,9 +250,60 @@
assertEquals("2", countString);
//CHECKSTYLE:ON
}
+
+ @Test
+ public void testNestedMapType() throws Exception {
+ Method m = CollectionService.class.getMethod("mapOfMapWithStringAndPojo",
+ new Class[] {Map.class});
+ Type type = creator.createType(m, 0);
+ tm.register(type);
+ assertTrue(type instanceof MapType);
+ MapType mapType = (MapType) type;
+ Type valueType = mapType.getValueType();
+ assertFalse(valueType.getSchemaType().getLocalPart().contains("any"));
+ }
+
+ /**
+ * CXF-2017
+ * @throws Exception
+ */
+ @Test
+ public void testNestedMap() throws Exception {
+ CollectionService impl = new CollectionService();
+ createService(CollectionServiceInterface.class, impl, null);
+
+ ClientProxyFactoryBean proxyFac = new ClientProxyFactoryBean();
+ proxyFac.getServiceFactory().getServiceConfigurations().add(0,
+ new XFireCompatibilityServiceConfiguration());
+ proxyFac.setServiceClass(CollectionServiceInterface.class);
+ proxyFac.setDataBinding(new AegisDatabinding());
+ proxyFac.setAddress("local://CollectionServiceInterface");
+ proxyFac.setBus(getBus());
+
+ CollectionServiceInterface csi = (CollectionServiceInterface)proxyFac.create();
+
+ Map<String, Map<String, BeanWithGregorianDate>> complexMap;
+ complexMap = new HashMap<String, Map<String, BeanWithGregorianDate>>();
+ Map<String, BeanWithGregorianDate> innerMap = new HashMap<String, BeanWithGregorianDate>();
+ BeanWithGregorianDate bean = new BeanWithGregorianDate();
+ bean.setName("shem bean");
+ bean.setId(42);
+ innerMap.put("firstBean", bean);
+ complexMap.put("firstKey", innerMap);
+ csi.mapOfMapWithStringAndPojo(complexMap);
+
+ Map<String, Map<String, BeanWithGregorianDate>> gotMap = impl.getLastComplexMap();
+ assertTrue(gotMap.containsKey("firstKey"));
+ Map<String, BeanWithGregorianDate> v = gotMap.get("firstKey");
+ BeanWithGregorianDate b = v.get("firstBean");
+ assertNotNull(b);
+
+ }
public class CollectionService implements CollectionServiceInterface {
+ private Map<String, Map<String, BeanWithGregorianDate>> lastComplexMap;
+
/** {@inheritDoc}*/
public Collection<String> getStrings() {
return null;
@@ -285,9 +346,19 @@
}
//CHECKSTYLE:ON
+
public void method1(List<String> headers1) {
// Do nothing here
}
+ public void mapOfMapWithStringAndPojo(Map<String, Map<String, BeanWithGregorianDate>> bigParam) {
+ lastComplexMap = bigParam;
+ }
+
+ protected Map<String, Map<String, BeanWithGregorianDate>> getLastComplexMap() {
+ return lastComplexMap;
+ }
+
+
}
}