Merge "Fix variable hiding warnings in Predicate classes"

gerrit-server/src/main/java/com/google/gerrit/server/query/IntPredicate.java

@@ -16,25 +16,25 @@ package com.google.gerrit.server.query;
 
 /** Predicate to filter a field by matching integer value. */
 public abstract class IntPredicate<T> extends OperatorPredicate<T> {
-  private final int value;
+  private final int intValue;
 
   public IntPredicate(final String name, final String value) {
     super(name, value);
-    this.value = Integer.parseInt(value);
+    this.intValue = Integer.parseInt(value);
   }
 
-  public IntPredicate(final String name, final int value) {
-    super(name, String.valueOf(value));
-    this.value = value;
+  public IntPredicate(final String name, final int intValue) {
+    super(name, String.valueOf(intValue));
+    this.intValue = intValue;
   }
 
   public int intValue() {
-    return value;
+    return intValue;
   }
 
   @Override
   public int hashCode() {
-    return getOperator().hashCode() * 31 + value;
+    return getOperator().hashCode() * 31 + intValue;
   }
 
   @Override

gerrit-server/src/main/java/com/google/gerrit/server/query/change/EqualsFilePredicate.java

@@ -28,11 +28,8 @@ public class EqualsFilePredicate extends ChangeIndexPredicate {
     return Predicate.or(eqPath, new EqualsFilePredicate(value));
   }
 
-  protected final String value;
-
   private EqualsFilePredicate(String value) {
     super(ChangeField.FILE_PART, ChangeQueryBuilder.FIELD_FILE, value);
-    this.value = value;
   }
 
   @Override

gerrit-server/src/main/java/com/google/gerrit/server/query/change/EqualsPathPredicate.java

@@ -20,11 +20,8 @@ import java.util.Collections;
 import java.util.List;
 
 public class EqualsPathPredicate extends ChangeIndexPredicate {
-  protected final String value;
-
   public EqualsPathPredicate(String fieldName, String value) {
     super(ChangeField.PATH, fieldName, value);
-    this.value = value;
   }
 
   @Override