diff options
Diffstat (limited to 'java/com/google/gerrit/server/account/AccountConfig.java')
-rw-r--r-- | java/com/google/gerrit/server/account/AccountConfig.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/java/com/google/gerrit/server/account/AccountConfig.java b/java/com/google/gerrit/server/account/AccountConfig.java index 45f1f35d2d..4143f7792b 100644 --- a/java/com/google/gerrit/server/account/AccountConfig.java +++ b/java/com/google/gerrit/server/account/AccountConfig.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.ArrayList; import java.util.HashMap; import java.util.List; @@ -177,7 +177,7 @@ public class AccountConfig extends VersionedMetaData implements ValidationError. * @throws DuplicateKeyException if the user branch already exists */ public Account getNewAccount() throws DuplicateKeyException { - return getNewAccount(TimeUtil.nowTs()); + return getNewAccount(TimeUtil.now()); } /** @@ -186,7 +186,7 @@ public class AccountConfig extends VersionedMetaData implements ValidationError. * @return the new account * @throws DuplicateKeyException if the user branch already exists */ - Account getNewAccount(Timestamp registeredOn) throws DuplicateKeyException { + Account getNewAccount(Instant registeredOn) throws DuplicateKeyException { checkLoaded(); if (revision != null) { throw new DuplicateKeyException(String.format("account %s already exists", accountId)); @@ -216,7 +216,7 @@ public class AccountConfig extends VersionedMetaData implements ValidationError. rw.reset(); rw.markStart(revision); rw.sort(RevSort.REVERSE); - Timestamp registeredOn = new Timestamp(rw.next().getCommitTime() * 1000L); + Instant registeredOn = Instant.ofEpochMilli(rw.next().getCommitTime() * 1000L); Config accountConfig = readConfig(AccountProperties.ACCOUNT_CONFIG); loadedAccountProperties = @@ -274,7 +274,7 @@ public class AccountConfig extends VersionedMetaData implements ValidationError. commit.setMessage("Create account\n"); } - Timestamp registeredOn = loadedAccountProperties.get().getRegisteredOn(); + Instant registeredOn = loadedAccountProperties.get().getRegisteredOn(); commit.setAuthor(new PersonIdent(commit.getAuthor(), registeredOn)); commit.setCommitter(new PersonIdent(commit.getCommitter(), registeredOn)); } |