Assignee: Use java.util.Optional
Change-Id: Ied58a946c0a21c322f17f27a6d64c6544b6cbf58
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/GetAssignee.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/GetAssignee.java
index d57107b..5ad259b 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/GetAssignee.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/GetAssignee.java
@@ -14,7 +14,6 @@
package com.google.gerrit.server.change;
-import com.google.common.base.Optional;
import com.google.gerrit.extensions.common.AccountInfo;
import com.google.gerrit.extensions.restapi.Response;
import com.google.gerrit.extensions.restapi.RestReadView;
@@ -25,6 +24,8 @@
import com.google.inject.Inject;
import com.google.inject.Singleton;
+import java.util.Optional;
+
@Singleton
public class GetAssignee implements RestReadView<ChangeResource> {
private final AccountInfoCacheFactory.Factory accountInfo;
@@ -36,9 +37,8 @@
@Override
public Response<AccountInfo> apply(ChangeResource rsrc) throws OrmException {
-
Optional<Account.Id> assignee =
- Optional.fromNullable(rsrc.getChange().getAssignee());
+ Optional.ofNullable(rsrc.getChange().getAssignee());
if (assignee.isPresent()) {
Account account = accountInfo.create().get(assignee.get());
return Response.ok(AccountJson.toAccountInfo(account));
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/SetAssigneeOp.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/SetAssigneeOp.java
index 7ef72ec..43c1dee 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/SetAssigneeOp.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/SetAssigneeOp.java
@@ -16,7 +16,6 @@
import static com.google.common.base.Preconditions.checkNotNull;
-import com.google.common.base.Optional;
import com.google.gerrit.extensions.registration.DynamicSet;
import com.google.gerrit.extensions.restapi.AuthException;
import com.google.gerrit.extensions.restapi.ResourceConflictException;
@@ -40,6 +39,8 @@
import com.google.inject.assistedinject.Assisted;
import com.google.inject.assistedinject.AssistedInject;
+import java.util.Optional;
+
public class SetAssigneeOp extends BatchUpdate.Op {
public interface Factory {
SetAssigneeOp create(String assignee);
@@ -80,7 +81,7 @@
change = ctx.getChange();
ChangeUpdate update = ctx.getUpdate(change.currentPatchSetId());
Optional<Account.Id> oldAssigneeId =
- Optional.fromNullable(change.getAssignee());
+ Optional.ofNullable(change.getAssignee());
oldAssignee = null;
if (oldAssigneeId.isPresent()) {
oldAssignee = accountInfosFactory.create().get(oldAssigneeId.get());
