[SPARK-3944][Core] Using Option[String] where value of String can be null

[Shiti]

No description provided.

[AmplabJenkins]

Can one of the admins verify this patch?

[ScrapCodes]

Jenkins, test this please.

[ScrapCodes]

Nice fix, LGTM. This is required by scala 2.11 too. @pwendell take a look ?

[pwendell]

Jenkins, test this please.

[SparkQA]

QA tests have started for PR 2795 at commit 46897d7.

• This patch merges cleanly.

[SparkQA]

QA tests have finished for PR 2795 at commit 46897d7.

• This patch passes all tests.
• This patch merges cleanly.
• This patch adds no public classes.

[AmplabJenkins]

Test PASSed.
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins//job/SparkPullRequestBuilder/21728/
Test PASSed.

[andrewor14]

I see, this is for scala 2.11. LGTM, I'm merging this into master.

[markhamstra]

Sorry for being late on this, but I'd really rather not see things like case Some("http") | Some("https") | Some("ftp") =>. Instead, I'd do this as:

Option(uri.getScheme).getOrElse("file") match {
  case "http" | "https" | "ftp" => ...
  case "file" => ...
  case _ =>
}