Merge "Fix OperatorPrecedence bug pattern flagged by error prone"
diff --git a/java/com/google/gerrit/extensions/common/EmailInfo.java b/java/com/google/gerrit/extensions/common/EmailInfo.java
index 184a89f..96e8adf 100644
--- a/java/com/google/gerrit/extensions/common/EmailInfo.java
+++ b/java/com/google/gerrit/extensions/common/EmailInfo.java
@@ -20,6 +20,6 @@
public Boolean pendingConfirmation;
public void preferred(String e) {
- this.preferred = e != null && e.equals(email) ? true : null;
+ this.preferred = (e != null && e.equals(email)) ? true : null;
}
}
diff --git a/java/com/google/gerrit/server/restapi/project/CreateBranch.java b/java/com/google/gerrit/server/restapi/project/CreateBranch.java
index 412559b..ae9b1a8 100644
--- a/java/com/google/gerrit/server/restapi/project/CreateBranch.java
+++ b/java/com/google/gerrit/server/restapi/project/CreateBranch.java
@@ -208,8 +208,8 @@
info.canDelete = null;
} else {
info.canDelete =
- permissionBackend.currentUser().ref(name).testOrFalse(RefPermission.DELETE)
- && rsrc.getProjectState().statePermitsWrite()
+ (permissionBackend.currentUser().ref(name).testOrFalse(RefPermission.DELETE)
+ && rsrc.getProjectState().statePermitsWrite())
? true
: null;
}
diff --git a/java/com/google/gerrit/server/restapi/project/ListBranches.java b/java/com/google/gerrit/server/restapi/project/ListBranches.java
index 1327319..3cb412a 100644
--- a/java/com/google/gerrit/server/restapi/project/ListBranches.java
+++ b/java/com/google/gerrit/server/restapi/project/ListBranches.java
@@ -348,8 +348,8 @@
info.canDelete = null;
} else {
info.canDelete =
- perm.ref(ref.getName()).testOrFalse(RefPermission.DELETE)
- && projectState.statePermitsWrite()
+ (perm.ref(ref.getName()).testOrFalse(RefPermission.DELETE)
+ && projectState.statePermitsWrite())
? true
: null;
}
@@ -415,9 +415,9 @@
info.canDelete = null;
} else {
info.canDelete =
- !targets.contains(ref.getName())
+ (!targets.contains(ref.getName())
&& perm.testOrFalse(RefPermission.DELETE)
- && projectState.statePermitsWrite()
+ && projectState.statePermitsWrite())
? true
: null;
}
diff --git a/java/com/google/gerrit/server/restapi/project/ListTags.java b/java/com/google/gerrit/server/restapi/project/ListTags.java
index 31e4be5..83d29de 100644
--- a/java/com/google/gerrit/server/restapi/project/ListTags.java
+++ b/java/com/google/gerrit/server/restapi/project/ListTags.java
@@ -181,7 +181,9 @@
if (!isConfigRef(ref.getName())) {
// Never allow to delete the meta config branch.
canDelete =
- perm.testOrFalse(RefPermission.DELETE) && projectState.statePermitsWrite() ? true : null;
+ (perm.testOrFalse(RefPermission.DELETE) && projectState.statePermitsWrite())
+ ? true
+ : null;
}
ImmutableList<WebLinkInfo> webLinks = links.getTagLinks(projectState.getName(), ref.getName());
diff --git a/javatests/com/google/gerrit/acceptance/rest/account/ExternalIdIT.java b/javatests/com/google/gerrit/acceptance/rest/account/ExternalIdIT.java
index a76bf47..749ca79 100644
--- a/javatests/com/google/gerrit/acceptance/rest/account/ExternalIdIT.java
+++ b/javatests/com/google/gerrit/acceptance/rest/account/ExternalIdIT.java
@@ -1083,9 +1083,9 @@
info.emailAddress = extId.email();
info.canDelete = !extId.isScheme(SCHEME_USERNAME) ? true : null;
info.trusted =
- extId.isScheme(SCHEME_MAILTO)
+ (extId.isScheme(SCHEME_MAILTO)
|| extId.isScheme(SCHEME_UUID)
- || extId.isScheme(SCHEME_USERNAME)
+ || extId.isScheme(SCHEME_USERNAME))
? true
: null;
return info;