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

remove unused imports

Browse Source
This commit is contained in:
xuwei-k
2017-01-13 15:04:38 +09:00
parent d19b2778fe
commit 076bc9e2d6
19 changed files with 11 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/scala/gitbucket/core/controller/FileUploadController.scala
View File

@@ -10,7 +10,6 @@ import gitbucket.core.util.Implicits._
import org.eclipse.jgit.api.Git
import org.eclipse.jgit.dircache.DirCache
import org.eclipse.jgit.lib.{FileMode, Constants}
import org.scalatra
import org.scalatra._
import org.scalatra.servlet.{MultipartConfig, FileUploadSupport, FileItem}
import org.apache.commons.io.{IOUtils, FileUtils}

2
src/main/scala/gitbucket/core/controller/IndexController.scala
View File

@@ -5,7 +5,7 @@ import gitbucket.core.model.Account
import gitbucket.core.service._
import gitbucket.core.util.Implicits._
import gitbucket.core.util.ControlUtil._
import gitbucket.core.util.{Keys, LDAPUtil, ReferrerAuthenticator, StringUtil, UsersAuthenticator}
import gitbucket.core.util.{Keys, LDAPUtil, ReferrerAuthenticator, UsersAuthenticator}
import io.github.gitbucket.scalatra.forms._
import org.scalatra.Ok

1
src/main/scala/gitbucket/core/controller/IssuesController.scala
View File

@@ -2,7 +2,6 @@ package gitbucket.core.controller
import gitbucket.core.issues.html
import gitbucket.core.service.IssuesService._
import gitbucket.core.service.RepositoryService.RepositoryInfo
import gitbucket.core.service._
import gitbucket.core.util.ControlUtil._
import gitbucket.core.util.Implicits._

2
src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala
View File

@@ -18,7 +18,7 @@ import gitbucket.core.service.WebHookService._
import gitbucket.core.view
import gitbucket.core.view.helpers
import io.github.gitbucket.scalatra.forms._
import org.apache.commons.io.{FileUtils, IOUtils}
import org.apache.commons.io.IOUtils
import org.eclipse.jgit.api.{ArchiveCommand, Git}
import org.eclipse.jgit.archive.{TgzFormat, ZipFormat}
import org.eclipse.jgit.dircache.DirCache

1
src/main/scala/gitbucket/core/model/CommitStatus.scala
View File

@@ -1,6 +1,5 @@
package gitbucket.core.model
import scala.slick.lifted.MappedTo
import scala.slick.jdbc._
trait CommitStatusComponent extends TemplateComponent { self: Profile =>

3
src/main/scala/gitbucket/core/model/ProtectedBranch.scala
View File

@@ -1,8 +1,5 @@
package gitbucket.core.model
import scala.slick.lifted.MappedTo
import scala.slick.jdbc._
trait ProtectedBranchComponent extends TemplateComponent { self: Profile =>
import profile.simple._
import self._

5
src/main/scala/gitbucket/core/service/CommitStatusService.scala
View File

@@ -5,9 +5,6 @@ import profile.simple._
import gitbucket.core.model.{CommitState, CommitStatus, Account}
import gitbucket.core.util.Implicits._
import gitbucket.core.util.StringUtil._
import gitbucket.core.service.RepositoryService.RepositoryInfo
import org.joda.time.LocalDateTime
import gitbucket.core.model.Profile.dateColumnType
trait CommitStatusService {
@@ -54,4 +51,4 @@ trait CommitStatusService {
protected def byCommitStatues(userName: String, repositoryName: String, sha: String)(implicit s: Session) =
CommitStatuses.filter(t => t.byCommit(userName, repositoryName, sha)).sortBy(_.updatedDate desc)
}
}

5
src/main/scala/gitbucket/core/service/CommitsService.scala
View File

@@ -1,14 +1,11 @@
package gitbucket.core.service
import gitbucket.core.model.CommitComment
import gitbucket.core.util.{StringUtil, Implicits}
import gitbucket.core.util.Implicits
import scala.slick.jdbc.{StaticQuery => Q}
import Q.interpolation
import gitbucket.core.model.Profile._
import profile.simple._
import Implicits._
import StringUtil._
trait CommitsService {

1
src/main/scala/gitbucket/core/service/IssuesService.scala
View File

@@ -111,7 +111,6 @@ trait IssuesService {
pp.setInt(a._3)
}
}
import gitbucket.core.model.Profile.commitStateColumnType
val query = Q.query[Seq[(String, String, Int)], (String, String, Int, Int, Int, Option[String], Option[CommitState], Option[String], Option[String])](s"""
SELECT
SUMM.USER_NAME,

4
src/main/scala/gitbucket/core/service/MergeService.scala
View File

@@ -1,9 +1,7 @@
package gitbucket.core.service
import gitbucket.core.model.Account
import gitbucket.core.util.LockUtil
import gitbucket.core.util.Directory._
import gitbucket.core.util.Implicits._
import gitbucket.core.util.ControlUtil._
import org.eclipse.jgit.merge.MergeStrategy
@@ -197,4 +195,4 @@ object MergeService{
private def parseCommit(id:ObjectId) = using(new RevWalk( repository ))(_.parseCommit(id))
}
}
}

2
src/main/scala/gitbucket/core/service/WebHookService.scala
View File

@@ -1,7 +1,5 @@
package gitbucket.core.service
import java.util.Date
import fr.brouillard.oss.security.xhub.XHub
import fr.brouillard.oss.security.xhub.XHub.{XHubConverter, XHubDigest}
import gitbucket.core.api._

2
src/main/scala/gitbucket/core/servlet/ApiAuthenticationFilter.scala
View File

@@ -7,8 +7,6 @@ import gitbucket.core.model.Account
import gitbucket.core.service.SystemSettingsService.SystemSettings
import gitbucket.core.service.{AccessTokenService, AccountService, SystemSettingsService}
import gitbucket.core.util.{AuthUtil, Keys}
import org.scalatra.servlet.ServletApiImplicits._
import org.scalatra._
class ApiAuthenticationFilter extends Filter with AccessTokenService with AccountService with SystemSettingsService {

2
src/main/scala/gitbucket/core/servlet/GitLfsTransferServlet.scala
View File

@@ -4,7 +4,7 @@ import java.io.{File, FileInputStream, FileOutputStream}
import java.text.MessageFormat
import javax.servlet.http.{HttpServlet, HttpServletRequest, HttpServletResponse}
import gitbucket.core.util.{Directory, FileUtil, StringUtil}
import gitbucket.core.util.{FileUtil, StringUtil}
import org.apache.commons.io.{FileUtils, IOUtils}
import org.json4s.jackson.Serialization._
import org.apache.http.HttpStatus

4
src/main/scala/gitbucket/core/servlet/GitRepositoryServlet.scala
View File

@@ -4,7 +4,7 @@ import java.io.File
import java.util.Date
import gitbucket.core.api
import gitbucket.core.model.{Session, WebHook}
import gitbucket.core.model.WebHook
import gitbucket.core.plugin.{GitRepositoryRouting, PluginRegistry}
import gitbucket.core.service.IssuesService.IssueSearchCondition
import gitbucket.core.service.WebHookService._
@@ -337,4 +337,4 @@ object GitLfs {
message: String
)
}
}

1
src/main/scala/gitbucket/core/ssh/NoShell.scala
View File

@@ -1,6 +1,5 @@
package gitbucket.core.ssh
import gitbucket.core.service.SystemSettingsService
import gitbucket.core.service.SystemSettingsService.SshAddress
import org.apache.sshd.common.Factory
import org.apache.sshd.server.{Environment, ExitCallback, Command}

1
src/main/scala/gitbucket/core/ssh/PublicKeyAuthenticator.scala
View File

@@ -2,7 +2,6 @@ package gitbucket.core.ssh
import java.security.PublicKey
import gitbucket.core.model.SshKey
import gitbucket.core.service.SshKeyService
import gitbucket.core.servlet.Database
import org.apache.sshd.server.auth.pubkey.PublickeyAuthenticator

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

@@ -6,7 +6,7 @@ import org.mozilla.universalchardet.UniversalDetector
import ControlUtil._
import org.apache.commons.io.input.BOMInputStream
import org.apache.commons.io.IOUtils
import org.apache.commons.codec.binary.{Base64, StringUtils}
import org.apache.commons.codec.binary.Base64
import scala.util.control.Exception._

2
src/test/scala/gitbucket/core/service/ServiceSpecBase.scala
View File

@@ -1,7 +1,7 @@
package gitbucket.core.service
import gitbucket.core.GitBucketCoreModule
import gitbucket.core.util.{ControlUtil, DatabaseConfig, FileUtil}
import gitbucket.core.util.{DatabaseConfig, FileUtil}
import gitbucket.core.util.ControlUtil._
import gitbucket.core.model._
import gitbucket.core.model.Profile._

2
src/test/scala/gitbucket/core/view/AvatarImageProviderSpec.scala
View File

@@ -5,7 +5,7 @@ import java.util.Date
import gitbucket.core.model.Account
import gitbucket.core.service.{RequestCache, SystemSettingsService}
import gitbucket.core.controller.Context
import SystemSettingsService.{Lfs, SystemSettings}
import SystemSettingsService.SystemSettings
import javax.servlet.http.{HttpServletRequest, HttpSession}
import play.twirl.api.Html