commit | 06429fc1a3d9319471ec441a696987f66dabd1c4 | [log] [tgz] |
---|---|---|
author | David Pursehouse <dpursehouse@collab.net> | Wed Mar 20 11:29:51 2019 +0000 |
committer | Marco Miller <marco.miller@ericsson.com> | Wed Mar 20 09:19:52 2019 -0400 |
tree | 7953e85476e56b4a357b10c2797396280682f666 | |
parent | 747ff43e075485900f18bae8ce6cf68aa1d035fe [diff] |
Extend ServletModule instead of HttpPluginModule As described in I3b89150d1. Change-Id: Ic91ce95719c6bccc73cc29a2139a2274f20d1939
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/HttpModule.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/HttpModule.java index 49741ae..6fa743f 100644 --- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/HttpModule.java +++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/HttpModule.java
@@ -17,10 +17,10 @@ import com.ericsson.gerrit.plugins.highavailability.forwarder.rest.RestForwarderServletModule; import com.ericsson.gerrit.plugins.highavailability.health.HealthServletModule; import com.ericsson.gerrit.plugins.highavailability.websession.file.FileBasedWebsessionModule; -import com.google.gerrit.httpd.plugins.HttpPluginModule; import com.google.inject.Inject; +import com.google.inject.servlet.ServletModule; -class HttpModule extends HttpPluginModule { +class HttpModule extends ServletModule { private final Configuration config; @Inject
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/RestForwarderServletModule.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/RestForwarderServletModule.java index 761cc3e..5e98a5c 100644 --- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/RestForwarderServletModule.java +++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/RestForwarderServletModule.java
@@ -14,9 +14,9 @@ package com.ericsson.gerrit.plugins.highavailability.forwarder.rest; -import com.google.gerrit.httpd.plugins.HttpPluginModule; +import com.google.inject.servlet.ServletModule; -public class RestForwarderServletModule extends HttpPluginModule { +public class RestForwarderServletModule extends ServletModule { @Override protected void configureServlets() { serveRegex("/index/account/\\d+$").with(IndexAccountRestApiServlet.class);
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/health/HealthServletModule.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/health/HealthServletModule.java index f3318a9..514ed03 100644 --- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/health/HealthServletModule.java +++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/health/HealthServletModule.java
@@ -14,9 +14,9 @@ package com.ericsson.gerrit.plugins.highavailability.health; -import com.google.gerrit.httpd.plugins.HttpPluginModule; +import com.google.inject.servlet.ServletModule; -public class HealthServletModule extends HttpPluginModule { +public class HealthServletModule extends ServletModule { @Override protected void configureServlets() { serve("/health").with(HealthServlet.class);