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
commit 8f95084efc3258e8697f8206f68a3206535fb008 Author: Sergey Beryozkin <[email protected]> AuthorDate: Tue Dec 12 16:46:40 2017 +0000 [CXF-7525] Adapting swagger to open api conversion code for 3.1.x --- .../apache/cxf/jaxrs/json/basic/JsonMapObject.java | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/rt/rs/extensions/json-basic/src/main/java/org/apache/cxf/jaxrs/json/basic/JsonMapObject.java b/rt/rs/extensions/json-basic/src/main/java/org/apache/cxf/jaxrs/json/basic/JsonMapObject.java index 0783c5c..84f916c 100644 --- a/rt/rs/extensions/json-basic/src/main/java/org/apache/cxf/jaxrs/json/basic/JsonMapObject.java +++ b/rt/rs/extensions/json-basic/src/main/java/org/apache/cxf/jaxrs/json/basic/JsonMapObject.java @@ -48,6 +48,9 @@ public class JsonMapObject implements Serializable { count = count == null ? 2 : count++; updateCount.put(name, count); } + if (value instanceof JsonMapObject) { + value = ((JsonMapObject)value).asMap(); + } values.put(name, value); } @@ -68,6 +71,14 @@ public class JsonMapObject implements Serializable { } } + public JsonMapObject getJsonMapProperty(String name) { + Map<String, Object> value = getMapProperty(name); + if (value != null) { + return new JsonMapObject(value); + } + return null; + } + public Map<String, Object> asMap() { return values; } @@ -111,6 +122,16 @@ public class JsonMapObject implements Serializable { return null; } } + + public List<Map<String, Object>> getListMapProperty(String name) { + Object value = getProperty(name); + List<Map<String, Object>> list = null; + if (value != null) { + list = CastUtils.cast((List<?>)value); + } + return list; + } + public int hashCode() { return values.hashCode(); } @@ -118,6 +139,11 @@ public class JsonMapObject implements Serializable { public boolean equals(Object obj) { return obj instanceof JsonMapObject && ((JsonMapObject)obj).values.equals(this.values); } + + public int size() { + return values.size(); + } + public Map<String, Object> getUpdateCount() { return updateCount == null ? null : Collections.<String, Object>unmodifiableMap(updateCount); } -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
