opendev/gerrit
Code Issues Proposed changes

Reformat all Java files with google-java-format 1.6

Browse Source 
Change-Id: Iedba3f24ac00e2186e3e0688fabea817ddf43739
This commit is contained in:
David Pursehouse
2018-06-06 10:26:51 +09:00
parent 399e9aa2aa
commit af864a0aad
193 changed files with 1331 additions and 1984 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
java/com/google/gerrit/server/permissions/GlobalPermission.java
View File

@@ -69,13 +69,11 @@ public enum GlobalPermission implements GlobalOrPluginPermission {
RequiresCapability rc = findAnnotation(clazz, RequiresCapability.class);
RequiresAnyCapability rac = findAnnotation(clazz, RequiresAnyCapability.class);
if (rc != null && rac != null) {
logger
.atSevere()
.log(
"Class %s uses both @%s and @%s",
clazz.getName(),
RequiresCapability.class.getSimpleName(),
RequiresAnyCapability.class.getSimpleName());
logger.atSevere().log(
"Class %s uses both @%s and @%s",
clazz.getName(),
RequiresCapability.class.getSimpleName(),
RequiresAnyCapability.class.getSimpleName());
throw new PermissionBackendException("cannot extract permission");
} else if (rc != null) {
return Collections.singleton(
@@ -124,11 +122,9 @@ public enum GlobalPermission implements GlobalOrPluginPermission {
}
if (scope == CapabilityScope.PLUGIN) {
logger
.atSevere()
.log(
"Class %s uses @%s(scope=%s), but is not within a plugin",
clazz.getName(), annotationClass.getSimpleName(), scope.name());
logger.atSevere().log(
"Class %s uses @%s(scope=%s), but is not within a plugin",
clazz.getName(), annotationClass.getSimpleName(), scope.name());
throw new PermissionBackendException("cannot extract permission");
}