commit d875e38b25173fb9b659b33dd6237df429da26ad
author Shawn O. Pearce <sop@google.com> Mon May 10 11:24:28 2010 -0700
committer Shawn O. Pearce <sop@google.com> Mon May 10 11:24:28 2010 -0700
tree 0cd67f678a18b7423ca094abb78233689eae8fff
parent 2f1f80687e2d74a58e13f21181ebcf43a541e76c

Refactor PushOp to use Project.NameKey

Elsewhere we keep track of a project by its NameKey object, rather
than a simple String.  Do the same in PushOp, as it makes the API
a bit more clear.

Change-Id: Ieb3120e655b7b1dc43a675555ea8de63900d13a8
Signed-off-by: Shawn O. Pearce <sop@google.com>

gerrit-server/src/main/java/com/google/gerrit/server/git/PushOp.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/PushOp.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/PushOp.java
index f2d0848..14f0574 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/PushOp.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/PushOp.java
@@ -53,7 +53,7 @@
  */
 class PushOp implements ProjectRunnable {
   interface Factory {
-    PushOp create(String d, URIish u);
+    PushOp create(Project.NameKey d, URIish u);
   }
 
   private static final Logger log = PushReplication.log;
@@ -64,15 +64,16 @@
   private final RemoteConfig config;
 
   private final Set<String> delta = new HashSet<String>();
-  private final String projectName;
+  private final Project.NameKey projectName;
   private final URIish uri;
   private boolean mirror;
 
   private Repository db;
 
   @Inject
-  PushOp(final GitRepositoryManager grm, final PushReplication.ReplicationConfig p,
-      final RemoteConfig c, @Assisted final String d, @Assisted final URIish u) {
+  PushOp(final GitRepositoryManager grm,
+      final PushReplication.ReplicationConfig p, final RemoteConfig c,
+      @Assisted final Project.NameKey d, @Assisted final URIish u) {
     repoManager = grm;
     pool = p;
     config = c;
@@ -100,7 +101,7 @@
       // created and scheduled for a future point in time.)
       //
       pool.notifyStarting(this);
-      db = repoManager.openRepository(projectName);
+      db = repoManager.openRepository(projectName.get());
       runImpl();
     } catch (RepositoryNotFoundException e) {
       log.error("Cannot replicate " + projectName + "; " + e.getMessage());
@@ -289,7 +290,7 @@
 
   @Override
   public NameKey getProjectNameKey() {
-    return new Project.NameKey(projectName);
+    return projectName;
   }
 
   @Override

gerrit-server/src/main/java/com/google/gerrit/server/git/PushReplication.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/PushReplication.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/PushReplication.java
index 652c757..cb3e3fc 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/PushReplication.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/PushReplication.java
@@ -366,7 +366,7 @@
       synchronized (pending) {
         PushOp e = pending.get(uri);
         if (e == null) {
-          e = opFactory.create(project.get(), uri);
+          e = opFactory.create(project, uri);
           pool.schedule(e, delay, TimeUnit.SECONDS);
           pending.put(uri, e);
         }