You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by re...@apache.org on 2020/01/24 00:45:47 UTC
[cxf] branch 3.2.x-fixes updated (9ec58c9 -> e3b449d)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a change to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from 9ec58c9 Recording .gitmergeinfo Changes
new 28221c6 CXF-8200: Use name() instead of toString() for enums when generating WADL
new e3b449d 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 | 1 +
.../org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java | 2 +-
.../wadl/{AbstractStore.java => BookOrderEnum.java} | 17 +++++++++--------
.../java/org/apache/cxf/jaxrs/model/wadl/BookStore.java | 1 +
.../apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java | 4 +++-
5 files changed, 15 insertions(+), 10 deletions(-)
copy rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/{AbstractStore.java => BookOrderEnum.java} (78%)
[cxf] 02/02: Recording .gitmergeinfo Changes
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit e3b449d89f8839318191add00c2c81d9fc28c2ef
Author: reta <dr...@gmail.com>
AuthorDate: Thu Jan 23 19:44:27 2020 -0500
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 3262aee..3e5e80f 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -290,6 +290,7 @@ B 58e72337226f4e963abfc6f1a65625d86b7003b5
B 58e9812a84a1a98d1f0699b59a86a147c847cb2f
B 5960c04d98d4cbe5cb154dffd017d867412d31f7
B 59a74cf86b42143a71b23c6e67a494a57dc645e7
+B 59c47a66c7a584bbae945af8aeecf6e8644ed17d
B 5a5d6eab2748d03508d51ee036701244ad0cfe25
B 5a72b4170110d58fb6186fd7ce9f5339b9550f5e
B 5b11f39743278a06fdf174e89b0178a7f9d86fbb
[cxf] 01/02: CXF-8200: Use name() instead of toString() for enums
when generating WADL
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 28221c649cf983f444912204d59df0feaa799b90
Author: reta <dr...@gmail.com>
AuthorDate: Thu Jan 23 19:16:16 2020 -0500
CXF-8200: Use name() instead of toString() for enums when generating WADL
(cherry picked from commit 1fb179ff05138dcd34a21bca20dc5fe381d56301)
(cherry picked from commit 5a2525c2c537040b31fd7646644c49bd9b59d505)
---
.../apache/cxf/jaxrs/model/wadl/WadlGenerator.java | 2 +-
.../apache/cxf/jaxrs/model/wadl/BookOrderEnum.java | 34 ++++++++++++++++++++++
.../org/apache/cxf/jaxrs/model/wadl/BookStore.java | 1 +
.../cxf/jaxrs/model/wadl/WadlGeneratorTest.java | 4 ++-
4 files changed, 39 insertions(+), 2 deletions(-)
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 cf6bff1..93e5496 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
@@ -1011,7 +1011,7 @@ public class WadlGenerator implements ContainerRequestFilter {
try {
Method m = enumClass.getMethod("values", new Class<?>[] {});
Object[] values = (Object[])m.invoke(null, new Object[] {});
- m = enumClass.getMethod("toString", new Class<?>[] {});
+ m = enumClass.getMethod("name", new Class<?>[] {});
for (Object o : values) {
String str = (String)m.invoke(o, new Object[] {});
sb.append("<option value=\"").append(str).append("\"/>");
diff --git a/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/BookOrderEnum.java b/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/BookOrderEnum.java
new file mode 100644
index 0000000..0328d68
--- /dev/null
+++ b/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/BookOrderEnum.java
@@ -0,0 +1,34 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.jaxrs.model.wadl;
+
+public enum BookOrderEnum {
+ INVOICED("Invoiced"),
+ NOT_INVOICED("Not invoiced");
+
+ private final String desc;
+
+ BookOrderEnum(String desc) {
+ this.desc = desc;
+ }
+
+ public String toString() {
+ return desc;
+ }
+}
diff --git a/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/BookStore.java b/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/BookStore.java
index 9800577..3512525 100644
--- a/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/BookStore.java
+++ b/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/BookStore.java
@@ -125,6 +125,7 @@ public class BookStore extends AbstractStore<Book> implements BookDescription {
@CookieParam("cid") int cookieId,
@QueryParam("provider.bar") int queryParam,
@QueryParam("bookstate") BookEnum state,
+ @QueryParam("orderstatus") BookOrderEnum status,
@QueryParam("a") List<String> queryList,
@Context HttpHeaders headers,
@Description("InputBook")
diff --git a/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java b/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java
index d09343c..789ea4b 100644
--- a/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java
+++ b/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java
@@ -563,11 +563,13 @@ public class WadlGeneratorTest extends Assert {
checkDocs(requestEls.get(0), "", "Request", "");
- verifyParameters(requestEls.get(0), 4,
+ verifyParameters(requestEls.get(0), 5,
new Param("hid", "header", "xs:int"),
new Param("provider.bar", "query", "xs:int"),
new Param("bookstate", "query", "xs:string",
new HashSet<>(Arrays.asList("NEW", "USED", "OLD"))),
+ new Param("orderstatus", "query", "xs:string",
+ new HashSet<>(Arrays.asList("INVOICED", "NOT_INVOICED"))),
new Param("a", "query", "xs:string", true));
verifyXmlJsonRepresentations(requestEls.get(0), book2El, "InputBook");