changed to use groovy's built in type conversion as a first resort

git-svn-id: https://svn.codehaus.org/grails/trunk@4146 1cfb16fd-6d17-0410-8ff1-b7e8e1e2867d

Author: graeme

src/persistence/org/codehaus/groovy/grails/orm/hibernate/metaclass/ExistsPersistentMethod.java

@@ -18,6 +18,7 @@
 import org.codehaus.groovy.grails.commons.DomainClassArtefactHandler;
 import org.codehaus.groovy.grails.commons.GrailsApplication;
 import org.codehaus.groovy.grails.commons.GrailsDomainClass;
+import org.codehaus.groovy.runtime.DefaultGroovyMethods;
 import org.hibernate.SessionFactory;
 import org.springframework.beans.SimpleTypeConverter;
 
@@ -61,7 +62,12 @@ protected Object doInvokeInternal(Class clazz, String methodName, Object[] argum
         if(domainClass != null) {
             Class identityType = domainClass.getIdentifier().getType();
             if(!identityType.isAssignableFrom(arg.getClass())) {
-                arg = typeConverter.convertIfNecessary(arg, identityType);
+                if(arg instanceof Number && Long.class.equals(identityType)) {
+                    arg = DefaultGroovyMethods.toLong((Number)arg);
+                }
+                else {
+                    arg = typeConverter.convertIfNecessary(arg, identityType);
+                }
             }
         }
 

src/persistence/org/codehaus/groovy/grails/orm/hibernate/metaclass/GetAllPersistentMethod.java

@@ -18,6 +18,7 @@
 import org.codehaus.groovy.grails.commons.DomainClassArtefactHandler;
 import org.codehaus.groovy.grails.commons.GrailsApplication;
 import org.codehaus.groovy.grails.commons.GrailsDomainClass;
+import org.codehaus.groovy.runtime.DefaultGroovyMethods;
 import org.hibernate.*;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.orm.hibernate3.HibernateCallback;
@@ -78,7 +79,12 @@ protected Object doInvokeInternal(final Class clazz, String methodName, Object[]
 			// convert arguments to required identifier type
 			for (int i = 0; i < arguments.length; i++) {
 				if (!identityType.isAssignableFrom(arguments[i].getClass())) {
-					args.add(typeConverter.convertIfNecessary(arguments[i], identityType));
+                    if(arguments[i] instanceof Number && Long.class.equals(identityType)) {
+                        args.add(DefaultGroovyMethods.toLong((Number)arguments[i]));
+                    }
+                    else {
+                        args.add(typeConverter.convertIfNecessary(arguments[i], identityType));
+                    }
 				} else {
 					args.add(arguments[i]);
 				}

src/persistence/org/codehaus/groovy/grails/orm/hibernate/metaclass/GetPersistentMethod.java

@@ -18,6 +18,7 @@
 import org.codehaus.groovy.grails.commons.DomainClassArtefactHandler;
 import org.codehaus.groovy.grails.commons.GrailsApplication;
 import org.codehaus.groovy.grails.commons.GrailsDomainClass;
+import org.codehaus.groovy.runtime.DefaultGroovyMethods;
 import org.hibernate.SessionFactory;
 import org.springframework.beans.SimpleTypeConverter;
 
@@ -63,8 +64,14 @@ protected Object doInvokeInternal(final Class clazz, String methodName,
             DomainClassArtefactHandler.TYPE, clazz.getName());
 		if(domainClass != null) {
 			Class identityType = domainClass.getIdentifier().getType();
-			if(!identityType.isAssignableFrom(arg.getClass())) {
-				arg = typeConverter.convertIfNecessary(arg, identityType);
+
+            if(!identityType.isAssignableFrom(arg.getClass())) {
+                if(arg instanceof Number && Long.class.equals(identityType)) {
+                    arg = DefaultGroovyMethods.toLong((Number)arg);
+                }
+                else {
+                    arg = typeConverter.convertIfNecessary(arg, identityType);
+                }                
 			}
 		}