JOHNZON-420 use JsonBAdapter when converting back from array

Author: struberg

johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/AdapterTest.java

@@ -234,6 +234,23 @@ public void adaptCollectionValue() {
         assertEquals("42", adaptedBazCollection.collection.get(0).value);
     }
 
+    @Test
+    public void testArrayOfClassWithTypeAdapter() {
+        final Jsonb jsonb = JsonbBuilder.create(
+                new JsonbConfig()
+                        .setProperty("johnzon.readAttributeBeforeWrite", true)
+                        .withPropertyOrderStrategy(PropertyOrderStrategy.LEXICOGRAPHICAL) /* assertEquals() order */);
+
+        Baz[] bazs = new Baz[]{new Baz("A"), new Baz("B")};
+        final String bazsJson = jsonb.toJson(bazs);
+        assertEquals("[\"A\",\"B\"]", bazsJson);
+
+
+        // and the other way around:
+        final Baz[] bazs2 = jsonb.fromJson(bazsJson, Baz[].class);
+        assertEquals(2, bazs2.length);
+    }
+
     public static class BarCollection {
         @JsonbTypeAdapter(BarAdapter.class)
         public List<Bar> collection;
@@ -336,6 +353,13 @@ public TypeInstance adaptToJson(final Bar obj) throws Exception {
 
     @JsonbTypeAdapter(BazAdapter.class)
     public static class Baz {
+        public Baz() {
+        }
+
+        public Baz(String value) {
+            this.value = value;
+        }
+
         public String value;
     }
 

johnzon-mapper/src/main/java/org/apache/johnzon/mapper/MappingParserImpl.java

@@ -1219,6 +1219,12 @@ private Adapter findAdapter(final Type aClass) {
             }
             return adapter;
         }
+
+        final Mappings.ClassMapping classMapping = mappings.getClassMapping(aClass);
+        if (classMapping != null && classMapping.adapter != null) {
+            return classMapping.adapter;
+        }
+
         config.getNoParserAdapterTypes().add(aClass);
         return null;
     }