Return-Path: X-Original-To: apmail-commons-commits-archive@minotaur.apache.org Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 463007978 for ; Mon, 5 Dec 2011 22:28:17 +0000 (UTC) Received: (qmail 14224 invoked by uid 500); 5 Dec 2011 22:28:17 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 14165 invoked by uid 500); 5 Dec 2011 22:28:17 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 14157 invoked by uid 99); 5 Dec 2011 22:28:17 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 Dec 2011 22:28:17 +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; Mon, 05 Dec 2011 22:28:13 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 27376238899C for ; Mon, 5 Dec 2011 22:27:51 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1210678 - in /commons/proper/digester/trunk/src: main/java/org/apache/commons/digester3/binder/ test/resources/org/apache/commons/digester3/xmlrules/ Date: Mon, 05 Dec 2011 22:27:50 -0000 To: commits@commons.apache.org From: simonetripodi@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111205222751.27376238899C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: simonetripodi Date: Mon Dec 5 22:27:50 2011 New Revision: 1210678 URL: http://svn.apache.org/viewvc?rev=1210678&view=rev Log: [DIGESTER-154] The DigesterBinder is not able to load primitive classes by name Added: commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/binder/BinderClassLoader.java (with props) Modified: commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/binder/DigesterLoader.java commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/binder/ObjectCreateBuilder.java commons/proper/digester/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/constructor-testrules.xml Added: commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/binder/BinderClassLoader.java URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/binder/BinderClassLoader.java?rev=1210678&view=auto ============================================================================== --- commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/binder/BinderClassLoader.java (added) +++ commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/binder/BinderClassLoader.java Mon Dec 5 22:27:50 2011 @@ -0,0 +1,71 @@ +package org.apache.commons.digester3.binder; + +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +final class BinderClassLoader + extends ClassLoader +{ + + private static final Map> PRIMITIVE_TYPES; + static + { + HashMap> primitiveTypes = new HashMap>(); + primitiveTypes.put( "boolean", boolean.class ); + primitiveTypes.put( "byte", byte.class ); + primitiveTypes.put( "short", short.class ); + primitiveTypes.put( "int", int.class ); + primitiveTypes.put( "char", char.class ); + primitiveTypes.put( "long", long.class ); + primitiveTypes.put( "float", float.class ); + primitiveTypes.put( "double", double.class ); + PRIMITIVE_TYPES = Collections.unmodifiableMap( primitiveTypes ); + } + + private final ClassLoader adaptedClassLoader; + + public BinderClassLoader( ClassLoader adaptedClassLoader ) + { + this.adaptedClassLoader = adaptedClassLoader; + } + + public ClassLoader getAdaptedClassLoader() + { + return adaptedClassLoader; + } + + /** + * {@inheritDoc} + */ + @Override + protected synchronized Class loadClass( String name, boolean resolve ) + throws ClassNotFoundException + { + if ( PRIMITIVE_TYPES.containsKey( name ) ) + { + return PRIMITIVE_TYPES.get( name ); + } + return adaptedClassLoader.loadClass( name ); + } + +} Propchange: commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/binder/BinderClassLoader.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/binder/BinderClassLoader.java ------------------------------------------------------------------------------ svn:keywords = Date Author Id Revision HeadURL Propchange: commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/binder/BinderClassLoader.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/binder/DigesterLoader.java URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/binder/DigesterLoader.java?rev=1210678&r1=1210677&r2=1210678&view=diff ============================================================================== --- commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/binder/DigesterLoader.java (original) +++ commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/binder/DigesterLoader.java Mon Dec 5 22:27:50 2011 @@ -113,7 +113,7 @@ public final class DigesterLoader * used to load Digester itself, is used, based on the value of the * useContextClassLoader variable. */ - private ClassLoader classLoader; + private BinderClassLoader classLoader; /** * An optional class that substitutes values in attributes and body text. This may be null and so a null check is @@ -196,7 +196,7 @@ public final class DigesterLoader throw new IllegalArgumentException( "Parameter 'classLoader' cannot be null" ); } - this.classLoader = classLoader; + this.classLoader = new BinderClassLoader( classLoader ); return this; } @@ -550,7 +550,8 @@ public final class DigesterLoader } Digester digester = new Digester( reader ); - digester.setClassLoader( classLoader ); + // the ClassLoader adapter is no needed anymore + digester.setClassLoader( classLoader.getAdaptedClassLoader() ); digester.setRules( rules ); digester.setSubstitutor( substitutor ); digester.registerAll( entityValidator ); Modified: commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/binder/ObjectCreateBuilder.java URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/binder/ObjectCreateBuilder.java?rev=1210678&r1=1210677&r2=1210678&view=diff ============================================================================== --- commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/binder/ObjectCreateBuilder.java (original) +++ commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/binder/ObjectCreateBuilder.java Mon Dec 5 22:27:50 2011 @@ -22,9 +22,6 @@ package org.apache.commons.digester3.bin import static java.lang.String.format; import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; import org.apache.commons.digester3.ObjectCreateRule; @@ -36,20 +33,7 @@ import org.apache.commons.digester3.Obje public final class ObjectCreateBuilder extends AbstractBackToLinkedRuleBuilder { - private static final Map> PRIMITIVE_TYPES; - static - { - HashMap> primitiveTypes = new HashMap>(); - primitiveTypes.put("boolean", boolean.class); - primitiveTypes.put("byte", byte.class); - primitiveTypes.put("short", short.class); - primitiveTypes.put("int", int.class); - primitiveTypes.put("char", char.class); - primitiveTypes.put("long", long.class); - primitiveTypes.put("float", float.class); - primitiveTypes.put("double", double.class); - PRIMITIVE_TYPES = Collections.unmodifiableMap(primitiveTypes); - } + private final ClassLoader classLoader; @@ -151,11 +135,6 @@ public final class ObjectCreateBuilder Class[] paramTypes = new Class[paramTypeNames.length]; for ( int i = 0; i < paramTypeNames.length; i++ ) { - if ( PRIMITIVE_TYPES.containsKey( paramTypeNames[i] ) ) - { - paramTypes[i] = PRIMITIVE_TYPES.get( paramTypeNames[i] ); - continue; - } try { paramTypes[i] = classLoader.loadClass( paramTypeNames[i] ); Modified: commons/proper/digester/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/constructor-testrules.xml URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/constructor-testrules.xml?rev=1210678&r1=1210677&r2=1210678&view=diff ============================================================================== --- commons/proper/digester/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/constructor-testrules.xml (original) +++ commons/proper/digester/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/constructor-testrules.xml Mon Dec 5 22:27:50 2011 @@ -19,7 +19,7 @@ + paramtypes="boolean,double" params="true,0" />