Alignment of ServerPluginProvider to latest interfaces
Adoption of Optional<T> and removal of name in the
ServerPluginProvider.
Aligned with the refs/changes/70/56270/3 on Gerrit
Change-Id: I994b8689576189295b5d9fc78b4ebcccbdca3787
diff --git a/src/main/java/com/googlesource/gerrit/plugins/scripting/groovyprovider/GroovyPluginProvider.java b/src/main/java/com/googlesource/gerrit/plugins/scripting/groovyprovider/GroovyPluginProvider.java
index 8f5f68d..9203331 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/scripting/groovyprovider/GroovyPluginProvider.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/scripting/groovyprovider/GroovyPluginProvider.java
@@ -61,7 +61,7 @@
@Override
- public ServerPlugin get(String name, File srcFile, PluginUser pluginUser,
+ public ServerPlugin get(File srcFile, PluginUser pluginUser,
FileSnapshot snapshot, String pluginCanonicalWebUrl, File pluginDataDir)
throws InvalidPluginException {
GroovyPluginScriptEngine scriptEngine = scriptEngineProvider.get();
diff --git a/src/main/java/com/googlesource/gerrit/plugins/scripting/groovyprovider/GroovyPluginScanner.java b/src/main/java/com/googlesource/gerrit/plugins/scripting/groovyprovider/GroovyPluginScanner.java
index 7811df0..c4790de 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/scripting/groovyprovider/GroovyPluginScanner.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/scripting/groovyprovider/GroovyPluginScanner.java
@@ -13,6 +13,7 @@
// limitations under the License.
package com.googlesource.gerrit.plugins.scripting.groovyprovider;
+import com.google.common.base.Optional;
import com.google.common.collect.Sets;
import com.google.gerrit.server.plugins.AbstractPreloadedPluginScanner;
import com.google.gerrit.server.plugins.InvalidPluginException;
@@ -50,14 +51,14 @@
}
@Override
- public <T> T getResource(String resourcePath, Class<? extends T> resourceClass) {
- return null;
+ public <T> Optional<T> getResource(String resourcePath, Class<? extends T> resourceClass) {
+ return Optional.absent();
}
@Override
- public InputStream getResourceInputStream(String resourcePath)
+ public Optional<InputStream> getResourceInputStream(String resourcePath)
throws IOException {
- return null;
+ return Optional.absent();
}
@Override
