diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/JsPlugin.java b/gerrit-server/src/main/java/com/google/gerrit/server/plugins/JsPlugin.java index 8da8cc1efb..ea81f17a50 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/JsPlugin.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/plugins/JsPlugin.java @@ -58,7 +58,7 @@ class JsPlugin extends Plugin { } @Override - void stop(PluginGuiceEnvironment env) { + protected void stop(PluginGuiceEnvironment env) { if (manager != null) { manager.stop(); httpInjector = null; @@ -83,7 +83,7 @@ class JsPlugin extends Plugin { } @Override - boolean canReload() { + protected boolean canReload() { return true; } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/Plugin.java b/gerrit-server/src/main/java/com/google/gerrit/server/plugins/Plugin.java index 6b84c21c14..c2b28cb14c 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/Plugin.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/plugins/Plugin.java @@ -130,9 +130,9 @@ public abstract class Plugin { return disabled; } - abstract void start(PluginGuiceEnvironment env) throws Exception; + protected abstract void start(PluginGuiceEnvironment env) throws Exception; - abstract void stop(PluginGuiceEnvironment env); + protected abstract void stop(PluginGuiceEnvironment env); public abstract PluginContentScanner getContentScanner(); @@ -168,7 +168,7 @@ public abstract class Plugin { return "Plugin [" + name + "]"; } - abstract boolean canReload(); + protected abstract boolean canReload(); boolean isModified(Path jar) { return snapshot.lastModified() != lastModified(jar); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginGuiceEnvironment.java b/gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginGuiceEnvironment.java index 2887a00705..6b458aa330 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginGuiceEnvironment.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginGuiceEnvironment.java @@ -145,7 +145,7 @@ public class PluginGuiceEnvironment { || (httpMaps != null && httpMaps.containsKey(type)); } - Module getSysModule() { + public Module getSysModule() { return sysModule; } @@ -210,15 +210,15 @@ public class PluginGuiceEnvironment { return httpGen.get(); } - RequestContext enter(Plugin plugin) { + public RequestContext enter(Plugin plugin) { return local.setContext(new PluginRequestContext(plugin.getPluginUser())); } - void exit(RequestContext old) { + public void exit(RequestContext old) { local.setContext(old); } - void onStartPlugin(Plugin plugin) { + public void onStartPlugin(Plugin plugin) { RequestContext oldContext = enter(plugin); try { attachItem(sysItems, plugin.getSysInjector(), plugin); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/ServerPlugin.java b/gerrit-server/src/main/java/com/google/gerrit/server/plugins/ServerPlugin.java index 28d57b26d3..14c11854f0 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/ServerPlugin.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/plugins/ServerPlugin.java @@ -151,7 +151,7 @@ public class ServerPlugin extends Plugin { } @Override - boolean canReload() { + protected boolean canReload() { Attributes main = manifest.getMainAttributes(); String v = main.getValue("Gerrit-ReloadMode"); if (Strings.isNullOrEmpty(v) || "reload".equalsIgnoreCase(v)) { @@ -167,7 +167,7 @@ public class ServerPlugin extends Plugin { } @Override - void start(PluginGuiceEnvironment env) throws Exception { + protected void start(PluginGuiceEnvironment env) throws Exception { RequestContext oldContext = env.enter(this); try { startPlugin(env); @@ -241,7 +241,7 @@ public class ServerPlugin extends Plugin { } @Override - void stop(PluginGuiceEnvironment env) { + protected void stop(PluginGuiceEnvironment env) { if (serverManager != null) { RequestContext oldContext = env.enter(this); try {