opendev/gerrit
Code Issues Proposed changes

Merge changes Ief6bb783,Ifb255960

Browse Source 
* changes:
  Organize imports
  SubmoduleOp: Remove unthrown exception and fix Javadoc error
This commit is contained in:
David Pursehouse 2016-07-20 00:55:55 +00:00 committed by Gerrit Code Review
commit 00cd500b36
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/AbstractDaemonTest.java
View File

@ -18,7 +18,6 @@ import static com.google.common.truth.Truth.assertThat;
import static com.google.gerrit.acceptance.GitUtil.initSsh;
import static com.google.gerrit.extensions.api.changes.SubmittedTogetherOption.NON_VISIBLE_CHANGES;
import static com.google.gerrit.server.group.SystemGroupBackend.REGISTERED_USERS;
import static org.eclipse.jgit.lib.Constants.HEAD;
import com.google.common.base.Function;
@ -81,9 +80,9 @@ import com.google.gerrit.server.query.change.ChangeData;
import com.google.gerrit.server.query.change.InternalChangeQuery;
import com.google.gerrit.testutil.ConfigSuite;
import com.google.gerrit.testutil.FakeEmailSender;
import com.google.gerrit.testutil.FakeEmailSender.Message;
import com.google.gerrit.testutil.TempFileUtil;
import com.google.gerrit.testutil.TestNotesMigration;
import com.google.gerrit.testutil.FakeEmailSender.Message;
import com.google.gson.Gson;
import com.google.gwtorm.server.OrmException;
import com.google.gwtorm.server.SchemaFactory;

2
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/TopicIT.java
View File

@ -15,8 +15,8 @@
package com.google.gerrit.acceptance.rest.change;
import com.google.gerrit.acceptance.AbstractDaemonTest;
import com.google.gerrit.acceptance.RestResponse;
import com.google.gerrit.acceptance.PushOneCommit.Result;
import com.google.gerrit.acceptance.RestResponse;
import org.junit.Test;

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

@ -32,7 +32,6 @@ import com.google.gerrit.server.git.MergeOpRepoManager.OpenRepo;
import com.google.gerrit.server.project.NoSuchProjectException;
import com.google.gerrit.server.project.ProjectCache;
import com.google.gerrit.server.project.ProjectState;
import com.google.gwtorm.server.OrmException;
import com.google.inject.assistedinject.Assisted;
import com.google.inject.assistedinject.AssistedInject;
@ -271,11 +270,11 @@ public class SubmoduleOp {
/**
* Create a gitlink update commit on the tip of subscriber or modify the
* {@param baseCommit} with gitlink update patch
* baseCommit with gitlink update patch
*/
public CodeReviewCommit composeGitlinksCommit(
final Branch.NameKey subscriber, RevCommit baseCommit)
throws IOException, SubmoduleException, OrmException {
throws IOException, SubmoduleException {
PersonIdent author = null;
StringBuilder msgbuf = new StringBuilder("Update git submodules\n\n");
boolean sameAuthorForAll = true;