opendev/gerrit
Code Issues Proposed changes

Make gerrit's HttpServletRequest and HttpServletResponse visible to http plugins

Browse Source 
Introduce a @RootRelative annotation for plugins to use to request the
HttpServletRequest and HttpServletResponse from gerrit.

The annotation distinguishes these request and response objects from
those injected by guice's ServletModule when http plugins are handling
a request.

This is needed to eventually allow plugins to replace gerrit's
WebSession implementation.

Change-Id: Idc8c248540deadb10644aca9a1ad92d28e07aad3
This commit is contained in:
Martin Fick
2014-03-24 15:25:36 -07:00
committed by Jonathan Nieder
parent 2dfac17753
commit e877c6e91a
3 changed files with 58 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginGuiceEnvironment.java
View File

@@ -24,6 +24,7 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import com.google.gerrit.common.Nullable;
import com.google.gerrit.extensions.annotations.RootRelative;
import com.google.gerrit.extensions.events.LifecycleListener;
import com.google.gerrit.extensions.registration.DynamicItem;
import com.google.gerrit.extensions.registration.DynamicMap;
@@ -56,6 +57,8 @@ import java.util.Set;
import java.util.concurrent.CopyOnWriteArrayList;
import javax.inject.Inject;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
/**
* Tracks Guice bindings that should be exposed to loaded plugins.
@@ -501,6 +504,12 @@ public class PluginGuiceEnvironment {
bindings.remove(Key.get(Injector.class));
bindings.remove(Key.get(java.util.logging.Logger.class));
final @Nullable Binding<HttpServletRequest> requestBinding =
src.getExistingBinding(Key.get(HttpServletRequest.class));
final @Nullable Binding<HttpServletResponse> responseBinding =
src.getExistingBinding(Key.get(HttpServletResponse.class));
return new AbstractModule() {
@SuppressWarnings("unchecked")
@Override
@@ -510,6 +519,17 @@ public class PluginGuiceEnvironment {
Binding<Object> b = (Binding<Object>) e.getValue();
bind(k).toProvider(b.getProvider());
}
if (requestBinding != null) {
bind(HttpServletRequest.class)
.annotatedWith(RootRelative.class)
.toProvider(requestBinding.getProvider());
}
if (responseBinding != null) {
bind(HttpServletResponse.class)
.annotatedWith(RootRelative.class)
.toProvider(responseBinding.getProvider());
}
}
};
}