SPARKC-641 Move the deprecation checks from the method apply(SparkConf) to the method fromSparkConf(SparkConf)

yohannrub · yohannrub · commit 1b2e262f33b7 · 2021-02-25T20:33:14.000+01:00
Benefits:
- every method named `fromSparkConf(SparkConf)` (from classes `CassandraConnectorConf`, `ReadConf` and `WriteConf`) homogeneously checks config deprecations
- `apply(SparkConf)` is in effect a synonym of `fromSparkConf(SparkConf)` and so can be used interchangeably
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
`@@ -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)`