ChangeNotes: Remove project arg from constructors

We always pass a Change to the constructor, so this argument is not
necessary. It was originally so we could pass (project, ID) to the
constructor, but we don't do that currently, so until then it's
unnecessary.

Change-Id: I59d6632c28523bd2f405486899215e2f9ebfa685

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

@@ -173,7 +173,7 @@ public class ChangeNotes extends AbstractChangeNotes<ChangeNotes> {
           project, changeId, change.getProject());
       // TODO: Throw NoSuchChangeException when the change is not found in the
       // database
-      return new ChangeNotes(args, project, change).load();
+      return new ChangeNotes(args, change).load();
     }
 
     /**
@@ -185,11 +185,11 @@ public class ChangeNotes extends AbstractChangeNotes<ChangeNotes> {
      * @return change notes
      */
     public ChangeNotes createFromIndexedChange(Change change) {
-      return new ChangeNotes(args, change.getProject(), change);
+      return new ChangeNotes(args, change);
     }
 
     public ChangeNotes createForNew(Change change) throws OrmException {
-      return new ChangeNotes(args, change.getProject(), change).load();
+      return new ChangeNotes(args, change).load();
     }
 
     // TODO(dborowitz): Remove when deleting index schemas <27.
@@ -200,13 +200,12 @@ public class ChangeNotes extends AbstractChangeNotes<ChangeNotes> {
       Change change = unwrap(db).changes().get(changeId);
       checkNotNull(change,
           "change %s not found in ReviewDb", changeId);
-      return new ChangeNotes(args, change.getProject(), change).load();
+      return new ChangeNotes(args, change).load();
     }
 
     public ChangeNotes createWithAutoRebuildingDisabled(Change change,
         RefCache refs) throws OrmException {
-      return new ChangeNotes(args, change.getProject(), change, false, refs)
+      return new ChangeNotes(args, change, false, refs).load();
-          .load();
     }
 
     // TODO(ekempin): Remove when database backend is deleted
@@ -218,7 +217,7 @@ public class ChangeNotes extends AbstractChangeNotes<ChangeNotes> {
         throws OrmException {
       checkState(!args.migration.readChanges(), "do not call"
           + " createFromChangeWhenNoteDbDisabled when NoteDb is enabled");
-      return new ChangeNotes(args, change.getProject(), change).load();
+      return new ChangeNotes(args, change).load();
     }
 
     public CheckedFuture<ChangeNotes, OrmException> createAsync(
@@ -237,7 +236,7 @@ public class ChangeNotes extends AbstractChangeNotes<ChangeNotes> {
                           "passed project %s when creating ChangeNotes for %s,"
                               + " but actual project is %s",
                           project, changeId, change.getProject());
-                      return new ChangeNotes(args, project, change).load();
+                      return new ChangeNotes(args, change).load();
                     }
                   });
                 }
@@ -376,7 +375,6 @@ public class ChangeNotes extends AbstractChangeNotes<ChangeNotes> {
     return db;
   }
 
-  private final Project.NameKey project;
   private final RefCache refs;
 
   private Change change;
@@ -397,14 +395,13 @@ public class ChangeNotes extends AbstractChangeNotes<ChangeNotes> {
   private DraftCommentNotes draftCommentNotes;
 
   @VisibleForTesting
-  public ChangeNotes(Args args, Project.NameKey project, Change change) {
+  public ChangeNotes(Args args, Change change) {
-    this(args, project, change, true, null);
+    this(args, change, true, null);
   }
 
-  private ChangeNotes(Args args, Project.NameKey project, Change change,
+  private ChangeNotes(Args args, Change change, boolean autoRebuild,
-      boolean autoRebuild, @Nullable RefCache refs) {
+      @Nullable RefCache refs) {
     super(args, change.getId(), autoRebuild);
-    this.project = project;
     this.change = new Change(change);
     this.refs = refs;
   }
@@ -561,7 +558,7 @@ public class ChangeNotes extends AbstractChangeNotes<ChangeNotes> {
     comments = ImmutableListMultimap.copyOf(parser.comments);
     revisionNoteMap = parser.revisionNoteMap;
     change.setKey(new Change.Key(parser.changeId));
-    change.setDest(new Branch.NameKey(project, parser.branch));
+    change.setDest(new Branch.NameKey(change.getProject(), parser.branch));
     change.setTopic(Strings.emptyToNull(parser.topic));
     change.setCreatedOn(parser.createdOn);
     change.setLastUpdatedOn(parser.lastUpdatedOn);
@@ -605,7 +602,7 @@ public class ChangeNotes extends AbstractChangeNotes<ChangeNotes> {
 
   @Override
   public Project.NameKey getProjectName() {
-    return project;
+    return change.getProject();
   }
 
   @Override

gerrit-server/src/test/java/com/google/gerrit/server/notedb/AbstractChangeNotesTest.java

@@ -211,7 +211,7 @@ public abstract class AbstractChangeNotesTest extends GerritBaseTests {
   }
 
   protected ChangeNotes newNotes(Change c) throws OrmException {
-    return new ChangeNotes(args, c.getProject(), c).load();
+    return new ChangeNotes(args, c).load();
   }
 
   protected static SubmitRecord submitRecord(String status,

gerrit-server/src/test/java/com/google/gerrit/testutil/TestChanges.java

@@ -139,7 +139,7 @@ public class TestChanges {
     expect(ctl.getChange()).andStubReturn(c);
     expect(ctl.getProject()).andStubReturn(new Project(c.getProject()));
     expect(ctl.getUser()).andStubReturn(user);
-    ChangeNotes notes = new ChangeNotes(args, c.getProject(), c).load();
+    ChangeNotes notes = new ChangeNotes(args, c).load();
     expect(ctl.getNotes()).andStubReturn(notes);
     expect(ctl.getId()).andStubReturn(c.getId());
     EasyMock.replay(ctl);