Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 918F6179A8 for ; Fri, 17 Oct 2014 12:47:32 +0000 (UTC) Received: (qmail 53757 invoked by uid 500); 17 Oct 2014 12:47:32 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 53696 invoked by uid 500); 17 Oct 2014 12:47:32 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 53687 invoked by uid 99); 17 Oct 2014 12:47:32 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 17 Oct 2014 12:47:32 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 151339399A1; Fri, 17 Oct 2014 12:47:32 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sergeyb@apache.org To: commits@cxf.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: Updating JsonMapObject provider to ensure the update property history is preserved Date: Fri, 17 Oct 2014 12:47:32 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/3.0.x-fixes 45bd0cdbd -> 17a6302e9 Updating JsonMapObject provider to ensure the update property history is preserved Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/17a6302e Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/17a6302e Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/17a6302e Branch: refs/heads/3.0.x-fixes Commit: 17a6302e91d067c9a9c71b9897299d1ae21dc9eb Parents: 45bd0cd Author: Sergey Beryozkin Authored: Fri Oct 17 13:45:46 2014 +0100 Committer: Sergey Beryozkin Committed: Fri Oct 17 13:47:14 2014 +0100 ---------------------------------------------------------------------- .../org/apache/cxf/jaxrs/provider/json/JsonMapObject.java | 3 +-- .../cxf/jaxrs/provider/json/JsonMapObjectProvider.java | 9 ++++++--- 2 files changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/17a6302e/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JsonMapObject.java ---------------------------------------------------------------------- diff --git a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JsonMapObject.java b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JsonMapObject.java index efecd88..1e6adcd 100644 --- a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JsonMapObject.java +++ b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JsonMapObject.java @@ -24,9 +24,8 @@ import java.util.LinkedHashMap; import java.util.Map; public class JsonMapObject { + Map updateCount; private Map values = new LinkedHashMap(); - private Map updateCount; - public JsonMapObject() { } http://git-wip-us.apache.org/repos/asf/cxf/blob/17a6302e/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JsonMapObjectProvider.java ---------------------------------------------------------------------- diff --git a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JsonMapObjectProvider.java b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JsonMapObjectProvider.java index f8fea4b..9387a7d 100644 --- a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JsonMapObjectProvider.java +++ b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JsonMapObjectProvider.java @@ -69,13 +69,16 @@ public class JsonMapObjectProvider implements MessageBodyReader, MultivaluedMap headers, InputStream is) throws IOException, WebApplicationException { String s = IOUtils.readStringFromStream(is); - Map jsonMap = handler.fromJson(s); + JsonMapObject obj = new JsonMapObject(); + handler.fromJson(obj, s); if (cls == JsonMapObject.class) { - return new JsonMapObject(jsonMap); + return obj; } else { try { Constructor c = cls.getConstructor(Map.class); - return (JsonMapObject)c.newInstance(jsonMap); + JsonMapObject actualObj = (JsonMapObject)c.newInstance(obj.asMap()); + actualObj.updateCount = obj.updateCount; + return actualObj; } catch (Exception ex) { throw new IOException(ex); }