Author: dkulp
Date: Thu Aug 27 16:56:17 2009
New Revision: 808517
URL: http://svn.apache.org/viewvc?rev=808517&view=rev
Log:
Merged revisions 807295 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r807295 | sergeyb | 2009-08-24 12:22:56 -0400 (Mon, 24 Aug 2009) | 1 line
JAXRS : updating ResourceUtils to collect all the available resource classes
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ResourceUtils.java
cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java
cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/ResourceUtilsTest.java
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug 27 16:56:17 2009
@@ -1 +1 @@
-/cxf/trunk:782728-782730,783097,783294,783396,784059,784181-784184,784893,784895,785279-785282,785468,785621,785624,785651,785734,785866,786142,786271-786272,786395,786512,786514,786582-786583,786638,786647,786850,787200,787269,787277-787279,787290-787291,787305,787323,787366,787849,788030,788060,788187,788444,788451,788703,788752,788774,788819-788820,789013,789371,789387,789420,789527-789530,789704-789705,789788,789811,789896-789901,790074,790094,790134,790188,790294,790553,790637-790644,790868,791301,791354,791538,791753,791947,792007,792096,792183,792261-792265,792271,792604,792683-792685,792975,792985,793059,793570,794297,794396,794680,794728,794771,794778-794780,794892,795044,795104,795160,795583,795907,796022-796023,796352,796593,796741,796780,796994-796997,797117,797159,797192,797194,797231-797233,797442,797505,797517,797534,797581-797583,797587,797640,797651,797699,797882-797883,798344-798346,798363,798461,798479,798533,798551,798557,798561-798562,798570,798573,79858
4,798654,798748-798749,798816,798891,798929-798930,799245,799267,799439,799448,799637,799723-799724,799792,800453,800497-800498,801380-801381,801447,801962,802892,803056,803129,803419,803460,803493,803689,804002,804175,804276,805784,805907,805909,806020-806021,806023,806405-806406,806576,806602-806604,806620,806627,806631,806633,806638,806687,806876,806922,806979-806982,807181,807205
+/cxf/trunk:782728-782730,783097,783294,783396,784059,784181-784184,784893,784895,785279-785282,785468,785621,785624,785651,785734,785866,786142,786271-786272,786395,786512,786514,786582-786583,786638,786647,786850,787200,787269,787277-787279,787290-787291,787305,787323,787366,787849,788030,788060,788187,788444,788451,788703,788752,788774,788819-788820,789013,789371,789387,789420,789527-789530,789704-789705,789788,789811,789896-789901,790074,790094,790134,790188,790294,790553,790637-790644,790868,791301,791354,791538,791753,791947,792007,792096,792183,792261-792265,792271,792604,792683-792685,792975,792985,793059,793570,794297,794396,794680,794728,794771,794778-794780,794892,795044,795104,795160,795583,795907,796022-796023,796352,796593,796741,796780,796994-796997,797117,797159,797192,797194,797231-797233,797442,797505,797517,797534,797581-797583,797587,797640,797651,797699,797882-797883,798344-798346,798363,798461,798479,798533,798551,798557,798561-798562,798570,798573,79858
4,798654,798748-798749,798816,798891,798929-798930,799245,799267,799439,799448,799637,799723-799724,799792,800453,800497-800498,801380-801381,801447,801962,802892,803056,803129,803419,803460,803493,803689,804002,804175,804276,805784,805907,805909,806020-806021,806023,806405-806406,806576,806602-806604,806620,806627,806631,806633,806638,806687,806876,806922,806979-806982,807181,807205,807295
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java?rev=808517&r1=808516&r2=808517&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
(original)
+++
cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
Thu Aug 27 16:56:17 2009
@@ -338,9 +338,7 @@
sb.append("<!-- Primitive type : " + value + " -->");
}
sb.append("<representation");
- if (!mt.isWildcardType()) {
- sb.append("
mediaType=\"").append(mt.toString()).append("\"");
- }
+ sb.append(" mediaType=\"").append(mt.toString()).append("\"");
if (jaxbProxy != null && mt.getSubtype().contains("xml") &&
jaxbTypes.contains(type)) {
generateQName(sb, jaxbProxy, clsMap, type);
}
Modified:
cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ResourceUtils.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ResourceUtils.java?rev=808517&r1=808516&r2=808517&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ResourceUtils.java
(original)
+++
cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ResourceUtils.java
Thu Aug 27 16:56:17 2009
@@ -400,33 +400,43 @@
public static Map<Class<?>, Type>
getAllRequestResponseTypes(List<ClassResourceInfo> cris,
boolean
jaxbOnly) {
Map<Class<?>, Type> types = new HashMap<Class<?>, Type>();
- for (ClassResourceInfo root : cris) {
- for (OperationResourceInfo ori :
root.getMethodDispatcher().getOperationResourceInfos()) {
- Class<?> cls = ori.getMethodToInvoke().getReturnType();
- Type type = ori.getMethodToInvoke().getGenericReturnType();
- if (jaxbOnly) {
- checkJaxbType(cls, types);
- } else {
- types.put(cls, type);
- }
- for (Parameter pm : ori.getParameters()) {
- if (pm.getType() == ParameterType.REQUEST_BODY) {
- Class<?> inType =
ori.getMethodToInvoke().getParameterTypes()[pm.getIndex()];
- Type type2 =
ori.getMethodToInvoke().getGenericParameterTypes()[pm.getIndex()];
- if (jaxbOnly) {
- checkJaxbType(inType, types);
- } else {
- types.put(inType, type2);
- }
+ for (ClassResourceInfo resource : cris) {
+ getAllTypesForResource(resource, types, jaxbOnly);
+ }
+ return types;
+ }
+
+ private static void getAllTypesForResource(ClassResourceInfo resource,
Map<Class<?>, Type> types,
+ boolean jaxbOnly) {
+ for (OperationResourceInfo ori :
resource.getMethodDispatcher().getOperationResourceInfos()) {
+ Class<?> cls = ori.getMethodToInvoke().getReturnType();
+ Type type = ori.getMethodToInvoke().getGenericReturnType();
+ if (jaxbOnly) {
+ checkJaxbType(cls, types);
+ } else {
+ types.put(cls, type);
+ }
+ for (Parameter pm : ori.getParameters()) {
+ if (pm.getType() == ParameterType.REQUEST_BODY) {
+ Class<?> inType =
ori.getMethodToInvoke().getParameterTypes()[pm.getIndex()];
+ Type type2 =
ori.getMethodToInvoke().getGenericParameterTypes()[pm.getIndex()];
+ if (jaxbOnly) {
+ checkJaxbType(inType, types);
+ } else {
+ types.put(inType, type2);
}
}
-
}
+
}
- return types;
+ for (ClassResourceInfo sub : resource.getSubResources()) {
+ if (sub != resource) {
+ getAllTypesForResource(sub, types, jaxbOnly);
+ }
+ }
}
-
+
private static void checkJaxbType(Class<?> type, Map<Class<?>, Type>
types) {
JAXBElementProvider provider = new JAXBElementProvider();
if (!InjectionUtils.isPrimitive(type)
Modified:
cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java?rev=808517&r1=808516&r2=808517&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java
(original)
+++
cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java
Thu Aug 27 16:56:17 2009
@@ -18,8 +18,6 @@
*/
package org.apache.cxf.jaxrs.model.wadl;
-import java.io.File;
-import java.io.FileOutputStream;
import java.io.StringReader;
import java.util.ArrayList;
import java.util.List;
@@ -84,14 +82,14 @@
assertNotNull(r);
assertEquals(WadlGenerator.WADL_TYPE.toString(),
r.getMetadata().getFirst(HttpHeaders.CONTENT_TYPE));
- File f = new File("test.xml");
- f.delete();
- f.createNewFile();
- System.out.println(f.getAbsolutePath());
- FileOutputStream fos = new FileOutputStream(f);
- fos.write(r.getEntity().toString().getBytes());
- fos.flush();
- fos.close();
+// File f = new File("test.xml");
+// f.delete();
+// f.createNewFile();
+// System.out.println(f.getAbsolutePath());
+// FileOutputStream fos = new FileOutputStream(f);
+// fos.write(r.getEntity().toString().getBytes());
+// fos.flush();
+// fos.close();
}
@Test
Modified:
cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/ResourceUtilsTest.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/ResourceUtilsTest.java?rev=808517&r1=808516&r2=808517&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/ResourceUtilsTest.java
(original)
+++
cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/ResourceUtilsTest.java
Thu Aug 27 16:56:17 2009
@@ -20,6 +20,7 @@
import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
+import java.lang.reflect.Type;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
@@ -34,6 +35,9 @@
import org.apache.cxf.jaxrs.model.ParameterType;
import org.apache.cxf.jaxrs.model.UserOperation;
import org.apache.cxf.jaxrs.model.UserResource;
+import org.apache.cxf.jaxrs.resources.Book;
+import org.apache.cxf.jaxrs.resources.BookInterface;
+import org.apache.cxf.jaxrs.resources.Chapter;
import org.junit.Assert;
import org.junit.Test;
@@ -77,4 +81,14 @@
assertEquals("id", p.getName());
}
+ @Test
+ public void testGetAllJaxbClasses() {
+ ClassResourceInfo cri1 =
+ ResourceUtils.createClassResourceInfo(BookInterface.class,
BookInterface.class, true, true);
+ Map<Class<?>, Type> types =
+
ResourceUtils.getAllRequestResponseTypes(Collections.singletonList(cri1), true);
+ assertEquals(2, types.size());
+ assertTrue(types.containsKey(Book.class));
+ assertTrue(types.containsKey(Chapter.class));
+ }
}
