opendev/gerrit
Code Issues Proposed changes

Inject right plugin name @PluginName in init step

Browse Source 
@PluginName is injected to the plugin environment. Since plugin can provide
their own names, the right name is injected. During init step the wrong plugin
name was bound, ignoring the plugin name that was defined in MANIFEST file.

Change-Id: I5411c6d796cbb25457df357c173274b27ab909db
This commit is contained in:
David Ostrovsky
2013-10-18 21:39:19 +02:00
parent 55583ac43e
commit 30d0981942
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitPluginStepsLoader.java
View File

@@ -14,9 +14,11 @@
package com.google.gerrit.pgm.init;
import com.google.common.base.Objects;
import com.google.gerrit.extensions.annotations.PluginName;
import com.google.gerrit.pgm.util.ConsoleUI;
import com.google.gerrit.server.config.SitePaths;
import com.google.gerrit.server.plugins.PluginLoader;
import com.google.inject.AbstractModule;
import com.google.inject.Inject;
import com.google.inject.Injector;
@@ -24,6 +26,7 @@ import com.google.inject.Singleton;
import java.io.File;
import java.io.FileFilter;
import java.io.IOException;
import java.net.URL;
import java.net.URLClassLoader;
import java.util.ArrayList;
@@ -90,10 +93,10 @@ public class InitPluginStepsLoader {
}
}
private Injector getPluginInjector(File jarFile) {
String jarFileName = jarFile.getName();
private Injector getPluginInjector(File jarFile) throws IOException {
final String pluginName =
jarFileName.substring(0, jarFileName.lastIndexOf('.'));
Objects.firstNonNull(PluginLoader.getGerritPluginName(jarFile),
PluginLoader.nameOf(jarFile));
return initInjector.createChildInjector(new AbstractModule() {
@Override
protected void configure() {