From ced330630bb147b2de7f320cdec5608cd53e5ed2 Mon Sep 17 00:00:00 2001 From: "Juan M.vi" Date: Wed, 22 Nov 2017 01:06:36 -0300 Subject: [PATCH] Revert "Add Adapter Sample" This reverts commit d20693e31b6f1bbbcabf5c1984ff9557b7e8f1bd. --- .../com/baeldung/adapter/PersonAdapter.java | 26 ---------------- .../main/java/com/baeldung/jsonb/Person.java | 2 +- .../java/com/baeldung/jsonb/JsonbTest.java | 30 ------------------- 3 files changed, 1 insertion(+), 57 deletions(-) delete mode 100644 jsonb/src/main/java/com/baeldung/adapter/PersonAdapter.java diff --git a/jsonb/src/main/java/com/baeldung/adapter/PersonAdapter.java b/jsonb/src/main/java/com/baeldung/adapter/PersonAdapter.java deleted file mode 100644 index dfab2eb0d2..0000000000 --- a/jsonb/src/main/java/com/baeldung/adapter/PersonAdapter.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.baeldung.adapter; - -import javax.json.Json; -import javax.json.JsonObject; -import javax.json.bind.adapter.JsonbAdapter; - -import com.baeldung.jsonb.Person; - -public class PersonAdapter implements JsonbAdapter { - - @Override - public JsonObject adaptToJson(Person p) throws Exception { - return Json.createObjectBuilder() - .add("id", p.getId()) - .add("name", p.getName()) - .build(); - } - - @Override - public Person adaptFromJson(JsonObject adapted) throws Exception { - Person person = new Person(); - person.setId(adapted.getInt("id")); - person.setName(adapted.getString("name")); - return person; - } -} \ No newline at end of file diff --git a/jsonb/src/main/java/com/baeldung/jsonb/Person.java b/jsonb/src/main/java/com/baeldung/jsonb/Person.java index a506c1b000..7a54b37574 100755 --- a/jsonb/src/main/java/com/baeldung/jsonb/Person.java +++ b/jsonb/src/main/java/com/baeldung/jsonb/Person.java @@ -22,10 +22,10 @@ public class Person { private BigDecimal salary; public Person() { - this(0, "", "", 0, LocalDate.now(), new BigDecimal(0)); } public Person(int id, String name, String email, int age, LocalDate registeredDate, BigDecimal salary) { + super(); this.id = id; this.name = name; this.email = email; diff --git a/jsonb/src/test/java/com/baeldung/jsonb/JsonbTest.java b/jsonb/src/test/java/com/baeldung/jsonb/JsonbTest.java index dd50f89dec..92ffe0aa6f 100755 --- a/jsonb/src/test/java/com/baeldung/jsonb/JsonbTest.java +++ b/jsonb/src/test/java/com/baeldung/jsonb/JsonbTest.java @@ -17,8 +17,6 @@ import javax.json.bind.config.PropertyOrderStrategy; import org.apache.commons.collections4.ListUtils; import org.junit.Test; -import com.baeldung.adapter.PersonAdapter; - public class JsonbTest { @Test @@ -157,32 +155,4 @@ public class JsonbTest { .equals(person)); } - @Test - public void givenPersonObject_whenSerializeWithAdapter_thenGetPersonJson() { - JsonbConfig config = new JsonbConfig().withAdapters(new PersonAdapter()); - Jsonb jsonb = JsonbBuilder.create(config); - Person person = new Person(1, "Jhon", "jhon@test.com", 0, LocalDate.of(2019, 9, 7), BigDecimal.valueOf(1000.0));// new Person(1, "Jhon"); - String jsonPerson = jsonb.toJson(person); - // @formatter:off - String jsonExpected = - "{\"id\":1," + - "\"name\":\"Jhon\"}"; - // @formatter:on - assertTrue(jsonExpected.equals(jsonPerson)); - } - - @Test - public void givenPersonJson_whenDeserializeWithAdapter_thenGetPersonObject() { - JsonbConfig config = new JsonbConfig().withAdapters(new PersonAdapter()); - Jsonb jsonb = JsonbBuilder.create(config); - Person person = new Person(1, "Jhon", "jhon@test.com", 0, LocalDate.of(2019, 9, 7), BigDecimal.valueOf(1000.0));// new Person(1, "Jhon"); - // @formatter:off - String jsonPerson = - "{\"id\":1," + - "\"name\":\"Jhon\"}"; - // @formatter:on - assertTrue(jsonb.fromJson(jsonPerson, Person.class) - .equals(person)); - } - }