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

5
gerrit-util-cli/src/main/java/com/google/gerrit/util/cli/OptionHandlerFactory.java
View File

@@ -20,7 +20,6 @@ import org.kohsuke.args4j.spi.Setter;
/** Creates an args4j OptionHandler through a Guice Injector. */
public interface OptionHandlerFactory<T> {
@SuppressWarnings("rawtypes")
OptionHandler create(org.kohsuke.args4j.CmdLineParser cmdLineParser,
OptionDef optionDef, Setter setter);
OptionHandler<T> create(org.kohsuke.args4j.CmdLineParser cmdLineParser,
OptionDef optionDef, Setter<T> setter);
}

24
gerrit-util-cli/src/main/java/com/google/gerrit/util/cli/OptionHandlerUtil.java
View File

@@ -15,8 +15,13 @@
package com.google.gerrit.util.cli;
import com.google.inject.Key;
import com.google.inject.Module;
import com.google.inject.TypeLiteral;
import com.google.inject.internal.MoreTypes.ParameterizedTypeImpl;
import com.google.inject.assistedinject.FactoryModuleBuilder;
import com.google.inject.util.Types;
import org.kohsuke.args4j.spi.OptionHandler;
import org.kohsuke.args4j.spi.Setter;
import java.lang.reflect.Type;
@@ -25,10 +30,21 @@ public class OptionHandlerUtil {
/** Generate a key for an {@link OptionHandlerFactory} in Guice. */
@SuppressWarnings("unchecked")
public static <T> Key<OptionHandlerFactory<T>> keyFor(final Class<T> valueType) {
final Type factoryType =
new ParameterizedTypeImpl(null, OptionHandlerFactory.class, valueType);
final Type factoryType = Types.newParameterizedType(OptionHandlerFactory.class, valueType);
return (Key<OptionHandlerFactory<T>>) Key.get(factoryType);
}
return (Key<OptionHandlerFactory<T>>) Key.get(TypeLiteral.get(factoryType));
@SuppressWarnings("unchecked")
private static <T> Key<OptionHandler<T>> handlerOf(Class<T> type) {
final Type handlerType = Types.newParameterizedTypeWithOwner(null, OptionHandler.class, type);
return (Key<OptionHandler<T>>) Key.get(handlerType);
}
@SuppressWarnings("unchecked")
public static <T> Module moduleFor(final Class<T> type, Class<? extends OptionHandler<T>> impl) {
return new FactoryModuleBuilder()
.implement(handlerOf(type), impl)
.build(keyFor(type));
}
private OptionHandlerUtil() {