src/java.base/share/classes/javax/crypto/SecretKeyFactory.java

rev 15967 : [mq]: GetInstance

*** 150,172 ****
       * See the SecretKeyFactory section in the <a href=
       * "{@docRoot}/../technotes/guides/security/StandardNames.html#SecretKeyFactory">
       * Java Cryptography Architecture Standard Algorithm Name Documentation</a>
       * for information about standard algorithm names.
       *
!      * @return the new {@code SecretKeyFactory} object.
       *
!      * @exception NullPointerException if the specified algorithm
!      *          is null.
       *
!      * @exception NoSuchAlgorithmException if no Provider supports a
!      *          SecretKeyFactorySpi implementation for the
!      *          specified algorithm.
       *
       * @see java.security.Provider
       */
      public static final SecretKeyFactory getInstance(String algorithm)
              throws NoSuchAlgorithmException {
          return new SecretKeyFactory(algorithm);
      }
  
      /**
       * Returns a {@code SecretKeyFactory} object that converts
--- 150,172 ----
       * See the SecretKeyFactory section in the <a href=
       * "{@docRoot}/../technotes/guides/security/StandardNames.html#SecretKeyFactory">
       * Java Cryptography Architecture Standard Algorithm Name Documentation</a>
       * for information about standard algorithm names.
       *
!      * @return the new {@code SecretKeyFactory} object
       *
!      * @throws NoSuchAlgorithmException if no {@code Provider} supports a
!      *         {@code SecretKeyFactorySpi} implementation for the
!      *         specified algorithm
       *
!      * @throws NullPointerException if {@code algorithm} is {@code null}
       *
       * @see java.security.Provider
       */
      public static final SecretKeyFactory getInstance(String algorithm)
              throws NoSuchAlgorithmException {
+         Objects.requireNonNull(algorithm, "null algorithm name");
          return new SecretKeyFactory(algorithm);
      }
  
      /**
       * Returns a {@code SecretKeyFactory} object that converts
*** 187,216 ****
       * Java Cryptography Architecture Standard Algorithm Name Documentation</a>
       * for information about standard algorithm names.
       *
       * @param provider the name of the provider.
       *
!      * @return the new {@code SecretKeyFactory} object.
       *
!      * @exception NoSuchAlgorithmException if a SecretKeyFactorySpi
!      *          implementation for the specified algorithm is not
!      *          available from the specified provider.
       *
!      * @exception NullPointerException if the specified algorithm
!      *          is null.
       *
       * @throws NoSuchProviderException if the specified provider is not
!      *          registered in the security provider list.
       *
!      * @exception IllegalArgumentException if the {@code provider}
!      *          is null or empty.
       *
       * @see java.security.Provider
       */
      public static final SecretKeyFactory getInstance(String algorithm,
              String provider) throws NoSuchAlgorithmException,
              NoSuchProviderException {
          Instance instance = JceSecurity.getInstance("SecretKeyFactory",
                  SecretKeyFactorySpi.class, algorithm, provider);
          return new SecretKeyFactory((SecretKeyFactorySpi)instance.impl,
                  instance.provider, algorithm);
      }
--- 187,216 ----
       * Java Cryptography Architecture Standard Algorithm Name Documentation</a>
       * for information about standard algorithm names.
       *
       * @param provider the name of the provider.
       *
!      * @return the new {@code SecretKeyFactory} object
       *
!      * @throws IllegalArgumentException if the {@code provider}
!      *         is {@code null} or empty
       *
!      * @throws NoSuchAlgorithmException if a {@code SecretKeyFactorySpi}
!      *         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 java.security.Provider
       */
      public static final SecretKeyFactory getInstance(String algorithm,
              String provider) throws NoSuchAlgorithmException,
              NoSuchProviderException {
+         Objects.requireNonNull(algorithm, "null algorithm name");
          Instance instance = JceSecurity.getInstance("SecretKeyFactory",
                  SecretKeyFactorySpi.class, algorithm, provider);
          return new SecretKeyFactory((SecretKeyFactorySpi)instance.impl,
                  instance.provider, algorithm);
      }
*** 231,256 ****
       * Java Cryptography Architecture Standard Algorithm Name Documentation</a>
       * for information about standard algorithm names.
       *
       * @param provider the provider.
       *
!      * @return the new {@code SecretKeyFactory} object.
       *
!      * @exception NullPointerException if the specified algorithm
!      * is null.
       *
!      * @exception NoSuchAlgorithmException if a SecretKeyFactorySpi
       *          implementation for the specified algorithm is not available
!      *          from the specified Provider object.
       *
!      * @exception IllegalArgumentException if the {@code provider}
!      *          is null.
       *
       * @see java.security.Provider
       */
      public static final SecretKeyFactory getInstance(String algorithm,
              Provider provider) throws NoSuchAlgorithmException {
          Instance instance = JceSecurity.getInstance("SecretKeyFactory",
                  SecretKeyFactorySpi.class, algorithm, provider);
          return new SecretKeyFactory((SecretKeyFactorySpi)instance.impl,
                  instance.provider, algorithm);
      }
--- 231,256 ----
       * Java Cryptography Architecture Standard Algorithm Name Documentation</a>
       * for information about standard algorithm names.
       *
       * @param provider the provider.
       *
!      * @return the new {@code SecretKeyFactory} object
       *
!      * @throws IllegalArgumentException if the {@code provider}
!      *         is {@code null}
       *
!      * @throws NoSuchAlgorithmException if a {@code SecretKeyFactorySpi}
       *         implementation for the specified algorithm is not available
!      *         from the specified {@code Provider} object
       *
!      * @throws NullPointerException if {@code algorithm} is {@code null}
       *
       * @see java.security.Provider
       */
      public static final SecretKeyFactory getInstance(String algorithm,
              Provider provider) throws NoSuchAlgorithmException {
+         Objects.requireNonNull(algorithm, "null algorithm name");
          Instance instance = JceSecurity.getInstance("SecretKeyFactory",
                  SecretKeyFactorySpi.class, algorithm, provider);
          return new SecretKeyFactory((SecretKeyFactorySpi)instance.impl,
                  instance.provider, algorithm);
      }