Merge pull request #1301 from yohannrub/SPARKC-641-b2.5

jtgrabowski · web-flow · commit 1aaaff369f89 · 2021-03-01T11:05:05.000+01:00
SPARKC-641 Config deprecations are not checked when instantiating CassandraConnector
diff --git a/connector/src/main/scala/com/datastax/spark/connector/cql/CassandraConnector.scala b/connector/src/main/scala/com/datastax/spark/connector/cql/CassandraConnector.scala
@@ -220,7 +220,7 @@ object CassandraConnector extends Logging {
 
   /** Returns a CassandraConnector created from properties found in the [[org.apache.spark.SparkConf SparkConf]] object */
   def apply(conf: SparkConf): CassandraConnector = {
-    CassandraConnector(CassandraConnectorConf.fromSparkConf(conf))
+    CassandraConnector(CassandraConnectorConf(conf))
   }
 
   /** Returns a CassandraConnector with runtime Cluster Environment information. This can set remoteConnectionsPerExecutor
diff --git a/connector/src/main/scala/com/datastax/spark/connector/cql/CassandraConnectorConf.scala b/connector/src/main/scala/com/datastax/spark/connector/cql/CassandraConnectorConf.scala
@@ -355,7 +355,6 @@ object CassandraConnectorConf extends Logging {
   }
 
   def apply(conf: SparkConf): CassandraConnectorConf = {
-    ConfigCheck.checkConfig(conf)
     fromSparkConf(conf)
   }
 
@@ -410,6 +409,9 @@ object CassandraConnectorConf extends Logging {
   }
 
   def fromSparkConf(conf: SparkConf) = {
+
+    ConfigCheck.checkConfig(conf)
+
     val localDC = conf.getOption(LocalDCParam.name)
     val keepAlive = conf.getInt(KeepAliveMillisParam.name, KeepAliveMillisParam.default)
     val minReconnectionDelay = conf.getInt(MinReconnectionDelayParam.name, MinReconnectionDelayParam.default)

Original file line number	Diff line number	Diff line change
`@@ -220,7 +220,7 @@ object CassandraConnector extends Logging {`
`220`	`220`
`221`	`221`	`/** Returns a CassandraConnector created from properties found in the [[org.apache.spark.SparkConf SparkConf]] object */`
`222`	`222`	`def apply(conf: SparkConf): CassandraConnector = {`
`223`		`- CassandraConnector(CassandraConnectorConf.fromSparkConf(conf))`
	`223`	`+ CassandraConnector(CassandraConnectorConf(conf))`
`224`	`224`	`}`
`225`	`225`
`226`	`226`	`/** Returns a CassandraConnector with runtime Cluster Environment information. This can set remoteConnectionsPerExecutor`
Original file line number	Diff line number	Diff line change
`@@ -355,7 +355,6 @@ object CassandraConnectorConf extends Logging {`
`355`	`355`	`}`
`356`	`356`
`357`	`357`	`def apply(conf: SparkConf): CassandraConnectorConf = {`
`358`		`- ConfigCheck.checkConfig(conf)`
`359`	`358`	`fromSparkConf(conf)`
`360`	`359`	`}`
`361`	`360`
`@@ -410,6 +409,9 @@ object CassandraConnectorConf extends Logging {`
`410`	`409`	`}`
`411`	`410`
`412`	`411`	`def fromSparkConf(conf: SparkConf) = {`
	`412`	`+`
	`413`	`+ ConfigCheck.checkConfig(conf)`
	`414`	`+`
`413`	`415`	`val localDC = conf.getOption(LocalDCParam.name)`
`414`	`416`	`val keepAlive = conf.getInt(KeepAliveMillisParam.name, KeepAliveMillisParam.default)`
`415`	`417`	`val minReconnectionDelay = conf.getInt(MinReconnectionDelayParam.name, MinReconnectionDelayParam.default)`