From 19944d58e361cd5934496f43b4500e961d8a16e6 Mon Sep 17 00:00:00 2001
From: "Brian S. O'Neill" <bronee@gmail.com>
Date: Sat, 2 Jun 2007 16:21:19 +0000
Subject: Improve unsupported array type exception messages.

---
 src/main/java/com/amazon/carbonado/gen/MasterStorableGenerator.java | 4 ++--
 src/main/java/com/amazon/carbonado/info/StorableIntrospector.java   | 6 ++++--
 src/main/java/com/amazon/carbonado/raw/GenericEncodingStrategy.java | 3 ++-
 3 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'src/main/java/com/amazon/carbonado')

diff --git a/src/main/java/com/amazon/carbonado/gen/MasterStorableGenerator.java b/src/main/java/com/amazon/carbonado/gen/MasterStorableGenerator.java
index bf5503f..18f0ea9 100644
--- a/src/main/java/com/amazon/carbonado/gen/MasterStorableGenerator.java
+++ b/src/main/java/com/amazon/carbonado/gen/MasterStorableGenerator.java
@@ -314,8 +314,8 @@ public final class MasterStorableGenerator<S extends Storable> {
                             } else {
                                 throw new SupportException
                                     ("Unable to support sequence of type \"" +
-                                     property.getType().getName() + "\" for property: " +
-                                     property.getName());
+                                     TypeDesc.forClass(property.getType()).getFullName() +
+                                     "\" for property: " + property.getName());
                             }
                         } catch (NoSuchMethodException e) {
                             Error err = new NoSuchMethodError();
diff --git a/src/main/java/com/amazon/carbonado/info/StorableIntrospector.java b/src/main/java/com/amazon/carbonado/info/StorableIntrospector.java
index 3f84b00..0fd427d 100644
--- a/src/main/java/com/amazon/carbonado/info/StorableIntrospector.java
+++ b/src/main/java/com/amazon/carbonado/info/StorableIntrospector.java
@@ -1171,7 +1171,8 @@ public class StorableIntrospector {
 
             if (bestConstrainMethod == null) {
                 errorMessages.add("Constraint does not support property type: " +
-                                  property.getType().getName() + "; constraint type: " +
+                                  TypeDesc.forClass(property.getType()).getFullName() +
+                                  "; constraint type: " +
                                   annotation.annotationType().getName());
             } else {
                 StorablePropertyAnnotation spa =
@@ -1245,7 +1246,8 @@ public class StorableIntrospector {
 
             if (adaptMethods.length == 0) {
                 errorMessages.add("Adapter does not support property type: " +
-                                  property.getType().getName() + "; adapter type: " +
+                                  TypeDesc.forClass(property.getType()).getFullName() +
+                                  "; adapter type: " +
                                   annotation.annotationType().getName());
             } else {
                 StorablePropertyAnnotation spa =
diff --git a/src/main/java/com/amazon/carbonado/raw/GenericEncodingStrategy.java b/src/main/java/com/amazon/carbonado/raw/GenericEncodingStrategy.java
index c0fa0af..1c9a4e9 100644
--- a/src/main/java/com/amazon/carbonado/raw/GenericEncodingStrategy.java
+++ b/src/main/java/com/amazon/carbonado/raw/GenericEncodingStrategy.java
@@ -457,7 +457,8 @@ public class GenericEncodingStrategy<S extends Storable> {
     }
 
     private SupportException notSupported(StorableProperty<S> property) {
-        return notSupported(property.getName(), property.getType().getName());
+        return notSupported(property.getName(),
+                            TypeDesc.forClass(property.getType()).getFullName());
     }
 
     private SupportException notSupported(String propertyName, String typeName) {
-- 
cgit v1.2.3