diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/OnEditEnabler.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/OnEditEnabler.java index 932fb5e274..2ba41a2881 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/OnEditEnabler.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/OnEditEnabler.java @@ -24,7 +24,6 @@ import com.google.gwt.event.dom.client.KeyPressEvent; import com.google.gwt.event.dom.client.KeyPressHandler; import com.google.gwt.event.dom.client.MouseUpEvent; import com.google.gwt.event.dom.client.MouseUpHandler; - import com.google.gwt.event.logical.shared.ValueChangeEvent; import com.google.gwt.event.logical.shared.ValueChangeHandler; import com.google.gwt.event.shared.GwtEvent; @@ -43,7 +42,7 @@ import java.util.Map; * registered input widget. */ public class OnEditEnabler implements KeyPressHandler, KeyDownHandler, - MouseUpHandler, ChangeHandler, ValueChangeHandler { + MouseUpHandler, ChangeHandler, ValueChangeHandler { private final FocusWidget widget; private Map strings = new HashMap(); @@ -102,8 +101,9 @@ public class OnEditEnabler implements KeyPressHandler, KeyDownHandler, lb.addChangeHandler(this); } + @SuppressWarnings({"unchecked", "rawtypes"}) public void listenTo(final CheckBox cb) { - cb.addValueChangeHandler(this); + cb.addValueChangeHandler((ValueChangeHandler) this); } @@ -129,12 +129,13 @@ public class OnEditEnabler implements KeyPressHandler, KeyDownHandler, on(e); } + @SuppressWarnings("rawtypes") @Override public void onValueChange(final ValueChangeEvent e) { on(e); } - private void on(final GwtEvent e) { + private void on(final GwtEvent e) { if (widget.isEnabled() || ! (e.getSource() instanceof FocusWidget) || ! ((FocusWidget) e.getSource()).isEnabled() ) { diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/openid/OpenIdServiceImpl.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/openid/OpenIdServiceImpl.java index 068855fd7e..3dce96726b 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/openid/OpenIdServiceImpl.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/openid/OpenIdServiceImpl.java @@ -146,6 +146,7 @@ class OpenIdServiceImpl implements OpenIdService { "auth", null, "maxOpenIdSessionAge", -1, TimeUnit.SECONDS); } + @SuppressWarnings("unchecked") public void discover(final String openidIdentifier, final SignInMode mode, final boolean remember, final String returnToken, final AsyncCallback cb) { diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/ChangeListServiceImpl.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/ChangeListServiceImpl.java index 332e262572..5c19e117b5 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/ChangeListServiceImpl.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/ChangeListServiceImpl.java @@ -162,7 +162,7 @@ public class ChangeListServiceImpl extends BaseServiceImplementation implements } if (s instanceof ChangeDataSource) { - ArrayList r = new ArrayList(); + ArrayList r = new ArrayList(); HashSet want = new HashSet(); for (ChangeData d : ((ChangeDataSource) s).read()) { if (d.hasChange()) { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/MimeUtilFileTypeRegistry.java b/gerrit-server/src/main/java/com/google/gerrit/server/MimeUtilFileTypeRegistry.java index 36e9327ddb..792c1e71ac 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/MimeUtilFileTypeRegistry.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/MimeUtilFileTypeRegistry.java @@ -60,6 +60,7 @@ public class MimeUtilFileTypeRegistry implements FileTypeRegistry { mimeUtil.registerMimeDetector(name); } + @SuppressWarnings("unchecked") public MimeType getMimeType(final String path, final byte[] content) { Set mimeTypes = new HashSet(); if (content != null && content.length > 0) { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/cache/ProxyEhcache.java b/gerrit-server/src/main/java/com/google/gerrit/server/cache/ProxyEhcache.java index 8d167ecc24..bcead637f8 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/cache/ProxyEhcache.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/cache/ProxyEhcache.java @@ -105,6 +105,7 @@ final class ProxyEhcache implements Ehcache { return self().get(key); } + @SuppressWarnings("rawtypes") public Map getAllWithLoader(Collection keys, Object loaderArgument) throws CacheException { return self().getAllWithLoader(keys, loaderArgument); @@ -150,14 +151,17 @@ final class ProxyEhcache implements Ehcache { return self().getGuid(); } + @SuppressWarnings("rawtypes") public List getKeys() throws IllegalStateException, CacheException { return self().getKeys(); } + @SuppressWarnings("rawtypes") public List getKeysNoDuplicateCheck() throws IllegalStateException { return self().getKeysNoDuplicateCheck(); } + @SuppressWarnings("rawtypes") public List getKeysWithExpiryCheck() throws IllegalStateException, CacheException { return self().getKeysWithExpiryCheck(); @@ -247,6 +251,7 @@ final class ProxyEhcache implements Ehcache { self().load(key); } + @SuppressWarnings("rawtypes") public void loadAll(Collection keys, Object argument) throws CacheException { self().loadAll(keys, argument); } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/QueryBuilder.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/QueryBuilder.java index dfd3e30982..5aa6cdc8b1 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/QueryBuilder.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/QueryBuilder.java @@ -109,9 +109,10 @@ public abstract class QueryBuilder { } } + @SuppressWarnings("rawtypes") private final Map opFactories; - @SuppressWarnings("unchecked") + @SuppressWarnings({"unchecked", "rawtypes"}) protected QueryBuilder(Definition> def) { opFactories = (Map) def.opFactories; } @@ -199,7 +200,8 @@ public abstract class QueryBuilder { @SuppressWarnings("unchecked") private Predicate operator(final String name, final String value) throws QueryParseException { - final OperatorFactory f = opFactories.get(name); + @SuppressWarnings("rawtypes") + OperatorFactory f = opFactories.get(name); if (f == null) { throw error("Unsupported operator " + name + ":" + value); } @@ -271,7 +273,7 @@ public abstract class QueryBuilder { public

> P find(Predicate p, Class

clazz, String name) { if (p instanceof OperatorPredicate - && ((OperatorPredicate) p).getOperator().equals(name) + && ((OperatorPredicate) p).getOperator().equals(name) && clazz.isAssignableFrom(p.getClass())) { return (P) p; } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/QueryRewriter.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/QueryRewriter.java index 8104e038af..b3c10efc2e 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/QueryRewriter.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/QueryRewriter.java @@ -81,7 +81,7 @@ public abstract class QueryRewriter { if ((m.getModifiers() & Modifier.ABSTRACT) != Modifier.ABSTRACT && (m.getModifiers() & Modifier.PUBLIC) == Modifier.PUBLIC && rp != null) { - rewriteRules.add(new MethodRewrite(qb, rp.value(), m)); + rewriteRules.add(new MethodRewrite(qb, rp.value(), m)); } } c = c.getSuperclass(); @@ -414,7 +414,7 @@ public abstract class QueryRewriter { return null; } - final Predicate[] argList = new Predicate[argNames.length]; + final Predicate[] argList = new Predicate[argNames.length]; for (int i = 0; i < argList.length; i++) { argList[i] = args.get(argNames[i]); if (argList[i] == null) { @@ -438,7 +438,7 @@ public abstract class QueryRewriter { } if (rep instanceof RewritePredicate) { - ((RewritePredicate) rep).init(method.getName(), argList); + ((RewritePredicate) rep).init(method.getName(), argList); } if (res.extra == null) { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/RewritePredicate.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/RewritePredicate.java index 35fbc1c203..1c5c89c61a 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/RewritePredicate.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/RewritePredicate.java @@ -39,7 +39,7 @@ public abstract class RewritePredicate extends Predicate { @Override public boolean equals(Object other) { if (other instanceof RewritePredicate) { - RewritePredicate that = (RewritePredicate) other; + RewritePredicate that = (RewritePredicate) other; if (this.init && that.init) { return this.getClass() == that.getClass() && this.name.equals(that.name) diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeQueryBuilder.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeQueryBuilder.java index e7e53e28de..577c5af92a 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeQueryBuilder.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeQueryBuilder.java @@ -473,7 +473,7 @@ public class ChangeQueryBuilder extends QueryBuilder { @SuppressWarnings("unchecked") public int getLimit(Predicate p) { - return ((IntPredicate) find(p, IntPredicate.class, FIELD_LIMIT)).intValue(); + return ((IntPredicate) find(p, IntPredicate.class, FIELD_LIMIT)).intValue(); } public boolean hasSortKey(Predicate p) { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/QueryProcessor.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/QueryProcessor.java index 49f3ec191b..a975f1b85b 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/QueryProcessor.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/QueryProcessor.java @@ -290,7 +290,7 @@ public class QueryProcessor { } else if (value instanceof Collection) { out.print('\n'); - for (Object thing : ((Collection) value)) { + for (Object thing : ((Collection) value)) { if (isPrimitive(thing)) { out.print(' '); out.print(value); diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/DispatchCommandProvider.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/DispatchCommandProvider.java index 9492d42057..0b69228b85 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/DispatchCommandProvider.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/DispatchCommandProvider.java @@ -85,7 +85,8 @@ public class DispatchCommandProvider implements Provider { } } - return Collections.unmodifiableMap(new LinkedHashMap(m)); + return Collections.unmodifiableMap( + new LinkedHashMap>(m)); } private static final TypeLiteral type = diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/args4j/AccountGroupIdHandler.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/args4j/AccountGroupIdHandler.java index 13ff1b10f0..f269541a60 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/args4j/AccountGroupIdHandler.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/args4j/AccountGroupIdHandler.java @@ -29,7 +29,7 @@ import org.kohsuke.args4j.spi.Setter; public class AccountGroupIdHandler extends OptionHandler { private final GroupCache groupCache; - @SuppressWarnings("unchecked") + @SuppressWarnings({"unchecked", "rawtypes"}) @Inject public AccountGroupIdHandler(final GroupCache groupCache, @Assisted final CmdLineParser parser, @Assisted final OptionDef option, diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/args4j/AccountIdHandler.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/args4j/AccountIdHandler.java index 8add857989..b8bf0fd4eb 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/args4j/AccountIdHandler.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/args4j/AccountIdHandler.java @@ -35,7 +35,7 @@ public class AccountIdHandler extends OptionHandler { private final AccountResolver accountResolver; private final AccountManager accountManager; - @SuppressWarnings("unchecked") + @SuppressWarnings({"unchecked", "rawtypes"}) @Inject public AccountIdHandler(final AccountResolver accountResolver, final AccountManager accountManager, diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/args4j/PatchSetIdHandler.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/args4j/PatchSetIdHandler.java index 5b24ce5d46..847184db32 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/args4j/PatchSetIdHandler.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/args4j/PatchSetIdHandler.java @@ -26,7 +26,7 @@ import org.kohsuke.args4j.spi.Parameters; import org.kohsuke.args4j.spi.Setter; public class PatchSetIdHandler extends OptionHandler { - @SuppressWarnings("unchecked") + @SuppressWarnings({"unchecked", "rawtypes"}) @Inject public PatchSetIdHandler(@Assisted final CmdLineParser parser, @Assisted final OptionDef option, @Assisted final Setter setter) { diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/args4j/ProjectControlHandler.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/args4j/ProjectControlHandler.java index 4c962f04da..48733c03b3 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/args4j/ProjectControlHandler.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/args4j/ProjectControlHandler.java @@ -30,7 +30,7 @@ import org.kohsuke.args4j.spi.Setter; public class ProjectControlHandler extends OptionHandler { private final ProjectControl.Factory projectControlFactory; - @SuppressWarnings("unchecked") + @SuppressWarnings({"unchecked", "rawtypes"}) @Inject public ProjectControlHandler( final ProjectControl.Factory projectControlFactory, diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/args4j/SocketAddressHandler.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/args4j/SocketAddressHandler.java index 75defd43a4..50e41ae522 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/args4j/SocketAddressHandler.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/args4j/SocketAddressHandler.java @@ -28,7 +28,7 @@ import org.kohsuke.args4j.spi.Setter; import java.net.SocketAddress; public class SocketAddressHandler extends OptionHandler { - @SuppressWarnings("unchecked") + @SuppressWarnings({"unchecked", "rawtypes"}) @Inject public SocketAddressHandler(@Assisted final CmdLineParser parser, @Assisted final OptionDef option, @Assisted final Setter setter) { diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/args4j/SubcommandHandler.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/args4j/SubcommandHandler.java index 4eedca0bcd..434230f367 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/args4j/SubcommandHandler.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/args4j/SubcommandHandler.java @@ -25,7 +25,7 @@ import org.kohsuke.args4j.spi.Parameters; import org.kohsuke.args4j.spi.Setter; public class SubcommandHandler extends OptionHandler { - @SuppressWarnings("unchecked") + @SuppressWarnings({"unchecked", "rawtypes"}) @Inject public SubcommandHandler(@Assisted final CmdLineParser parser, @Assisted final OptionDef option, @Assisted final Setter setter) { diff --git a/gerrit-util-cli/src/main/java/com/google/gerrit/util/cli/CmdLineParser.java b/gerrit-util-cli/src/main/java/com/google/gerrit/util/cli/CmdLineParser.java index f83d852c26..d5a2a98ff9 100644 --- a/gerrit-util-cli/src/main/java/com/google/gerrit/util/cli/CmdLineParser.java +++ b/gerrit-util-cli/src/main/java/com/google/gerrit/util/cli/CmdLineParser.java @@ -132,7 +132,7 @@ public class CmdLineParser { super(bean); } - @SuppressWarnings("unchecked") + @SuppressWarnings({"unchecked", "rawtypes"}) @Override protected OptionHandler createOptionHandler(final OptionDef option, final Setter setter) { @@ -157,13 +157,11 @@ public class CmdLineParser { return option.handler() != OptionHandler.class; } - @SuppressWarnings("unchecked") - private boolean isEnum(final Setter setter) { + private boolean isEnum(Setter setter) { return Enum.class.isAssignableFrom(setter.getType()); } - @SuppressWarnings("unchecked") - private boolean isPrimitive(final Setter setter) { + private boolean isPrimitive(Setter setter) { return setter.getType().isPrimitive(); } } diff --git a/gerrit-util-cli/src/main/java/com/google/gerrit/util/cli/OptionHandlerFactory.java b/gerrit-util-cli/src/main/java/com/google/gerrit/util/cli/OptionHandlerFactory.java index ba9d7a3eb9..0009d057f5 100644 --- a/gerrit-util-cli/src/main/java/com/google/gerrit/util/cli/OptionHandlerFactory.java +++ b/gerrit-util-cli/src/main/java/com/google/gerrit/util/cli/OptionHandlerFactory.java @@ -20,6 +20,7 @@ import org.kohsuke.args4j.spi.Setter; /** Creates an args4j OptionHandler through a Guice Injector. */ public interface OptionHandlerFactory { + @SuppressWarnings("rawtypes") OptionHandler create(org.kohsuke.args4j.CmdLineParser cmdLineParser, OptionDef optionDef, Setter setter); }