asfgit closed pull request #332: Update WadlGenerator.java to process
TypeVariable correctly.
URL: https://github.com/apache/cxf/pull/332
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
index 9e1317f20df..523132b8e1f 100644
---
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
+++
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
@@ -1074,7 +1074,8 @@ protected void handleRepresentation(StringBuilder sb,
Set<Class<?>> jaxbTypes,
} else {
theActualType = ResourceUtils.getActualJaxbType(type,
opMethod, inbound);
}
- if (theActualType == Object.class && !(genericType instanceof
Class)) {
+ if ((theActualType == Object.class && !(genericType instanceof
Class))
+ || (genericType instanceof
TypeVariable)) {
Type theType = InjectionUtils.processGenericTypeIfNeeded(
ori.getClassResourceInfo().getServiceClass(),
Object.class, genericType);
theActualType = InjectionUtils.getActualType(theType);
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
