Merge branch 'stable-2.16'
* stable-2.16:
audit: import AuditEvent from server package
Upgrade bazlets to latest master to build with 2.16-rc3 API
Migrate `tools/bazel.rc` to `.bazelrc`
Upgrade bazlets to latest stable-2.15 to build with 2.15.7 API
Upgrade bazlets to latest stable-2.15 to build with 2.15.6 API
Align Eclipse compiler settings with core Gerrit's
WORKSPACE: Make commented out lines spaces indent consistent
bazlets: Replace native.git_repository with skylark rule
Upgrade bazlets to latest stable-2.15 to build with 2.15.5 API
Update bazlets to latest stable-2.15 to build with 2.15.4 API
Replace Guava functional constructs with Java native ones
Remove final qualifiers
Fix broken build status badge link
Allow to protect specific projects against deletion
Add tests for protected projects
Change-Id: I95885756e46761fb020bc21739b33a5470a62524
diff --git a/BUILD b/BUILD
index ef23579..fdd108d 100644
--- a/BUILD
+++ b/BUILD
@@ -8,7 +8,6 @@
load("//tools/bzl:genrule2.bzl", "genrule2")
load("//tools/bzl:js.bzl", "polygerrit_plugin")
-
gerrit_plugin(
name = "delete-project",
srcs = glob(["src/main/java/**/*.java"]),
@@ -18,8 +17,8 @@
"Gerrit-HttpModule: com.googlesource.gerrit.plugins.deleteproject.HttpModule",
"Gerrit-SshModule: com.googlesource.gerrit.plugins.deleteproject.SshModule",
],
- resources = glob(["src/main/resources/**/*"]),
resource_jars = [":gr-delete-repo-static"],
+ resources = glob(["src/main/resources/**/*"]),
)
genrule2(
diff --git a/src/main/java/com/googlesource/gerrit/plugins/deleteproject/HideProject.java b/src/main/java/com/googlesource/gerrit/plugins/deleteproject/HideProject.java
index f529c54..9546f9c 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/deleteproject/HideProject.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/deleteproject/HideProject.java
@@ -41,24 +41,27 @@
private final ProjectCache projectCache;
private final CreateProject createProject;
private final Configuration cfg;
+ private final ProjectConfig.Factory projectConfigFactory;
@Inject
HideProject(
MetaDataUpdate.Server metaDataUpdateFactory,
ProjectCache projectCache,
CreateProject createProject,
- Configuration cfg) {
+ Configuration cfg,
+ ProjectConfig.Factory projectConfigFactory) {
this.metaDataUpdateFactory = metaDataUpdateFactory;
this.projectCache = projectCache;
this.createProject = createProject;
this.cfg = cfg;
+ this.projectConfigFactory = projectConfigFactory;
}
public void apply(ProjectResource rsrc) throws IOException, RestApiException {
try {
MetaDataUpdate md = metaDataUpdateFactory.create(rsrc.getNameKey());
- ProjectConfig projectConfig = ProjectConfig.read(md);
+ ProjectConfig projectConfig = projectConfigFactory.read(md);
Project p = projectConfig.getProject();
p.setState(ProjectState.HIDDEN);
