Merge "Consistently use com.google.inject.Inject instead of javax.inject.Inject"

This commit is contained in:
Dave Borowitz
2014-10-07 15:40:25 +00:00
committed by Gerrit Code Review
9 changed files with 10 additions and 18 deletions

View File

@@ -40,6 +40,7 @@ import com.google.gerrit.server.util.ThreadLocalRequestContext;
import com.google.inject.AbstractModule;
import com.google.inject.Binding;
import com.google.inject.Guice;
import com.google.inject.Inject;
import com.google.inject.Injector;
import com.google.inject.Key;
import com.google.inject.Module;
@@ -56,7 +57,6 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.CopyOnWriteArrayList;
import javax.inject.Inject;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;