Merge branch 'stable-3.0'
* stable-3.0:
Upgrade bazlets to latest stable-3.0 to build with 3.0.1 API
Change-Id: I9af09ef3368468aff1081076befd58b45e4ef8ea
diff --git a/WORKSPACE b/WORKSPACE
index e073655..cef91ff 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,24 +3,24 @@
load("//:bazlets.bzl", "load_bazlets")
load_bazlets(
- commit = "f4a0de709185c5447fed6fdce124dc5d33065ca1",
+ commit = "d826d85285bb22d3fe817fe165a7e1d3472f65fa",
#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/quota/DeletionListener.java b/src/main/java/com/googlesource/gerrit/plugins/quota/DeletionListener.java
index e625187..c0e72f1 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/quota/DeletionListener.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/quota/DeletionListener.java
@@ -29,6 +29,6 @@
@Override
public void onProjectDeleted(Event event) {
- repoSizeCache.evict(new Project.NameKey(event.getProjectName()));
+ repoSizeCache.evict(Project.nameKey(event.getProjectName()));
}
}
diff --git a/src/main/java/com/googlesource/gerrit/plugins/quota/GCListener.java b/src/main/java/com/googlesource/gerrit/plugins/quota/GCListener.java
index ca2e933..6631b21 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/quota/GCListener.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/quota/GCListener.java
@@ -16,7 +16,6 @@
import com.google.gerrit.extensions.events.GarbageCollectorListener;
import com.google.gerrit.reviewdb.client.Project;
-import com.google.gerrit.reviewdb.client.Project.NameKey;
import com.google.inject.Inject;
import com.google.inject.Singleton;
import java.util.Properties;
@@ -33,7 +32,7 @@
@Override
public void onGarbageCollected(GarbageCollectorListener.Event event) {
- Project.NameKey key = new NameKey(event.getProjectName());
+ Project.NameKey key = Project.nameKey(event.getProjectName());
Properties statistics = event.getStatistics();
if (statistics != null) {
Number sizeOfLooseObjects = (Number) statistics.get("sizeOfLooseObjects");
diff --git a/src/main/java/com/googlesource/gerrit/plugins/quota/ListQuotas.java b/src/main/java/com/googlesource/gerrit/plugins/quota/ListQuotas.java
index d683de9..062700c 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/quota/ListQuotas.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/quota/ListQuotas.java
@@ -56,7 +56,7 @@
ListProjects lister = listProjects.get();
lister.setMatchPrefix(matchPrefix);
for (String projectName : lister.apply().keySet()) {
- Project.NameKey n = new Project.NameKey(projectName);
+ Project.NameKey n = Project.nameKey(projectName);
result.put(projectName, getQuota.getInfo(n));
}
return result;
diff --git a/src/main/java/com/googlesource/gerrit/plugins/quota/ProjectNameResolver.java b/src/main/java/com/googlesource/gerrit/plugins/quota/ProjectNameResolver.java
index bf3ece6..81980d4 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/quota/ProjectNameResolver.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/quota/ProjectNameResolver.java
@@ -41,7 +41,7 @@
if (gitDir.startsWith(basePath)) {
String p = basePath.relativize(gitDir).toString();
String n = p.substring(0, p.length() - ".git".length());
- return new Project.NameKey(n);
+ return Project.nameKey(n);
}
log.warn("Couldn't determine the project name from {}", gitDir);
return null;
diff --git a/src/test/java/com/googlesource/gerrit/plugins/quota/DeletionListenerTest.java b/src/test/java/com/googlesource/gerrit/plugins/quota/DeletionListenerTest.java
index 592809e..74d45c2 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/quota/DeletionListenerTest.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/quota/DeletionListenerTest.java
@@ -29,7 +29,7 @@
@Test
public void testName() throws Exception {
RepoSizeCache repoSizeCache = createMock(RepoSizeCache.class);
- Project.NameKey p = new Project.NameKey(MY_PROJECT);
+ Project.NameKey p = Project.nameKey(MY_PROJECT);
repoSizeCache.evict(p);
DeletionListener classUnderTest = new DeletionListener(repoSizeCache);
replay(repoSizeCache);
diff --git a/src/test/java/com/googlesource/gerrit/plugins/quota/GCListenerTest.java b/src/test/java/com/googlesource/gerrit/plugins/quota/GCListenerTest.java
index f73ef3d..7376ee5 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/quota/GCListenerTest.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/quota/GCListenerTest.java
@@ -31,7 +31,7 @@
@Test
public void testEventWithStatistics() {
RepoSizeCache repoSizeCache = createMock(RepoSizeCache.class);
- repoSizeCache.set(new Project.NameKey(PROJECT_NAME), 9999L);
+ repoSizeCache.set(Project.nameKey(PROJECT_NAME), 9999L);
expectLastCall();
replay(repoSizeCache);
@@ -49,7 +49,7 @@
@Test
public void testEventWithoutStatistics() {
RepoSizeCache repoSizeCache = createMock(RepoSizeCache.class);
- repoSizeCache.evict(new Project.NameKey(PROJECT_NAME));
+ repoSizeCache.evict(Project.nameKey(PROJECT_NAME));
expectLastCall();
replay(repoSizeCache);
@@ -63,7 +63,7 @@
@Test
public void testEventWithEmptyStatistics() {
RepoSizeCache repoSizeCache = createMock(RepoSizeCache.class);
- repoSizeCache.evict(new Project.NameKey(PROJECT_NAME));
+ repoSizeCache.evict(Project.nameKey(PROJECT_NAME));
expectLastCall();
replay(repoSizeCache);
diff --git a/src/test/java/com/googlesource/gerrit/plugins/quota/RepoSizeEventCreatorTest.java b/src/test/java/com/googlesource/gerrit/plugins/quota/RepoSizeEventCreatorTest.java
index 2b40ca4..df01576 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/quota/RepoSizeEventCreatorTest.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/quota/RepoSizeEventCreatorTest.java
@@ -32,9 +32,9 @@
import org.junit.Test;
public class RepoSizeEventCreatorTest {
- private Project.NameKey p1 = new Project.NameKey("p1");
- private Project.NameKey p2 = new Project.NameKey("p2");
- private Project.NameKey p3 = new Project.NameKey("p3");
+ private Project.NameKey p1 = Project.nameKey("p1");
+ private Project.NameKey p2 = Project.nameKey("p2");
+ private Project.NameKey p3 = Project.nameKey("p3");
private ProjectCache projectCache;
private RepoSizeEventCreator classUnderTest;
private File tmp;
diff --git a/src/test/java/com/googlesource/gerrit/plugins/quota/TestNamespaceMatching.java b/src/test/java/com/googlesource/gerrit/plugins/quota/TestNamespaceMatching.java
index 53253ee..b4ad2e6 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/quota/TestNamespaceMatching.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/quota/TestNamespaceMatching.java
@@ -25,22 +25,22 @@
@Test
public void exactNamespace() {
String exact = "test/myProject";
- assertTrue(new Namespace(exact).matches(new Project.NameKey("test/myProject")));
- assertFalse(new Namespace(exact).matches(new Project.NameKey("test/myOtherProject")));
+ assertTrue(new Namespace(exact).matches(Project.nameKey("test/myProject")));
+ assertFalse(new Namespace(exact).matches(Project.nameKey("test/myOtherProject")));
}
@Test
public void patternNamespace() {
String pattern = "test/*";
- assertTrue(new Namespace(pattern).matches(new Project.NameKey("test/myProject")));
- assertFalse(new Namespace(pattern).matches(new Project.NameKey("other/myOtherProject")));
+ assertTrue(new Namespace(pattern).matches(Project.nameKey("test/myProject")));
+ assertFalse(new Namespace(pattern).matches(Project.nameKey("other/myOtherProject")));
}
@Test
public void regExp() {
String pattern = "^test/.*/my.*";
- assertTrue(new Namespace(pattern).matches(new Project.NameKey("test/a/myProject")));
- assertTrue(new Namespace(pattern).matches(new Project.NameKey("test/b/myOtherProject")));
- assertFalse(new Namespace(pattern).matches(new Project.NameKey("other/otherProject")));
+ assertTrue(new Namespace(pattern).matches(Project.nameKey("test/a/myProject")));
+ assertTrue(new Namespace(pattern).matches(Project.nameKey("test/b/myOtherProject")));
+ assertFalse(new Namespace(pattern).matches(Project.nameKey("other/otherProject")));
}
}
