You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2022/01/31 08:59:56 UTC
[cxf] branch 3.4.x-fixes updated (cd7fb7b -> 9e7ce99)
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a change to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from cd7fb7b Added test case for response entity with annotations (#895)
new ccdeb7b CXF-8649 - Stop using Annotated.getGenericType
new 9e7ce99 Recording .gitmergeinfo Changes
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitmergeinfo | 3 +++
.../src/main/java/org/apache/cxf/jaxrs/swagger/JaxRs2Extension.java | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
[cxf] 02/02: Recording .gitmergeinfo Changes
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 9e7ce99aeeae4bb0a3e3ff1c75ee6fd76dc44683
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Mon Jan 31 08:59:45 2022 +0000
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 3 +++
1 file changed, 3 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index e6deb70..571f540 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -63,15 +63,18 @@ B 7f49050d5a01af413486ae488594cf89b5bbe9ca
B 837401d8b08449ea34304df68600514d1132c499
B 86c22f928f138c7f7cb2fc5fd7188b5e4dbe23d8
B 8a7aa1bad47f0a1d4b86e172cabc240f2bc9f008
+B 92406def0832887695cdd8f013e2bee956b90889
B 927cdd8c323dd41168947090def5709afede242e
B 94249fbccf981e90ba93784aa0fe6b9c9a6388e3
B 9485e3b46125c9102610aa6dcab6e330952b2fb0
B 951ee01baae5540cf99a29396fe649f25fc5a6b0
+B 983d15c06dafbfb883250b2d763bd3d6956ad114
B 9940b6f38d5380fc150cf6409c99197a595c840a
B 9c5658b9b39403cc95d38a61de900af0591222d5
B 9ed98f36a381b8f881c2d63a5846572ba83a4ed9
B a05c7db2a8c09f38e98ad08c921da55f0d5f511f
B a06d00066c88077a1cf25766b841bd8f6cabb027
+B a2405b2a535f76589ce1ad6e72b4ecaf5ec5b6a9
B a7000a6dc4d61290fe96f579a43e231393ed7670
B a7c37c22b7c80eea75d8b992626694b4cdd189d2
B a7f455e36eba7d8f75be760991f23fa9be705143
[cxf] 01/02: CXF-8649 - Stop using Annotated.getGenericType
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit ccdeb7b2bea8a70e1cdb6eb105206712308cc3fa
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Mon Jan 31 08:41:06 2022 +0000
CXF-8649 - Stop using Annotated.getGenericType
(cherry picked from commit 2f777e00095391a2bb4b5f381c4e03b84c28df1e)
(cherry picked from commit ded2b0ccd0d090846525052c070ebaf4cf29a219)
---
.../src/main/java/org/apache/cxf/jaxrs/swagger/JaxRs2Extension.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/JaxRs2Extension.java b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/JaxRs2Extension.java
index f1d6cec..a3d6403 100644
--- a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/JaxRs2Extension.java
+++ b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/JaxRs2Extension.java
@@ -99,7 +99,7 @@ public class JaxRs2Extension extends AbstractSwaggerExtension {
// Gather the field's details
if (field != null) {
- paramType = field.getAnnotated().getGenericType();
+ paramType = field.getAnnotated().getType();
for (final Annotation fieldAnnotation : field.annotations()) {
if (!paramAnnotations.contains(fieldAnnotation)) {