Auto register static/init.js as JavaScript plugin

When plugin does not expose Guice Modules explicitly,
auto discover and register static/init.js as WebUi extension
if found by the plugin content scanner.
This simplify JavaScript development from now on
no Java (or other scripting) code/classes are
required to extend Gerrit WebUi.

(based on the idea and initial patch by Dariusz: Ia5b3cb63f62)

Change-Id: I8c793764ac1876dc62d740d28c0d4cf6b9409b10
This commit is contained in:
Luca Milanesio
2014-07-09 10:05:28 +01:00
parent 64802216fa
commit f721eb5772
6 changed files with 67 additions and 7 deletions

View File

@@ -16,6 +16,9 @@ package com.google.gerrit.extensions.webui;
/** Configures a web UI plugin written using JavaScript. */ /** Configures a web UI plugin written using JavaScript. */
public class JavaScriptPlugin extends WebUiPlugin { public class JavaScriptPlugin extends WebUiPlugin {
public static final String INIT_JS = "init.js";
public static final String STATIC_INIT_JS = "static/" + INIT_JS;
private final String fileName; private final String fileName;
/** /**

View File

@@ -14,14 +14,18 @@
package com.google.gerrit.httpd.plugins; package com.google.gerrit.httpd.plugins;
import static com.google.common.base.Preconditions.checkState;
import static com.google.gerrit.server.plugins.AutoRegisterUtil.calculateBindAnnotation; import static com.google.gerrit.server.plugins.AutoRegisterUtil.calculateBindAnnotation;
import com.google.common.collect.LinkedListMultimap; import com.google.common.collect.LinkedListMultimap;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import com.google.common.collect.Multimap; import com.google.common.collect.Multimap;
import com.google.gerrit.extensions.annotations.Export; import com.google.gerrit.extensions.annotations.Export;
import com.google.gerrit.extensions.registration.DynamicSet;
import com.google.gerrit.extensions.webui.JavaScriptPlugin;
import com.google.gerrit.extensions.webui.WebUiPlugin;
import com.google.gerrit.server.plugins.HttpModuleGenerator;
import com.google.gerrit.server.plugins.InvalidPluginException; import com.google.gerrit.server.plugins.InvalidPluginException;
import com.google.gerrit.server.plugins.ModuleGenerator;
import com.google.inject.Module; import com.google.inject.Module;
import com.google.inject.Scopes; import com.google.inject.Scopes;
import com.google.inject.TypeLiteral; import com.google.inject.TypeLiteral;
@@ -33,9 +37,10 @@ import java.util.Map;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
class HttpAutoRegisterModuleGenerator extends ServletModule class HttpAutoRegisterModuleGenerator extends ServletModule
implements ModuleGenerator { implements HttpModuleGenerator {
private final Map<String, Class<HttpServlet>> serve = Maps.newHashMap(); private final Map<String, Class<HttpServlet>> serve = Maps.newHashMap();
private final Multimap<TypeLiteral<?>, Class<?>> listeners = LinkedListMultimap.create(); private final Multimap<TypeLiteral<?>, Class<?>> listeners = LinkedListMultimap.create();
private String javascript;
@Override @Override
protected void configureServlets() { protected void configureServlets() {
@@ -53,6 +58,10 @@ class HttpAutoRegisterModuleGenerator extends ServletModule
Annotation n = calculateBindAnnotation(impl); Annotation n = calculateBindAnnotation(impl);
bind(type).annotatedWith(n).to(impl); bind(type).annotatedWith(n).to(impl);
} }
if (javascript != null) {
DynamicSet.bind(binder(), WebUiPlugin.class).toInstance(
new JavaScriptPlugin(javascript));
}
} }
@Override @Override
@@ -79,6 +88,14 @@ class HttpAutoRegisterModuleGenerator extends ServletModule
} }
} }
@Override
public void export(String javascript) {
checkState(this.javascript == null,
"Multiple JavaScript plugins detected: %s, %s", this.javascript,
javascript);
this.javascript = javascript;
}
@Override @Override
public void listen(TypeLiteral<?> tl, Class<?> clazz) { public void listen(TypeLiteral<?> tl, Class<?> clazz) {
listeners.put(tl, clazz); listeners.put(tl, clazz);

View File

@@ -15,6 +15,7 @@
package com.google.gerrit.httpd.plugins; package com.google.gerrit.httpd.plugins;
import com.google.gerrit.server.cache.CacheModule; import com.google.gerrit.server.cache.CacheModule;
import com.google.gerrit.server.plugins.HttpModuleGenerator;
import com.google.gerrit.server.plugins.ModuleGenerator; import com.google.gerrit.server.plugins.ModuleGenerator;
import com.google.gerrit.server.plugins.ReloadPluginListener; import com.google.gerrit.server.plugins.ReloadPluginListener;
import com.google.gerrit.server.plugins.StartPluginListener; import com.google.gerrit.server.plugins.StartPluginListener;
@@ -37,7 +38,7 @@ public class HttpPluginModule extends ServletModule {
.annotatedWith(UniqueAnnotations.create()) .annotatedWith(UniqueAnnotations.create())
.to(HttpPluginServlet.class); .to(HttpPluginServlet.class);
bind(ModuleGenerator.class) bind(HttpModuleGenerator.class)
.to(HttpAutoRegisterModuleGenerator.class); .to(HttpAutoRegisterModuleGenerator.class);
install(new CacheModule() { install(new CacheModule() {

View File

@@ -23,12 +23,17 @@ import com.google.common.collect.Sets;
import com.google.gerrit.extensions.annotations.Export; import com.google.gerrit.extensions.annotations.Export;
import com.google.gerrit.extensions.annotations.ExtensionPoint; import com.google.gerrit.extensions.annotations.ExtensionPoint;
import com.google.gerrit.extensions.annotations.Listen; import com.google.gerrit.extensions.annotations.Listen;
import com.google.gerrit.extensions.webui.JavaScriptPlugin;
import com.google.gerrit.server.plugins.PluginContentScanner.ExtensionMetaData; import com.google.gerrit.server.plugins.PluginContentScanner.ExtensionMetaData;
import com.google.inject.AbstractModule; import com.google.inject.AbstractModule;
import com.google.inject.Module; import com.google.inject.Module;
import com.google.inject.Scopes; import com.google.inject.Scopes;
import com.google.inject.TypeLiteral; import com.google.inject.TypeLiteral;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.lang.annotation.Annotation; import java.lang.annotation.Annotation;
import java.lang.reflect.ParameterizedType; import java.lang.reflect.ParameterizedType;
import java.util.Arrays; import java.util.Arrays;
@@ -36,12 +41,14 @@ import java.util.Map;
import java.util.Set; import java.util.Set;
class AutoRegisterModules { class AutoRegisterModules {
private static final Logger log = LoggerFactory.getLogger(AutoRegisterModules.class);
private final String pluginName; private final String pluginName;
private final PluginGuiceEnvironment env; private final PluginGuiceEnvironment env;
private final PluginContentScanner scanner; private final PluginContentScanner scanner;
private final ClassLoader classLoader; private final ClassLoader classLoader;
private final ModuleGenerator sshGen; private final ModuleGenerator sshGen;
private final ModuleGenerator httpGen; private final HttpModuleGenerator httpGen;
private Set<Class<?>> sysSingletons; private Set<Class<?>> sysSingletons;
private Multimap<TypeLiteral<?>, Class<?>> sysListen; private Multimap<TypeLiteral<?>, Class<?>> sysListen;
@@ -117,6 +124,19 @@ class AutoRegisterModules {
for (ExtensionMetaData listener : extensions.get(Listen.class)) { for (ExtensionMetaData listener : extensions.get(Listen.class)) {
listen(listener); listen(listener);
} }
exportInitJs();
}
private void exportInitJs() {
try {
if (scanner.getEntry(JavaScriptPlugin.STATIC_INIT_JS).isPresent()) {
httpGen.export(JavaScriptPlugin.INIT_JS);
}
} catch (IOException e) {
log.warn(String.format("Cannot access %s from plugin %s: "
+ "JavaScript auto-discovered plugin will not be registered",
JavaScriptPlugin.STATIC_INIT_JS, pluginName), e);
}
} }
private void export(ExtensionMetaData def) throws InvalidPluginException { private void export(ExtensionMetaData def) throws InvalidPluginException {

View File

@@ -0,0 +1,19 @@
// Copyright (C) 2014 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package com.google.gerrit.server.plugins;
public interface HttpModuleGenerator extends ModuleGenerator {
void export(String javascript);
}

View File

@@ -83,7 +83,7 @@ public class PluginGuiceEnvironment {
private Module httpModule; private Module httpModule;
private Provider<ModuleGenerator> sshGen; private Provider<ModuleGenerator> sshGen;
private Provider<ModuleGenerator> httpGen; private Provider<HttpModuleGenerator> httpGen;
private Map<TypeLiteral<?>, DynamicItem<?>> sysItems; private Map<TypeLiteral<?>, DynamicItem<?>> sysItems;
private Map<TypeLiteral<?>, DynamicItem<?>> sshItems; private Map<TypeLiteral<?>, DynamicItem<?>> sshItems;
@@ -187,7 +187,7 @@ public class PluginGuiceEnvironment {
public void setHttpInjector(Injector injector) { public void setHttpInjector(Injector injector) {
httpModule = copy(injector); httpModule = copy(injector);
httpGen = injector.getProvider(ModuleGenerator.class); httpGen = injector.getProvider(HttpModuleGenerator.class);
httpItems = dynamicItemsOf(injector); httpItems = dynamicItemsOf(injector);
httpSets = dynamicSetsOf(injector); httpSets = dynamicSetsOf(injector);
httpMaps = dynamicMapsOf(injector); httpMaps = dynamicMapsOf(injector);
@@ -204,7 +204,7 @@ public class PluginGuiceEnvironment {
return httpModule; return httpModule;
} }
ModuleGenerator newHttpModuleGenerator() { HttpModuleGenerator newHttpModuleGenerator() {
return httpGen.get(); return httpGen.get();
} }