TAP5-944: When a ValueEncoder is unable to convert an id to a entity, it should wrap the underlying type coercion exception to describe the input and expected output type

git-svn-id: https://svn.apache.org/repos/asf/tapestry/tapestry5/trunk@895090 13f79535-47bb-0310-9956-ffa450edef68

Author: Howard Lewis Ship

.gitignore

@@ -7,3 +7,4 @@
 *.iws
 target
 test-output
+temp-testng*.xml

tapestry-hibernate/src/main/java/org/apache/tapestry5/internal/hibernate/HibernateEntityValueEncoder.java

@@ -41,8 +41,8 @@ public final class HibernateEntityValueEncoder<E> implements ValueEncoder<E>
 
     private final Logger logger;
 
-    public HibernateEntityValueEncoder(Class<E> entityClass, PersistentClass persistentClass, Session session,
-                                       PropertyAccess propertyAccess, TypeCoercer typeCoercer, Logger logger)
+    public HibernateEntityValueEncoder(Class<E> entityClass, PersistentClass persistentClass,
+            Session session, PropertyAccess propertyAccess, TypeCoercer typeCoercer, Logger logger)
     {
         this.entityClass = entityClass;
         this.session = session;
@@ -53,39 +53,58 @@ public HibernateEntityValueEncoder(Class<E> entityClass, PersistentClass persist
 
         idPropertyName = property.getName();
 
-        propertyAdapter = propertyAccess.getAdapter(this.entityClass).getPropertyAdapter(idPropertyName);
+        propertyAdapter = propertyAccess.getAdapter(this.entityClass).getPropertyAdapter(
+                idPropertyName);
     }
 
-
     public String toClient(E value)
     {
-        if (value == null) return null;
+        if (value == null)
+            return null;
 
         Object id = propertyAdapter.get(value);
 
         if (id == null)
-            throw new IllegalStateException(String.format(
-                    "Entity %s has an %s property of null; this probably means that it has not been persisted yet.",
-                    value, idPropertyName));
+            throw new IllegalStateException(
+                    String
+                            .format(
+                                    "Entity %s has an %s property of null; this probably means that it has not been persisted yet.",
+                                    value, idPropertyName));
 
         return typeCoercer.coerce(id, String.class);
     }
 
     @SuppressWarnings("unchecked")
     public E toValue(String clientValue)
     {
-        if (InternalUtils.isBlank(clientValue)) return null;
+        if (InternalUtils.isBlank(clientValue))
+            return null;
+
+        Object id = null;
+
+        try
+        {
 
-        Object id = typeCoercer.coerce(clientValue, propertyAdapter.getType());
+            id = typeCoercer.coerce(clientValue, propertyAdapter.getType());
+        }
+        catch (Exception ex)
+        {
+            throw new RuntimeException(String.format(
+                    "Exception converting '%s' to instance of %s (id type for entity %s): %s",
+                    clientValue, propertyAdapter.getType().getName(), entityClass.getName(),
+                    InternalUtils.toMessage(ex)), ex);
+        }
 
         Serializable ser = Defense.cast(id, Serializable.class, "id");
 
         E result = (E) session.get(entityClass, ser);
 
         if (result == null)
         {
-            // We don't identify the entity type in the message because the logger is based on the entity type.
-            logger.error(String.format("Unable to convert client value '%s' into an entity instance.", clientValue));
+            // We don't identify the entity type in the message because the logger is based on the
+            // entity type.
+            logger.error(String.format(
+                    "Unable to convert client value '%s' into an entity instance.", clientValue));
         }
 
         return result;

tapestry-hibernate/src/test/java/org/apache/tapestry5/internal/hibernate/HibernateEntityValueEncoderTest.java

@@ -68,16 +68,16 @@ public void to_client_id_null()
         HibernateEntityValueEncoder<SampleEntity> encoder = new HibernateEntityValueEncoder<SampleEntity>(
                 SampleEntity.class, persistentClass, session, access, typeCoercer, logger);
 
-
         try
         {
             encoder.toClient(entity);
             unreachable();
         }
         catch (IllegalStateException ex)
         {
-            assertMessageContains(ex, "Entity org.apache.tapestry5.internal.hibernate.SampleEntity",
-                                  "has an id property of null");
+            assertMessageContains(ex,
+                    "Entity org.apache.tapestry5.internal.hibernate.SampleEntity",
+                    "has an id property of null");
         }
 
         verify();
@@ -104,11 +104,42 @@ public void to_value_not_found()
         HibernateEntityValueEncoder<SampleEntity> encoder = new HibernateEntityValueEncoder<SampleEntity>(
                 SampleEntity.class, persistentClass, session, access, typeCoercer, logger);
 
-
         assertNull(encoder.toValue("12345"));
 
         verify();
+    }
+
+    @Test
+    public void to_value_bad_type_coercion()
+    {
+        Session session = mockSession();
+        Logger logger = mockLogger();
+
+        replay();
 
+        RootClass persistentClass = new RootClass();
+        Property idProperty = new Property();
+        idProperty.setName("id");
+        persistentClass.setIdentifierProperty(idProperty);
+
+        HibernateEntityValueEncoder<SampleEntity> encoder = new HibernateEntityValueEncoder<SampleEntity>(
+                SampleEntity.class, persistentClass, session, access, typeCoercer, logger);
+
+        try
+        {
+            encoder.toValue("xyz");
+            unreachable();
+        }
+        catch (RuntimeException ex)
+        {
+            assertMessageContains(
+                    ex,
+                    "Exception converting 'xyz' to instance of java.lang.Long (id type for entity org.apache.tapestry5.internal.hibernate.SampleEntity)");
+        }
+
+        assertNull(encoder.toValue(""));
+
+        verify();
     }
 
     protected final Session mockSession()