RestForwarderServletModule: Add missing wildcard to event endpoint
Add the corresponding test that otherwise fails upon reverting this fix.
Add another companion test to make the expected endpoint usage explicit.
Change-Id: I34cc1b8bafb48e8fd38238126d6b5ba123418add
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 eb83809..761cc3e 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
@@ -22,7 +22,7 @@
serveRegex("/index/account/\\d+$").with(IndexAccountRestApiServlet.class);
serveRegex("/index/change/\\d+$").with(IndexChangeRestApiServlet.class);
serveRegex("/index/group/\\w+$").with(IndexGroupRestApiServlet.class);
- serve("/event").with(EventRestApiServlet.class);
+ serve("/event/*").with(EventRestApiServlet.class);
serve("/cache/project_list/*").with(ProjectListApiServlet.class);
serve("/cache/*").with(CacheRestApiServlet.class);
}
diff --git a/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/RestForwarderServletModuleIT.java b/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/RestForwarderServletModuleIT.java
new file mode 100644
index 0000000..05cda6d
--- /dev/null
+++ b/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/RestForwarderServletModuleIT.java
@@ -0,0 +1,49 @@
+// Copyright (C) 2019 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.ericsson.gerrit.plugins.highavailability.forwarder.rest;
+
+import com.google.common.base.Joiner;
+import com.google.gerrit.acceptance.LightweightPluginDaemonTest;
+import com.google.gerrit.acceptance.NoHttpd;
+import com.google.gerrit.acceptance.TestPlugin;
+import com.google.gerrit.acceptance.UseLocalDisk;
+import com.google.gerrit.server.events.Event;
+import javax.servlet.http.HttpServletResponse;
+import org.junit.Test;
+
+@NoHttpd
+@TestPlugin(
+ name = "high-availability",
+ sysModule = "com.ericsson.gerrit.plugins.highavailability.Module",
+ httpModule = "com.ericsson.gerrit.plugins.highavailability.HttpModule")
+public class RestForwarderServletModuleIT extends LightweightPluginDaemonTest {
+
+ private final Event event = new Event("un-deserializable") {};
+ private final String endPoint = "/plugins/high-availability/event";
+
+ @Test
+ @UseLocalDisk
+ public void serveTypedEventEndpoint() throws Exception {
+ adminRestSession
+ .post(Joiner.on("/").join(endPoint, event.type), event)
+ .assertStatus(HttpServletResponse.SC_UNSUPPORTED_MEDIA_TYPE);
+ }
+
+ @Test
+ @UseLocalDisk
+ public void doNotServeStraightEventEndpoint() throws Exception {
+ adminRestSession.post(endPoint, event).assertMethodNotAllowed();
+ }
+}
