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 A7DF618392 for ; Wed, 24 Feb 2016 12:32:36 +0000 (UTC) Received: (qmail 3542 invoked by uid 500); 24 Feb 2016 12:32:27 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 3478 invoked by uid 500); 24 Feb 2016 12:32:27 -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 3469 invoked by uid 99); 24 Feb 2016 12:32:27 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 Feb 2016 12:32:27 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id EB847E0974; Wed, 24 Feb 2016 12:32:26 +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: cxf git commit: Updating the basic JSON writer to support explicit nulls (ex, OIDC claims parameter supports them directly, ect) Date: Wed, 24 Feb 2016 12:32:26 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/3.1.x-fixes 9db45329a -> aab20d1c5 Updating the basic JSON writer to support explicit nulls (ex, OIDC claims parameter supports them directly, ect) Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/aab20d1c Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/aab20d1c Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/aab20d1c Branch: refs/heads/3.1.x-fixes Commit: aab20d1c5dfe152370c4db5252441178449c6462 Parents: 9db4532 Author: Sergey Beryozkin Authored: Wed Feb 24 12:29:26 2016 +0000 Committer: Sergey Beryozkin Committed: Wed Feb 24 12:32:15 2016 +0000 ---------------------------------------------------------------------- .../apache/cxf/jaxrs/json/basic/JsonMapObjectReaderWriter.java | 4 +++- .../cxf/jaxrs/json/basic/JsonMapObjectReaderWriterTest.java | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/aab20d1c/rt/rs/extensions/json-basic/src/main/java/org/apache/cxf/jaxrs/json/basic/JsonMapObjectReaderWriter.java ---------------------------------------------------------------------- diff --git a/rt/rs/extensions/json-basic/src/main/java/org/apache/cxf/jaxrs/json/basic/JsonMapObjectReaderWriter.java b/rt/rs/extensions/json-basic/src/main/java/org/apache/cxf/jaxrs/json/basic/JsonMapObjectReaderWriter.java index 4595444..b311ede 100644 --- a/rt/rs/extensions/json-basic/src/main/java/org/apache/cxf/jaxrs/json/basic/JsonMapObjectReaderWriter.java +++ b/rt/rs/extensions/json-basic/src/main/java/org/apache/cxf/jaxrs/json/basic/JsonMapObjectReaderWriter.java @@ -96,7 +96,9 @@ public class JsonMapObjectReaderWriter { @SuppressWarnings("unchecked") protected void toJsonInternal(Output out, Object value, boolean hasNext) { - if (JsonMapObject.class.isAssignableFrom(value.getClass())) { + if (value == null) { + out.append(null); + } else if (JsonMapObject.class.isAssignableFrom(value.getClass())) { out.append(toJson((JsonMapObject)value)); } else if (value.getClass().isArray()) { toJsonInternal(out, (Object[])value); http://git-wip-us.apache.org/repos/asf/cxf/blob/aab20d1c/rt/rs/extensions/json-basic/src/test/java/org/apache/cxf/jaxrs/json/basic/JsonMapObjectReaderWriterTest.java ---------------------------------------------------------------------- diff --git a/rt/rs/extensions/json-basic/src/test/java/org/apache/cxf/jaxrs/json/basic/JsonMapObjectReaderWriterTest.java b/rt/rs/extensions/json-basic/src/test/java/org/apache/cxf/jaxrs/json/basic/JsonMapObjectReaderWriterTest.java index 5a20475..4f03acb 100644 --- a/rt/rs/extensions/json-basic/src/test/java/org/apache/cxf/jaxrs/json/basic/JsonMapObjectReaderWriterTest.java +++ b/rt/rs/extensions/json-basic/src/test/java/org/apache/cxf/jaxrs/json/basic/JsonMapObjectReaderWriterTest.java @@ -34,8 +34,9 @@ public class JsonMapObjectReaderWriterTest extends Assert { map.put("a", "aValue"); map.put("b", 123); map.put("c", Collections.singletonList("cValue")); + map.put("claim", null); String json = new JsonMapObjectReaderWriter().toJson(map); - assertEquals("{\"a\":\"aValue\",\"b\":123,\"c\":[\"cValue\"]}", + assertEquals("{\"a\":\"aValue\",\"b\":123,\"c\":[\"cValue\"],\"claim\":null}", json); } @Test