Return-Path: Delivered-To: apmail-openjpa-commits-archive@www.apache.org Received: (qmail 39269 invoked from network); 29 Jun 2007 10:53:29 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 29 Jun 2007 10:53:29 -0000 Received: (qmail 3185 invoked by uid 500); 29 Jun 2007 10:53:32 -0000 Delivered-To: apmail-openjpa-commits-archive@openjpa.apache.org Received: (qmail 3173 invoked by uid 500); 29 Jun 2007 10:53:32 -0000 Mailing-List: contact commits-help@openjpa.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openjpa.apache.org Delivered-To: mailing list commits@openjpa.apache.org Received: (qmail 3161 invoked by uid 99); 29 Jun 2007 10:53:32 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 29 Jun 2007 03:53:32 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 29 Jun 2007 03:53:28 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id CED801A981C; Fri, 29 Jun 2007 03:53:08 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r551845 - in /openjpa/trunk/openjpa-kernel/src/main: java/org/apache/openjpa/kernel/MethodStoreQuery.java resources/org/apache/openjpa/kernel/localizer.properties Date: Fri, 29 Jun 2007 10:53:07 -0000 To: commits@openjpa.apache.org From: pcl@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070629105308.CED801A981C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: pcl Date: Fri Jun 29 03:53:05 2007 New Revision: 551845 URL: http://svn.apache.org/viewvc?view=rev&rev=551845 Log: Improved error messages Modified: openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/MethodStoreQuery.java openjpa/trunk/openjpa-kernel/src/main/resources/org/apache/openjpa/kernel/localizer.properties Modified: openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/MethodStoreQuery.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/MethodStoreQuery.java?view=diff&rev=551845&r1=551844&r2=551845 ============================================================================== --- openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/MethodStoreQuery.java (original) +++ openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/MethodStoreQuery.java Fri Jun 29 03:53:05 2007 @@ -248,6 +248,10 @@ } if (!Modifier.isStatic(meth.getModifiers())) throw new UserException(_loc.get("method-not-static", meth)); + if (!ResultObjectProvider.class.isAssignableFrom( + meth.getReturnType())) + throw new UserException(_loc.get("method-return-type-invalid", + meth, meth.getReturnType())); _meth = meth; } Modified: openjpa/trunk/openjpa-kernel/src/main/resources/org/apache/openjpa/kernel/localizer.properties URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/resources/org/apache/openjpa/kernel/localizer.properties?view=diff&rev=551845&r1=551844&r2=551845 ============================================================================== --- openjpa/trunk/openjpa-kernel/src/main/resources/org/apache/openjpa/kernel/localizer.properties (original) +++ openjpa/trunk/openjpa-kernel/src/main/resources/org/apache/openjpa/kernel/localizer.properties Fri Jun 29 03:53:05 2007 @@ -300,6 +300,9 @@ qualify the class name or to import its package into this query if the \ class is not in the query candidate class'' package. method-not-static: Method "{0}" named in the MethodQL query must be static. +method-return-type-invalid: Method "{0}" named in the MethodQL query must \ + have a return type that is assignable from ResultObjectProvider. Return \ + type is: {1}. no-method: You must set the query filter to the name of the method to execute \ for this MethodQL query instance. method-error: There was an error invoking method "{0}" with arguments "{1}".