diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitWebServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitWebServlet.java index 42dfae013b..7bc6580f0e 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitWebServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitWebServlet.java @@ -291,7 +291,6 @@ class GitWebServlet extends HttpServlet { } final Map params = getParameters(req); - final String action = params.get("a"); if (deniedActions.contains(params.get("a"))) { rsp.sendError(HttpServletResponse.SC_FORBIDDEN); return; @@ -307,7 +306,6 @@ class GitWebServlet extends HttpServlet { } final ProjectControl project; - final boolean anonymousRead; try { final Project.NameKey nameKey = new Project.NameKey(name); project = projectControl.validateFor(nameKey); 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 c85497086f..2e03870573 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 @@ -359,7 +359,6 @@ public class ChangeListServiceImpl extends BaseServiceImplementation implements final AsyncCallback callback) { run(callback, new Action() { public SingleListChangeInfo run(final ReviewDb db) throws OrmException { - final Account.Id me = getAccountId(); final AccountInfoCacheFactory ac = accountInfoCacheFactory.create(); final SingleListChangeInfo d = new SingleListChangeInfo(); final Set starred = currentUser.get().getStarredChanges(); @@ -538,7 +537,6 @@ public class ChangeListServiceImpl extends BaseServiceImplementation implements } public SingleListChangeInfo run(final ReviewDb db) throws OrmException { - final Account.Id me = getAccountId(); final AccountInfoCacheFactory ac = accountInfoCacheFactory.create(); final SingleListChangeInfo d = new SingleListChangeInfo(); final Set starred = currentUser.get().getStarredChanges(); diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/changedetail/ChangeDetailFactory.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/changedetail/ChangeDetailFactory.java index 102b41c1d5..d641c86cae 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/changedetail/ChangeDetailFactory.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/changedetail/ChangeDetailFactory.java @@ -28,7 +28,6 @@ import com.google.gerrit.reviewdb.ChangeMessage; import com.google.gerrit.reviewdb.PatchSet; import com.google.gerrit.reviewdb.PatchSetAncestor; import com.google.gerrit.reviewdb.PatchSetApproval; -import com.google.gerrit.reviewdb.Project; import com.google.gerrit.reviewdb.RevId; import com.google.gerrit.reviewdb.ReviewDb; import com.google.gerrit.server.account.AccountInfoCacheFactory; @@ -90,7 +89,6 @@ public class ChangeDetailFactory extends Handler { PatchSetInfoNotAvailableException, NoSuchChangeException { control = changeControlFactory.validateFor(changeId); final Change change = control.getChange(); - final Project proj = control.getProject(); final PatchSet patch = db.patchSets().get(change.currentPatchSetId()); if (patch == null) { throw new NoSuchEntityException(); diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/ListBranches.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/ListBranches.java index c8c4409cb4..a3fdcfdad9 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/ListBranches.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/ListBranches.java @@ -60,9 +60,8 @@ class ListBranches extends Handler> { @Override public List call() throws NoSuchProjectException, RepositoryNotFoundException { - final ProjectControl projectControl = - projectControlFactory.validateFor(projectName, ProjectControl.OWNER - | ProjectControl.VISIBLE); + projectControlFactory.validateFor(projectName, ProjectControl.OWNER + | ProjectControl.VISIBLE); final List branches = new ArrayList(); final Repository db = repoManager.openRepository(projectName.get()); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapType.java b/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapType.java index 4a0ea2cc49..56a6eecd63 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapType.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapType.java @@ -14,21 +14,15 @@ package com.google.gerrit.server.auth.ldap; -import javax.naming.NamingEnumeration; import javax.naming.NamingException; import javax.naming.directory.Attribute; import javax.naming.directory.Attributes; import javax.naming.directory.DirContext; -import javax.naming.directory.SearchControls; -import javax.naming.directory.SearchResult; abstract class LdapType { static final LdapType RFC_2307 = new Rfc2307(); static LdapType guessType(final DirContext ctx) throws NamingException { - final SearchControls cons = new SearchControls(); - final NamingEnumeration res; - final Attributes rootAtts = ctx.getAttributes(""); Attribute supported = rootAtts.get("supportedCapabilities"); if (supported != null && supported.contains("1.2.840.113556.1.4.800")) { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/PushAllProjectsOp.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/PushAllProjectsOp.java index 5e176d6a5a..4dbc9e8632 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/PushAllProjectsOp.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/PushAllProjectsOp.java @@ -14,7 +14,6 @@ package com.google.gerrit.server.git; -import com.google.gerrit.reviewdb.Branch; import com.google.gerrit.reviewdb.Project; import com.google.gerrit.reviewdb.ReviewDb; import com.google.gerrit.server.config.Nullable; @@ -27,7 +26,6 @@ import com.google.inject.assistedinject.Assisted; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.HashSet; import java.util.concurrent.TimeUnit; public class PushAllProjectsOp extends DefaultQueueOp { @@ -63,7 +61,6 @@ public class PushAllProjectsOp extends DefaultQueueOp { } public void run() { - final HashSet pending = new HashSet(); try { final ReviewDb db = schema.open(); try { diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ScpCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ScpCommand.java index 2fa177f226..531f1bcc4f 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ScpCommand.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ScpCommand.java @@ -49,8 +49,6 @@ final class ScpCommand extends BaseCommand { private boolean opt_r; private boolean opt_t; private boolean opt_f; - private boolean opt_v; - private boolean opt_p; private String root; private TreeMap toc; @@ -70,7 +68,6 @@ final class ScpCommand extends BaseCommand { opt_f = true; break; case 'p': - opt_p = true; break; case 'r': opt_r = true; @@ -79,7 +76,6 @@ final class ScpCommand extends BaseCommand { opt_t = true; break; case 'v': - opt_v = true; break; } }