Review fixes:

* Added comment for getKrb5LoginModuleName. * Used === operator in tests instead of equals.
apache · Oct 10, 2018 · fffd139 · fffd139
1 parent a2c4397
commit fffd139
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/...nal/kafka-0-10-sql/src/main/scala/org/apache/spark/sql/kafka010/KafkaSecurityHelper.scala b/...nal/kafka-0-10-sql/src/main/scala/org/apache/spark/sql/kafka010/KafkaSecurityHelper.scala
@@ -49,6 +49,10 @@ private[kafka010] object KafkaSecurityHelper extends Logging {
     }
   }
 
+  /**
+   * Krb5LoginModule package vary in different JVMs.
+   * Please see Hadoop UserGroupInformation for further details.
+   */
   private def getKrb5LoginModuleName(): String = {
     if (System.getProperty("java.vendor").contains("IBM")) {
       "com.ibm.security.auth.module.Krb5LoginModule"

diff --git a/external/kafka-0-10-sql/src/test/scala/org/apache/spark/sql/kafka010/TokenUtilSuite.scala b/external/kafka-0-10-sql/src/test/scala/org/apache/spark/sql/kafka010/TokenUtilSuite.scala
@@ -58,9 +58,9 @@ class TokenUtilSuite extends SparkFunSuite with BeforeAndAfterEach {
     val adminClientProperties = TokenUtil.createAdminClientProperties(sparkConf)
 
     assert(adminClientProperties.get(CommonClientConfigs.BOOTSTRAP_SERVERS_CONFIG)
-      .equals(bootStrapServers))
+      === bootStrapServers)
     assert(adminClientProperties.get(CommonClientConfigs.SECURITY_PROTOCOL_CONFIG)
-      .equals(plainSecurityProtocol))
+      === plainSecurityProtocol)
     assert(!adminClientProperties.containsKey("ssl.truststore.location"))
     assert(!adminClientProperties.containsKey("ssl.truststore.password"))
   }
@@ -74,11 +74,11 @@ class TokenUtilSuite extends SparkFunSuite with BeforeAndAfterEach {
     val adminClientProperties = TokenUtil.createAdminClientProperties(sparkConf)
 
     assert(adminClientProperties.get(CommonClientConfigs.BOOTSTRAP_SERVERS_CONFIG)
-      .equals(bootStrapServers))
+      === bootStrapServers)
     assert(adminClientProperties.get(CommonClientConfigs.SECURITY_PROTOCOL_CONFIG)
-      .equals(sslSecurityProtocol))
-    assert(adminClientProperties.get("ssl.truststore.location").equals(trustStoreLocation))
-    assert(adminClientProperties.get("ssl.truststore.password").equals(trustStorePassword))
+      === sslSecurityProtocol)
+    assert(adminClientProperties.get("ssl.truststore.location") === trustStoreLocation)
+    assert(adminClientProperties.get("ssl.truststore.password") === trustStorePassword)
   }
 
   test("createAdminClientProperties without keytab should not set dynamic jaas config") {
@@ -88,9 +88,9 @@ class TokenUtilSuite extends SparkFunSuite with BeforeAndAfterEach {
     val adminClientProperties = TokenUtil.createAdminClientProperties(sparkConf)
 
     assert(adminClientProperties.get(CommonClientConfigs.BOOTSTRAP_SERVERS_CONFIG)
-      .equals(bootStrapServers))
+      === bootStrapServers)
     assert(adminClientProperties.get(CommonClientConfigs.SECURITY_PROTOCOL_CONFIG)
-      .equals(sslSecurityProtocol))
+      === sslSecurityProtocol)
     assert(!adminClientProperties.containsKey(SaslConfigs.SASL_MECHANISM))
     assert(!adminClientProperties.containsKey(SaslConfigs.SASL_JAAS_CONFIG))
   }
@@ -105,9 +105,9 @@ class TokenUtilSuite extends SparkFunSuite with BeforeAndAfterEach {
     val adminClientProperties = TokenUtil.createAdminClientProperties(sparkConf)
 
     assert(adminClientProperties.get(CommonClientConfigs.BOOTSTRAP_SERVERS_CONFIG)
-      .equals(bootStrapServers))
+      === bootStrapServers)
     assert(adminClientProperties.get(CommonClientConfigs.SECURITY_PROTOCOL_CONFIG)
-      .equals(sslSecurityProtocol))
+      === sslSecurityProtocol)
     assert(adminClientProperties.containsKey(SaslConfigs.SASL_MECHANISM))
     assert(adminClientProperties.containsKey(SaslConfigs.SASL_JAAS_CONFIG))
   }