Fix #63 (for 2.7.9 / 2.8.4)

Author: cowtowncoder

release-notes/VERSION

@@ -8,6 +8,11 @@ Project: jackson-module-jaxb-annotations
 
 No changes since 2.7
 
+2.7.9 (not yet released)
+
+#63: Error in type resolution of reference type (`Optional`)
+ (reported by adrianriley@github)
+
 2.7.8 (26-Sep-2016)
 2.7.7 (27-Aug-2016)
 2.7.6 (23-Jul-2016)

src/main/java/com/fasterxml/jackson/module/jaxb/JaxbAnnotationIntrospector.java

@@ -563,8 +563,8 @@ public TypeResolverBuilder<?> findPropertyContentTypeResolver(MapperConfig<?> co
         /* First: let's ensure property is a container type: caller should have
          * verified but just to be sure
          */
-        if (!containerType.isContainerType()) {
-            throw new IllegalArgumentException("Must call method with a container type (got "+containerType+")");
+        if (containerType.getContentType() == null) {
+            throw new IllegalArgumentException("Must call method with a container or reference type (got "+containerType+")");
         }
         return _typeResolverFromXmlElements(am);
     }

src/test/java/com/fasterxml/jackson/module/jaxb/types/OptionalTypeRefinementTest.java

@@ -0,0 +1,28 @@
+package com.fasterxml.jackson.module.jaxb.types;
+
+import java.util.concurrent.atomic.AtomicReference;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.module.jaxb.BaseJaxbTest;
+
+// [jaxb-annotations#63]
+public class OptionalTypeRefinementTest extends BaseJaxbTest
+{
+    static class Stuff63 {
+        public AtomicReference<String> value = new AtomicReference<String>("abc");
+    }
+
+    public void testWithReferenceType() throws Exception
+    {
+        final ObjectMapper mapper = getJaxbMapper();
+
+        String json = mapper.writeValueAsString(new Stuff63());
+        assertEquals("{\"value\":\"abc\"}", json);
+
+        Stuff63 result = mapper.readValue("{\"value\":\"xyz\"}",
+                Stuff63.class);
+        assertNotNull(result);
+        assertNotNull(result.value);
+        assertEquals("xyz", result.value.get());
+    }
+}