Return-Path: X-Original-To: apmail-camel-commits-archive@www.apache.org Delivered-To: apmail-camel-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0ABE6EE86 for ; Thu, 7 Feb 2013 18:31:20 +0000 (UTC) Received: (qmail 47767 invoked by uid 500); 7 Feb 2013 18:31:20 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 47729 invoked by uid 500); 7 Feb 2013 18:31:19 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 47721 invoked by uid 99); 7 Feb 2013 18:31:19 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Feb 2013 18:31:19 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Feb 2013 18:31:17 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 03B4A238890B; Thu, 7 Feb 2013 18:30:57 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1443644 - in /camel/trunk/camel-core/src: main/java/org/apache/camel/util/ObjectHelper.java test/java/org/apache/camel/impl/DefaultClassResolverTest.java Date: Thu, 07 Feb 2013 18:30:56 -0000 To: commits@camel.apache.org From: davsclaus@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130207183057.03B4A238890B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: davsclaus Date: Thu Feb 7 18:30:56 2013 New Revision: 1443644 URL: http://svn.apache.org/r1443644 Log: CAMEL-6051: Added more simple type converters to array types to default class resolver, so you can convert to Object[] etc. Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultClassResolverTest.java Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java?rev=1443644&r1=1443643&r2=1443644&view=diff ============================================================================== --- camel/trunk/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java (original) +++ camel/trunk/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java Thu Feb 7 18:30:56 2013 @@ -799,9 +799,15 @@ public final class ObjectHelper { * @return the class or null if it could not be loaded */ public static Class loadSimpleType(String name) { - // special for byte[] as its common to use + // special for byte[] or Object[] as its common to use if ("java.lang.byte[]".equals(name) || "byte[]".equals(name)) { return byte[].class; + } else if ("java.lang.Byte[]".equals(name) || "Byte[]".equals(name)) { + return Byte[].class; + } else if ("java.lang.Object[]".equals(name) || "Object[]".equals(name)) { + return Object[].class; + } else if ("java.lang.String[]".equals(name) || "String[]".equals(name)) { + return String[].class; // and these is common as well } else if ("java.lang.String".equals(name) || "String".equals(name)) { return String.class; Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultClassResolverTest.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultClassResolverTest.java?rev=1443644&r1=1443643&r2=1443644&view=diff ============================================================================== --- camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultClassResolverTest.java (original) +++ camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultClassResolverTest.java Thu Feb 7 18:30:56 2013 @@ -62,6 +62,40 @@ public class DefaultClassResolverTest ex assertNotNull(clazz); } + public void testResolveMandatorySimpleClassType()throws Exception { + DefaultClassResolver resolver = new DefaultClassResolver(); + + Class clazz = resolver.resolveMandatoryClass("Byte", Byte.class); + assertNotNull(clazz); + clazz = resolver.resolveMandatoryClass("java.lang.Byte", Byte.class); + assertNotNull(clazz); + + Class clazz2 = resolver.resolveMandatoryClass("Long", Long.class); + assertNotNull(clazz2); + clazz2 = resolver.resolveMandatoryClass("java.lang.Long", Long.class); + assertNotNull(clazz2); + + Class clazz3 = resolver.resolveMandatoryClass("String", String.class); + assertNotNull(clazz3); + clazz3 = resolver.resolveMandatoryClass("java.lang.String", String.class); + assertNotNull(clazz3); + + Class clazz4 = resolver.resolveMandatoryClass("Byte[]", Byte[].class); + assertNotNull(clazz4); + clazz4 = resolver.resolveMandatoryClass("java.lang.Byte[]", Byte[].class); + assertNotNull(clazz4); + + Class clazz5 = resolver.resolveMandatoryClass("Object[]", Object[].class); + assertNotNull(clazz5); + clazz5 = resolver.resolveMandatoryClass("java.lang.Object[]", Object[].class); + assertNotNull(clazz5); + + Class clazz6 = resolver.resolveMandatoryClass("String[]", String[].class); + assertNotNull(clazz6); + clazz6 = resolver.resolveMandatoryClass("java.lang.String[]", String[].class); + assertNotNull(clazz6); + } + public void testResolveMandatoryClassClassLoader() throws Exception { DefaultClassResolver resolver = new DefaultClassResolver(); Class clazz = resolver.resolveMandatoryClass("java.lang.Integer", DefaultClassResolverTest.class.getClassLoader());