Adapt to recent API version
Change-Id: I7163b6e4158365643ee222004b2b3d97220ef4d1
diff --git a/src/main/java/com/googlesource/gerrit/plugins/manager/AvailablePluginsCollection.java b/src/main/java/com/googlesource/gerrit/plugins/manager/AvailablePluginsCollection.java
index a0e595a..458ade8 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/manager/AvailablePluginsCollection.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/manager/AvailablePluginsCollection.java
@@ -15,12 +15,9 @@
package com.googlesource.gerrit.plugins.manager;
import com.google.gerrit.extensions.registration.DynamicMap;
-import com.google.gerrit.extensions.restapi.AcceptsCreate;
import com.google.gerrit.extensions.restapi.IdString;
import com.google.gerrit.extensions.restapi.ResourceNotFoundException;
-import com.google.gerrit.extensions.restapi.RestApiException;
import com.google.gerrit.extensions.restapi.RestCollection;
-import com.google.gerrit.extensions.restapi.RestModifyView;
import com.google.gerrit.extensions.restapi.RestView;
import com.google.gerrit.extensions.restapi.TopLevelResource;
import com.google.gerrit.server.plugins.PluginResource;
@@ -30,7 +27,7 @@
@Singleton
public class AvailablePluginsCollection
- implements RestCollection<TopLevelResource, PluginResource>, AcceptsCreate<TopLevelResource> {
+ implements RestCollection<TopLevelResource, PluginResource> {
private final DynamicMap<RestView<PluginResource>> views;
private final Provider<ListAvailablePlugins> list;
@@ -57,10 +54,4 @@
public DynamicMap<RestView<PluginResource>> views() {
return views;
}
-
- @Override
- public RestModifyView<TopLevelResource, ?> create(TopLevelResource parent, IdString id)
- throws RestApiException {
- throw new IllegalArgumentException("Operation not supported");
- }
}
diff --git a/src/main/java/com/googlesource/gerrit/plugins/manager/PluginManagerConfig.java b/src/main/java/com/googlesource/gerrit/plugins/manager/PluginManagerConfig.java
index 02e4a58..624e605 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/manager/PluginManagerConfig.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/manager/PluginManagerConfig.java
@@ -53,7 +53,7 @@
public boolean canAdministerPlugins() {
try {
- permissions.user(currentUserProvider).check(GlobalPermission.ADMINISTRATE_SERVER);
+ permissions.user(currentUserProvider.get()).check(GlobalPermission.ADMINISTRATE_SERVER);
return true;
} catch (AuthException | PermissionBackendException e) {
return false;
diff --git a/src/main/java/com/googlesource/gerrit/plugins/manager/PluginsCentralCache.java b/src/main/java/com/googlesource/gerrit/plugins/manager/PluginsCentralCache.java
index 1c490e0..4140be5 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/manager/PluginsCentralCache.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/manager/PluginsCentralCache.java
@@ -21,9 +21,9 @@
import com.google.inject.name.Named;
import com.googlesource.gerrit.plugins.manager.PluginsCentralLoader.ListKey;
import com.googlesource.gerrit.plugins.manager.repository.PluginInfo;
+import java.time.Duration;
import java.util.Collection;
import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
public class PluginsCentralCache {
@@ -49,7 +49,7 @@
PluginsCentralCache.PLUGINS_LIST_CACHE_NAME,
ListKey.class,
new TypeLiteral<Collection<PluginInfo>>() {})
- .expireAfterWrite(1, TimeUnit.DAYS)
+ .expireAfterWrite(Duration.ofDays(10))
.loader(PluginsCentralLoader.class);
bind(PluginsCentralCache.class);
