src/java.base/share/classes/java/security/KeyPairGenerator.java

rev 15967 : [mq]: GetInstance

*** 207,226 ****
       * See the KeyPairGenerator section in the <a href=
       * "{@docRoot}/../technotes/guides/security/StandardNames.html#KeyPairGenerator">
       * Java Cryptography Architecture Standard Algorithm Name Documentation</a>
       * for information about standard algorithm names.
       *
!      * @return the new KeyPairGenerator object.
       *
!      * @exception NoSuchAlgorithmException if no Provider supports a
!      *          KeyPairGeneratorSpi implementation for the
!      *          specified algorithm.
       *
       * @see Provider
       */
      public static KeyPairGenerator getInstance(String algorithm)
              throws NoSuchAlgorithmException {
          List<Service> list =
                  GetInstance.getServices("KeyPairGenerator", algorithm);
          Iterator<Service> t = list.iterator();
          if (t.hasNext() == false) {
              throw new NoSuchAlgorithmException
--- 207,229 ----
       * See the KeyPairGenerator section in the <a href=
       * "{@docRoot}/../technotes/guides/security/StandardNames.html#KeyPairGenerator">
       * Java Cryptography Architecture Standard Algorithm Name Documentation</a>
       * for information about standard algorithm names.
       *
!      * @return the new {@code KeyPairGenerator} object
       *
!      * @throws NoSuchAlgorithmException if no {@code Provider} supports a
!      *         {@code KeyPairGeneratorSpi} implementation for the
!      *         specified algorithm
!      *
!      * @throws NullPointerException if {@code algorithm} is {@code null}
       *
       * @see Provider
       */
      public static KeyPairGenerator getInstance(String algorithm)
              throws NoSuchAlgorithmException {
+         Objects.requireNonNull(algorithm, "null algorithm name");
          List<Service> list =
                  GetInstance.getServices("KeyPairGenerator", algorithm);
          Iterator<Service> t = list.iterator();
          if (t.hasNext() == false) {
              throw new NoSuchAlgorithmException
*** 265,291 ****
       * Java Cryptography Architecture Standard Algorithm Name Documentation</a>
       * for information about standard algorithm names.
       *
       * @param provider the string name of the provider.
       *
!      * @return the new KeyPairGenerator object.
       *
!      * @exception NoSuchAlgorithmException if a KeyPairGeneratorSpi
       *          implementation for the specified algorithm is not
!      *          available from the specified provider.
       *
!      * @exception NoSuchProviderException if the specified provider is not
!      *          registered in the security provider list.
       *
!      * @exception IllegalArgumentException if the provider name is null
!      *          or empty.
       *
       * @see Provider
       */
      public static KeyPairGenerator getInstance(String algorithm,
              String provider)
              throws NoSuchAlgorithmException, NoSuchProviderException {
          Instance instance = GetInstance.getInstance("KeyPairGenerator",
                  KeyPairGeneratorSpi.class, algorithm, provider);
          return getInstance(instance, algorithm);
      }
  
--- 268,297 ----
       * Java Cryptography Architecture Standard Algorithm Name Documentation</a>
       * for information about standard algorithm names.
       *
       * @param provider the string name of the provider.
       *
!      * @return the new {@code KeyPairGenerator} object
!      *
!      * @throws IllegalArgumentException if the provider name is {@code null}
!      *         or empty
       *
!      * @throws NoSuchAlgorithmException if a {@code KeyPairGeneratorSpi}
       *         implementation for the specified algorithm is not
!      *         available from the specified provider
       *
!      * @throws NoSuchProviderException if the specified provider is not
!      *         registered in the security provider list
       *
!      * @throws NullPointerException if {@code algorithm} is {@code null}
       *
       * @see Provider
       */
      public static KeyPairGenerator getInstance(String algorithm,
              String provider)
              throws NoSuchAlgorithmException, NoSuchProviderException {
+         Objects.requireNonNull(algorithm, "null algorithm name");
          Instance instance = GetInstance.getInstance("KeyPairGenerator",
                  KeyPairGeneratorSpi.class, algorithm, provider);
          return getInstance(instance, algorithm);
      }
  
*** 304,327 ****
       * Java Cryptography Architecture Standard Algorithm Name Documentation</a>
       * for information about standard algorithm names.
       *
       * @param provider the provider.
       *
!      * @return the new KeyPairGenerator object.
       *
!      * @exception NoSuchAlgorithmException if a KeyPairGeneratorSpi
       *          implementation for the specified algorithm is not available
!      *          from the specified Provider object.
       *
!      * @exception IllegalArgumentException if the specified provider is null.
       *
       * @see Provider
       *
       * @since 1.4
       */
      public static KeyPairGenerator getInstance(String algorithm,
              Provider provider) throws NoSuchAlgorithmException {
          Instance instance = GetInstance.getInstance("KeyPairGenerator",
                  KeyPairGeneratorSpi.class, algorithm, provider);
          return getInstance(instance, algorithm);
      }
  
--- 310,337 ----
       * Java Cryptography Architecture Standard Algorithm Name Documentation</a>
       * for information about standard algorithm names.
       *
       * @param provider the provider.
       *
!      * @return the new {@code KeyPairGenerator} object
!      *
!      * @throws IllegalArgumentException if the specified provider is
!      *         {@code null}
       *
!      * @throws NoSuchAlgorithmException if a {@code KeyPairGeneratorSpi}
       *         implementation for the specified algorithm is not available
!      *         from the specified {@code Provider} object
       *
!      * @throws NullPointerException if {@code algorithm} is {@code null}
       *
       * @see Provider
       *
       * @since 1.4
       */
      public static KeyPairGenerator getInstance(String algorithm,
              Provider provider) throws NoSuchAlgorithmException {
+         Objects.requireNonNull(algorithm, "null algorithm name");
          Instance instance = GetInstance.getInstance("KeyPairGenerator",
                  KeyPairGeneratorSpi.class, algorithm, provider);
          return getInstance(instance, algorithm);
      }