xkrogen commented on a change in pull request #30928:
URL: https://github.com/apache/spark/pull/30928#discussion_r551469962
##########
File path: core/src/main/scala/org/apache/spark/util/DependencyUtils.scala
##########
@@ -150,36 +150,36 @@ private[spark] object DependencyUtils extends Logging {
resolveMavenDependencies(
transitive,
exclusionList,
- authority,
+ Some(authority),
ivyProperties.repositories,
ivyProperties.ivyRepoPath,
- Option(ivyProperties.ivySettingsPath)
+ ivyProperties.ivySettingsPath
)
}
def resolveMavenDependencies(
packagesTransitive: Boolean,
- packagesExclusions: String,
- packages: String,
- repositories: String,
- ivyRepoPath: String,
+ packagesExclusions: Option[String],
+ packages: Option[String],
+ repositories: Option[String],
+ ivyRepoPath: Option[String],
ivySettingsPath: Option[String]): Seq[String] = {
val exclusions: Seq[String] =
- if (!StringUtils.isBlank(packagesExclusions)) {
- packagesExclusions.split(",")
+ if (packagesExclusions.nonEmpty) {
+ packagesExclusions.map(_.split(",")).get
} else {
Nil
}
// Create the IvySettings, either load from file or build defaults
val ivySettings = ivySettingsPath match {
case Some(path) =>
- SparkSubmitUtils.loadIvySettings(path, Option(repositories),
Option(ivyRepoPath))
+ SparkSubmitUtils.loadIvySettings(path, repositories, ivyRepoPath)
case None =>
- SparkSubmitUtils.buildIvySettings(Option(repositories),
Option(ivyRepoPath))
+ SparkSubmitUtils.buildIvySettings(repositories, ivyRepoPath)
}
- SparkSubmitUtils.resolveMavenCoordinates(packages, ivySettings,
+ SparkSubmitUtils.resolveMavenCoordinates(packages.get, ivySettings,
Review comment:
Should be `packages.orNull` ?
##########
File path: core/src/main/scala/org/apache/spark/util/DependencyUtils.scala
##########
@@ -150,36 +150,36 @@ private[spark] object DependencyUtils extends Logging {
resolveMavenDependencies(
transitive,
exclusionList,
- authority,
+ Some(authority),
ivyProperties.repositories,
ivyProperties.ivyRepoPath,
- Option(ivyProperties.ivySettingsPath)
+ ivyProperties.ivySettingsPath
)
}
def resolveMavenDependencies(
packagesTransitive: Boolean,
- packagesExclusions: String,
- packages: String,
- repositories: String,
- ivyRepoPath: String,
+ packagesExclusions: Option[String],
+ packages: Option[String],
+ repositories: Option[String],
+ ivyRepoPath: Option[String],
ivySettingsPath: Option[String]): Seq[String] = {
val exclusions: Seq[String] =
- if (!StringUtils.isBlank(packagesExclusions)) {
- packagesExclusions.split(",")
+ if (packagesExclusions.nonEmpty) {
+ packagesExclusions.map(_.split(",")).get
} else {
Nil
}
Review comment:
Better to use idiomatic Option processing, either a `match` or
`packagesExclusions.map(_.split(",")).getOrElse(Nil)`
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
