Merge "Adapt to new TraceContext#newTimer method signature in core"
diff --git a/java/com/google/gerrit/plugins/checks/testing/CheckerConfigSubject.java b/java/com/google/gerrit/plugins/checks/testing/CheckerConfigSubject.java
index 4c4dc20..e74f050 100644
--- a/java/com/google/gerrit/plugins/checks/testing/CheckerConfigSubject.java
+++ b/java/com/google/gerrit/plugins/checks/testing/CheckerConfigSubject.java
@@ -32,11 +32,10 @@
import com.google.gerrit.plugins.checks.db.CheckerConfig;
import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.truth.OptionalSubject;
-import java.sql.Timestamp;
import java.util.Optional;
import org.eclipse.jgit.lib.Config;
-public class CheckerConfigSubject extends Subject<CheckerConfigSubject, CheckerConfig> {
+public class CheckerConfigSubject extends Subject {
public static CheckerConfigSubject assertThat(CheckerConfig checkerConfig) {
return assertAbout(CheckerConfigSubject::new).that(checkerConfig);
}
@@ -88,7 +87,7 @@
check("query()").about(optionals()).that(checker().getQuery()).isEmpty();
}
- public ComparableSubject<?, Timestamp> hasCreatedThat() {
+ public ComparableSubject hasCreatedThat() {
return check("created()").that(checker().getCreated());
}
diff --git a/java/com/google/gerrit/plugins/checks/testing/PendingChecksInfoSubject.java b/java/com/google/gerrit/plugins/checks/testing/PendingChecksInfoSubject.java
index 6a0266d..14ada06 100644
--- a/java/com/google/gerrit/plugins/checks/testing/PendingChecksInfoSubject.java
+++ b/java/com/google/gerrit/plugins/checks/testing/PendingChecksInfoSubject.java
@@ -26,7 +26,7 @@
import com.google.gerrit.reviewdb.client.Project;
import java.util.Map;
-public class PendingChecksInfoSubject extends Subject<PendingChecksInfoSubject, PendingChecksInfo> {
+public class PendingChecksInfoSubject extends Subject {
public static PendingChecksInfoSubject assertThat(PendingChecksInfo pendingChecksInfo) {
return assertAbout(PendingChecksInfoSubject::new).that(pendingChecksInfo);
}
