Adapt to renamed Account.Id.parse method
In [1] the method `parse` was renamed to `tryParse`, and its return
type changed to Optional<Id>.
[1] https://gerrit-review.googlesource.com/c/gerrit/+/156872
Change-Id: Ic0e503afd61328a43715a74d22b89914305b3a4e
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/IndexAccountRestApiServlet.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/IndexAccountRestApiServlet.java
index 94c9a4f..a58ba9f 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/IndexAccountRestApiServlet.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/IndexAccountRestApiServlet.java
@@ -37,7 +37,7 @@
@Override
Account.Id parse(String id) {
- return Account.Id.parse(id);
+ return Account.Id.tryParse(id).get();
}
@Override
diff --git a/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/IndexAccountRestApiServletTest.java b/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/IndexAccountRestApiServletTest.java
index 9893c0a..9cd7aea 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/IndexAccountRestApiServletTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/IndexAccountRestApiServletTest.java
@@ -55,7 +55,7 @@
@Before
public void setUpMocks() {
servlet = new IndexAccountRestApiServlet(indexer);
- id = Account.Id.parse(ACCOUNT_NUMBER);
+ id = Account.Id.tryParse(ACCOUNT_NUMBER).get();
when(req.getPathInfo()).thenReturn("/index/account/" + ACCOUNT_NUMBER);
}
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 e19f6f2..d4efd03 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
@@ -186,7 +186,7 @@
@Test
public void testEvictAccountsOK() throws Exception {
- Account.Id key = Account.Id.parse("123");
+ Account.Id key = Account.Id.tryParse("123").get();
String keyJson = new GsonBuilder().create().toJson(key);
when(httpSessionMock.post(buildCacheEndpoint(Constants.ACCOUNTS), keyJson))
.thenReturn(new HttpResult(SUCCESSFUL, EMPTY_MSG));
diff --git a/src/test/java/com/ericsson/gerrit/plugins/highavailability/index/IndexEventHandlerTest.java b/src/test/java/com/ericsson/gerrit/plugins/highavailability/index/IndexEventHandlerTest.java
index 3f94f21..0bfbea8 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/highavailability/index/IndexEventHandlerTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/highavailability/index/IndexEventHandlerTest.java
@@ -61,7 +61,7 @@
@Before
public void setUpMocks() {
changeId = Change.Id.parse(Integer.toString(CHANGE_ID));
- accountId = Account.Id.parse(Integer.toString(ACCOUNT_ID));
+ accountId = Account.Id.tryParse(Integer.toString(ACCOUNT_ID)).get();
accountGroupUUID = AccountGroup.UUID.parse(UUID);
indexEventHandler =
new IndexEventHandler(MoreExecutors.directExecutor(), PLUGIN_NAME, forwarder);
