Merge branch 'stable-2.12' into stable-2.13
* stable-2.12:
Fix standalone Eclipse project generation
Calculate repository disk usage by adding size of git objects
Remove source_under_test to comply with latest buck version
Change-Id: I07c7c515d05f4c6c4a9df2b5ba5af937b659e602
diff --git a/lib/gerrit/BUCK b/lib/gerrit/BUCK
index 936393a..4b48569 100644
--- a/lib/gerrit/BUCK
+++ b/lib/gerrit/BUCK
@@ -1,12 +1,12 @@
include_defs('//bucklets/maven_jar.bucklet')
-VER = '2.12.2'
+VER = '2.13.3'
REPO = MAVEN_CENTRAL
maven_jar(
name = 'plugin-api',
id = 'com.google.gerrit:gerrit-plugin-api:' + VER,
- sha1 = '621012e67c64774d9743d7c7c8b0cae0998fae0d',
+ sha1 = '78df190269b0d5a4bc4f61ab3a66a49252b779eb',
attach_source = False,
repository = REPO,
license = 'Apache2.0',
@@ -15,7 +15,7 @@
maven_jar(
name = 'acceptance-framework',
id = 'com.google.gerrit:gerrit-acceptance-framework:' + VER,
- sha1 ='22de68908b0c01fa92f9a9b7124675fd636871b5',
+ sha1 ='76eceefa7e31c6945513c36c4d106066d1df3e63',
license = 'Apache2.0',
attach_source = False,
repository = REPO,
diff --git a/pom.xml b/pom.xml
index 4bf0f74..0c61ba6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
<groupId>com.googlesource.gerrit.plugins.quota</groupId>
<artifactId>quota</artifactId>
<packaging>jar</packaging>
- <version>2.12.2</version>
+ <version>2.13-SNAPSHOT</version>
<name>quota</name>
<properties>
diff --git a/src/main/java/com/googlesource/gerrit/plugins/quota/MaxRepositorySizeQuota.java b/src/main/java/com/googlesource/gerrit/plugins/quota/MaxRepositorySizeQuota.java
index 90f3483..4388cd9 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/quota/MaxRepositorySizeQuota.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/quota/MaxRepositorySizeQuota.java
@@ -139,8 +139,9 @@
private boolean needPack(Collection<ReceiveCommand> commands) {
for (ReceiveCommand cmd : commands) {
- if (cmd.getType() != ReceiveCommand.Type.DELETE)
+ if (cmd.getType() != ReceiveCommand.Type.DELETE) {
return true;
+ }
}
return false;
}
diff --git a/src/main/java/com/googlesource/gerrit/plugins/quota/MetaDataImpl.java b/src/main/java/com/googlesource/gerrit/plugins/quota/MetaDataImpl.java
index 194241c..ae952f8 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/quota/MetaDataImpl.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/quota/MetaDataImpl.java
@@ -23,7 +23,7 @@
private String unitSymbol;
private String description;
- public MetaDataImpl(String name, String unitName, String unitSymbol, String description) {
+ MetaDataImpl(String name, String unitName, String unitSymbol, String description) {
this.name = name;
this.unitName = unitName;
this.unitSymbol = unitSymbol;
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 57aac5a..5d4fbcd 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/quota/ProjectNameResolver.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/quota/ProjectNameResolver.java
@@ -46,9 +46,8 @@
String p = basePath.relativize(gitDir).toString();
String n = p.substring(0, p.length() - ".git".length());
return new Project.NameKey(n);
- } else {
- log.warn("Couldn't determine the project name from " + gitDir);
- return null;
}
+ log.warn("Couldn't determine the project name from " + gitDir);
+ return null;
}
}
diff --git a/src/main/java/com/googlesource/gerrit/plugins/quota/UsageDataEvent.java b/src/main/java/com/googlesource/gerrit/plugins/quota/UsageDataEvent.java
index 8dfaa55..d37709c 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/quota/UsageDataEvent.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/quota/UsageDataEvent.java
@@ -28,7 +28,7 @@
private final MetaData metaData;
private final List<Data> data;
- public UsageDataEvent(MetaData metaData) {
+ UsageDataEvent(MetaData metaData) {
this.metaData = metaData;
timestamp = new Timestamp(System.currentTimeMillis());
data = new ArrayList<>();
diff --git a/src/main/java/com/googlesource/gerrit/plugins/quota/UsageDataEventCreator.java b/src/main/java/com/googlesource/gerrit/plugins/quota/UsageDataEventCreator.java
index 5ad42b9..56db9b3 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/quota/UsageDataEventCreator.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/quota/UsageDataEventCreator.java
@@ -18,8 +18,8 @@
public interface UsageDataEventCreator {
- public String getName();
+ String getName();
- public UsageDataPublishedListener.Event create();
+ UsageDataPublishedListener.Event create();
}
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 bc9fa07..4620323 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/quota/DeletionListenerTest.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/quota/DeletionListenerTest.java
@@ -18,6 +18,7 @@
import static org.easymock.EasyMock.replay;
import static org.easymock.EasyMock.verify;
+import com.google.gerrit.extensions.api.changes.NotifyHandling;
import com.google.gerrit.extensions.events.ProjectDeletedListener;
import com.google.gerrit.reviewdb.client.Project;
import com.google.gwtorm.client.KeyUtil;
@@ -46,6 +47,11 @@
public String getProjectName() {
return MY_PROJECT;
}
+
+ @Override
+ public NotifyHandling getNotify() {
+ return NotifyHandling.ALL;
+ }
};
classUnderTest.onProjectDeleted(event);
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 c7a6fdd..f8df792 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/quota/GCListenerTest.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/quota/GCListenerTest.java
@@ -19,6 +19,7 @@
import static org.easymock.EasyMock.replay;
import static org.easymock.EasyMock.verify;
+import com.google.gerrit.extensions.api.changes.NotifyHandling;
import com.google.gerrit.extensions.events.GarbageCollectorListener;
import com.google.gerrit.reviewdb.client.Project;
import com.google.gwtorm.client.KeyUtil;
@@ -38,15 +39,15 @@
@Test
public void testEventWithStatistics() {
RepoSizeCache repoSizeCache = createMock(RepoSizeCache.class);
- repoSizeCache.set(new Project.NameKey(PROJECT_NAME), 9999l);
+ repoSizeCache.set(new Project.NameKey(PROJECT_NAME), 9999L);
expectLastCall();
replay(repoSizeCache);
GCListener listener = new GCListener(repoSizeCache);
final Properties statistics = new Properties();
- statistics.put("sizeOfLooseObjects", 1234l);
- statistics.put("sizeOfPackedObjects", 8765l);
+ statistics.put("sizeOfLooseObjects", 1234L);
+ statistics.put("sizeOfPackedObjects", 8765L);
listener.onGarbageCollected(createEvent(PROJECT_NAME, statistics));
@@ -95,6 +96,11 @@
public Properties getStatistics() {
return statistics;
}
+
+ @Override
+ public NotifyHandling getNotify() {
+ return NotifyHandling.ALL;
+ }
};
return event;
}
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 f67f776..fc72e9a 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/quota/RepoSizeEventCreatorTest.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/quota/RepoSizeEventCreatorTest.java
@@ -75,7 +75,7 @@
@Test
public void testOneDataPoint() {
- expect(repoSizeCache.get(p1)).andStubReturn(100l);
+ expect(repoSizeCache.get(p1)).andStubReturn(100L);
replay(repoSizeCache);
Event event = classUnderTest.create();
@@ -84,7 +84,7 @@
assertEquals(1, event.getData().size());
Data dataPoint = event.getData().get(0);
assertEquals("p1", dataPoint.getProjectName());
- assertEquals(100l, dataPoint.getValue());
+ assertEquals(100L, dataPoint.getValue());
}
}
