Merge pull request #195 from brabenetz/master

Fixes for #193 and #194

Author: elaatifi

core/src/main/java/ma/glasnost/orika/converter/builtin/BuiltinConverters.java

@@ -18,17 +18,8 @@
 
 package ma.glasnost.orika.converter.builtin;
 
-import java.io.File;
-import java.math.BigInteger;
-import java.net.Inet4Address;
-import java.net.Inet6Address;
-import java.net.InetSocketAddress;
-import java.net.URI;
-import java.net.URL;
 import java.util.Calendar;
 import java.util.Date;
-import java.util.Locale;
-import java.util.UUID;
 
 import javax.xml.datatype.XMLGregorianCalendar;
 
@@ -65,19 +56,6 @@ public abstract class BuiltinConverters {
      * <li>java.sql.Time
      * <li>java.sql.Timestamp
      * </ul>
-     * <li>PassThroughConverter registered for the following (additional)
-     * immutable types:
-     * <ul>
-     * <li>java.net.URL
-     * <li>java.net.URI
-     * <li>java.util.UUID
-     * <li>java.math.BigInteger
-     * <li>java.util.Locale
-     * <li>java.io.File
-     * <li>java.net.Inet4Address
-     * <li>java.net.Inet6Address
-     * <li>java.net.InetSocketAddress
-     * </ul>
      * <li>CloneableConverter registered for the following cloneable types:
      * <ul>
      * <li>java.util.Date
@@ -151,11 +129,6 @@ public static void register(ConverterFactory converterFactory) {
         converterFactory.registerConverter(new NumericConverters.DoubleToIntegerConverter(false));
         converterFactory.registerConverter(new NumericConverters.DoubleToLongConverter(false));
 
-        /*
-         * Register additional common "immutable" types
-         */
-        converterFactory.registerConverter(new PassThroughConverter.Builtin(URL.class, URI.class, UUID.class, BigInteger.class,
-                Locale.class, File.class, Inet4Address.class, Inet6Address.class, InetSocketAddress.class));
         /*
          * Register additional common "cloneable" types
          */
@@ -164,6 +137,6 @@ public static void register(ConverterFactory converterFactory) {
          * Register converter to instantiate by using a constructor on the
          * destination which takes the source as argument
          */
-        // converterFactory.registerConverter(new ConstructorConverter());
+        converterFactory.registerConverter(new ConstructorConverter());
     }
 }

core/src/main/java/ma/glasnost/orika/metadata/Type.java

@@ -20,10 +20,17 @@
 
 import ma.glasnost.orika.impl.util.ClassUtil;
 
+import java.io.File;
 import java.lang.reflect.Modifier;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.TypeVariable;
 import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.net.Inet4Address;
+import java.net.Inet6Address;
+import java.net.InetSocketAddress;
+import java.net.URI;
+import java.net.URL;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -77,6 +84,30 @@ public final class Type<T> implements ParameterizedType, Comparable<Type<?>> {
         tmpPrimitiveWrapperTypes.add(Double.class);
         PRIMITIVE_WRAPPER_TYPES = Collections.unmodifiableSet(tmpPrimitiveWrapperTypes);
 
+        Set<Class<?>> tmpPrimitiveTypes = new HashSet<Class<?>>();
+        tmpPrimitiveTypes.add(Byte.TYPE);
+        tmpPrimitiveTypes.add(Short.TYPE);
+        tmpPrimitiveTypes.add(Integer.TYPE);
+        tmpPrimitiveTypes.add(Long.TYPE);
+        tmpPrimitiveTypes.add(Boolean.TYPE);
+        tmpPrimitiveTypes.add(Character.TYPE);
+        tmpPrimitiveTypes.add(Float.TYPE);
+        tmpPrimitiveTypes.add(Double.TYPE);
+        
+        Set<Class<?>> tmpImmutableJdk6Types = new HashSet<Class<?>>();
+        tmpImmutableJdk6Types.add(String.class);
+        tmpImmutableJdk6Types.add(BigDecimal.class);
+        tmpImmutableJdk6Types.add(BigInteger.class);
+        tmpImmutableJdk6Types.add(UUID.class);
+        tmpImmutableJdk6Types.add(URL.class);
+        tmpImmutableJdk6Types.add(URI.class);
+        tmpImmutableJdk6Types.add(Locale.class);
+        tmpImmutableJdk6Types.add(File.class);
+        tmpImmutableJdk6Types.add(Inet4Address.class);
+        tmpImmutableJdk6Types.add(Inet6Address.class);
+        tmpImmutableJdk6Types.add(InetSocketAddress.class);
+        tmpImmutableJdk6Types.add(Currency.class);
+        
         Set<Class<?>> tmpImmutableJdk8Types = new HashSet<Class<?>>();
         // TemporalAccessor
         addClassIfExists(tmpImmutableJdk8Types, "java.time.Instant");
@@ -100,18 +131,10 @@ public final class Type<T> implements ParameterizedType, Comparable<Type<?>> {
         addClassIfExists(tmpImmutableJdk8Types, "java.time.Period");
 
         Set<Class<?>> tmpImmutableTypes = new HashSet<Class<?>>();
-        tmpImmutableTypes.addAll(PRIMITIVE_WRAPPER_TYPES);
+        tmpImmutableTypes.addAll(tmpPrimitiveWrapperTypes);
+        tmpImmutableTypes.addAll(tmpPrimitiveTypes);
+        tmpImmutableTypes.addAll(tmpImmutableJdk6Types);
         tmpImmutableTypes.addAll(tmpImmutableJdk8Types);
-        tmpImmutableTypes.add(String.class);
-        tmpImmutableTypes.add(BigDecimal.class);
-        tmpImmutableTypes.add(Byte.TYPE);
-        tmpImmutableTypes.add(Short.TYPE);
-        tmpImmutableTypes.add(Integer.TYPE);
-        tmpImmutableTypes.add(Long.TYPE);
-        tmpImmutableTypes.add(Boolean.TYPE);
-        tmpImmutableTypes.add(Character.TYPE);
-        tmpImmutableTypes.add(Float.TYPE);
-        tmpImmutableTypes.add(Double.TYPE);
         IMMUTABLE_TYPES = Collections.unmodifiableSet(tmpImmutableTypes);
     }
 

tests/src/main/java/ma/glasnost/orika/test/converter/ConstructorConverterTestCase.java

@@ -39,30 +39,59 @@
  */
 public class ConstructorConverterTestCase {
 
-	
-	@Test
-	public void testStringBasedConstructor() {
-		MapperFactory factory = MappingUtil.getMapperFactory();
-		factory.getConverterFactory().registerConverter(new ConstructorConverter());
-		MapperFacade mapper = factory.getMapperFacade();
-		
-		String urlString = "http://localhost:80/index.html";
-		URL url = mapper.map(urlString, URL.class);
-		Assert.assertNotNull(url);
-		Assert.assertEquals(urlString, url.toExternalForm());
-	}
-	
-	@Test
-	public void testPrimitiveConstructor() {
-		MapperFactory factory = MappingUtil.getMapperFactory();
-		factory.getConverterFactory().registerConverter(new ConstructorConverter());
-		MapperFacade mapper = factory.getMapperFacade();
-		
-		Double doubleValue = Double.valueOf("4.99"); 
-		BigDecimal bd = mapper.map(doubleValue, BigDecimal.class);
-		Assert.assertNotNull(bd);
-		Assert.assertEquals(doubleValue, bd.doubleValue(), 0.0001);
-	}
-	
-	
+    @Test
+    public void testStringBasedConstructor() {
+        MapperFactory factory = MappingUtil.getMapperFactory();
+        factory.getConverterFactory().registerConverter(new ConstructorConverter());
+        MapperFacade mapper = factory.getMapperFacade();
+        
+        String urlString = "http://localhost:80/index.html";
+        URL url = mapper.map(urlString, URL.class);
+        Assert.assertNotNull(url);
+        Assert.assertEquals(urlString, url.toExternalForm());
+    }
+    
+    @Test
+    public void testPrimitiveConstructor() {
+        MapperFactory factory = MappingUtil.getMapperFactory();
+        factory.getConverterFactory().registerConverter(new ConstructorConverter());
+        MapperFacade mapper = factory.getMapperFacade();
+        
+        Double doubleValue = Double.valueOf("4.99");
+        BigDecimal bd = mapper.map(doubleValue, BigDecimal.class);
+        Assert.assertNotNull(bd);
+        Assert.assertEquals(doubleValue, bd.doubleValue(), 0.0001);
+    }
+    
+    @Test
+    public void testRegisterdAsBuiltinConverterAndWorksWithCustomType() {
+        MapperFactory factory = MappingUtil.getMapperFactory();
+        MapperFacade mapper = factory.getMapperFacade();
+        
+        StringContainer strCont = mapper.map("test", StringContainer.class);
+        Assert.assertNotNull(strCont);
+        Assert.assertEquals("test", strCont.getString());
+    }
+    
+    public static class StringContainer {
+        private String string;
+        
+        public StringContainer() {
+            super();
+        }
+        
+        public StringContainer(String string) {
+            super();
+            this.string = string;
+        }
+        
+        public String getString() {
+            return string;
+        }
+        
+        public void setString(String string) {
+            this.string = string;
+        }
+        
+    }
 }