From 7e4c29f4cf22ed5eb85153074c816ebf96b841b0 Mon Sep 17 00:00:00 2001 From: takezoe Date: Thu, 19 Sep 2013 00:47:46 +0900 Subject: [PATCH] (refs #74)Remove an auxiliary constructor from case class because json4s can't serialize correctly if case class have that. --- src/main/scala/app/RepositorySettingsController.scala | 2 +- src/main/scala/service/WebHookService.scala | 8 +++++--- src/main/scala/servlet/GitRepositoryServlet.scala | 3 ++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/main/scala/app/RepositorySettingsController.scala b/src/main/scala/app/RepositorySettingsController.scala index ce2264ff4..196f55ab9 100644 --- a/src/main/scala/app/RepositorySettingsController.scala +++ b/src/main/scala/app/RepositorySettingsController.scala @@ -142,7 +142,7 @@ trait RepositorySettingsControllerBase extends ControllerBase with FlashMapSuppo list.append(new CommitInfo(commit)) } - val payload = new WebHookPayload( + val payload = WebHookPayload( git, "refs/heads/" + repository.repository.defaultBranch, repository, diff --git a/src/main/scala/service/WebHookService.scala b/src/main/scala/service/WebHookService.scala index 9d68855e8..c3f7cd48a 100644 --- a/src/main/scala/service/WebHookService.scala +++ b/src/main/scala/service/WebHookService.scala @@ -74,10 +74,12 @@ object WebHookService { case class WebHookPayload( ref: String, commits: List[WebHookCommit], - repository: WebHookRepository){ + repository: WebHookRepository) - def this(git: Git, refName: String, repositoryInfo: RepositoryInfo, commits: List[CommitInfo], repositoryOwner: Account) = - this( + object WebHookPayload { + def apply(git: Git, refName: String, repositoryInfo: RepositoryInfo, + commits: List[CommitInfo], repositoryOwner: Account): WebHookPayload = + WebHookPayload( refName, commits.map { commit => val diffs = JGitUtil.getDiffs(git, commit.id, false) diff --git a/src/main/scala/servlet/GitRepositoryServlet.scala b/src/main/scala/servlet/GitRepositoryServlet.scala index 06d1f7fbb..a307cb0ff 100644 --- a/src/main/scala/servlet/GitRepositoryServlet.scala +++ b/src/main/scala/servlet/GitRepositoryServlet.scala @@ -119,7 +119,8 @@ class CommitLogHook(owner: String, repository: String, userName: String, baseURL println(getRepository(owner, repository, baseURL).get.url) // call web hook - val payload = new WebHookPayload(git, + val payload = WebHookPayload( + git, command.getRefName, getRepository(owner, repository, baseURL).get, newCommits,