opendev/gerrit
Code Issues Proposed changes

Remove imports of bare Id classes

Browse Source 
Change-Id: I670ce718ec53bf82ce6ecd3631ec33cc0fbc1ea6
This commit is contained in:
Dave Borowitz
2014-08-04 14:03:15 -07:00
parent a32fde72b6
commit e0c447ea63
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/server/PatchSetAncestorAccess.java
View File

@@ -14,7 +14,7 @@
package com.google.gerrit.reviewdb.server;
import com.google.gerrit.reviewdb.client.Change.Id;
import com.google.gerrit.reviewdb.client.Change;
import com.google.gerrit.reviewdb.client.PatchSet;
import com.google.gerrit.reviewdb.client.PatchSetAncestor;
import com.google.gerrit.reviewdb.client.RevId;
@@ -33,7 +33,7 @@ public interface PatchSetAncestorAccess extends
ResultSet<PatchSetAncestor> ancestorsOf(PatchSet.Id id) throws OrmException;
@Query("WHERE key.patchSetId.changeId = ?")
ResultSet<PatchSetAncestor> byChange(Id id) throws OrmException;
ResultSet<PatchSetAncestor> byChange(Change.Id id) throws OrmException;
@Query("WHERE key.patchSetId = ?")
ResultSet<PatchSetAncestor> byPatchSet(PatchSet.Id id) throws OrmException;

6
gerrit-server/src/main/java/com/google/gerrit/audit/GroupMemberAuditListener.java
View File

@@ -16,7 +16,6 @@ package com.google.gerrit.audit;
import com.google.gerrit.extensions.annotations.ExtensionPoint;
import com.google.gerrit.reviewdb.client.Account;
import com.google.gerrit.reviewdb.client.Account.Id;
import com.google.gerrit.reviewdb.client.AccountGroupById;
import com.google.gerrit.reviewdb.client.AccountGroupMember;
@@ -31,7 +30,8 @@ public interface GroupMemberAuditListener {
void onDeleteAccountsFromGroup(Account.Id actor,
Collection<AccountGroupMember> removed);
void onAddGroupsToGroup(Id actor, Collection<AccountGroupById> added);
void onAddGroupsToGroup(Account.Id actor, Collection<AccountGroupById> added);
void onDeleteGroupsFromGroup(Id actor, Collection<AccountGroupById> deleted);
void onDeleteGroupsFromGroup(Account.Id actor,
Collection<AccountGroupById> deleted);
}

3
gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeNotes.java
View File

@@ -46,7 +46,6 @@ import com.google.gerrit.reviewdb.client.ChangeMessage;
import com.google.gerrit.reviewdb.client.PatchLineComment;
import com.google.gerrit.reviewdb.client.PatchLineComment.Status;
import com.google.gerrit.reviewdb.client.PatchSet;
import com.google.gerrit.reviewdb.client.PatchSet.Id;
import com.google.gerrit.reviewdb.client.PatchSetApproval;
import com.google.gerrit.reviewdb.client.PatchSetApproval.LabelId;
import com.google.gerrit.reviewdb.client.Project;
@@ -163,7 +162,7 @@ public class ChangeNotes extends AbstractChangeNotes<ChangeNotes> {
private final List<Account.Id> allPastReviewers;
private final List<SubmitRecord> submitRecords;
private final Multimap<PatchSet.Id, ChangeMessage> changeMessages;
private final Multimap<Id, PatchLineComment> commentsForPs;
private final Multimap<PatchSet.Id, PatchLineComment> commentsForPs;
private final Multimap<PatchSet.Id, PatchLineComment> commentsForBase;
private NoteMap commentNoteMap;
private Change.Status status;