opendev/gerrit
Code Issues Proposed changes

Updated to Guice 3.0.

Browse Source 
Use the new FactoryModuleBuilder everywhere, instead of FactoryProvider.

Updated the OptionHandlers to be generic, instead of ignoring the type
parameter.

Removed the GuiceHelper and refactored the HttpLog implementation to
depend on a request attribute for passing the current user.

Change-Id: Ic7d94118c7ab6c46fa784b88acefd7434bb58a44
This commit is contained in:
Colby Ranger
2012-03-06 11:39:45 -08:00
parent d386bb2f6e
commit 7820803a0d
23 changed files with 171 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshModule.java
View File

@@ -42,11 +42,7 @@ import com.google.gerrit.sshd.commands.DefaultCommandModule;
import com.google.gerrit.sshd.commands.ProjectNode;
import com.google.gerrit.sshd.commands.QueryShell;
import com.google.gerrit.util.cli.CmdLineParser;
import com.google.gerrit.util.cli.OptionHandlerFactory;
import com.google.gerrit.util.cli.OptionHandlerUtil;
import com.google.inject.Key;
import com.google.inject.TypeLiteral;
import com.google.inject.assistedinject.FactoryProvider;
import com.google.inject.servlet.RequestScoped;
import org.apache.sshd.common.KeyPairProvider;
@@ -129,14 +125,6 @@ public class SshModule extends FactoryModule {
private <T> void registerOptionHandler(Class<T> type,
Class<? extends OptionHandler<T>> impl) {
final Key<OptionHandlerFactory<T>> key = OptionHandlerUtil.keyFor(type);
final TypeLiteral<OptionHandlerFactory<T>> factoryType =
new TypeLiteral<OptionHandlerFactory<T>>() {};
final TypeLiteral<? extends OptionHandler<T>> implType =
TypeLiteral.get(impl);
bind(key).toProvider(FactoryProvider.newFactory(factoryType, implType));
install(OptionHandlerUtil.moduleFor(type, impl));
}
}