opendev/gerrit
Code Issues Proposed changes

BatchUpdate: Extract interfaces for *Context

Browse Source 
Keep the current implementations, which depend on reaching into
BatchUpdate internal state. This results in parallel inheritance for the
interfaces and implementations, which is a little sketchy and we might
eventually get rid of. But it keeps the change pretty minimal for now.

While we're extracting new public interfaces, document them.

Change-Id: I4f9ec67b1a2a560428aef01e41a3a94cb6ce6912
This commit is contained in:
Dave Borowitz
2017-03-10 13:11:59 -05:00
parent ea11b28e66
commit b91cf223be
55 changed files with 383 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gerrit-server/src/main/java/com/google/gerrit/server/git/AbandonOp.java
View File

@@ -31,8 +31,8 @@ import com.google.gerrit.server.mail.send.AbandonedSender;
import com.google.gerrit.server.mail.send.ReplyToChangeSender;
import com.google.gerrit.server.notedb.ChangeUpdate;
import com.google.gerrit.server.update.BatchUpdate;
import com.google.gerrit.server.update.BatchUpdate.ChangeContext;
import com.google.gerrit.server.update.BatchUpdate.Context;
import com.google.gerrit.server.update.ChangeContext;
import com.google.gerrit.server.update.Context;
import com.google.gwtorm.server.OrmException;
import com.google.inject.assistedinject.Assisted;
import com.google.inject.assistedinject.AssistedInject;

2
gerrit-server/src/main/java/com/google/gerrit/server/git/ChangeProgressOp.java
View File

@@ -15,7 +15,7 @@
package com.google.gerrit.server.git;
import com.google.gerrit.server.update.BatchUpdate;
import com.google.gerrit.server.update.BatchUpdate.ChangeContext;
import com.google.gerrit.server.update.ChangeContext;
import org.eclipse.jgit.lib.ProgressMonitor;
/** Trivial op to update a counter during {@code updateChange} */

2
gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java
View File

@@ -64,7 +64,7 @@ import com.google.gerrit.server.project.SubmitRuleOptions;
import com.google.gerrit.server.query.change.ChangeData;
import com.google.gerrit.server.query.change.InternalChangeQuery;
import com.google.gerrit.server.update.BatchUpdate;
import com.google.gerrit.server.update.BatchUpdate.ChangeContext;
import com.google.gerrit.server.update.ChangeContext;
import com.google.gerrit.server.update.UpdateException;
import com.google.gerrit.server.util.RequestId;
import com.google.gwtorm.server.OrmException;

4
gerrit-server/src/main/java/com/google/gerrit/server/git/MergedByPushOp.java
View File

@@ -30,8 +30,8 @@ import com.google.gerrit.server.mail.send.MergedSender;
import com.google.gerrit.server.notedb.ChangeUpdate;
import com.google.gerrit.server.patch.PatchSetInfoFactory;
import com.google.gerrit.server.update.BatchUpdate;
import com.google.gerrit.server.update.BatchUpdate.ChangeContext;
import com.google.gerrit.server.update.BatchUpdate.Context;
import com.google.gerrit.server.update.ChangeContext;
import com.google.gerrit.server.update.Context;
import com.google.gerrit.server.util.RequestScopePropagator;
import com.google.gwtorm.server.OrmException;
import com.google.inject.Provider;

2
gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java
View File

@@ -115,7 +115,7 @@ import com.google.gerrit.server.query.change.ChangeData;
import com.google.gerrit.server.query.change.InternalChangeQuery;
import com.google.gerrit.server.ssh.SshInfo;
import com.google.gerrit.server.update.BatchUpdate;
import com.google.gerrit.server.update.BatchUpdate.ChangeContext;
import com.google.gerrit.server.update.ChangeContext;
import com.google.gerrit.server.update.UpdateException;
import com.google.gerrit.server.util.LabelVote;
import com.google.gerrit.server.util.MagicBranch;

6
gerrit-server/src/main/java/com/google/gerrit/server/git/ReplaceOp.java
View File

@@ -50,9 +50,9 @@ import com.google.gerrit.server.project.ChangeControl;
import com.google.gerrit.server.project.ProjectControl;
import com.google.gerrit.server.query.change.ChangeData;
import com.google.gerrit.server.update.BatchUpdate;
import com.google.gerrit.server.update.BatchUpdate.ChangeContext;
import com.google.gerrit.server.update.BatchUpdate.Context;
import com.google.gerrit.server.update.BatchUpdate.RepoContext;
import com.google.gerrit.server.update.ChangeContext;
import com.google.gerrit.server.update.Context;
import com.google.gerrit.server.update.RepoContext;
import com.google.gerrit.server.util.RequestScopePropagator;
import com.google.gwtorm.server.OrmException;
import com.google.inject.assistedinject.Assisted;

2
gerrit-server/src/main/java/com/google/gerrit/server/git/SubmoduleOp.java
View File

@@ -32,7 +32,7 @@ import com.google.gerrit.server.project.ProjectCache;
import com.google.gerrit.server.project.ProjectState;
import com.google.gerrit.server.update.BatchUpdate;
import com.google.gerrit.server.update.BatchUpdate.Listener;
import com.google.gerrit.server.update.BatchUpdate.RepoContext;
import com.google.gerrit.server.update.RepoContext;
import com.google.gerrit.server.update.UpdateException;
import com.google.inject.assistedinject.Assisted;
import com.google.inject.assistedinject.AssistedInject;

4
gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/CherryPick.java
View File

@@ -27,8 +27,8 @@ import com.google.gerrit.server.git.IntegrationException;
import com.google.gerrit.server.git.MergeIdenticalTreeException;
import com.google.gerrit.server.git.MergeTip;
import com.google.gerrit.server.project.NoSuchChangeException;
import com.google.gerrit.server.update.BatchUpdate.ChangeContext;
import com.google.gerrit.server.update.BatchUpdate.RepoContext;
import com.google.gerrit.server.update.ChangeContext;
import com.google.gerrit.server.update.RepoContext;
import com.google.gwtorm.server.OrmException;
import java.io.IOException;
import java.util.ArrayList;

2
gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/FastForwardOnly.java
View File

@@ -16,7 +16,7 @@ package com.google.gerrit.server.git.strategy;
import com.google.gerrit.server.git.CodeReviewCommit;
import com.google.gerrit.server.git.IntegrationException;
import com.google.gerrit.server.update.BatchUpdate.RepoContext;
import com.google.gerrit.server.update.RepoContext;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;

2
gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/FastForwardOp.java
View File

@@ -16,7 +16,7 @@ package com.google.gerrit.server.git.strategy;
import com.google.gerrit.server.git.CodeReviewCommit;
import com.google.gerrit.server.git.IntegrationException;
import com.google.gerrit.server.update.BatchUpdate.RepoContext;
import com.google.gerrit.server.update.RepoContext;
class FastForwardOp extends SubmitStrategyOp {
FastForwardOp(SubmitStrategy.Arguments args, CodeReviewCommit toMerge) {

2
gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/MergeOneOp.java
View File

@@ -16,7 +16,7 @@ package com.google.gerrit.server.git.strategy;
import com.google.gerrit.server.git.CodeReviewCommit;
import com.google.gerrit.server.git.IntegrationException;
import com.google.gerrit.server.update.BatchUpdate.RepoContext;
import com.google.gerrit.server.update.RepoContext;
import java.io.IOException;
import org.eclipse.jgit.lib.PersonIdent;

6
gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/RebaseSubmitStrategy.java
View File

@@ -32,9 +32,9 @@ import com.google.gerrit.server.git.RebaseSorter;
import com.google.gerrit.server.git.validators.CommitValidators;
import com.google.gerrit.server.project.InvalidChangeOperationException;
import com.google.gerrit.server.project.NoSuchChangeException;
import com.google.gerrit.server.update.BatchUpdate.ChangeContext;
import com.google.gerrit.server.update.BatchUpdate.Context;
import com.google.gerrit.server.update.BatchUpdate.RepoContext;
import com.google.gerrit.server.update.ChangeContext;
import com.google.gerrit.server.update.Context;
import com.google.gerrit.server.update.RepoContext;
import com.google.gwtorm.server.OrmException;
import java.io.IOException;
import java.util.ArrayList;

6
gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/SubmitStrategyOp.java
View File

@@ -47,9 +47,9 @@ import com.google.gerrit.server.git.SubmoduleException;
import com.google.gerrit.server.notedb.ChangeUpdate;
import com.google.gerrit.server.project.ProjectState;
import com.google.gerrit.server.update.BatchUpdate;
import com.google.gerrit.server.update.BatchUpdate.ChangeContext;
import com.google.gerrit.server.update.BatchUpdate.Context;
import com.google.gerrit.server.update.BatchUpdate.RepoContext;
import com.google.gerrit.server.update.ChangeContext;
import com.google.gerrit.server.update.Context;
import com.google.gerrit.server.update.RepoContext;
import com.google.gwtorm.server.OrmException;
import java.io.IOException;
import java.util.ArrayList;