Return-Path: Delivered-To: apmail-harmony-commits-archive@www.apache.org Received: (qmail 28339 invoked from network); 13 Dec 2008 19:23:31 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 13 Dec 2008 19:23:31 -0000 Received: (qmail 3994 invoked by uid 500); 13 Dec 2008 19:23:43 -0000 Delivered-To: apmail-harmony-commits-archive@harmony.apache.org Received: (qmail 3978 invoked by uid 500); 13 Dec 2008 19:23:43 -0000 Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@harmony.apache.org Delivered-To: mailing list commits@harmony.apache.org Received: (qmail 3969 invoked by uid 99); 13 Dec 2008 19:23:43 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 13 Dec 2008 11:23:43 -0800 X-ASF-Spam-Status: No, hits=0.0 required=10.0 tests= 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, 13 Dec 2008 19:23:29 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 225FE238889B; Sat, 13 Dec 2008 11:23:08 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r726259 - in /harmony/enhanced/classlib/trunk/modules/x-net/src: main/java/javax/net/ssl/KeyStoreBuilderParameters.java test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/KeyStoreBuilderParametersTest.java Date: Sat, 13 Dec 2008 19:23:07 -0000 To: commits@harmony.apache.org From: ndbeyer@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081213192308.225FE238889B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ndbeyer Date: Sat Dec 13 11:23:07 2008 New Revision: 726259 URL: http://svn.apache.org/viewvc?rev=726259&view=rev Log: Code clean up and documentation Modified: harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/javax/net/ssl/KeyStoreBuilderParameters.java harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/KeyStoreBuilderParametersTest.java Modified: harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/javax/net/ssl/KeyStoreBuilderParameters.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/javax/net/ssl/KeyStoreBuilderParameters.java?rev=726259&r1=726258&r2=726259&view=diff ============================================================================== --- harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/javax/net/ssl/KeyStoreBuilderParameters.java (original) +++ harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/javax/net/ssl/KeyStoreBuilderParameters.java Sat Dec 13 11:23:07 2008 @@ -23,31 +23,52 @@ import java.security.KeyStore; /** - * @com.intel.drl.spec_ref - * + * A parameters object for {@link X509KeyManager} + * + * @since 1.5 + * @see X509KeyManager + * @see KeyStore.Builder */ public class KeyStoreBuilderParameters implements ManagerFactoryParameters { - private List ksbuilders; + private final List ksbuilders; + /** + * Constructs an instance for the builder passed. + * + * @param builder a builder + */ public KeyStoreBuilderParameters(KeyStore.Builder builder) { - ksbuilders = new ArrayList(); - if (builder != null) { - ksbuilders.add(builder); - } + super(); + ksbuilders = Collections.singletonList(builder); } + /** + * Constructs an instance for the builder list passed. + * + * @param parameters the builder list + * @throws NullPointerException if {@code parameters} is {@code null} + * @throws IllegalArgumentException if {@code parameters} is empty + */ + @SuppressWarnings("unchecked") public KeyStoreBuilderParameters(List parameters) { + super(); if (parameters == null) { throw new NullPointerException("Builders list is null"); } if (parameters.isEmpty()) { throw new IllegalArgumentException("Builders list is empty"); } - ksbuilders = new ArrayList(parameters); + ksbuilders = Collections.unmodifiableList(new ArrayList(parameters)); } + /** + * The list of builder parameters. + * + * @return an unmodifiable list of parameters + */ + @SuppressWarnings("unchecked") public List getParameters() { - return Collections.unmodifiableList(ksbuilders); + return ksbuilders; } } Modified: harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/KeyStoreBuilderParametersTest.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/KeyStoreBuilderParametersTest.java?rev=726259&r1=726258&r2=726259&view=diff ============================================================================== --- harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/KeyStoreBuilderParametersTest.java (original) +++ harmony/enhanced/classlib/trunk/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/KeyStoreBuilderParametersTest.java Sat Dec 13 11:23:07 2008 @@ -19,6 +19,7 @@ import java.security.KeyStore; import java.security.KeyStoreException; +import java.security.KeyStore.Builder; import java.util.ArrayList; import java.util.List; @@ -31,13 +32,28 @@ * methods. */ public class KeyStoreBuilderParametersTest extends TestCase { + + class EmptyBuilder extends KeyStore.Builder { + public KeyStore getKeyStore() throws KeyStoreException { + return null; + } + + public KeyStore.ProtectionParameter getProtectionParameter(String alias) + throws KeyStoreException { + return null; + } + } /* * Class under test for void KeyStoreBuilderParameters(KeyStore.Builder) */ public final void testKeyStoreBuilderParametersBuilder() { - // should not throw NullPointerException - new KeyStoreBuilderParameters((KeyStore.Builder) null); + try { + new KeyStoreBuilderParameters((KeyStore.Builder) null); + } catch (NullPointerException e) { + // javadoc says this should throw NPE, but it doesn't + fail("no NPE expected"); + } } /* @@ -45,36 +61,37 @@ */ public final void testKeyStoreBuilderParametersList() { try { - new KeyStoreBuilderParameters((List) null); - fail("No expected NullPointerException"); + new KeyStoreBuilderParameters((List) null); + fail("expected a NPE"); } catch (NullPointerException e) { } try { - new KeyStoreBuilderParameters(new ArrayList()); - fail("No expected IllegalArgumentException"); + new KeyStoreBuilderParameters(new ArrayList()); + fail("expected a IAE"); } catch (IllegalArgumentException e) { } } + @SuppressWarnings("unchecked") public final void testGetParameters() { - List ksbuilders; - KeyStore.Builder builder = new myBuilder(); - List result; + List ksbuilders; + KeyStore.Builder builder = new EmptyBuilder(); + List result; KeyStoreBuilderParameters param = new KeyStoreBuilderParameters(builder); result = param.getParameters(); try { - result.add(new myBuilder()); + result.add(new EmptyBuilder()); fail("The list is modifiable"); } catch (UnsupportedOperationException e) { } assertEquals("incorrect size", 1, result.size()); assertTrue("incorrect list", result.contains(builder)); - ksbuilders = new ArrayList(); + ksbuilders = new ArrayList(); ksbuilders.add(builder); - ksbuilders.add(new myBuilder()); + ksbuilders.add(new EmptyBuilder()); param = new KeyStoreBuilderParameters(ksbuilders); result = param.getParameters(); try { @@ -86,14 +103,3 @@ assertTrue("incorrect list", result.containsAll(ksbuilders)); } } - -class myBuilder extends KeyStore.Builder { - public KeyStore getKeyStore() throws KeyStoreException { - return null; - } - - public KeyStore.ProtectionParameter getProtectionParameter(String alias) - throws KeyStoreException { - return null; - } -}