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 D22191069D for ; Sat, 27 Jul 2013 02:47:04 +0000 (UTC) Received: (qmail 30150 invoked by uid 500); 27 Jul 2013 02:47:02 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 30122 invoked by uid 500); 27 Jul 2013 02:47:00 -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 30114 invoked by uid 99); 27 Jul 2013 02:46:58 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 27 Jul 2013 02:46:58 +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; Sat, 27 Jul 2013 02:46:55 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 269A123888E7; Sat, 27 Jul 2013 02:46:34 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1507564 - in /commons/proper/proxy/branches/version-2.0-work/core/src: main/java/org/apache/commons/proxy2/provider/BeanProvider.java test/java/org/apache/commons/proxy2/provider/TestBeanProvider.java Date: Sat, 27 Jul 2013 02:46:34 -0000 To: commits@commons.apache.org From: jcarman@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130727024634.269A123888E7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jcarman Date: Sat Jul 27 02:46:33 2013 New Revision: 1507564 URL: http://svn.apache.org/r1507564 Log: Simplifying BeanProvider. Modified: commons/proper/proxy/branches/version-2.0-work/core/src/main/java/org/apache/commons/proxy2/provider/BeanProvider.java commons/proper/proxy/branches/version-2.0-work/core/src/test/java/org/apache/commons/proxy2/provider/TestBeanProvider.java Modified: commons/proper/proxy/branches/version-2.0-work/core/src/main/java/org/apache/commons/proxy2/provider/BeanProvider.java URL: http://svn.apache.org/viewvc/commons/proper/proxy/branches/version-2.0-work/core/src/main/java/org/apache/commons/proxy2/provider/BeanProvider.java?rev=1507564&r1=1507563&r2=1507564&view=diff ============================================================================== --- commons/proper/proxy/branches/version-2.0-work/core/src/main/java/org/apache/commons/proxy2/provider/BeanProvider.java (original) +++ commons/proper/proxy/branches/version-2.0-work/core/src/main/java/org/apache/commons/proxy2/provider/BeanProvider.java Sat Jul 27 02:46:33 2013 @@ -17,6 +17,8 @@ package org.apache.commons.proxy2.provider; +import org.apache.commons.lang3.SerializationUtils; +import org.apache.commons.lang3.Validate; import org.apache.commons.proxy2.ObjectProvider; import org.apache.commons.proxy2.exception.ObjectProviderException; @@ -37,18 +39,11 @@ public class BeanProvider implements // Fields //********************************************************************************************************************** - private Class beanClass; + private final Class beanClass; - //********************************************************************************************************************** - // Constructors - //********************************************************************************************************************** - - /** - * Create a new BeanProvider instance. - */ - public BeanProvider() - { - } +//********************************************************************************************************************** +// Constructors +//********************************************************************************************************************** /** * Constructs a provider which instantiates objects of the specified bean class. @@ -57,12 +52,13 @@ public class BeanProvider implements */ public BeanProvider( Class beanClass ) { + Validate.notNull(beanClass, "Bean class cannot be null."); this.beanClass = beanClass; } - //********************************************************************************************************************** - // ObjectProvider Implementation - //********************************************************************************************************************** +//********************************************************************************************************************** +// ObjectProvider Implementation +//********************************************************************************************************************** /** * {@inheritDoc} @@ -71,10 +67,6 @@ public class BeanProvider implements { try { - if( beanClass == null ) - { - throw new ObjectProviderException("No bean class provided."); - } return beanClass.newInstance(); } catch( InstantiationException e ) @@ -87,16 +79,4 @@ public class BeanProvider implements e); } } - - //********************************************************************************************************************** - // Getter/Setter Methods - //********************************************************************************************************************** - - /** - * Set the beanClass. - * @param beanClass the Class to set - */ - public void setBeanClass(Class beanClass) { - this.beanClass = beanClass; - } } Modified: commons/proper/proxy/branches/version-2.0-work/core/src/test/java/org/apache/commons/proxy2/provider/TestBeanProvider.java URL: http://svn.apache.org/viewvc/commons/proper/proxy/branches/version-2.0-work/core/src/test/java/org/apache/commons/proxy2/provider/TestBeanProvider.java?rev=1507564&r1=1507563&r2=1507564&view=diff ============================================================================== --- commons/proper/proxy/branches/version-2.0-work/core/src/test/java/org/apache/commons/proxy2/provider/TestBeanProvider.java (original) +++ commons/proper/proxy/branches/version-2.0-work/core/src/test/java/org/apache/commons/proxy2/provider/TestBeanProvider.java Sat Jul 27 02:46:33 2013 @@ -30,8 +30,7 @@ public class TestBeanProvider extends Ab { try { - final BeanProvider p = new BeanProvider(); - p.setBeanClass(Number.class); + final BeanProvider p = new BeanProvider(Number.class); p.getObject(); fail(); } @@ -61,11 +60,11 @@ public class TestBeanProvider extends Ab { try { - final BeanProvider p = new BeanProvider(); + final BeanProvider p = new BeanProvider(null); p.getObject(); - fail(); + fail("Should throw NullPointerException."); } - catch( ObjectProviderException e ) + catch( NullPointerException e ) { } }