opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.16' into stable-3.0

Browse Source 
* stable-2.16:
  TestSubmitType: Enable logErrors when debug logging is enabled
  TestSubmitRule: Enable logErrors when debug logging is enabled
  Fix typos in test.submit_rule and test.submit_type examples
  RestApiServlet: Log JSON parse error at debug level

Change-Id: I04a240a36382d84b3ec7794ed0f0a339dcc90788
This commit is contained in:
David Pursehouse
2020-06-18 17:25:04 +09:00
parent 8df3fb4b4a 0eec00fd58
commit f5ef2dc2d3
4 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/rest-api-changes.txt
View File

@@ -4301,7 +4301,7 @@ a project-specific rule.
.Request .Request
---- ----
POST /changes/myProject~master~I8473b95934b5732ac55d26311a706c9c2bde9940/revisions/current/test.submit_type HTTP/1.0 POST /changes/myProject~master~I8473b95934b5732ac55d26311a706c9c2bde9940/revisions/current/test.submit_type HTTP/1.0
Content-Type: text/plain; charset-UTF-8 Content-Type: text/plain; charset=UTF-8
submit_type(cherry_pick). submit_type(cherry_pick).
---- ----
@@ -4332,7 +4332,7 @@ a project-specific rule.
.Request .Request
---- ----
POST /changes/myProject~master~I8473b95934b5732ac55d26311a706c9c2bde9940/revisions/current/test.submit_rule?filters=SKIP HTTP/1.0 POST /changes/myProject~master~I8473b95934b5732ac55d26311a706c9c2bde9940/revisions/current/test.submit_rule?filters=SKIP HTTP/1.0
Content-Type: text/plain; charset-UTF-8 Content-Type: text/plain; charset=UTF-8
submit_rule(submit(R)) :- submit_rule(submit(R)) :-
R = label('Any-Label-Name', reject(_)). R = label('Any-Label-Name', reject(_)).

1
java/com/google/gerrit/httpd/restapi/RestApiServlet.java
View File

@@ -555,6 +555,7 @@ public class RestApiServlet extends HttpServlet {
} }
} }
} catch (MalformedJsonException | JsonParseException e) { } catch (MalformedJsonException | JsonParseException e) {
logger.atFine().withCause(e).log("REST call failed on JSON parsing");
responseBytes = responseBytes =
replyError( replyError(
req, res, status = SC_BAD_REQUEST, "Invalid " + JSON_TYPE + " in request", e); req, res, status = SC_BAD_REQUEST, "Invalid " + JSON_TYPE + " in request", e);

5
java/com/google/gerrit/server/restapi/change/TestSubmitRule.java
View File

@@ -17,6 +17,7 @@ package com.google.gerrit.server.restapi.change;
import com.google.common.base.MoreObjects; import com.google.common.base.MoreObjects;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.common.flogger.FluentLogger;
import com.google.gerrit.common.data.SubmitRecord; import com.google.gerrit.common.data.SubmitRecord;
import com.google.gerrit.extensions.common.AccountInfo; import com.google.gerrit.extensions.common.AccountInfo;
import com.google.gerrit.extensions.common.TestSubmitRuleInfo; import com.google.gerrit.extensions.common.TestSubmitRuleInfo;
@@ -41,6 +42,8 @@ import java.util.List;
import org.kohsuke.args4j.Option; import org.kohsuke.args4j.Option;
public class TestSubmitRule implements RestModifyView<RevisionResource, TestSubmitRuleInput> { public class TestSubmitRule implements RestModifyView<RevisionResource, TestSubmitRuleInput> {
private static final FluentLogger logger = FluentLogger.forEnclosingClass();
private final ChangeData.Factory changeDataFactory; private final ChangeData.Factory changeDataFactory;
private final RulesCache rules; private final RulesCache rules;
private final AccountLoader.Factory accountInfoFactory; private final AccountLoader.Factory accountInfoFactory;
@@ -82,7 +85,7 @@ public class TestSubmitRule implements RestModifyView<RevisionResource, TestSubm
SubmitRuleOptions.builder() SubmitRuleOptions.builder()
.skipFilters(input.filters == Filters.SKIP) .skipFilters(input.filters == Filters.SKIP)
.rule(input.rule) .rule(input.rule)
.logErrors(false) .logErrors(logger.atFine().isEnabled())
.build(); .build();
ProjectState projectState = projectCache.get(rsrc.getProject()); ProjectState projectState = projectCache.get(rsrc.getProject());

5
java/com/google/gerrit/server/restapi/change/TestSubmitType.java
View File

@@ -15,6 +15,7 @@
package com.google.gerrit.server.restapi.change; package com.google.gerrit.server.restapi.change;
import com.google.common.base.MoreObjects; import com.google.common.base.MoreObjects;
import com.google.common.flogger.FluentLogger;
import com.google.gerrit.common.data.SubmitTypeRecord; import com.google.gerrit.common.data.SubmitTypeRecord;
import com.google.gerrit.extensions.client.SubmitType; import com.google.gerrit.extensions.client.SubmitType;
import com.google.gerrit.extensions.common.TestSubmitRuleInput; import com.google.gerrit.extensions.common.TestSubmitRuleInput;
@@ -32,6 +33,8 @@ import com.google.inject.Inject;
import org.kohsuke.args4j.Option; import org.kohsuke.args4j.Option;
public class TestSubmitType implements RestModifyView<RevisionResource, TestSubmitRuleInput> { public class TestSubmitType implements RestModifyView<RevisionResource, TestSubmitRuleInput> {
private static final FluentLogger logger = FluentLogger.forEnclosingClass();
private final ChangeData.Factory changeDataFactory; private final ChangeData.Factory changeDataFactory;
private final RulesCache rules; private final RulesCache rules;
private final SubmitRuleEvaluator.Factory submitRuleEvaluatorFactory; private final SubmitRuleEvaluator.Factory submitRuleEvaluatorFactory;
@@ -62,7 +65,7 @@ public class TestSubmitType implements RestModifyView<RevisionResource, TestSubm
SubmitRuleOptions opts = SubmitRuleOptions opts =
SubmitRuleOptions.builder() SubmitRuleOptions.builder()
.logErrors(false) .logErrors(logger.atFine().isEnabled())
.skipFilters(input.filters == Filters.SKIP) .skipFilters(input.filters == Filters.SKIP)
.rule(input.rule) .rule(input.rule)
.build(); .build();