Rename change indexing servlet
Make room to add the account indexing servlet that will be added in a
follow up change.
Change-Id: Iab12f99cfa9fc292d61b12beed49f5d7d9c3d5f0
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/IndexRestApiServlet.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/IndexChangeRestApiServlet.java
similarity index 96%
rename from src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/IndexRestApiServlet.java
rename to src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/IndexChangeRestApiServlet.java
index 0a6761e..0ed9bcc 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/IndexRestApiServlet.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/IndexChangeRestApiServlet.java
@@ -42,10 +42,10 @@
import javax.servlet.http.HttpServletResponse;
@Singleton
-class IndexRestApiServlet extends HttpServlet {
+class IndexChangeRestApiServlet extends HttpServlet {
private static final long serialVersionUID = -1L;
private static final Logger logger =
- LoggerFactory.getLogger(IndexRestApiServlet.class);
+ LoggerFactory.getLogger(IndexChangeRestApiServlet.class);
private static final Map<Change.Id, AtomicInteger> changeIdLocks =
new HashMap<>();
@@ -53,7 +53,7 @@
private final SchemaFactory<ReviewDb> schemaFactory;
@Inject
- IndexRestApiServlet(ChangeIndexer indexer,
+ IndexChangeRestApiServlet(ChangeIndexer indexer,
SchemaFactory<ReviewDb> schemaFactory) {
this.indexer = indexer;
this.schemaFactory = schemaFactory;
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/RestForwarder.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/RestForwarder.java
index 94f538f..fddec98 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/RestForwarder.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/RestForwarder.java
@@ -65,7 +65,7 @@
}
private String buildIndexEndpoint(int changeId) {
- return Joiner.on("/").join(pluginRelativePath, "index", changeId);
+ return Joiner.on("/").join(pluginRelativePath, "index/change", changeId);
}
@Override
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 71b9bf0..4b0157d 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
@@ -19,7 +19,7 @@
public class RestForwarderServletModule extends HttpPluginModule {
@Override
protected void configureServlets() {
- serveRegex("/index/\\d+$").with(IndexRestApiServlet.class);
+ serveRegex("/index/change/\\d+$").with(IndexChangeRestApiServlet.class);
serve("/event").with(EventRestApiServlet.class);
serve("/cache/*").with(CacheRestApiServlet.class);
}
diff --git a/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/IndexRestApiServletTest.java b/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/IndexChangeRestApiServletTest.java
similarity index 95%
rename from src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/IndexRestApiServletTest.java
rename to src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/IndexChangeRestApiServletTest.java
index 3aa7009..0f2f1d5 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/IndexRestApiServletTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/IndexChangeRestApiServletTest.java
@@ -47,7 +47,7 @@
import javax.servlet.http.HttpServletResponse;
@RunWith(MockitoJUnitRunner.class)
-public class IndexRestApiServletTest {
+public class IndexChangeRestApiServletTest {
private static final boolean CHANGE_EXISTS = true;
private static final boolean CHANGE_DOES_NOT_EXIST = false;
private static final boolean DO_NOT_THROW_IO_EXCEPTION = false;
@@ -68,7 +68,7 @@
private HttpServletResponse rsp;
private Change.Id id;
private Change change;
- private IndexRestApiServlet indexRestApiServlet;
+ private IndexChangeRestApiServlet indexRestApiServlet;
@BeforeClass
public static void setup() {
@@ -77,9 +77,9 @@
@Before
public void setUpMocks() {
- indexRestApiServlet = new IndexRestApiServlet(indexer, schemaFactory);
+ indexRestApiServlet = new IndexChangeRestApiServlet(indexer, schemaFactory);
id = Change.Id.parse(CHANGE_NUMBER);
- when(req.getPathInfo()).thenReturn("/index/" + CHANGE_NUMBER);
+ when(req.getPathInfo()).thenReturn("/index/change/" + CHANGE_NUMBER);
change = new Change(null, id, null, null, TimeUtil.nowTs());
}
diff --git a/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/RestForwarderTest.java b/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/RestForwarderTest.java
index 72e2462..2c65f84 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/RestForwarderTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/RestForwarderTest.java
@@ -45,7 +45,7 @@
//Index
private static final int CHANGE_NUMBER = 1;
private static final String DELETE_OP = "delete";
- private static final String INDEX_OP = "index";
+ private static final String INDEX_OP = "index/change";
//Evict cache
private static final String EMPTY_JSON = "{}";
