Add CheckerUuid#get() to get the checker UUID as String
At the moment we use CheckerUuid#toString() however having an explicit
get() method seems more consistent with how we unwrap other objects
(e.g. Project.NameKey#get() to get the project name as String).
Signed-off-by: Edwin Kempin <ekempin@google.com>
Change-Id: I2ea7c563eaa0efd2b07aa39ff5b978ac13efa4d1
diff --git a/java/com/google/gerrit/plugins/checks/CheckJson.java b/java/com/google/gerrit/plugins/checks/CheckJson.java
index 070fd4d..3d55666 100644
--- a/java/com/google/gerrit/plugins/checks/CheckJson.java
+++ b/java/com/google/gerrit/plugins/checks/CheckJson.java
@@ -60,7 +60,7 @@
public CheckInfo format(Check check) throws IOException {
CheckInfo info = new CheckInfo();
- info.checkerUuid = check.key().checkerUuid().toString();
+ info.checkerUuid = check.key().checkerUuid().get();
info.changeNumber = check.key().patchSet().changeId.id;
info.project = check.key().project().get();
info.patchSetId = check.key().patchSet().patchSetId;
diff --git a/java/com/google/gerrit/plugins/checks/CheckerJson.java b/java/com/google/gerrit/plugins/checks/CheckerJson.java
index 78202f8..27f96ec 100644
--- a/java/com/google/gerrit/plugins/checks/CheckerJson.java
+++ b/java/com/google/gerrit/plugins/checks/CheckerJson.java
@@ -22,7 +22,7 @@
public class CheckerJson {
public CheckerInfo format(Checker checker) {
CheckerInfo info = new CheckerInfo();
- info.uuid = checker.getUuid().toString();
+ info.uuid = checker.getUuid().get();
info.name = checker.getName().orElse(null);
info.description = checker.getDescription().orElse(null);
info.url = checker.getUrl().orElse(null);
diff --git a/java/com/google/gerrit/plugins/checks/CheckerUuid.java b/java/com/google/gerrit/plugins/checks/CheckerUuid.java
index 9d2822e..f34ab7d 100644
--- a/java/com/google/gerrit/plugins/checks/CheckerUuid.java
+++ b/java/com/google/gerrit/plugins/checks/CheckerUuid.java
@@ -142,13 +142,17 @@
scheme(), RefNames.shardUuid(Hashing.sha1().hashString(id(), UTF_8).toString()));
}
- @Override
- public String toString() {
+ public String get() {
return scheme() + ":" + id();
}
@Override
+ public String toString() {
+ return get();
+ }
+
+ @Override
public int compareTo(CheckerUuid o) {
- return toString().compareTo(o.toString());
+ return get().compareTo(o.get());
}
}
diff --git a/java/com/google/gerrit/plugins/checks/NoSuchCheckerException.java b/java/com/google/gerrit/plugins/checks/NoSuchCheckerException.java
index e196029..dcdadcc 100644
--- a/java/com/google/gerrit/plugins/checks/NoSuchCheckerException.java
+++ b/java/com/google/gerrit/plugins/checks/NoSuchCheckerException.java
@@ -21,7 +21,7 @@
public static final String MESSAGE = "Checker Not Found: ";
public NoSuchCheckerException(CheckerUuid uuid) {
- this(uuid.toString());
+ this(uuid.get());
}
public NoSuchCheckerException(String uuid) {
diff --git a/java/com/google/gerrit/plugins/checks/api/Checkers.java b/java/com/google/gerrit/plugins/checks/api/Checkers.java
index 124a789..00de8b6 100644
--- a/java/com/google/gerrit/plugins/checks/api/Checkers.java
+++ b/java/com/google/gerrit/plugins/checks/api/Checkers.java
@@ -33,7 +33,7 @@
* @throws RestApiException if an error occurred.
*/
default CheckerApi id(CheckerUuid checkerUuid) throws RestApiException {
- return id(checkerUuid.toString());
+ return id(checkerUuid.get());
}
/**
diff --git a/java/com/google/gerrit/plugins/checks/api/ChecksImpl.java b/java/com/google/gerrit/plugins/checks/api/ChecksImpl.java
index d7d67bf..cbc454f 100644
--- a/java/com/google/gerrit/plugins/checks/api/ChecksImpl.java
+++ b/java/com/google/gerrit/plugins/checks/api/ChecksImpl.java
@@ -57,7 +57,7 @@
public CheckApi id(CheckerUuid checkerUuid) throws RestApiException {
try {
return checkApiImplFactory.create(
- checksCollection.parse(revisionResource, IdString.fromDecoded(checkerUuid.toString())));
+ checksCollection.parse(revisionResource, IdString.fromDecoded(checkerUuid.get())));
} catch (Exception e) {
throw asRestApiException("Cannot parse check", e);
}
diff --git a/java/com/google/gerrit/plugins/checks/api/ListPendingChecks.java b/java/com/google/gerrit/plugins/checks/api/ListPendingChecks.java
index 4ad556c..e3da451 100644
--- a/java/com/google/gerrit/plugins/checks/api/ListPendingChecks.java
+++ b/java/com/google/gerrit/plugins/checks/api/ListPendingChecks.java
@@ -154,7 +154,7 @@
pendingChecksInfo.patchSet.patchSetId = patchSetId.get();
pendingChecksInfo.pendingChecks =
- ImmutableMap.of(checkerUuid.toString(), new PendingCheckInfo(checkState));
+ ImmutableMap.of(checkerUuid.get(), new PendingCheckInfo(checkState));
return pendingChecksInfo;
}
diff --git a/java/com/google/gerrit/plugins/checks/api/UpdateCheck.java b/java/com/google/gerrit/plugins/checks/api/UpdateCheck.java
index df517f4..fb5b653 100644
--- a/java/com/google/gerrit/plugins/checks/api/UpdateCheck.java
+++ b/java/com/google/gerrit/plugins/checks/api/UpdateCheck.java
@@ -42,8 +42,8 @@
input = new CheckInput();
}
if (input.checkerUuid == null) {
- input.checkerUuid = checkResource.getCheckerUuid().toString();
- } else if (!checkResource.getCheckerUuid().toString().equals(input.checkerUuid)) {
+ input.checkerUuid = checkResource.getCheckerUuid().get();
+ } else if (!checkResource.getCheckerUuid().get().equals(input.checkerUuid)) {
throw new BadRequestException(
String.format(
"checkerUuid must either be null or the same as on the resource:\n"
diff --git a/java/com/google/gerrit/plugins/checks/api/UpdateChecker.java b/java/com/google/gerrit/plugins/checks/api/UpdateChecker.java
index 403ef8e..093a11b 100644
--- a/java/com/google/gerrit/plugins/checks/api/UpdateChecker.java
+++ b/java/com/google/gerrit/plugins/checks/api/UpdateChecker.java
@@ -74,7 +74,7 @@
// Callers shouldn't really be providing UUID. If they do, the only legal UUID is exactly the
// current UUID.
- if (input.uuid != null && !input.uuid.equals(resource.getChecker().getUuid().toString())) {
+ if (input.uuid != null && !input.uuid.equals(resource.getChecker().getUuid().get())) {
throw new BadRequestException("uuid cannot be updated");
}
diff --git a/java/com/google/gerrit/plugins/checks/db/CheckerConfig.java b/java/com/google/gerrit/plugins/checks/db/CheckerConfig.java
index c5891a6..dde68b0 100644
--- a/java/com/google/gerrit/plugins/checks/db/CheckerConfig.java
+++ b/java/com/google/gerrit/plugins/checks/db/CheckerConfig.java
@@ -296,7 +296,7 @@
}
private String describeForError() {
- return checkerUuid.map(CheckerUuid::toString).orElse(ref);
+ return checkerUuid.map(CheckerUuid::get).orElse(ref);
}
private void ensureThatMandatoryPropertiesAreSet() throws ConfigInvalidException {
diff --git a/java/com/google/gerrit/plugins/checks/db/CheckerConfigEntry.java b/java/com/google/gerrit/plugins/checks/db/CheckerConfigEntry.java
index 88583c0..a4bb1ca 100644
--- a/java/com/google/gerrit/plugins/checks/db/CheckerConfigEntry.java
+++ b/java/com/google/gerrit/plugins/checks/db/CheckerConfigEntry.java
@@ -60,7 +60,7 @@
"%s.%s is not set in config file for checker %s",
SECTION_NAME, super.keyName, checkerUuid));
}
- if (checkerUuid != null && !configUuid.equals(checkerUuid.toString())) {
+ if (checkerUuid != null && !configUuid.equals(checkerUuid.get())) {
throw new ConfigInvalidException(
String.format(
"value of %s.%s=%s does not match expected checker UUID %s",
@@ -78,8 +78,7 @@
@Override
void initNewConfig(Config config, CheckerCreation checkerCreation) {
- config.setString(
- SECTION_NAME, null, super.keyName, checkerCreation.getCheckerUuid().toString());
+ config.setString(SECTION_NAME, null, super.keyName, checkerCreation.getCheckerUuid().get());
}
@Override
diff --git a/java/com/google/gerrit/plugins/checks/db/CheckersByRepositoryNotes.java b/java/com/google/gerrit/plugins/checks/db/CheckersByRepositoryNotes.java
index 09fdcb2..65d5719 100644
--- a/java/com/google/gerrit/plugins/checks/db/CheckersByRepositoryNotes.java
+++ b/java/com/google/gerrit/plugins/checks/db/CheckersByRepositoryNotes.java
@@ -347,7 +347,7 @@
CheckerUuid checkerUuid,
Project.NameKey repositoryName)
throws IOException {
- String checkerUuidStr = checkerUuid.toString();
+ String checkerUuidStr = checkerUuid.get();
ObjectId noteId = computeRepositorySha1(repositoryName);
ImmutableSortedSet.Builder<String> newLinesBuilder = ImmutableSortedSet.naturalOrder();
if (noteMap.contains(noteId)) {
@@ -380,7 +380,7 @@
CheckerUuid checkerUuid,
Project.NameKey repositoryName)
throws IOException {
- String checkerUuidStr = checkerUuid.toString();
+ String checkerUuidStr = checkerUuid.get();
ObjectId noteId = computeRepositorySha1(repositoryName);
ImmutableSortedSet.Builder<String> newLinesBuilder = ImmutableSortedSet.naturalOrder();
if (noteMap.contains(noteId)) {
diff --git a/java/com/google/gerrit/plugins/checks/db/NoteDbChecks.java b/java/com/google/gerrit/plugins/checks/db/NoteDbChecks.java
index c01b359..1e3a6f9 100644
--- a/java/com/google/gerrit/plugins/checks/db/NoteDbChecks.java
+++ b/java/com/google/gerrit/plugins/checks/db/NoteDbChecks.java
@@ -135,13 +135,13 @@
ChangeData changeData = changeDataFactory.create(projectName, patchSetId.changeId);
ImmutableMap<String, Checker> allCheckersOfProject =
checkers.checkersOf(projectName).stream()
- .collect(ImmutableMap.toImmutableMap(c -> c.getUuid().toString(), c -> c));
+ .collect(ImmutableMap.toImmutableMap(c -> c.getUuid().get(), c -> c));
// Always backfilling checks to have a meaningful "CombinedCheckState" even when there are some
// or all checks missing.
ImmutableMap<String, Check> checks =
getChecks(projectName, patchSetId, GetCheckOptions.withBackfilling()).stream()
- .collect(ImmutableMap.toImmutableMap(c -> c.key().checkerUuid().toString(), c -> c));
+ .collect(ImmutableMap.toImmutableMap(c -> c.key().checkerUuid().get(), c -> c));
ChangeQueryBuilder queryBuilder =
queryBuilderProvider.get().asUser(anonymousUserProvider.get());
diff --git a/java/com/google/gerrit/plugins/checks/db/NoteDbChecksUpdate.java b/java/com/google/gerrit/plugins/checks/db/NoteDbChecksUpdate.java
index 242bccb..de2758e 100644
--- a/java/com/google/gerrit/plugins/checks/db/NoteDbChecksUpdate.java
+++ b/java/com/google/gerrit/plugins/checks/db/NoteDbChecksUpdate.java
@@ -232,7 +232,7 @@
}
NoteDbCheckMap checksForRevision = newNotes.get(revId);
- if (!checksForRevision.checks.containsKey(checkKey.checkerUuid().toString())) {
+ if (!checksForRevision.checks.containsKey(checkKey.checkerUuid().get())) {
if (operation == Operation.UPDATE) {
throw new IOException("Not found: " + checkKey.checkerUuid());
}
@@ -241,7 +241,7 @@
NoteDbCheck newCheck = NoteDbCheck.createInitialNoteDbCheck(checkUpdate);
newCheck.created = Timestamp.from(personIdent.getWhen().toInstant());
newCheck.updated = newCheck.created;
- checksForRevision.checks.put(checkKey.checkerUuid().toString(), newCheck);
+ checksForRevision.checks.put(checkKey.checkerUuid().get(), newCheck);
writeNotesMap(newNotes, cb, ins);
return true;
} else if (operation == Operation.CREATE) {
@@ -249,7 +249,7 @@
}
// Update in place
- NoteDbCheck modifiedCheck = checksForRevision.checks.get(checkKey.checkerUuid().toString());
+ NoteDbCheck modifiedCheck = checksForRevision.checks.get(checkKey.checkerUuid().get());
boolean dirty = modifiedCheck.applyUpdate(checkUpdate);
if (!dirty) {
return false;
@@ -338,7 +338,7 @@
throw new IllegalStateException("revision " + revId + " not found");
}
Map<String, NoteDbCheck> checks = newNotes.get(revId).checks;
- String checkerUuidString = checkKey.checkerUuid().toString();
+ String checkerUuidString = checkKey.checkerUuid().get();
if (!checks.containsKey(checkerUuidString)) {
throw new IllegalStateException("checker " + checkerUuidString + " not found");
}
diff --git a/javatests/com/google/gerrit/plugins/checks/CheckerUuidTest.java b/javatests/com/google/gerrit/plugins/checks/CheckerUuidTest.java
index f62a1f1..46bf2f8 100644
--- a/javatests/com/google/gerrit/plugins/checks/CheckerUuidTest.java
+++ b/javatests/com/google/gerrit/plugins/checks/CheckerUuidTest.java
@@ -86,7 +86,7 @@
@Test
public void parseValidUuids() {
for (String uuidString : VALID_CHECKER_UUIDS) {
- assertThat(CheckerUuid.tryParse(uuidString).map(CheckerUuid::toString))
+ assertThat(CheckerUuid.tryParse(uuidString).map(CheckerUuid::get))
.named(uuidString)
.hasValue(uuidString);
CheckerUuid checkerUuid;
@@ -95,7 +95,7 @@
} catch (RuntimeException e) {
throw new AssertionError("failed to parse " + uuidString, e);
}
- assertThat(checkerUuid.toString()).named(uuidString).isEqualTo(uuidString);
+ assertThat(checkerUuid.get()).named(uuidString).isEqualTo(uuidString);
assertThat(Repository.isValidRefName(checkerUuid.toRefName()))
.named("valid ref name: %s", checkerUuid.toRefName())
.isTrue();
@@ -115,7 +115,7 @@
CheckerUuid checkerUuid = CheckerUuid.parse("test:my-checker");
assertThat(checkerUuid.scheme()).isEqualTo("test");
assertThat(checkerUuid.id()).isEqualTo("my-checker");
- assertThat(checkerUuid.toString()).isEqualTo("test:my-checker");
+ assertThat(checkerUuid.get()).isEqualTo("test:my-checker");
// $ echo -n my-checker | sha1sum
// f4bf6f9d65a2069e1b23de004b626b9a08e58daa -
diff --git a/javatests/com/google/gerrit/plugins/checks/acceptance/ChecksRestApiBindingsIT.java b/javatests/com/google/gerrit/plugins/checks/acceptance/ChecksRestApiBindingsIT.java
index 6df71c0..c492426 100644
--- a/javatests/com/google/gerrit/plugins/checks/acceptance/ChecksRestApiBindingsIT.java
+++ b/javatests/com/google/gerrit/plugins/checks/acceptance/ChecksRestApiBindingsIT.java
@@ -50,7 +50,7 @@
@Test
public void checkerEndpoints() throws Exception {
CheckerUuid checkerUuid = checkerOperations.newChecker().create();
- RestApiCallHelper.execute(adminRestSession, CHECKER_ENDPOINTS, checkerUuid.toString());
+ RestApiCallHelper.execute(adminRestSession, CHECKER_ENDPOINTS, checkerUuid.get());
}
@Test
@@ -76,7 +76,7 @@
SCOPED_CHECK_ENDPOINTS,
String.valueOf(key.patchSet().changeId.id),
String.valueOf(key.patchSet().patchSetId),
- checkerUuid.toString());
+ checkerUuid.get());
}
@Test
diff --git a/javatests/com/google/gerrit/plugins/checks/acceptance/api/CreateCheckIT.java b/javatests/com/google/gerrit/plugins/checks/acceptance/api/CreateCheckIT.java
index fbb4f1d..8ef5e51 100644
--- a/javatests/com/google/gerrit/plugins/checks/acceptance/api/CreateCheckIT.java
+++ b/javatests/com/google/gerrit/plugins/checks/acceptance/api/CreateCheckIT.java
@@ -68,12 +68,12 @@
CheckerUuid checkerUuid = checkerOperations.newChecker().repository(project).create();
CheckInput input = new CheckInput();
- input.checkerUuid = checkerUuid.toString();
+ input.checkerUuid = checkerUuid.get();
input.state = CheckState.RUNNING;
Timestamp expectedCreationTimestamp = TestTimeUtil.getCurrentTimestamp();
CheckInfo info = checksApiFactory.revision(patchSetId).create(input).get();
- assertThat(info.checkerUuid).isEqualTo(checkerUuid.toString());
+ assertThat(info.checkerUuid).isEqualTo(checkerUuid.get());
assertThat(info.state).isEqualTo(CheckState.RUNNING);
assertThat(info.started).isNull();
assertThat(info.finished).isNull();
@@ -88,8 +88,7 @@
assertThat(notes)
.containsExactly(
revId,
- noteDbContent(
- checkerUuid.toString(), expectedCreationTimestamp, expectedCreationTimestamp));
+ noteDbContent(checkerUuid.get(), expectedCreationTimestamp, expectedCreationTimestamp));
}
@Test
@@ -120,7 +119,7 @@
checkerOperations.checker(checkerUuid).forUpdate().forceInvalidConfig().update();
CheckInput input = new CheckInput();
- input.checkerUuid = checkerUuid.toString();
+ input.checkerUuid = checkerUuid.get();
input.state = CheckState.RUNNING;
exception.expect(RestApiException.class);
@@ -134,7 +133,7 @@
checkerOperations.newChecker().repository(project).status(CheckerStatus.DISABLED).create();
CheckInput input = new CheckInput();
- input.checkerUuid = checkerUuid.toString();
+ input.checkerUuid = checkerUuid.get();
input.state = CheckState.RUNNING;
checksApiFactory.revision(patchSetId).create(input);
@@ -149,7 +148,7 @@
CheckerUuid checkerUuid = checkerOperations.newChecker().repository(otherProject).create();
CheckInput input = new CheckInput();
- input.checkerUuid = checkerUuid.toString();
+ input.checkerUuid = checkerUuid.get();
input.state = CheckState.RUNNING;
checksApiFactory.revision(patchSetId).create(input);
@@ -164,7 +163,7 @@
checkerOperations.newChecker().repository(project).query("message:not-matching").create();
CheckInput input = new CheckInput();
- input.checkerUuid = checkerUuid.toString();
+ input.checkerUuid = checkerUuid.get();
input.state = CheckState.RUNNING;
checksApiFactory.revision(patchSetId).create(input);
@@ -183,7 +182,7 @@
.create();
CheckInput input = new CheckInput();
- input.checkerUuid = checkerUuid.toString();
+ input.checkerUuid = checkerUuid.get();
input.state = CheckState.RUNNING;
checksApiFactory.revision(patchSetId).create(input);
@@ -202,7 +201,7 @@
.create();
CheckInput input = new CheckInput();
- input.checkerUuid = checkerUuid.toString();
+ input.checkerUuid = checkerUuid.get();
input.state = CheckState.RUNNING;
checksApiFactory.revision(patchSetId).create(input);
@@ -218,7 +217,7 @@
CheckerUuid checkerUuid = checkerOperations.newChecker().repository(project).create();
CheckInput input = new CheckInput();
- input.checkerUuid = checkerUuid.toString();
+ input.checkerUuid = checkerUuid.get();
input.state = CheckState.RUNNING;
exception.expect(AuthException.class);
diff --git a/javatests/com/google/gerrit/plugins/checks/acceptance/api/GetCheckIT.java b/javatests/com/google/gerrit/plugins/checks/acceptance/api/GetCheckIT.java
index 8629d37..3c9d886 100644
--- a/javatests/com/google/gerrit/plugins/checks/acceptance/api/GetCheckIT.java
+++ b/javatests/com/google/gerrit/plugins/checks/acceptance/api/GetCheckIT.java
@@ -95,9 +95,9 @@
CheckKey checkKey = CheckKey.create(project, patchSetId, checkerUuid);
checkOperations.newCheck(checkKey).upsert();
- assertThat(getCheckInfo(patchSetId, checkerUuid).checkerUuid).isEqualTo(checkerUuid.toString());
+ assertThat(getCheckInfo(patchSetId, checkerUuid).checkerUuid).isEqualTo(checkerUuid.get());
assertThat(getCheckInfo(patchSetId, checkerUuid, ListChecksOption.CHECKER).checkerUuid)
- .isEqualTo(checkerUuid.toString());
+ .isEqualTo(checkerUuid.get());
}
@Test
@@ -303,7 +303,7 @@
expected.project = checkKey.project().get();
expected.changeNumber = checkKey.patchSet().getParentKey().get();
expected.patchSetId = checkKey.patchSet().get();
- expected.checkerUuid = checkKey.checkerUuid().toString();
+ expected.checkerUuid = checkKey.checkerUuid().get();
expected.state = CheckState.NOT_STARTED;
expected.created = psCreated;
expected.updated = psCreated;
@@ -321,7 +321,7 @@
expected.project = checkKey.project().get();
expected.changeNumber = checkKey.patchSet().getParentKey().get();
expected.patchSetId = checkKey.patchSet().get();
- expected.checkerUuid = checkKey.checkerUuid().toString();
+ expected.checkerUuid = checkKey.checkerUuid().get();
expected.state = CheckState.NOT_STARTED;
expected.created = psCreated;
expected.updated = psCreated;
diff --git a/javatests/com/google/gerrit/plugins/checks/acceptance/api/GetCheckerIT.java b/javatests/com/google/gerrit/plugins/checks/acceptance/api/GetCheckerIT.java
index 9759b17..960e3bc 100644
--- a/javatests/com/google/gerrit/plugins/checks/acceptance/api/GetCheckerIT.java
+++ b/javatests/com/google/gerrit/plugins/checks/acceptance/api/GetCheckerIT.java
@@ -42,7 +42,7 @@
@Test
public void getCheckerReturnsUuid() throws Exception {
CheckerUuid checkerUuid = checkerOperations.newChecker().create();
- assertThat(getCheckerInfo(checkerUuid).uuid).isEqualTo(checkerUuid.toString());
+ assertThat(getCheckerInfo(checkerUuid).uuid).isEqualTo(checkerUuid.get());
}
@Test
diff --git a/javatests/com/google/gerrit/plugins/checks/acceptance/api/ListChecksIT.java b/javatests/com/google/gerrit/plugins/checks/acceptance/api/ListChecksIT.java
index ec925bc..9f55fa2 100644
--- a/javatests/com/google/gerrit/plugins/checks/acceptance/api/ListChecksIT.java
+++ b/javatests/com/google/gerrit/plugins/checks/acceptance/api/ListChecksIT.java
@@ -63,7 +63,7 @@
expected1.project = checkKey1.project().get();
expected1.changeNumber = checkKey1.patchSet().getParentKey().get();
expected1.patchSetId = checkKey1.patchSet().get();
- expected1.checkerUuid = checkKey1.checkerUuid().toString();
+ expected1.checkerUuid = checkKey1.checkerUuid().get();
expected1.state = CheckState.RUNNING;
expected1.created = checkOperations.check(checkKey1).get().created();
expected1.updated = expected1.created;
@@ -72,7 +72,7 @@
expected2.project = checkKey2.project().get();
expected2.changeNumber = checkKey2.patchSet().getParentKey().get();
expected2.patchSetId = checkKey2.patchSet().get();
- expected2.checkerUuid = checkKey2.checkerUuid().toString();
+ expected2.checkerUuid = checkKey2.checkerUuid().get();
expected2.state = CheckState.RUNNING;
expected2.created = checkOperations.check(checkKey2).get().created();
expected2.updated = expected2.created;
@@ -89,7 +89,7 @@
expected1.project = checkKey1.project().get();
expected1.changeNumber = checkKey1.patchSet().getParentKey().get();
expected1.patchSetId = checkKey1.patchSet().get();
- expected1.checkerUuid = checkKey1.checkerUuid().toString();
+ expected1.checkerUuid = checkKey1.checkerUuid().get();
expected1.state = CheckState.RUNNING;
expected1.created = checkOperations.check(checkKey1).get().created();
expected1.updated = expected1.created;
@@ -100,7 +100,7 @@
expected2.project = checkKey2.project().get();
expected2.changeNumber = checkKey2.patchSet().getParentKey().get();
expected2.patchSetId = checkKey2.patchSet().get();
- expected2.checkerUuid = checkKey2.checkerUuid().toString();
+ expected2.checkerUuid = checkKey2.checkerUuid().get();
expected2.state = CheckState.RUNNING;
expected2.created = checkOperations.check(checkKey2).get().created();
expected2.updated = expected2.created;
@@ -191,7 +191,7 @@
checkInfo3.project = checkKey3.project().get();
checkInfo3.changeNumber = checkKey3.patchSet().getParentKey().get();
checkInfo3.patchSetId = checkKey3.patchSet().get();
- checkInfo3.checkerUuid = checkKey3.checkerUuid().toString();
+ checkInfo3.checkerUuid = checkKey3.checkerUuid().get();
checkInfo3.state = CheckState.NOT_STARTED;
checkInfo3.created = psCreated;
checkInfo3.updated = psCreated;
@@ -211,7 +211,7 @@
checkInfo3.project = checkKey3.project().get();
checkInfo3.changeNumber = checkKey3.patchSet().getParentKey().get();
checkInfo3.patchSetId = checkKey3.patchSet().get();
- checkInfo3.checkerUuid = checkKey3.checkerUuid().toString();
+ checkInfo3.checkerUuid = checkKey3.checkerUuid().get();
checkInfo3.state = CheckState.NOT_STARTED;
checkInfo3.created = psCreated;
checkInfo3.updated = psCreated;
diff --git a/javatests/com/google/gerrit/plugins/checks/acceptance/api/ListPendingChecksIT.java b/javatests/com/google/gerrit/plugins/checks/acceptance/api/ListPendingChecksIT.java
index 6d02d74..60fe8f9 100644
--- a/javatests/com/google/gerrit/plugins/checks/acceptance/api/ListPendingChecksIT.java
+++ b/javatests/com/google/gerrit/plugins/checks/acceptance/api/ListPendingChecksIT.java
@@ -118,7 +118,7 @@
assertThat(pendingChecks).hasPatchSet(patchSetId);
assertThat(pendingChecks)
.hasPendingChecksMapThat()
- .containsExactly(checkerUuid.toString(), new PendingCheckInfo(CheckState.NOT_STARTED));
+ .containsExactly(checkerUuid.get(), new PendingCheckInfo(CheckState.NOT_STARTED));
}
@Test
@@ -153,7 +153,7 @@
assertThat(pendingChecks).hasPatchSet(patchSetId);
assertThat(pendingChecks)
.hasPendingChecksMapThat()
- .containsExactly(checkerUuid.toString(), new PendingCheckInfo(CheckState.FAILED));
+ .containsExactly(checkerUuid.get(), new PendingCheckInfo(CheckState.FAILED));
}
@Test
@@ -199,14 +199,14 @@
assertThat(pendingChecksChange2).hasPatchSet(patchSetId2);
assertThat(pendingChecksChange2)
.hasPendingChecksMapThat()
- .containsExactly(checkerUuid.toString(), new PendingCheckInfo(CheckState.SCHEDULED));
+ .containsExactly(checkerUuid.get(), new PendingCheckInfo(CheckState.SCHEDULED));
PendingChecksInfo pendingChecksChange1 = pendingChecksList.get(1);
assertThat(pendingChecksChange1).hasProject(project);
assertThat(pendingChecksChange1).hasPatchSet(patchSetId);
assertThat(pendingChecksChange1)
.hasPendingChecksMapThat()
- .containsExactly(checkerUuid.toString(), new PendingCheckInfo(CheckState.NOT_STARTED));
+ .containsExactly(checkerUuid.get(), new PendingCheckInfo(CheckState.NOT_STARTED));
}
@Test
@@ -219,7 +219,7 @@
assertThat(pendingChecks).hasPatchSet(patchSetId);
assertThat(pendingChecks)
.hasPendingChecksMapThat()
- .containsExactly(checkerUuid.toString(), new PendingCheckInfo(CheckState.NOT_STARTED));
+ .containsExactly(checkerUuid.get(), new PendingCheckInfo(CheckState.NOT_STARTED));
}
@Test
@@ -334,7 +334,7 @@
assertThat(pendingChecks).hasPatchSet(patchSetId);
assertThat(pendingChecks)
.hasPendingChecksMapThat()
- .containsExactly(checkerUuid.toString(), new PendingCheckInfo(CheckState.NOT_STARTED));
+ .containsExactly(checkerUuid.get(), new PendingCheckInfo(CheckState.NOT_STARTED));
}
@Test
diff --git a/javatests/com/google/gerrit/plugins/checks/acceptance/api/UpdateCheckerIT.java b/javatests/com/google/gerrit/plugins/checks/acceptance/api/UpdateCheckerIT.java
index 17cdffd..c7ab750 100644
--- a/javatests/com/google/gerrit/plugins/checks/acceptance/api/UpdateCheckerIT.java
+++ b/javatests/com/google/gerrit/plugins/checks/acceptance/api/UpdateCheckerIT.java
@@ -84,7 +84,7 @@
input.repository = repositoryName.get();
CheckerInfo info = checkersApi.id(checkerUuid).update(input);
- assertThat(info.uuid).isEqualTo(checkerUuid.toString());
+ assertThat(info.uuid).isEqualTo(checkerUuid.get());
assertThat(info.name).isEqualTo(input.name);
assertThat(info.description).isEqualTo(input.description);
assertThat(info.url).isEqualTo(input.url);
@@ -121,7 +121,7 @@
CheckerUuid checkerUuid = checkerOperations.newChecker().create();
CheckerInput input = new CheckerInput();
- input.uuid = checkerUuid.toString();
+ input.uuid = checkerUuid.get();
input.name = "some-name";
CheckerInfo info = checkersApi.id(checkerUuid).update(input);
diff --git a/javatests/com/google/gerrit/plugins/checks/acceptance/testsuite/CheckerOperationsImplTest.java b/javatests/com/google/gerrit/plugins/checks/acceptance/testsuite/CheckerOperationsImplTest.java
index ed63108..4663c4c 100644
--- a/javatests/com/google/gerrit/plugins/checks/acceptance/testsuite/CheckerOperationsImplTest.java
+++ b/javatests/com/google/gerrit/plugins/checks/acceptance/testsuite/CheckerOperationsImplTest.java
@@ -68,7 +68,7 @@
CheckerUuid checkerUuid = checkerOperations.newChecker().create();
CheckerInfo foundChecker = getCheckerFromServer(checkerUuid);
- assertThat(foundChecker.uuid).isEqualTo(checkerUuid.toString());
+ assertThat(foundChecker.uuid).isEqualTo(checkerUuid.get());
assertThat(foundChecker.name).isNull();
assertThat(foundChecker.repository).isEqualTo(allProjects.get());
assertThat(foundChecker.status).isEqualTo(CheckerStatus.ENABLED);
@@ -95,7 +95,7 @@
CheckerUuid checkerUuid = checkerOperations.newChecker().create();
CheckerInfo foundChecker = getCheckerFromServer(checkerUuid);
- assertThat(foundChecker.uuid).isEqualTo(checkerUuid.toString());
+ assertThat(foundChecker.uuid).isEqualTo(checkerUuid.get());
}
@Test
@@ -221,7 +221,7 @@
Checker foundChecker = checkerOperations.checker(checkerUuid).get();
assertThat(foundChecker.getUuid()).isEqualTo(checkerUuid);
- assertThat(foundChecker.getUuid().toString()).isEqualTo(input.uuid);
+ assertThat(foundChecker.getUuid().get()).isEqualTo(input.uuid);
}
@Test
@@ -561,7 +561,7 @@
.create();
Checker checker = checkerOperations.checker(checkerUuid).get();
CheckerInfo checkerInfo = checkerOperations.checker(checkerUuid).asInfo();
- assertThat(checkerInfo.uuid).isEqualTo(checker.getUuid().toString());
+ assertThat(checkerInfo.uuid).isEqualTo(checker.getUuid().get());
assertThat(checkerInfo.name).isEqualTo(checker.getName().get());
assertThat(checkerInfo.description).isEqualTo(checker.getDescription().get());
assertThat(checkerInfo.url).isEqualTo(checker.getUrl().get());
