From 0009ace9321a89a8c7a22a83d12fde6e5debe96e Mon Sep 17 00:00:00 2001 From: Edwin Kempin Date: Thu, 3 Nov 2011 08:54:22 +0100 Subject: [PATCH] Fix miscellaneous compiler warnings Remove unused imports, remove unused local variables, parameterize generic types, suppress warnings. Change-Id: I8e4867d9a03ff774c1f8e04ff9853b0afb676e69 Signed-off-by: Edwin Kempin --- .../main/java/com/google/gerrit/client/Dispatcher.java | 1 - .../com/google/gerrit/client/admin/GroupTable.java | 1 - .../com/google/gerrit/httpd/ContainerAuthFilter.java | 1 - .../com/google/gerrit/httpd/WebSessionManager.java | 1 - .../gerrit/httpd/rpc/account/AccountSecurityImpl.java | 1 - .../com/google/gerrit/rules/PrologEnvironment.java | 2 ++ .../main/java/com/google/gerrit/server/ChangeUtil.java | 10 +++++----- .../google/gerrit/server/project/ChangeControl.java | 6 +++--- .../google/gerrit/server/project/ProjectControl.java | 1 - .../com/google/gerrit/server/schema/Schema_53.java | 1 - .../gerrit/AbstractCommitUserIdentityPredicate.java | 6 ------ .../src/main/java/gerrit/PRED_commit_delta_4.java | 4 ++-- .../src/main/java/gerrit/PRED_commit_edits_2.java | 5 ----- 13 files changed, 12 insertions(+), 28 deletions(-) diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/Dispatcher.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/Dispatcher.java index b439e6c9c3..bfdc69f77d 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/Dispatcher.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/Dispatcher.java @@ -277,7 +277,6 @@ public class Dispatcher { private static String legacyChange(final String token) { final String s = skip(token); - final String q = "patchset="; final String t[] = s.split(",", 2); if (t.length > 1 && matchPrefix("patchset=", t[1])) { return PageLinks.toChange(PatchSet.Id.parse(t[0] + "," + skip(t[1]))); diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/GroupTable.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/GroupTable.java index 76495e7ce0..7585f8aca3 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/GroupTable.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/GroupTable.java @@ -16,7 +16,6 @@ package com.google.gerrit.client.admin; import com.google.gerrit.client.Dispatcher; import com.google.gerrit.client.Gerrit; -import com.google.gerrit.client.rpc.GerritCallback; import com.google.gerrit.client.ui.Hyperlink; import com.google.gerrit.client.ui.NavigationTable; import com.google.gerrit.common.data.GroupDetail; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/ContainerAuthFilter.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/ContainerAuthFilter.java index 11c94a72e5..e170f54601 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/ContainerAuthFilter.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/ContainerAuthFilter.java @@ -19,7 +19,6 @@ import static javax.servlet.http.HttpServletResponse.SC_UNAUTHORIZED; import com.google.gerrit.server.account.AccountCache; import com.google.gerrit.server.account.AccountState; -import com.google.gerrit.server.config.AuthConfig; import com.google.gerrit.server.config.GerritServerConfig; import com.google.gwtjsonrpc.server.XsrfException; import com.google.inject.Inject; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/WebSessionManager.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/WebSessionManager.java index 4ae5c30e4a..4a3e113c93 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/WebSessionManager.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/WebSessionManager.java @@ -99,7 +99,6 @@ class WebSessionManager { // If we don't yet have a token for this session, establish one. // final int nonceLen = 20; - final ByteArrayOutputStream buf; final byte[] rnd = new byte[nonceLen]; prng.nextBytes(rnd); xsrfToken = CookieBase64.encode(rnd); diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/account/AccountSecurityImpl.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/account/AccountSecurityImpl.java index f69a0d64e4..ec5ec1c6c0 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/account/AccountSecurityImpl.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/account/AccountSecurityImpl.java @@ -33,7 +33,6 @@ import com.google.gerrit.reviewdb.AuthType; import com.google.gerrit.reviewdb.ContactInformation; import com.google.gerrit.reviewdb.ContributorAgreement; import com.google.gerrit.reviewdb.ReviewDb; -import com.google.gerrit.reviewdb.Project; import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.account.AccountByEmailCache; diff --git a/gerrit-server/src/main/java/com/google/gerrit/rules/PrologEnvironment.java b/gerrit-server/src/main/java/com/google/gerrit/rules/PrologEnvironment.java index 5d86954c1e..310b4011ef 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/rules/PrologEnvironment.java +++ b/gerrit-server/src/main/java/com/google/gerrit/rules/PrologEnvironment.java @@ -82,6 +82,7 @@ public class PrologEnvironment extends BufferingPrologControl { * @param sv unique key. * @return the value; null if not stored. */ + @SuppressWarnings("unchecked") public T get(StoredValue sv) { return (T) storedValues.get(sv); } @@ -93,6 +94,7 @@ public class PrologEnvironment extends BufferingPrologControl { * @param sv unique key. * @param obj the value to store under {@code sv}. */ + @SuppressWarnings("unchecked") public void set(StoredValue sv, T obj) { storedValues.put((StoredValue) sv, obj); } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/ChangeUtil.java b/gerrit-server/src/main/java/com/google/gerrit/server/ChangeUtil.java index 89f5ab2a14..93665f44db 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/ChangeUtil.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/ChangeUtil.java @@ -403,11 +403,11 @@ public class ChangeUtil { hooks.doChangeRestoreHook(updatedChange, user.getAccount(), message); } - private static void updatedChange(final ReviewDb db, final IdentifiedUser user, - final Change change, final ChangeMessage cmsg, - ReplyToChangeSender.Factory senderFactory, final String err) - throws NoSuchChangeException, InvalidChangeOperationException, - EmailException, OrmException { + private static void updatedChange( + final ReviewDb db, final IdentifiedUser user, final Change change, + final ChangeMessage cmsg, ReplyToChangeSender.Factory senderFactory, + final String err) throws NoSuchChangeException, + InvalidChangeOperationException, EmailException, OrmException { if (change == null) { throw new InvalidChangeOperationException(err); } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ChangeControl.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/ChangeControl.java index 6d44511bd3..c7e205566e 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/ChangeControl.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/ChangeControl.java @@ -36,7 +36,6 @@ import com.googlecode.prolog_cafe.lang.ListTerm; import com.googlecode.prolog_cafe.lang.Prolog; import com.googlecode.prolog_cafe.lang.PrologException; import com.googlecode.prolog_cafe.lang.StructureTerm; -import com.googlecode.prolog_cafe.lang.SymbolTerm; import com.googlecode.prolog_cafe.lang.Term; import com.googlecode.prolog_cafe.lang.VariableTerm; @@ -46,7 +45,6 @@ import org.slf4j.LoggerFactory; import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; -import java.util.LinkedList; import java.util.List; import java.util.Set; @@ -315,7 +313,9 @@ public class ChangeControl { filterRule, resultsTerm, new VariableTerm()); - results.addAll(((ListTerm) template[2]).toJava()); + @SuppressWarnings("unchecked") + final List termList = ((ListTerm) template[2]).toJava(); + results.addAll(termList); } catch (PrologException err) { return logRuleError("Exception calling " + filterRule + " on change " + change.getId() + " of " + parentState.getProject().getName(), err); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectControl.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectControl.java index ee4283337e..5a3f0bdbe7 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectControl.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectControl.java @@ -19,7 +19,6 @@ import com.google.gerrit.common.data.AccessSection; import com.google.gerrit.common.data.Capable; import com.google.gerrit.common.data.Permission; import com.google.gerrit.common.data.PermissionRule; -import com.google.gerrit.common.data.PermissionRule.Action; import com.google.gerrit.reviewdb.AbstractAgreement; import com.google.gerrit.reviewdb.AccountAgreement; import com.google.gerrit.reviewdb.AccountGroup; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_53.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_53.java index 152f25a0ff..89ee5cf05c 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_53.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_53.java @@ -30,7 +30,6 @@ import com.google.gerrit.common.data.AccessSection; import com.google.gerrit.common.data.GroupReference; import com.google.gerrit.common.data.Permission; import com.google.gerrit.common.data.PermissionRule; -import com.google.gerrit.common.data.PermissionRule.Action; import com.google.gerrit.reviewdb.AccountGroup; import com.google.gerrit.reviewdb.ApprovalCategory; import com.google.gerrit.reviewdb.Project; diff --git a/gerrit-server/src/main/java/gerrit/AbstractCommitUserIdentityPredicate.java b/gerrit-server/src/main/java/gerrit/AbstractCommitUserIdentityPredicate.java index 94d5b07ebc..27bc2869f5 100644 --- a/gerrit-server/src/main/java/gerrit/AbstractCommitUserIdentityPredicate.java +++ b/gerrit-server/src/main/java/gerrit/AbstractCommitUserIdentityPredicate.java @@ -15,13 +15,7 @@ package gerrit; import com.google.gerrit.reviewdb.Account; -import com.google.gerrit.reviewdb.PatchSet; -import com.google.gerrit.reviewdb.PatchSetInfo; import com.google.gerrit.reviewdb.UserIdentity; -import com.google.gerrit.rules.PrologEnvironment; -import com.google.gerrit.rules.StoredValues; -import com.google.gerrit.server.patch.PatchSetInfoFactory; -import com.google.gerrit.server.patch.PatchSetInfoNotAvailableException; import com.googlecode.prolog_cafe.lang.IntegerTerm; import com.googlecode.prolog_cafe.lang.Operation; diff --git a/gerrit-server/src/main/java/gerrit/PRED_commit_delta_4.java b/gerrit-server/src/main/java/gerrit/PRED_commit_delta_4.java index 4a9c71bace..77bd81eb9d 100644 --- a/gerrit-server/src/main/java/gerrit/PRED_commit_delta_4.java +++ b/gerrit-server/src/main/java/gerrit/PRED_commit_delta_4.java @@ -15,7 +15,6 @@ package gerrit; import com.google.gerrit.reviewdb.Patch; -import com.google.gerrit.reviewdb.PatchSetInfo; import com.google.gerrit.rules.StoredValues; import com.google.gerrit.server.patch.PatchList; import com.google.gerrit.server.patch.PatchListEntry; @@ -80,7 +79,6 @@ public class PRED_commit_delta_4 extends Predicate.P4 { engine.areg3 = arg3; engine.areg4 = arg4; - PatchSetInfo psInfo = StoredValues.PATCH_SET_INFO.get(engine); PatchList pl = StoredValues.PATCH_LIST.get(engine); Iterator iter = pl.getPatches().iterator(); @@ -99,6 +97,7 @@ public class PRED_commit_delta_4 extends Predicate.P4 { Term a5 = engine.areg5; Pattern regex = (Pattern)((JavaObjectTerm)a1).object(); + @SuppressWarnings("unchecked") Iterator iter = (Iterator)((JavaObjectTerm)a5).object(); while (iter.hasNext()) { @@ -148,6 +147,7 @@ public class PRED_commit_delta_4 extends Predicate.P4 { public Operation exec(Prolog engine) { Term a5 = engine.areg5; + @SuppressWarnings("unchecked") Iterator iter = (Iterator)((JavaObjectTerm)a5).object(); if (!iter.hasNext()) { diff --git a/gerrit-server/src/main/java/gerrit/PRED_commit_edits_2.java b/gerrit-server/src/main/java/gerrit/PRED_commit_edits_2.java index f9e3036edd..f0accf0cbd 100644 --- a/gerrit-server/src/main/java/gerrit/PRED_commit_edits_2.java +++ b/gerrit-server/src/main/java/gerrit/PRED_commit_edits_2.java @@ -14,8 +14,6 @@ package gerrit; -import com.google.gerrit.reviewdb.PatchSetInfo; -import com.google.gerrit.rules.PrologEnvironment; import com.google.gerrit.rules.StoredValues; import com.google.gerrit.server.patch.PatchList; import com.google.gerrit.server.patch.PatchListEntry; @@ -28,7 +26,6 @@ import com.googlecode.prolog_cafe.lang.PInstantiationException; import com.googlecode.prolog_cafe.lang.Predicate; import com.googlecode.prolog_cafe.lang.Prolog; import com.googlecode.prolog_cafe.lang.PrologException; -import com.googlecode.prolog_cafe.lang.SystemException; import com.googlecode.prolog_cafe.lang.Term; import org.eclipse.jgit.diff.Edit; @@ -75,8 +72,6 @@ public class PRED_commit_edits_2 extends Predicate.P2 { Pattern fileRegex = getRegexParameter(a1); Pattern editRegex = getRegexParameter(a2); - PrologEnvironment env = (PrologEnvironment) engine.control; - PatchSetInfo psInfo = StoredValues.PATCH_SET_INFO.get(engine); PatchList pl = StoredValues.PATCH_LIST.get(engine); Repository repo = StoredValues.REPOSITORY.get(engine);