opendev/gerrit
Code Issues Proposed changes

LabelType: Use LabelFunction directly

Browse Source 
String was used instead of LabelFunction for compatibility with GWT,
but since GWT was removed this is no longer necessary.

Change-Id: I7e88cee660971cdc5b63a74a867106ddcc02d9f1
This commit is contained in:
David Pursehouse 2018-12-04 16:05:44 +09:00
parent 557dbb0938
commit 99926324de
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
java/com/google/gerrit/common/data/LabelType.java
View File

@ -94,8 +94,7 @@ public class LabelType {
protected String name;
// String rather than LabelFunction for backwards compatibility with GWT JSON interface.
protected String functionName;
protected LabelFunction function;
protected boolean copyMinScore;
protected boolean copyMaxScore;
@ -123,7 +122,7 @@ public class LabelType {
values = sortValues(valueList);
defaultValue = 0;
functionName = LabelFunction.MAX_WITH_BLOCK.getFunctionName();
function = LabelFunction.MAX_WITH_BLOCK;
maxNegative = Short.MIN_VALUE;
maxPositive = Short.MAX_VALUE;
@ -160,15 +159,11 @@ public class LabelType {
}
public LabelFunction getFunction() {
if (functionName == null) {
return null;
}
return LabelFunction.parse(functionName)
.orElseThrow(() -> new IllegalStateException("Unsupported functionName: " + functionName));
return function;
}
public void setFunction(@Nullable LabelFunction function) {
this.functionName = function != null ? function.getFunctionName() : null;
this.function = function;
}
public boolean canOverride() {