Fix a few issues detected by static analysis

This commit is contained in:
HairyFotr
2014-12-26 15:26:45 +01:00
parent 427b6ce846
commit a01b5a4a59
9 changed files with 13 additions and 13 deletions

View File

@@ -98,8 +98,8 @@ object PluginSystem extends PluginService {
// Compile and eval Scala source code // Compile and eval Scala source code
ScalaPlugin.eval(pluginDir.listFiles.filter(_.getName.endsWith(".scala.html")).map { file => ScalaPlugin.eval(pluginDir.listFiles.filter(_.getName.endsWith(".scala.html")).map { file =>
ScalaPlugin.compileTemplate( ScalaPlugin.compileTemplate(
id.replaceAll("-", ""), id.replace("-", ""),
file.getName.replaceAll("\\.scala\\.html$", ""), file.getName.stripSuffix(".scala.html"),
IOUtils.toString(new FileInputStream(file))) IOUtils.toString(new FileInputStream(file)))
}.mkString("\n") + source) }.mkString("\n") + source)

View File

@@ -421,7 +421,7 @@ object IssuesService {
conditions.get("author").flatMap(_.headOption), conditions.get("author").flatMap(_.headOption),
conditions.get("assignee").flatMap(_.headOption), conditions.get("assignee").flatMap(_.headOption),
conditions.get("mentions").flatMap(_.headOption), conditions.get("mentions").flatMap(_.headOption),
conditions.get("is").getOrElse(Seq.empty).filter(x => x == "open" || x == "closed").headOption.getOrElse("open"), conditions.get("is").getOrElse(Seq.empty).find(x => x == "open" || x == "closed").getOrElse("open"),
sort, sort,
direction, direction,
conditions.get("visibility").flatMap(_.headOption), conditions.get("visibility").flatMap(_.headOption),

View File

@@ -190,7 +190,7 @@ trait RepositoryService { self: AccountService =>
JGitUtil.getRepositoryInfo(repository.userName, repository.repositoryName, baseUrl), JGitUtil.getRepositoryInfo(repository.userName, repository.repositoryName, baseUrl),
repository, repository,
issues.size, issues.size,
issues.filter(_ == true).size, issues.count(_ == true),
getForkedCount( getForkedCount(
repository.originUserName.getOrElse(repository.userName), repository.originUserName.getOrElse(repository.userName),
repository.originRepositoryName.getOrElse(repository.repositoryName) repository.originRepositoryName.getOrElse(repository.repositoryName)

View File

@@ -40,7 +40,7 @@ trait SystemSettingsService {
props.setProperty(LdapUserNameAttribute, ldap.userNameAttribute) props.setProperty(LdapUserNameAttribute, ldap.userNameAttribute)
ldap.additionalFilterCondition.foreach(x => props.setProperty(LdapAdditionalFilterCondition, x)) ldap.additionalFilterCondition.foreach(x => props.setProperty(LdapAdditionalFilterCondition, x))
ldap.fullNameAttribute.foreach(x => props.setProperty(LdapFullNameAttribute, x)) ldap.fullNameAttribute.foreach(x => props.setProperty(LdapFullNameAttribute, x))
ldap.mailAttribute.foreach(x => props.setProperty(LdapMailAddressAttribute, x.toString)) ldap.mailAttribute.foreach(x => props.setProperty(LdapMailAddressAttribute, x))
ldap.tls.foreach(x => props.setProperty(LdapTls, x.toString)) ldap.tls.foreach(x => props.setProperty(LdapTls, x.toString))
ldap.keystore.foreach(x => props.setProperty(LdapKeystore, x)) ldap.keystore.foreach(x => props.setProperty(LdapKeystore, x))
} }

View File

@@ -217,7 +217,7 @@ object JGitUtil {
list.append((treeWalk.getObjectId(0), treeWalk.getFileMode(0), treeWalk.getPathString, treeWalk.getNameString, linkUrl)) list.append((treeWalk.getObjectId(0), treeWalk.getFileMode(0), treeWalk.getPathString, treeWalk.getNameString, linkUrl))
} }
list = list.map(tuple => list.transform(tuple =>
if (tuple._2 != FileMode.TREE) if (tuple._2 != FileMode.TREE)
tuple tuple
else else

View File

@@ -12,7 +12,7 @@ trait LinkConverter { self: RequestCache =>
issueIdPrefix: String = "#")(implicit context: app.Context): String = { issueIdPrefix: String = "#")(implicit context: app.Context): String = {
value value
// escape HTML tags // escape HTML tags
.replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll(">", "&gt;").replaceAll("\"", "&quot;") .replace("&", "&amp;").replace("<", "&lt;").replace(">", "&gt;").replace("\"", "&quot;")
// convert issue id to link // convert issue id to link
.replaceBy(("(?<=(^|\\W))" + issueIdPrefix + "([0-9]+)(?=(\\W|$))").r){ m => .replaceBy(("(?<=(^|\\W))" + issueIdPrefix + "([0-9]+)(?=(\\W|$))").r){ m =>
getIssue(repository.owner, repository.name, m.group(2)) match { getIssue(repository.owner, repository.name, m.group(2)) match {

View File

@@ -38,7 +38,7 @@
} }
<span class="muted"> <span class="muted">
@user(issue.openedUserName, styleClass="username strong") opened this issue @helper.html.datetimeago(issue.registeredDate) - @defining( @user(issue.openedUserName, styleClass="username strong") opened this issue @helper.html.datetimeago(issue.registeredDate) - @defining(
comments.filter( _.action.contains("comment") ).size comments.count( _.action.contains("comment") )
){ count => ){ count =>
@count @plural(count, "comment") @count @plural(count, "comment")
} }

View File

@@ -14,11 +14,11 @@
<span class="small"> <span class="small">
<a class="button-link@if(state == "open"){ selected}" href="?state=open"> <a class="button-link@if(state == "open"){ selected}" href="?state=open">
<img src="@assets/common/images/milestone@(if(state == "open"){"-active"}).png"/> <img src="@assets/common/images/milestone@(if(state == "open"){"-active"}).png"/>
@milestones.filter(_._1.closedDate.isEmpty).size Open @milestones.count(_._1.closedDate.isEmpty) Open
</a>&nbsp;&nbsp; </a>&nbsp;&nbsp;
<a class="button-link@if(state == "closed"){ selected}" href="?state=closed"> <a class="button-link@if(state == "closed"){ selected}" href="?state=closed">
<img src="@assets/common/images/milestone@(if(state == "closed"){"-active"}).png"/> <img src="@assets/common/images/milestone@(if(state == "closed"){"-active"}).png"/>
@milestones.filter(_._1.closedDate.isDefined).size Closed @milestones.count(_._1.closedDate.isDefined) Closed
</a> </a>
</span> </span>
</th> </th>

View File

@@ -21,7 +21,7 @@
@comments.get.flatMap @{ @comments.get.flatMap @{
case comment: model.CommitComment => Some(comment) case comment: model.CommitComment => Some(comment)
case other => None case other => None
}.filter(_.commitId == commit.id).size }.count(_.commitId == commit.id)
}</span> }</span>
</td> </td>
<td style="width: 10%; text-align: right;"> <td style="width: 10%; text-align: right;">