commit 0980d3303642a75491fe340674a294b8142ecfc0
author Edwin Kempin <ekempin@google.com> Mon Oct 18 08:18:00 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Oct 18 08:18:00 2021 +0000
tree 6da28c5d6b0d2aae331d6e5dd2511971b9ab1585
parent 1f727dc9931d7461cc340879dd55159b807df47b
parent 8c19c396117d7f4d393901deafea191c9f8c892a

Merge changes Id068891e,If4cdbc4e

* changes:
  Enable error level for the InvalidInlineTag bug pattern in ErrorProne
  Enable error level for the ParameterName bug pattern in ErrorProne

java/com/google/gerrit/httpd/CacheBasedWebSession.java

diff --git a/java/com/google/gerrit/httpd/CacheBasedWebSession.java b/java/com/google/gerrit/httpd/CacheBasedWebSession.java
index 1605397..92e16ce 100644
--- a/java/com/google/gerrit/httpd/CacheBasedWebSession.java
+++ b/java/com/google/gerrit/httpd/CacheBasedWebSession.java
@@ -32,14 +32,12 @@
 import com.google.gerrit.server.account.externalids.ExternalId;
 import com.google.gerrit.server.config.AuthConfig;
 import com.google.inject.Provider;
-import com.google.inject.servlet.RequestScoped;
 import java.util.EnumSet;
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.eclipse.jgit.http.server.GitSmartHttpTools;
 
-@RequestScoped
 public abstract class CacheBasedWebSession extends WebSession {
   @VisibleForTesting public static final String ACCOUNT_COOKIE = "GerritAccount";
   protected static final long MAX_AGE_MINUTES = HOURS.toMinutes(12);

java/com/google/gerrit/server/restapi/change/CheckSubmitRequirement.java

diff --git a/java/com/google/gerrit/server/restapi/change/CheckSubmitRequirement.java b/java/com/google/gerrit/server/restapi/change/CheckSubmitRequirement.java
index 15728ce..55b234c 100644
--- a/java/com/google/gerrit/server/restapi/change/CheckSubmitRequirement.java
+++ b/java/com/google/gerrit/server/restapi/change/CheckSubmitRequirement.java
@@ -19,9 +19,7 @@
 import com.google.gerrit.entities.SubmitRequirementResult;
 import com.google.gerrit.extensions.common.SubmitRequirementInput;
 import com.google.gerrit.extensions.common.SubmitRequirementResultInfo;
-import com.google.gerrit.extensions.restapi.AuthException;
 import com.google.gerrit.extensions.restapi.BadRequestException;
-import com.google.gerrit.extensions.restapi.ResourceConflictException;
 import com.google.gerrit.extensions.restapi.Response;
 import com.google.gerrit.extensions.restapi.RestModifyView;
 import com.google.gerrit.server.change.ChangeResource;
@@ -47,8 +45,7 @@
 
   @Override
   public Response<SubmitRequirementResultInfo> apply(
-      ChangeResource resource, SubmitRequirementInput input)
-      throws AuthException, BadRequestException, ResourceConflictException, Exception {
+      ChangeResource resource, SubmitRequirementInput input) throws BadRequestException {
     SubmitRequirement requirement = createSubmitRequirement(input);
     SubmitRequirementResult res =
         evaluator.evaluateRequirement(requirement, resource.getChangeData());