This is an automated email from the ASF dual-hosted git repository.
sergeyb pushed a commit to branch 3.1.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/3.1.x-fixes by this push:
new fe2b815 [CXF-7545] Checking for TypeVariable, patch from Evaristo
Wychoski Benfatti applied, This closes #332
fe2b815 is described below
commit fe2b8157d73e7ee7d8061f492589de644309149f
Author: Sergey Beryozkin <[email protected]>
AuthorDate: Thu Nov 2 15:23:13 2017 +0000
[CXF-7545] Checking for TypeVariable, patch from Evaristo Wychoski Benfatti
applied, This closes #332
---
.../src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
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 1b71601..155b7ff 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
@@ -29,6 +29,7 @@ import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.lang.reflect.Type;
+import java.lang.reflect.TypeVariable;
import java.net.URI;
import java.net.URL;
import java.util.ArrayList;
@@ -1078,7 +1079,8 @@ public class WadlGenerator implements
ContainerRequestFilter {
} 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);
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
