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

rev 15967 : [mq]: GetInstance

*** 164,183 ****
       * See the Mac section in the <a href=
       *   "{@docRoot}/../technotes/guides/security/StandardNames.html#Mac">
       * Java Cryptography Architecture Standard Algorithm Name Documentation</a>
       * for information about standard algorithm names.
       *
!      * @return the new {@code Mac} object.
       *
!      * @exception NoSuchAlgorithmException if no Provider supports a
!      *          MacSpi implementation for the
!      *          specified algorithm.
       *
       * @see java.security.Provider
       */
      public static final Mac getInstance(String algorithm)
              throws NoSuchAlgorithmException {
          List<Service> services = GetInstance.getServices("Mac", algorithm);
          // make sure there is at least one service from a signed provider
          Iterator<Service> t = services.iterator();
          while (t.hasNext()) {
              Service s = t.next();
--- 164,185 ----
       * See the Mac section in the <a href=
       *   "{@docRoot}/../technotes/guides/security/StandardNames.html#Mac">
       * Java Cryptography Architecture Standard Algorithm Name Documentation</a>
       * for information about standard algorithm names.
       *
!      * @return the new {@code Mac} object
       *
!      * @throws NoSuchAlgorithmException if no {@code Provider} supports a
!      *         {@code MacSpi} implementation for the specified algorithm
!      *
!      * @throws NullPointerException if {@code algorithm} is {@code null}
       *
       * @see java.security.Provider
       */
      public static final Mac getInstance(String algorithm)
              throws NoSuchAlgorithmException {
+         Objects.requireNonNull(algorithm, "null algorithm name");
          List<Service> services = GetInstance.getServices("Mac", algorithm);
          // make sure there is at least one service from a signed provider
          Iterator<Service> t = services.iterator();
          while (t.hasNext()) {
              Service s = t.next();
*** 208,233 ****
       * 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 Mac} object.
       *
!      * @exception NoSuchAlgorithmException if a MacSpi
       *          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 {@code provider}
!      *          is null or empty.
       *
       * @see java.security.Provider
       */
      public static final Mac getInstance(String algorithm, String provider)
              throws NoSuchAlgorithmException, NoSuchProviderException {
          Instance instance = JceSecurity.getInstance
                  ("Mac", MacSpi.class, algorithm, provider);
          return new Mac((MacSpi)instance.impl, instance.provider, algorithm);
      }
  
--- 210,238 ----
       * 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 Mac} object
!      *
!      * @throws IllegalArgumentException if the {@code provider}
!      *         is {@code null} or empty
       *
!      * @throws NoSuchAlgorithmException if a {@code MacSpi}
       *         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 Mac getInstance(String algorithm, String provider)
              throws NoSuchAlgorithmException, NoSuchProviderException {
+         Objects.requireNonNull(algorithm, "null algorithm name");
          Instance instance = JceSecurity.getInstance
                  ("Mac", MacSpi.class, algorithm, provider);
          return new Mac((MacSpi)instance.impl, instance.provider, algorithm);
      }
  
*** 246,268 ****
       * Java Cryptography Architecture Standard Algorithm Name Documentation</a>
       * for information about standard algorithm names.
       *
       * @param provider the provider.
       *
!      * @return the new {@code Mac} object.
       *
!      * @exception NoSuchAlgorithmException if a MacSpi
       *          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 Mac getInstance(String algorithm, Provider provider)
              throws NoSuchAlgorithmException {
          Instance instance = JceSecurity.getInstance
                  ("Mac", MacSpi.class, algorithm, provider);
          return new Mac((MacSpi)instance.impl, instance.provider, algorithm);
      }
  
--- 251,276 ----
       * Java Cryptography Architecture Standard Algorithm Name Documentation</a>
       * for information about standard algorithm names.
       *
       * @param provider the provider.
       *
!      * @return the new {@code Mac} object
!      *
!      * @throws IllegalArgumentException if the {@code provider} is
!      *         {@code null}
       *
!      * @throws NoSuchAlgorithmException if a {@code MacSpi}
       *         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 Mac getInstance(String algorithm, Provider provider)
              throws NoSuchAlgorithmException {
+         Objects.requireNonNull(algorithm, "null algorithm name");
          Instance instance = JceSecurity.getInstance
                  ("Mac", MacSpi.class, algorithm, provider);
          return new Mac((MacSpi)instance.impl, instance.provider, algorithm);
      }