Merge pull request #1 from loefflefarn/master

fixed supports handling with abstract version of returnType class
julian-eggers · May 23, 2017 · d5865bc · d5865bc
2 parents af9bb74 + 234ff3e
commit d5865bc
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -14,7 +14,7 @@ Spring XML Unmarshalling with [XOM](http://www.xom.nu/)
 	<dependency>
 		<groupId>com.itelg.spring</groupId>
 		<artifactId>spring-xom-unmarshaller</artifactId>
-		<version>0.1.0-RELEASE</version>
+		<version>0.1.1-RELEASE</version>
 	</dependency>
 </dependencies>
 ```

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
   <name>spring-xom-unmarshaller</name>
   <description>Spring XML Unmarshalling with XOM</description>
   <url>https://github.com/julian-eggers/spring-xom-unmarshaller</url>
-  <version>0.1.0-RELEASE</version>
+  <version>0.1.1-RELEASE</version>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

diff --git a/src/main/java/com/itelg/spring/xom/unmarshaller/XomUnmarshaller.java b/src/main/java/com/itelg/spring/xom/unmarshaller/XomUnmarshaller.java
@@ -37,15 +37,15 @@ public boolean supports(Class<?> clazz)
     {
         for (ParserHolder parser : parsers)
         {
-            if (clazz.equals(parser.getReturnType()))
+            if (parser.getReturnType().isAssignableFrom(clazz))
             {
                 return true;
             }
         }
 
         return false;
     }
-    
+
     @Override
     public Object unmarshal(Source source) throws IOException, XmlMappingException
     {

diff --git a/src/test/java/com/itelg/spring/xom/unmarshaller/XomUnmarshallerTest.java b/src/test/java/com/itelg/spring/xom/unmarshaller/XomUnmarshallerTest.java
@@ -18,6 +18,8 @@
 import com.itelg.spring.xom.unmarshaller.parser.RootTagMatcherParser;
 import com.itelg.spring.xom.unmarshaller.parser.RootTagTypeMatchingDisableParser;
 
+import nu.xom.Element;
+
 public class XomUnmarshallerTest
 {
     private Unmarshaller unmarshaller;
@@ -28,6 +30,7 @@ public void init()
         List<Parser<?>> parsers = new ArrayList<>();
         parsers.add(new RootTagMatcherParser());
         parsers.add(new RootTagTypeMatchingDisableParser());
+        parsers.add(new TestObjectParser());
         unmarshaller = new XomUnmarshaller(parsers);
     }
 
@@ -36,6 +39,7 @@ public void testSupports()
     {
         Assert.assertTrue(unmarshaller.supports(String.class));
         Assert.assertTrue(unmarshaller.supports(Integer.class));
+        Assert.assertTrue(unmarshaller.supports(TestObject.class));
         Assert.assertFalse(unmarshaller.supports(Double.class));
     }
 
@@ -48,7 +52,7 @@ public void testUnmarshallString() throws IOException
             Assert.assertEquals("test", value);
         }
     }
-    
+
     @Test
     public void testUnmarshallNumber() throws IOException
     {
@@ -58,7 +62,7 @@ public void testUnmarshallNumber() throws IOException
             Assert.assertEquals(Integer.valueOf(12), value);
         }
     }
-    
+
     @Test(expected = UnmarshallingFailureException.class)
     public void testUnmarshallLong() throws IOException
     {
@@ -68,4 +72,23 @@ public void testUnmarshallLong() throws IOException
             Assert.fail("unmarshaller should fail!");
         }
     }
+
+    private class TestObject extends AbstractTestObject
+    {
+        // empty class for type check
+    }
+
+    private abstract class AbstractTestObject
+    {
+        // empty abstract class for type check
+    }
+
+    private class TestObjectParser implements Parser<AbstractTestObject>
+    {
+        @Override
+        public AbstractTestObject parse(Element rootElement)
+        {
+            return null;
+        }
+    }
 }