opendev/gerrit
Code Issues Proposed changes

Merge "Use javax.inject.Inject instead of com.google.inject.Inject"

Browse Source
This commit is contained in:
Saša Živkov
2014-09-30 08:11:24 +00:00
committed by Gerrit Code Review
parent 242673dd96 5db3bba3e2
commit 27543f9656
638 changed files with 1210 additions and 638 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gerrit-server/src/main/java/com/google/gerrit/server/query/change/BasicChangeRewrites.java
View File

@@ -19,11 +19,12 @@ import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.server.query.IntPredicate;
import com.google.gerrit.server.query.Predicate;
import com.google.gerrit.server.query.QueryRewriter;
import com.google.inject.Inject;
import com.google.inject.OutOfScopeException;
import com.google.inject.Provider;
import com.google.inject.name.Named;
import javax.inject.Inject;
public class BasicChangeRewrites extends QueryRewriter<ChangeData> {
private static final ChangeQueryBuilder BUILDER = new ChangeQueryBuilder(
new ChangeQueryBuilder.Arguments( //

3
gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeQueryBuilder.java
View File

@@ -48,7 +48,6 @@ import com.google.gerrit.server.query.Predicate;
import com.google.gerrit.server.query.QueryBuilder;
import com.google.gerrit.server.query.QueryParseException;
import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.inject.assistedinject.Assisted;
@@ -63,6 +62,8 @@ import java.util.Map;
import java.util.Set;
import java.util.regex.Pattern;
import javax.inject.Inject;
/**
* Parses a query string meant to be applied to change objects.
*/

3
gerrit-server/src/main/java/com/google/gerrit/server/query/change/ConflictsCacheImpl.java
View File

@@ -16,11 +16,12 @@ package com.google.gerrit.server.query.change;
import com.google.common.cache.Cache;
import com.google.gerrit.server.cache.CacheModule;
import com.google.inject.Inject;
import com.google.inject.Module;
import com.google.inject.Singleton;
import com.google.inject.name.Named;
import javax.inject.Inject;
@Singleton
public class ConflictsCacheImpl implements ConflictsCache {
public final static String NAME = "conflicts";

3
gerrit-server/src/main/java/com/google/gerrit/server/query/change/QueryChanges.java
View File

@@ -26,7 +26,6 @@ import com.google.gerrit.server.change.ChangeJson;
import com.google.gerrit.server.change.ChangeJson.ChangeInfo;
import com.google.gerrit.server.query.QueryParseException;
import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject;
import com.google.inject.Provider;
import org.kohsuke.args4j.Option;
@@ -38,6 +37,8 @@ import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import javax.inject.Inject;
public class QueryChanges implements RestReadView<TopLevelResource> {
private final ChangeJson json;
private final QueryProcessor imp;

3
gerrit-server/src/main/java/com/google/gerrit/server/query/change/QueryProcessor.java
View File

@@ -36,7 +36,6 @@ import com.google.gerrit.server.util.TimeUtil;
import com.google.gson.Gson;
import com.google.gwtorm.server.OrmException;
import com.google.gwtorm.server.ResultSet;
import com.google.inject.Inject;
import com.google.inject.Provider;
import org.eclipse.jgit.util.io.DisabledOutputStream;
@@ -58,6 +57,8 @@ import java.util.Comparator;
import java.util.Date;
import java.util.List;
import javax.inject.Inject;
public class QueryProcessor {
private static final Logger log =
LoggerFactory.getLogger(QueryProcessor.class);