Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-01 19:15:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2193 from NomadBlacky/get-and-getOrElse-to-getOrElse

Browse Source 
Fix Map#get & getOrElse to Map#getOrElse
This commit is contained in:
Naoki Takezoe
2018-11-12 02:27:57 +09:00
committed by GitHub
parent fda847640d 7e0fb5b2bb
commit 1799e9b487
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala
View File

@@ -512,10 +512,10 @@ trait RepositorySettingsControllerBase extends ControllerBase {
private def mergeOptions = new ValueType[Seq[String]] { private def mergeOptions = new ValueType[Seq[String]] {
override def convert(name: String, params: Map[String, Seq[String]], messages: Messages): Seq[String] = { override def convert(name: String, params: Map[String, Seq[String]], messages: Messages): Seq[String] = {
params.get("mergeOptions").getOrElse(Nil) params.getOrElse("mergeOptions", Nil)
} }
override def validate(name: String, params: Map[String, Seq[String]], messages: Messages): Seq[(String, String)] = { override def validate(name: String, params: Map[String, Seq[String]], messages: Messages): Seq[(String, String)] = {
val mergeOptions = params.get("mergeOptions").getOrElse(Nil) val mergeOptions = params.getOrElse("mergeOptions", Nil)
if (mergeOptions.isEmpty) { if (mergeOptions.isEmpty) {
Seq("mergeOptions" -> "At least one option must be enabled.") Seq("mergeOptions" -> "At least one option must be enabled.")
} else if (!mergeOptions.forall(x => Seq("merge-commit", "squash", "rebase").contains(x))) { } else if (!mergeOptions.forall(x => Seq("merge-commit", "squash", "rebase").contains(x))) {

2
src/main/scala/gitbucket/core/util/SyntaxSugars.scala
View File

@@ -65,7 +65,7 @@ object SyntaxSugars {
implicit class HeadValueAccessibleMap(map: Map[String, Seq[String]]) { implicit class HeadValueAccessibleMap(map: Map[String, Seq[String]]) {
def value(key: String): String = map(key).head def value(key: String): String = map(key).head
def optionValue(key: String): Option[String] = map.get(key).flatMap(_.headOption) def optionValue(key: String): Option[String] = map.get(key).flatMap(_.headOption)
def values(key: String): Seq[String] = map.get(key).getOrElse(Seq.empty) def values(key: String): Seq[String] = map.getOrElse(key, Seq.empty)
} }
} }