You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@johnzon.apache.org by rm...@apache.org on 2016/02/22 14:05:08 UTC
incubator-johnzon git commit: removing JsonbAdapter#handlesNullValue
Repository: incubator-johnzon
Updated Branches:
refs/heads/master f5b13af9f -> a79a5dd96
removing JsonbAdapter#handlesNullValue
Project: http://git-wip-us.apache.org/repos/asf/incubator-johnzon/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-johnzon/commit/a79a5dd9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-johnzon/tree/a79a5dd9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-johnzon/diff/a79a5dd9
Branch: refs/heads/master
Commit: a79a5dd96a6140568f4d8ea9c6e10f405bba1ea3
Parents: f5b13af
Author: Romain manni-Bucau <rm...@gmail.com>
Authored: Mon Feb 22 14:04:55 2016 +0100
Committer: Romain manni-Bucau <rm...@gmail.com>
Committed: Mon Feb 22 14:04:55 2016 +0100
----------------------------------------------------------------------
.../org/apache/johnzon/jsonb/converter/JohnzonJsonbAdapter.java | 4 ++--
jsonb-api/pom.xml | 2 +-
.../src/main/java/javax/json/bind/adapter/JsonbAdapter.java | 4 ----
3 files changed, 3 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-johnzon/blob/a79a5dd9/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/converter/JohnzonJsonbAdapter.java
----------------------------------------------------------------------
diff --git a/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/converter/JohnzonJsonbAdapter.java b/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/converter/JohnzonJsonbAdapter.java
index 02d9437..fa5e4ce 100644
--- a/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/converter/JohnzonJsonbAdapter.java
+++ b/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/converter/JohnzonJsonbAdapter.java
@@ -32,7 +32,7 @@ public class JohnzonJsonbAdapter<A, B> implements Adapter<A, B> {
@Override
public A to(final B obj) {
- if (obj == null && !delegate.handlesNullValue()) {
+ if (obj == null) {
return null;
}
try {
@@ -44,7 +44,7 @@ public class JohnzonJsonbAdapter<A, B> implements Adapter<A, B> {
@Override
public B from(final A obj) {
- if (obj == null && !delegate.handlesNullValue()) {
+ if (obj == null) {
return null;
}
try {
http://git-wip-us.apache.org/repos/asf/incubator-johnzon/blob/a79a5dd9/jsonb-api/pom.xml
----------------------------------------------------------------------
diff --git a/jsonb-api/pom.xml b/jsonb-api/pom.xml
index 725a08f..8b1f7d5 100644
--- a/jsonb-api/pom.xml
+++ b/jsonb-api/pom.xml
@@ -26,7 +26,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>jsonb-api</artifactId>
- <version>1.0-early-draft</version>
+ <version>1.0-early-draft-1</version>
<name>Johnzon :: JSON-B API</name>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-johnzon/blob/a79a5dd9/jsonb-api/src/main/java/javax/json/bind/adapter/JsonbAdapter.java
----------------------------------------------------------------------
diff --git a/jsonb-api/src/main/java/javax/json/bind/adapter/JsonbAdapter.java b/jsonb-api/src/main/java/javax/json/bind/adapter/JsonbAdapter.java
index 4139b67..f31c13f 100644
--- a/jsonb-api/src/main/java/javax/json/bind/adapter/JsonbAdapter.java
+++ b/jsonb-api/src/main/java/javax/json/bind/adapter/JsonbAdapter.java
@@ -21,8 +21,4 @@ package javax.json.bind.adapter;
public interface JsonbAdapter<A, B> {
A adaptTo(B obj) throws Exception;
B adaptFrom(A obj) throws Exception;
- default boolean handlesNullValue() {
- return false;
- }
-
}
\ No newline at end of file