opendev/gerrit
Code Issues Proposed changes

Factor GetCommit#toCommitInfo to a utility class

Browse Source 
Ideally this would go in CommitInfo itself, but we can't use JGit from
the extension API POJOs.

Change-Id: I290ed0a0af876068a86c90a87c91c3ba00f9307d
This commit is contained in:
Dave Borowitz
2017-11-13 09:52:07 -05:00
parent 06d2ba6b8d
commit 58cdc4928e
2 changed files with 45 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
java/com/google/gerrit/server/git/CommitUtil.java Normal file
View File

@@ -0,0 +1,43 @@
// Copyright (C) 2017 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package com.google.gerrit.server.git;
import com.google.gerrit.extensions.common.CommitInfo;
import com.google.gerrit.server.CommonConverters;
import java.util.ArrayList;
import org.eclipse.jgit.revwalk.RevCommit;
/** Static utilities for working with {@link RevCommit}s. */
public class CommitUtil {
public static CommitInfo toCommitInfo(RevCommit commit) {
CommitInfo info = new CommitInfo();
info.commit = commit.getName();
info.author = CommonConverters.toGitPerson(commit.getAuthorIdent());
info.committer = CommonConverters.toGitPerson(commit.getCommitterIdent());
info.subject = commit.getShortMessage();
info.message = commit.getFullMessage();
info.parents = new ArrayList<>(commit.getParentCount());
for (int i = 0; i < commit.getParentCount(); i++) {
RevCommit p = commit.getParent(i);
CommitInfo parentInfo = new CommitInfo();
parentInfo.commit = p.getName();
parentInfo.subject = p.getShortMessage();
info.parents.add(parentInfo);
}
return info;
}
private CommitUtil() {}
}

24
java/com/google/gerrit/server/project/GetCommit.java
View File

@@ -16,34 +16,14 @@ package com.google.gerrit.server.project;
import com.google.gerrit.extensions.common.CommitInfo;
import com.google.gerrit.extensions.restapi.RestReadView;
import com.google.gerrit.server.CommonConverters;
import com.google.gerrit.server.git.CommitUtil;
import com.google.inject.Singleton;
import java.util.ArrayList;
import org.eclipse.jgit.revwalk.RevCommit;
@Singleton
public class GetCommit implements RestReadView<CommitResource> {
@Override
public CommitInfo apply(CommitResource rsrc) {
return toCommitInfo(rsrc.getCommit());
}
private static CommitInfo toCommitInfo(RevCommit commit) {
CommitInfo info = new CommitInfo();
info.commit = commit.getName();
info.author = CommonConverters.toGitPerson(commit.getAuthorIdent());
info.committer = CommonConverters.toGitPerson(commit.getCommitterIdent());
info.subject = commit.getShortMessage();
info.message = commit.getFullMessage();
info.parents = new ArrayList<>(commit.getParentCount());
for (int i = 0; i < commit.getParentCount(); i++) {
RevCommit p = commit.getParent(i);
CommitInfo parentInfo = new CommitInfo();
parentInfo.commit = p.getName();
parentInfo.subject = p.getShortMessage();
info.parents.add(parentInfo);
}
return info;
return CommitUtil.toCommitInfo(rsrc.getCommit());
}
}