commit | 9d87f9c431f306fa3913386cd4565411c467b023 | [log] [tgz] |
---|---|---|
author | Marco Miller <marco.miller@ericsson.com> | Wed Mar 20 16:35:32 2019 -0400 |
committer | Marco Miller <marco.miller@ericsson.com> | Wed Mar 20 16:37:42 2019 -0400 |
tree | 0bca92ec300ebe5defde2fabad5b5d8a733df1d9 | |
parent | 6081ae9afe25095326377b839430797da1bdadb1 [diff] | |
parent | 000da9352b185a4d2f175ba11874b67ede0aebba [diff] |
Merge branch 'stable-2.16' * stable-2.16: Extend ServletModule instead of HttpPluginModule Change-Id: I97b755c41a9cd5179994d3e530ea62a563aeb315
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 17038e2..589bbef 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);