Merge changes I698de717,I8f9f37de,I974ba930
* changes:
PluginOperatorsIT: fix unchecked cast warning
PluginOperatorsIT: remove unnecessary cast
Fix Javadoc warnings "invalid member type qualification"
diff --git a/java/com/google/gerrit/extensions/restapi/testing/AttentionSetUpdateSubject.java b/java/com/google/gerrit/extensions/restapi/testing/AttentionSetUpdateSubject.java
index 2dc94b0..4033c3e 100644
--- a/java/com/google/gerrit/extensions/restapi/testing/AttentionSetUpdateSubject.java
+++ b/java/com/google/gerrit/extensions/restapi/testing/AttentionSetUpdateSubject.java
@@ -66,11 +66,11 @@
}
/**
- * Returns a {@link ComparableSubject} for the {@link AttentionSetUpdate.Operation} of attention
- * set update.
+ * Returns a {@link ComparableSubject} for the {@link
+ * com.google.gerrit.entities.AttentionSetUpdate.Operation} of attention set update.
*
- * @return {@link ComparableSubject} for the {@link AttentionSetUpdate.Operation} of attention set
- * update
+ * @return {@link ComparableSubject} for the {@link
+ * com.google.gerrit.entities.AttentionSetUpdate.Operation} of attention set update.
*/
public ComparableSubject<AttentionSetUpdate.Operation> hasOperationThat() {
return check("operation()").that(attentionSetUpdate().operation());
diff --git a/javatests/com/google/gerrit/acceptance/api/change/PluginOperatorsIT.java b/javatests/com/google/gerrit/acceptance/api/change/PluginOperatorsIT.java
index 68307cf..f4cf96d 100644
--- a/javatests/com/google/gerrit/acceptance/api/change/PluginOperatorsIT.java
+++ b/javatests/com/google/gerrit/acceptance/api/change/PluginOperatorsIT.java
@@ -49,10 +49,11 @@
assertThat(getChanges(queryChanges)).hasSize(0);
try (AutoCloseable ignored = installPlugin("myplugin", IsOperatorModule.class)) {
- List<ChangeInfo> changes = getChanges(queryChanges);
+ List<?> changes = getChanges(queryChanges);
assertThat(changes).hasSize(1);
- String outputChangeId = ((ChangeInfo) changes.get(0)).changeId;
+ ChangeInfo c = (ChangeInfo) changes.get(0);
+ String outputChangeId = c.changeId;
assertThat(outputChangeId).isEqualTo(evenChangeId);
assertThat(outputChangeId).isNotEqualTo(oddChangeId);
}
@@ -95,8 +96,8 @@
}
}
- private List<ChangeInfo> getChanges(QueryChanges queryChanges)
+ private List<?> getChanges(QueryChanges queryChanges)
throws AuthException, PermissionBackendException, BadRequestException {
- return (List<ChangeInfo>) queryChanges.apply(TopLevelResource.INSTANCE).value();
+ return queryChanges.apply(TopLevelResource.INSTANCE).value();
}
}
