fix

Author: gongxuanzhang

clients/src/main/java/org/apache/kafka/common/security/JaasUtils.java

@@ -37,11 +37,11 @@ public final class JaasUtils {
     private JaasUtils() {
     }
 
-    public static void allowDefaultJaasAndCustomJass(String... customJaas) {
+    public static void allowDefaultJaasAndCustomJaas(String... customJaas) {
         List<String> jaasModules = new ArrayList<>();
         jaasModules.add(ALLOWED_LOGIN_MODULES_DEFAULT);
         jaasModules.addAll(Arrays.asList(customJaas));
-        System.setProperty(org.apache.kafka.common.security.JaasUtils.ALLOWED_LOGIN_MODULES_CONFIG, String.join(",", jaasModules));
+        System.setProperty(ALLOWED_LOGIN_MODULES_CONFIG, String.join(",", jaasModules));
     }
 
 }

clients/src/test/java/org/apache/kafka/common/security/authenticator/ClientAuthenticationFailureTest.java

@@ -76,7 +76,7 @@ public void setup() throws Exception {
         TestJaasConfig testJaasConfig = TestJaasConfig.createConfiguration("PLAIN", Collections.singletonList("PLAIN"));
         testJaasConfig.setClientOptions("PLAIN", TestJaasConfig.USERNAME, "anotherpassword");
         server = createEchoServer(securityProtocol);
-        JaasUtils.allowDefaultJaasAndCustomJass();
+        JaasUtils.allowDefaultJaasAndCustomJaas();
     }
 
     @AfterEach

clients/src/test/java/org/apache/kafka/common/security/authenticator/LoginManagerTest.java

@@ -60,7 +60,7 @@ public void setUp() {
                 " required user=\"digestuser\" password=\"digest-secret\";");
         TestJaasConfig.createConfiguration("SCRAM-SHA-256",
                 Collections.singletonList("SCRAM-SHA-256"));
-        JaasUtils.allowDefaultJaasAndCustomJass("org.apache.kafka.common.security.authenticator.TestDigestLoginModule");
+        JaasUtils.allowDefaultJaasAndCustomJaas("org.apache.kafka.common.security.authenticator.TestDigestLoginModule");
     }
 
     @AfterEach

clients/src/test/java/org/apache/kafka/common/security/authenticator/SaslAuthenticatorFailureDelayTest.java

@@ -75,7 +75,7 @@ public void setup() throws Exception {
         credentialCache = new CredentialCache();
         SaslAuthenticatorTest.TestLogin.loginCount.set(0);
         startTimeMs = time.milliseconds();
-        JaasUtils.allowDefaultJaasAndCustomJass();
+        JaasUtils.allowDefaultJaasAndCustomJaas();
     }
 
     @AfterEach

clients/src/test/java/org/apache/kafka/common/security/authenticator/SaslAuthenticatorTest.java

@@ -175,7 +175,7 @@ public void setup() throws Exception {
         saslClientConfigs = clientCertStores.getTrustingConfig(serverCertStores);
         credentialCache = new CredentialCache();
         TestLogin.loginCount.set(0);
-        JaasUtils.allowDefaultJaasAndCustomJass("org.apache.kafka.common.security.authenticator.TestDigestLoginModule",
+        JaasUtils.allowDefaultJaasAndCustomJaas("org.apache.kafka.common.security.authenticator.TestDigestLoginModule",
                 "org.apache.kafka.common.security.authenticator.SaslAuthenticatorTest$TestPlainLoginModule");
     }
 

core/src/test/scala/integration/kafka/api/SaslEndToEndAuthorizationTest.scala

@@ -46,6 +46,7 @@ abstract class SaslEndToEndAuthorizationTest extends EndToEndAuthorizationTest {
     producerConfig.put(SaslConfigs.SASL_JAAS_CONFIG, clientLoginContext)
     consumerConfig.put(SaslConfigs.SASL_JAAS_CONFIG, clientLoginContext)
     adminClientConfig.put(SaslConfigs.SASL_JAAS_CONFIG, clientLoginContext)
+
     val superuserLoginContext = jaasAdminLoginModule(kafkaClientSaslMechanism)
     superuserClientConfig.put(SaslConfigs.SASL_JAAS_CONFIG, superuserLoginContext)
     super.setUp(testInfo)

core/src/test/scala/integration/kafka/api/SaslSslAdminIntegrationTest.scala

@@ -70,6 +70,7 @@ class SaslSslAdminIntegrationTest extends BaseAdminIntegrationTest with SaslSetu
     this.serverConfig.setProperty(DelegationTokenManagerConfigs.DELEGATION_TOKEN_SECRET_KEY_CONFIG, secretKey)
     this.serverConfig.setProperty(DelegationTokenManagerConfigs.DELEGATION_TOKEN_EXPIRY_TIME_MS_CONFIG, Long.MaxValue.toString)
     this.serverConfig.setProperty(DelegationTokenManagerConfigs.DELEGATION_TOKEN_MAX_LIFETIME_CONFIG, Long.MaxValue.toString)
+
     setUpSasl()
     super.setUp(testInfo)
     setInitialAcls()