Build with 3.0-SNAPSHOT API Update bazlets to the latest master revision and switch to the snapshot API version. Adjust to the newly introduced ProjectConfig.Factory. Change-Id: I02dbaa021393d2a08894557579199b34c34a6323
diff --git a/WORKSPACE b/WORKSPACE index eb189de..cb8cb31 100644 --- a/WORKSPACE +++ b/WORKSPACE
@@ -3,24 +3,24 @@ load("//:bazlets.bzl", "load_bazlets") load_bazlets( - commit = "c2227415d5044f8439bd47edffb0f052f8da2ac5", + commit = "60bb597a9b8b0700334f8845ca61a7abc604ffcc", #local_path = "/home/<user>/projects/bazlets", ) # Snapshot Plugin API -#load( -# "@com_googlesource_gerrit_bazlets//:gerrit_api_maven_local.bzl", -# "gerrit_api_maven_local", -#) - -# Load snapshot Plugin API -#gerrit_api_maven_local() - -# Release Plugin API load( - "@com_googlesource_gerrit_bazlets//:gerrit_api.bzl", - "gerrit_api", + "@com_googlesource_gerrit_bazlets//:gerrit_api_maven_local.bzl", + "gerrit_api_maven_local", ) +# Load snapshot Plugin API +gerrit_api_maven_local() + +# Release Plugin API +#load( +# "@com_googlesource_gerrit_bazlets//:gerrit_api.bzl", +# "gerrit_api", +#) + # Load release Plugin API -gerrit_api() +#gerrit_api()
diff --git a/src/main/java/com/googlesource/gerrit/plugins/adminconsole/ShowRepoAccessCommand.java b/src/main/java/com/googlesource/gerrit/plugins/adminconsole/ShowRepoAccessCommand.java index 4c88634..367ed4b 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/adminconsole/ShowRepoAccessCommand.java +++ b/src/main/java/com/googlesource/gerrit/plugins/adminconsole/ShowRepoAccessCommand.java
@@ -45,11 +45,14 @@ private boolean wide; @Inject - ShowRepoAccessCommand(MetaDataUpdate.Server metaDataUpdateFactory) { + ShowRepoAccessCommand( + MetaDataUpdate.Server metaDataUpdateFactory, ProjectConfig.Factory projectConfigFactory) { this.metaDataUpdateFactory = metaDataUpdateFactory; + this.projectConfigFactory = projectConfigFactory; } private final MetaDataUpdate.Server metaDataUpdateFactory; + private final ProjectConfig.Factory projectConfigFactory; private int columns = 80; private int permissionGroupWidth; @@ -71,7 +74,7 @@ ProjectConfig config; try { MetaDataUpdate md = metaDataUpdateFactory.create(nameKey); - config = ProjectConfig.read(md); + config = projectConfigFactory.read(md); for (AccessSection accessSection : config.getAccessSections()) { stdout.print((String.format(sectionNameFormatter, accessSection.getName().toString())));
diff --git a/src/main/java/com/googlesource/gerrit/plugins/adminconsole/ShowRepoAccountAccessCommand.java b/src/main/java/com/googlesource/gerrit/plugins/adminconsole/ShowRepoAccountAccessCommand.java index 2f542bf..80ccea1 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/adminconsole/ShowRepoAccountAccessCommand.java +++ b/src/main/java/com/googlesource/gerrit/plugins/adminconsole/ShowRepoAccountAccessCommand.java
@@ -65,17 +65,20 @@ MetaDataUpdate.Server metaDataUpdateFactory, Provider<GetGroups> accountGetGroups, AccountResolver accountResolver, - IdentifiedUser.GenericFactory userFactory) { + IdentifiedUser.GenericFactory userFactory, + ProjectConfig.Factory projectConfigFactory) { this.metaDataUpdateFactory = metaDataUpdateFactory; this.accountGetGroups = accountGetGroups; this.accountResolver = accountResolver; this.userFactory = userFactory; + this.projectConfigFactory = projectConfigFactory; } private final MetaDataUpdate.Server metaDataUpdateFactory; private final AccountResolver accountResolver; private final Provider<GetGroups> accountGetGroups; private final IdentifiedUser.GenericFactory userFactory; + private final ProjectConfig.Factory projectConfigFactory; private int columns = 80; private int permissionGroupWidth; @@ -114,7 +117,7 @@ try { MetaDataUpdate md = metaDataUpdateFactory.create(nameKey); ProjectConfig config; - config = ProjectConfig.read(md); + config = projectConfigFactory.read(md); permissionGroupWidth = wide ? Integer.MAX_VALUE : columns - 9 - 5 - 9;