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/26 16:56:41 UTC
incubator-johnzon git commit: renaming jsonb adapter methods
Repository: incubator-johnzon
Updated Branches:
refs/heads/master a79a5dd96 -> e19af1134
renaming jsonb adapter methods
Project: http://git-wip-us.apache.org/repos/asf/incubator-johnzon/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-johnzon/commit/e19af113
Tree: http://git-wip-us.apache.org/repos/asf/incubator-johnzon/tree/e19af113
Diff: http://git-wip-us.apache.org/repos/asf/incubator-johnzon/diff/e19af113
Branch: refs/heads/master
Commit: e19af11346b1f1231b45ee5a5fae356d17ca9013
Parents: a79a5dd
Author: Romain manni-Bucau <rm...@gmail.com>
Authored: Fri Feb 26 16:56:25 2016 +0100
Committer: Romain manni-Bucau <rm...@gmail.com>
Committed: Fri Feb 26 16:56:25 2016 +0100
----------------------------------------------------------------------
.../apache/johnzon/jsonb/converter/JohnzonJsonbAdapter.java | 4 ++--
.../src/test/java/org/apache/johnzon/jsonb/AdapterTest.java | 8 ++++----
.../test/java/org/apache/johnzon/jsonb/CdiAdapterTest.java | 4 ++--
.../src/main/java/javax/json/bind/adapter/JsonbAdapter.java | 4 ++--
4 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-johnzon/blob/e19af113/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 fa5e4ce..4c79610 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
@@ -36,7 +36,7 @@ public class JohnzonJsonbAdapter<A, B> implements Adapter<A, B> {
return null;
}
try {
- return delegate.adaptTo(obj);
+ return delegate.adaptToJson(obj);
} catch (final Exception e) {
throw new JsonbException(e.getMessage(), e);
}
@@ -48,7 +48,7 @@ public class JohnzonJsonbAdapter<A, B> implements Adapter<A, B> {
return null;
}
try {
- return delegate.adaptFrom(obj);
+ return delegate.adaptFromJson(obj);
} catch (final Exception e) {
throw new JsonbException(e.getMessage(), e);
}
http://git-wip-us.apache.org/repos/asf/incubator-johnzon/blob/e19af113/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/AdapterTest.java
----------------------------------------------------------------------
diff --git a/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/AdapterTest.java b/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/AdapterTest.java
index 7cf9962..5aa6b7d 100644
--- a/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/AdapterTest.java
+++ b/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/AdapterTest.java
@@ -63,28 +63,28 @@ public class AdapterTest {
public static class DummyAdapter implements JsonbAdapter<Dummy, String> {
@Override
- public Dummy adaptTo(final String obj) throws Exception {
+ public Dummy adaptToJson(final String obj) throws Exception {
final Dummy bar = new Dummy();
bar.value = Long.parseLong(obj);
return bar;
}
@Override
- public String adaptFrom(final Dummy obj) throws Exception {
+ public String adaptFromJson(final Dummy obj) throws Exception {
return Long.toString(obj.value);
}
}
public static class BarAdapter implements JsonbAdapter<Bar, String> {
@Override
- public Bar adaptTo(final String obj) throws Exception {
+ public Bar adaptToJson(final String obj) throws Exception {
final Bar bar = new Bar();
bar.value = Integer.parseInt(obj);
return bar;
}
@Override
- public String adaptFrom(final Bar obj) throws Exception {
+ public String adaptFromJson(final Bar obj) throws Exception {
return Integer.toString(obj.value);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-johnzon/blob/e19af113/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/CdiAdapterTest.java
----------------------------------------------------------------------
diff --git a/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/CdiAdapterTest.java b/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/CdiAdapterTest.java
index a96a66f..322325f 100644
--- a/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/CdiAdapterTest.java
+++ b/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/CdiAdapterTest.java
@@ -90,12 +90,12 @@ public class CdiAdapterTest {
private Service service;
@Override
- public Model adaptTo(final String obj) throws Exception {
+ public Model adaptToJson(final String obj) throws Exception {
throw new UnsupportedOperationException();
}
@Override
- public String adaptFrom(final Model obj) throws Exception {
+ public String adaptFromJson(final Model obj) throws Exception {
assertTrue(OwbNormalScopeProxy.class.isInstance(service)); // additional test
return service.toString(obj);
}
http://git-wip-us.apache.org/repos/asf/incubator-johnzon/blob/e19af113/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 f31c13f..bae6ae1 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
@@ -19,6 +19,6 @@
package javax.json.bind.adapter;
public interface JsonbAdapter<A, B> {
- A adaptTo(B obj) throws Exception;
- B adaptFrom(A obj) throws Exception;
+ A adaptToJson(B obj) throws Exception;
+ B adaptFromJson(A obj) throws Exception;
}
\ No newline at end of file