diff options
Diffstat (limited to 'java/com/google/gerrit/server/group/db/GroupConfig.java')
-rw-r--r-- | java/com/google/gerrit/server/group/db/GroupConfig.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/java/com/google/gerrit/server/group/db/GroupConfig.java b/java/com/google/gerrit/server/group/db/GroupConfig.java index a00d5299b9..682fd15f27 100644 --- a/java/com/google/gerrit/server/group/db/GroupConfig.java +++ b/java/com/google/gerrit/server/group/db/GroupConfig.java @@ -34,7 +34,7 @@ import com.google.gerrit.server.git.meta.MetaDataUpdate; import com.google.gerrit.server.git.meta.VersionedMetaData; import com.google.gerrit.server.util.time.TimeUtil; import java.io.IOException; -import java.sql.Timestamp; +import java.time.Instant; import java.util.Arrays; import java.util.Optional; import java.util.function.Function; @@ -278,7 +278,7 @@ public class GroupConfig extends VersionedMetaData { rw.markStart(revision); rw.sort(RevSort.REVERSE); RevCommit earliestCommit = rw.next(); - Timestamp createdOn = new Timestamp(earliestCommit.getCommitTime() * 1000L); + Instant createdOn = Instant.ofEpochSecond(earliestCommit.getCommitTime()); Config config = readConfig(GROUP_CONFIG_FILE); ImmutableSet<Account.Id> members = readMembers(); @@ -313,9 +313,9 @@ public class GroupConfig extends VersionedMetaData { // Commit timestamps are internally truncated to seconds. To return the correct 'createdOn' time // for new groups, we explicitly need to truncate the timestamp here. - Timestamp commitTimestamp = + Instant commitTimestamp = TimeUtil.truncateToSecond( - groupDelta.flatMap(GroupDelta::getUpdatedOn).orElseGet(TimeUtil::nowTs)); + groupDelta.flatMap(GroupDelta::getUpdatedOn).orElseGet(TimeUtil::now)); commit.setAuthor(new PersonIdent(commit.getAuthor(), commitTimestamp)); commit.setCommitter(new PersonIdent(commit.getCommitter(), commitTimestamp)); @@ -345,7 +345,7 @@ public class GroupConfig extends VersionedMetaData { return Optional.empty(); } - private InternalGroup updateGroup(Timestamp commitTimestamp) + private InternalGroup updateGroup(Instant commitTimestamp) throws IOException, ConfigInvalidException { Config config = updateGroupProperties(); @@ -357,7 +357,7 @@ public class GroupConfig extends VersionedMetaData { loadedGroup.map(InternalGroup::getSubgroups).orElseGet(ImmutableSet::of); Optional<ImmutableSet<AccountGroup.UUID>> updatedSubgroups = updateSubgroups(originalSubgroups); - Timestamp createdOn = loadedGroup.map(InternalGroup::getCreatedOn).orElse(commitTimestamp); + Instant createdOn = loadedGroup.map(InternalGroup::getCreatedOn).orElse(commitTimestamp); return createFrom( groupUuid, @@ -452,7 +452,7 @@ public class GroupConfig extends VersionedMetaData { Config config, ImmutableSet<Account.Id> members, ImmutableSet<AccountGroup.UUID> subgroups, - Timestamp createdOn, + Instant createdOn, ObjectId refState) throws ConfigInvalidException { InternalGroup.Builder group = InternalGroup.builder(); |