opendev/gerrit
Code Issues Proposed changes

Merge "Merge branch 'stable-2.16'"

Browse Source
This commit is contained in:
Alice Kober-Sotzek 2018-11-21 12:28:52 +00:00 committed by Gerrit Code Review
commit 474178eca1
8 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
java/com/google/gerrit/server/change/LabelsJson.java
View File

@ -54,6 +54,7 @@ import com.google.gerrit.server.permissions.PermissionBackend;
import com.google.gerrit.server.permissions.PermissionBackendException;
import com.google.gerrit.server.query.change.ChangeData;
import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.inject.assistedinject.Assisted;
import java.sql.Timestamp;
@ -67,7 +68,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.TreeMap;
import javax.inject.Inject;
/**
* Produces label-related entities, like {@link LabelInfo}s, which is serialized to JSON afterwards.

6
java/com/google/gerrit/server/config/DefaultUrlFormatter.java
View File

@ -15,10 +15,10 @@
package com.google.gerrit.server.config;
import com.google.inject.AbstractModule;
import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.inject.Singleton;
import java.util.Optional;
import javax.inject.Inject;
import javax.inject.Provider;
import javax.inject.Singleton;
@Singleton
public class DefaultUrlFormatter implements UrlFormatter {

4
java/com/google/gerrit/server/group/db/GroupsConsistencyChecker.java
View File

@ -26,6 +26,8 @@ import com.google.gerrit.server.account.GroupBackend;
import com.google.gerrit.server.config.AllUsersName;
import com.google.gerrit.server.git.GitRepositoryManager;
import com.google.gerrit.server.group.InternalGroup;
import com.google.inject.Inject;
import com.google.inject.Singleton;
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashSet;
@ -35,8 +37,6 @@ import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.Set;
import javax.inject.Inject;
import javax.inject.Singleton;
import org.eclipse.jgit.errors.ConfigInvalidException;
import org.eclipse.jgit.lib.Repository;

2
java/com/google/gerrit/server/group/db/GroupsNoteDbConsistencyChecker.java
View File

@ -31,6 +31,7 @@ import com.google.gerrit.reviewdb.client.RefNames;
import com.google.gerrit.server.config.AllUsersName;
import com.google.gerrit.server.group.InternalGroup;
import com.google.inject.Inject;
import com.google.inject.Singleton;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
@ -39,7 +40,6 @@ import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import javax.inject.Singleton;
import org.eclipse.jgit.errors.ConfigInvalidException;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.ObjectLoader;

2
java/com/google/gerrit/server/index/project/StalenessChecker.java
View File

@ -28,9 +28,9 @@ import com.google.gerrit.index.query.FieldBundle;
import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.reviewdb.client.RefNames;
import com.google.gerrit.server.project.ProjectCache;
import com.google.inject.Inject;
import java.io.IOException;
import java.util.Optional;
import javax.inject.Inject;
public class StalenessChecker {
private static final ImmutableSet<String> FIELDS =

2
java/com/google/gerrit/server/restapi/change/Check.java
View File

@ -31,8 +31,8 @@ import com.google.gerrit.server.permissions.ProjectPermission;
import com.google.gerrit.server.project.NoSuchProjectException;
import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject;
import com.google.inject.Singleton;
import java.io.IOException;
import javax.inject.Singleton;
@Singleton
public class Check

2
java/com/google/gerrit/server/restapi/project/CheckAccessReadView.java
View File

@ -21,8 +21,8 @@ import com.google.gerrit.extensions.restapi.RestReadView;
import com.google.gerrit.server.permissions.PermissionBackendException;
import com.google.gerrit.server.project.ProjectResource;
import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject;
import java.io.IOException;
import javax.inject.Inject;
import org.eclipse.jgit.errors.ConfigInvalidException;
import org.kohsuke.args4j.Option;

2
javatests/com/google/gerrit/acceptance/rest/project/AccessIT.java
View File

@ -48,9 +48,9 @@ import com.google.gerrit.reviewdb.client.RefNames;
import com.google.gerrit.server.config.AllProjectsNameProvider;
import com.google.gerrit.server.group.SystemGroupBackend;
import com.google.gerrit.server.project.ProjectConfig;
import com.google.inject.Inject;
import java.util.HashMap;
import java.util.Map;
import javax.inject.Inject;
import org.eclipse.jgit.internal.storage.dfs.InMemoryRepository;
import org.eclipse.jgit.junit.TestRepository;
import org.eclipse.jgit.lib.Config;