Merge branch 'stable-3.4'
* stable-3.4:
Use existing pre-configured cache config for H2 migration
Allow migrating H2 to ChronicleMap from non-admin
Remove unused fields and imports
Add serialVersionUID in inner anonymous class
Fix references to put method in JavaDoc
Suppress unchecked, cast and rawtypes warnings
Remove unused variable and method in test
Assert return value when creating project in test
Remove unneeded else condition
Remove duplicate fields exposed by AbstractDaemonTest
Change-Id: Iea0815f4e7fed75d78a4cd2b684a96065a3d6dc5
diff --git a/src/test/java/com/googlesource/gerrit/modules/cache/chroniclemap/MigrateH2CachesInMemoryIT.java b/src/test/java/com/googlesource/gerrit/modules/cache/chroniclemap/MigrateH2CachesInMemoryIT.java
index dbca0df..3561051 100644
--- a/src/test/java/com/googlesource/gerrit/modules/cache/chroniclemap/MigrateH2CachesInMemoryIT.java
+++ b/src/test/java/com/googlesource/gerrit/modules/cache/chroniclemap/MigrateH2CachesInMemoryIT.java
@@ -65,6 +65,6 @@
private RestResponse runMigrationWithAcceptHeader(RestSession restSession, String acceptHeader)
throws IOException {
- return restSession.putWithHeader(MIGRATION_ENDPOINT, new BasicHeader(ACCEPT, acceptHeader));
+ return restSession.putWithHeaders(MIGRATION_ENDPOINT, new BasicHeader(ACCEPT, acceptHeader));
}
}
diff --git a/src/test/java/com/googlesource/gerrit/modules/cache/chroniclemap/MigrateH2CachesLocalDiskIT.java b/src/test/java/com/googlesource/gerrit/modules/cache/chroniclemap/MigrateH2CachesLocalDiskIT.java
index 93b0297..ec025ed 100644
--- a/src/test/java/com/googlesource/gerrit/modules/cache/chroniclemap/MigrateH2CachesLocalDiskIT.java
+++ b/src/test/java/com/googlesource/gerrit/modules/cache/chroniclemap/MigrateH2CachesLocalDiskIT.java
@@ -294,7 +294,7 @@
private RestResponse runMigrationWithAcceptHeader(RestSession restSession, String acceptHeader)
throws IOException {
- return restSession.putWithHeader(MIGRATION_ENDPOINT, new BasicHeader(ACCEPT, acceptHeader));
+ return restSession.putWithHeaders(MIGRATION_ENDPOINT, new BasicHeader(ACCEPT, acceptHeader));
}
private <T> T findClassBoundWithName(Class<T> clazz, String named) {