Adapt to using Instant for timestamps in groups Fixes the build of the uploadvalidator plugin. Signed-off-by: Edwin Kempin <ekempin@google.com> Change-Id: Ic677570782827c49e25505bf05a821442e5324e7
diff --git a/src/test/java/com/googlesource/gerrit/plugins/uploadvalidator/FakeGroupByNameFinder.java b/src/test/java/com/googlesource/gerrit/plugins/uploadvalidator/FakeGroupByNameFinder.java index b028f5d..0246222 100644 --- a/src/test/java/com/googlesource/gerrit/plugins/uploadvalidator/FakeGroupByNameFinder.java +++ b/src/test/java/com/googlesource/gerrit/plugins/uploadvalidator/FakeGroupByNameFinder.java
@@ -17,7 +17,7 @@ import com.google.common.collect.ImmutableSet; import com.google.gerrit.entities.AccountGroup; import com.google.gerrit.entities.InternalGroup; -import java.sql.Timestamp; +import java.time.Instant; import java.util.Objects; import java.util.Optional; @@ -30,7 +30,7 @@ } public FakeGroupByNameFinder( - AccountGroup.NameKey name, AccountGroup.Id id, AccountGroup.UUID uuid, Timestamp createdOn) { + AccountGroup.NameKey name, AccountGroup.Id id, AccountGroup.UUID uuid, Instant createdOn) { onlyGroup = Optional.of( InternalGroup.builder()
diff --git a/src/test/java/com/googlesource/gerrit/plugins/uploadvalidator/GroupAwareValidatorConfigTest.java b/src/test/java/com/googlesource/gerrit/plugins/uploadvalidator/GroupAwareValidatorConfigTest.java index c78b64b..482d8b4 100644 --- a/src/test/java/com/googlesource/gerrit/plugins/uploadvalidator/GroupAwareValidatorConfigTest.java +++ b/src/test/java/com/googlesource/gerrit/plugins/uploadvalidator/GroupAwareValidatorConfigTest.java
@@ -79,7 +79,7 @@ AccountGroup.nameKey("testGroupName"), AccountGroup.id(1), AccountGroup.uuid("testGroupId"), - TimeUtil.nowTs())); + TimeUtil.now())); assertThat( validatorConfig.isEnabled(
diff --git a/src/test/java/com/googlesource/gerrit/plugins/uploadvalidator/SkipValidationTest.java b/src/test/java/com/googlesource/gerrit/plugins/uploadvalidator/SkipValidationTest.java index 81a4ddc..b53cf1e 100644 --- a/src/test/java/com/googlesource/gerrit/plugins/uploadvalidator/SkipValidationTest.java +++ b/src/test/java/com/googlesource/gerrit/plugins/uploadvalidator/SkipValidationTest.java
@@ -75,7 +75,7 @@ AccountGroup.nameKey("testGroupName"), AccountGroup.id(1), AccountGroup.uuid("testGroupId"), - TimeUtil.nowTs())); + TimeUtil.now())); assertThat( validatorConfig.isEnabled(