aurora-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wfar...@apache.org
Subject [2/4] aurora git commit: Use java.util.Optional throughout
Date Fri, 15 Dec 2017 20:01:54 GMT
http://git-wip-us.apache.org/repos/asf/aurora/blob/6fd765bc/src/main/java/org/apache/aurora/scheduler/updater/SideEffect.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/updater/SideEffect.java b/src/main/java/org/apache/aurora/scheduler/updater/SideEffect.java
index 61d855e..aa736a6 100644
--- a/src/main/java/org/apache/aurora/scheduler/updater/SideEffect.java
+++ b/src/main/java/org/apache/aurora/scheduler/updater/SideEffect.java
@@ -14,10 +14,10 @@
 package org.apache.aurora.scheduler.updater;
 
 import java.util.Objects;
+import java.util.Optional;
 import java.util.Set;
 
 import com.google.common.base.MoreObjects;
-import com.google.common.base.Optional;
 
 import org.apache.aurora.scheduler.updater.StateEvaluator.Failure;
 

http://git-wip-us.apache.org/repos/asf/aurora/blob/6fd765bc/src/main/java/org/apache/aurora/scheduler/updater/StateEvaluator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/updater/StateEvaluator.java b/src/main/java/org/apache/aurora/scheduler/updater/StateEvaluator.java
index 06a7695..7d87ddf 100644
--- a/src/main/java/org/apache/aurora/scheduler/updater/StateEvaluator.java
+++ b/src/main/java/org/apache/aurora/scheduler/updater/StateEvaluator.java
@@ -13,7 +13,7 @@
  */
 package org.apache.aurora.scheduler.updater;
 
-import com.google.common.base.Optional;
+import java.util.Optional;
 
 import static java.util.Objects.requireNonNull;
 
@@ -47,7 +47,7 @@ interface StateEvaluator<T> {
    */
   Result evaluate(T actualState);
 
-  Optional<Failure> NO_FAILURE = Optional.absent();
+  Optional<Failure> NO_FAILURE = Optional.empty();
 
   enum Result {
     EVALUATE_ON_STATE_CHANGE(Optional.of(InstanceAction.AWAIT_STATE_CHANGE), NO_FAILURE),
@@ -56,8 +56,8 @@ interface StateEvaluator<T> {
     KILL_TASK_WITH_RESERVATION_AND_EVALUATE_ON_STATE_CHANGE(
         Optional.of(InstanceAction.KILL_TASK_AND_RESERVE), NO_FAILURE),
     EVALUATE_AFTER_MIN_RUNNING_MS(Optional.of(InstanceAction.WATCH_TASK), NO_FAILURE),
-    SUCCEEDED(Optional.absent(), NO_FAILURE),
-    FAILED_TERMINATED(Optional.absent(), Optional.of(Failure.EXITED));
+    SUCCEEDED(Optional.empty(), NO_FAILURE),
+    FAILED_TERMINATED(Optional.empty(), Optional.of(Failure.EXITED));
 
     private final Optional<InstanceAction> action;
     private final Optional<Failure> failure;

http://git-wip-us.apache.org/repos/asf/aurora/blob/6fd765bc/src/main/java/org/apache/aurora/scheduler/updater/UpdateAgentReserver.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/updater/UpdateAgentReserver.java b/src/main/java/org/apache/aurora/scheduler/updater/UpdateAgentReserver.java
index fca4b4e..b6909a6 100644
--- a/src/main/java/org/apache/aurora/scheduler/updater/UpdateAgentReserver.java
+++ b/src/main/java/org/apache/aurora/scheduler/updater/UpdateAgentReserver.java
@@ -13,9 +13,9 @@
  */
 package org.apache.aurora.scheduler.updater;
 
+import java.util.Optional;
 import java.util.Set;
 
-import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableSet;
 import com.google.inject.Inject;
 
@@ -133,7 +133,7 @@ public interface UpdateAgentReserver {
 
     @Override
     public Optional<String> getAgent(IInstanceKey key) {
-      return Optional.absent();
+      return Optional.empty();
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/aurora/blob/6fd765bc/src/main/java/org/apache/aurora/scheduler/updater/UpdateFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/updater/UpdateFactory.java b/src/main/java/org/apache/aurora/scheduler/updater/UpdateFactory.java
index b408a65..3992aa7 100644
--- a/src/main/java/org/apache/aurora/scheduler/updater/UpdateFactory.java
+++ b/src/main/java/org/apache/aurora/scheduler/updater/UpdateFactory.java
@@ -14,10 +14,10 @@
 package org.apache.aurora.scheduler.updater;
 
 import java.io.Serializable;
+import java.util.Optional;
 import java.util.Set;
 
 import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Optional;
 import com.google.common.collect.DiscreteDomain;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
@@ -98,7 +98,7 @@ interface UpdateFactory {
         if (rollingForward) {
           desiredStateConfig = desiredInstances.contains(instanceId)
               ? Optional.of(instructions.getDesiredState().getTask())
-              : Optional.absent();
+              : Optional.empty();
         } else {
           desiredStateConfig = getConfig(instanceId, instructions.getInitialState());
         }
@@ -152,7 +152,7 @@ interface UpdateFactory {
         }
       }
 
-      return Optional.absent();
+      return Optional.empty();
     }
   }
 

http://git-wip-us.apache.org/repos/asf/aurora/blob/6fd765bc/src/test/java/org/apache/aurora/scheduler/TaskStatusHandlerImplTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/TaskStatusHandlerImplTest.java b/src/test/java/org/apache/aurora/scheduler/TaskStatusHandlerImplTest.java
index 56a6b0c..c2731d6 100644
--- a/src/test/java/org/apache/aurora/scheduler/TaskStatusHandlerImplTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/TaskStatusHandlerImplTest.java
@@ -13,13 +13,12 @@
  */
 package org.apache.aurora.scheduler;
 
+import java.util.Optional;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeUnit;
 
-import com.google.common.base.Optional;
-
 import org.apache.aurora.common.testing.easymock.EasyMockTest;
 import org.apache.aurora.scheduler.mesos.Driver;
 import org.apache.aurora.scheduler.state.StateChangeResult;
@@ -96,7 +95,7 @@ public class TaskStatusHandlerImplTest extends EasyMockTest {
     expect(stateManager.changeState(
         storageUtil.mutableStoreProvider,
         TASK_ID_A,
-        Optional.absent(),
+        Optional.empty(),
         RUNNING,
         Optional.of("fake message")))
         .andReturn(StateChangeResult.SUCCESS);
@@ -122,7 +121,7 @@ public class TaskStatusHandlerImplTest extends EasyMockTest {
     expect(stateManager.changeState(
         storageUtil.mutableStoreProvider,
         TASK_ID_A,
-        Optional.absent(),
+        Optional.empty(),
         RUNNING,
         Optional.of("fake message")))
         .andAnswer(() -> {
@@ -164,7 +163,7 @@ public class TaskStatusHandlerImplTest extends EasyMockTest {
     expect(stateManager.changeState(
         storageUtil.mutableStoreProvider,
         TASK_ID_A,
-        Optional.absent(),
+        Optional.empty(),
         FAILED,
         expectedMessage))
         .andReturn(StateChangeResult.SUCCESS);
@@ -195,7 +194,7 @@ public class TaskStatusHandlerImplTest extends EasyMockTest {
   public void testMemoryLimitTranslationNoMessage() throws Exception {
     assertResourceLimitBehavior(
         TaskStatus.Reason.REASON_CONTAINER_LIMITATION_MEMORY,
-        Optional.absent(),
+        Optional.empty(),
         Optional.of(TaskStatusHandlerImpl.MEMORY_LIMIT_DISPLAY));
   }
 
@@ -213,7 +212,7 @@ public class TaskStatusHandlerImplTest extends EasyMockTest {
   public void testDiskLimitTranslationNoMessage() throws Exception {
     assertResourceLimitBehavior(
         TaskStatus.Reason.REASON_CONTAINER_LIMITATION_DISK,
-        Optional.absent(),
+        Optional.empty(),
         Optional.of(TaskStatusHandlerImpl.DISK_LIMIT_DISPLAY));
   }
 
@@ -231,9 +230,9 @@ public class TaskStatusHandlerImplTest extends EasyMockTest {
     expect(stateManager.changeState(
         storageUtil.mutableStoreProvider,
         TASK_ID_A,
-        Optional.absent(),
+        Optional.empty(),
         KILLED,
-        Optional.absent()))
+        Optional.empty()))
         .andReturn(StateChangeResult.SUCCESS);
 
     CountDownLatch latch = new CountDownLatch(1);

http://git-wip-us.apache.org/repos/asf/aurora/blob/6fd765bc/src/test/java/org/apache/aurora/scheduler/TaskVarsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/TaskVarsTest.java b/src/test/java/org/apache/aurora/scheduler/TaskVarsTest.java
index b1d9f8a..6321ec0 100644
--- a/src/test/java/org/apache/aurora/scheduler/TaskVarsTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/TaskVarsTest.java
@@ -15,9 +15,9 @@ package org.apache.aurora.scheduler;
 
 import java.util.EnumSet;
 import java.util.Map;
+import java.util.Optional;
+import java.util.function.Supplier;
 
-import com.google.common.base.Optional;
-import com.google.common.base.Supplier;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Maps;
 
@@ -334,7 +334,7 @@ public class TaskVarsTest extends EasyMockTest {
   public void testRackMissing() {
     expectStatusCountersInitialized();
     expect(storageUtil.attributeStore.getHostAttributes("a"))
-        .andReturn(Optional.absent());
+        .andReturn(Optional.empty());
 
     IScheduledTask a = makeTask(JOB_A, RUNNING, "a");
     expectStatExport(jobStatName(a, LOST), untrackedProvider);

http://git-wip-us.apache.org/repos/asf/aurora/blob/6fd765bc/src/test/java/org/apache/aurora/scheduler/app/SchedulerIT.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/app/SchedulerIT.java b/src/test/java/org/apache/aurora/scheduler/app/SchedulerIT.java
index 4929ecd..77fa904 100644
--- a/src/test/java/org/apache/aurora/scheduler/app/SchedulerIT.java
+++ b/src/test/java/org/apache/aurora/scheduler/app/SchedulerIT.java
@@ -17,6 +17,7 @@ import java.io.File;
 import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.util.Arrays;
+import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutorService;
@@ -24,7 +25,6 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 
-import com.google.common.base.Optional;
 import com.google.common.base.Throwables;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
@@ -135,12 +135,12 @@ public class SchedulerIT extends BaseZooKeeperTest {
 
   private static final DriverSettings SETTINGS = new DriverSettings(
       "fakemaster",
-      Optional.absent());
+      Optional.empty());
 
   private final ExecutorService executor = Executors.newCachedThreadPool(
       new ThreadFactoryBuilder().setNameFormat("SchedulerIT-%d").setDaemon(true).build());
   private final AtomicReference<Optional<RuntimeException>> mainException =
-      Atomics.newReference(Optional.absent());
+      Atomics.newReference(Optional.empty());
 
   private IMocksControl control;
 

http://git-wip-us.apache.org/repos/asf/aurora/blob/6fd765bc/src/test/java/org/apache/aurora/scheduler/app/local/FakeMaster.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/app/local/FakeMaster.java b/src/test/java/org/apache/aurora/scheduler/app/local/FakeMaster.java
index 63e8485..b9513673 100644
--- a/src/test/java/org/apache/aurora/scheduler/app/local/FakeMaster.java
+++ b/src/test/java/org/apache/aurora/scheduler/app/local/FakeMaster.java
@@ -17,6 +17,7 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
@@ -24,7 +25,6 @@ import java.util.concurrent.TimeUnit;
 
 import javax.inject.Inject;
 
-import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;

http://git-wip-us.apache.org/repos/asf/aurora/blob/6fd765bc/src/test/java/org/apache/aurora/scheduler/app/local/LocalSchedulerMain.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/app/local/LocalSchedulerMain.java b/src/test/java/org/apache/aurora/scheduler/app/local/LocalSchedulerMain.java
index 020f348..936de89 100644
--- a/src/test/java/org/apache/aurora/scheduler/app/local/LocalSchedulerMain.java
+++ b/src/test/java/org/apache/aurora/scheduler/app/local/LocalSchedulerMain.java
@@ -15,10 +15,10 @@ package org.apache.aurora.scheduler.app.local;
 
 import java.io.File;
 import java.util.List;
+import java.util.Optional;
 
 import javax.inject.Singleton;
 
-import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableList;
 import com.google.common.io.Files;
 import com.google.inject.AbstractModule;
@@ -56,7 +56,7 @@ public final class LocalSchedulerMain {
           .build();
   private static final DriverSettings DRIVER_SETTINGS = new DriverSettings(
       "fakemaster",
-      Optional.absent());
+      Optional.empty());
 
   public static void main(String[] args) {
     File backupDir = Files.createTempDir();

http://git-wip-us.apache.org/repos/asf/aurora/blob/6fd765bc/src/test/java/org/apache/aurora/scheduler/cron/CrontabEntryTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/cron/CrontabEntryTest.java b/src/test/java/org/apache/aurora/scheduler/cron/CrontabEntryTest.java
index 7c7a950..d5646d6 100644
--- a/src/test/java/org/apache/aurora/scheduler/cron/CrontabEntryTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/cron/CrontabEntryTest.java
@@ -151,7 +151,7 @@ public class CrontabEntryTest {
     );
 
     for (String pattern : badPatterns) {
-      assertNull(CrontabEntry.tryParse(pattern).orNull());
+      assertNull(CrontabEntry.tryParse(pattern).orElse(null));
     }
   }
 

http://git-wip-us.apache.org/repos/asf/aurora/blob/6fd765bc/src/test/java/org/apache/aurora/scheduler/cron/quartz/AuroraCronJobTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/cron/quartz/AuroraCronJobTest.java b/src/test/java/org/apache/aurora/scheduler/cron/quartz/AuroraCronJobTest.java
index 742a97c..5083fcd 100644
--- a/src/test/java/org/apache/aurora/scheduler/cron/quartz/AuroraCronJobTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/cron/quartz/AuroraCronJobTest.java
@@ -14,9 +14,9 @@
 package org.apache.aurora.scheduler.cron.quartz;
 
 import java.util.HashMap;
+import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 
-import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableSet;
 
 import org.apache.aurora.common.testing.easymock.EasyMockTest;
@@ -138,7 +138,7 @@ public class AuroraCronJobTest extends EasyMockTest {
     expect(stateManager.changeState(
         anyObject(),
         eq(TASK_ID),
-        eq(Optional.absent()),
+        eq(Optional.empty()),
         eq(ScheduleStatus.KILLING),
         eq(AuroraCronJob.KILL_AUDIT_MESSAGE)))
         .andReturn(StateChangeResult.SUCCESS);

http://git-wip-us.apache.org/repos/asf/aurora/blob/6fd765bc/src/test/java/org/apache/aurora/scheduler/cron/quartz/CronJobManagerImplTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/cron/quartz/CronJobManagerImplTest.java b/src/test/java/org/apache/aurora/scheduler/cron/quartz/CronJobManagerImplTest.java
index 439cf3e..f2e6238 100644
--- a/src/test/java/org/apache/aurora/scheduler/cron/quartz/CronJobManagerImplTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/cron/quartz/CronJobManagerImplTest.java
@@ -15,9 +15,9 @@ package org.apache.aurora.scheduler.cron.quartz;
 
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.TimeZone;
 
-import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
@@ -106,7 +106,9 @@ public class CronJobManagerImplTest extends EasyMockTest {
     control.replay();
 
     cronJobManager.updateJob(sanitizedCronJob);
-    assertEquals(sanitizedCronJob.getSanitizedConfig().getJobConfig(), fetchFromStorage().orNull());
+    assertEquals(
+        sanitizedCronJob.getSanitizedConfig().getJobConfig(),
+        fetchFromStorage().orElse(null));
   }
 
   @Test
@@ -120,7 +122,7 @@ public class CronJobManagerImplTest extends EasyMockTest {
       // Expected.
     }
 
-    assertEquals(Optional.absent(), fetchFromStorage());
+    assertEquals(Optional.empty(), fetchFromStorage());
   }
 
   @Test
@@ -136,7 +138,7 @@ public class CronJobManagerImplTest extends EasyMockTest {
 
     assertEquals(
         sanitizedCronJob.getSanitizedConfig().getJobConfig(),
-        fetchFromStorage().orNull());
+        fetchFromStorage().orElse(null));
   }
 
   @Test(expected = CronException.class)
@@ -182,7 +184,7 @@ public class CronJobManagerImplTest extends EasyMockTest {
       // Expected.
     }
 
-    assertEquals(Optional.absent(), fetchFromStorage());
+    assertEquals(Optional.empty(), fetchFromStorage());
   }
 
   @Test
@@ -194,7 +196,7 @@ public class CronJobManagerImplTest extends EasyMockTest {
     assertFalse(cronJobManager.deleteJob(QuartzTestUtil.AURORA_JOB_KEY));
     populateStorage();
     assertTrue(cronJobManager.deleteJob(QuartzTestUtil.AURORA_JOB_KEY));
-    assertEquals(Optional.absent(), fetchFromStorage());
+    assertEquals(Optional.empty(), fetchFromStorage());
   }
 
   @Test

http://git-wip-us.apache.org/repos/asf/aurora/blob/6fd765bc/src/test/java/org/apache/aurora/scheduler/cron/quartz/CronPredictorImplTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/cron/quartz/CronPredictorImplTest.java b/src/test/java/org/apache/aurora/scheduler/cron/quartz/CronPredictorImplTest.java
index 0f8c983..fc8fbf8 100644
--- a/src/test/java/org/apache/aurora/scheduler/cron/quartz/CronPredictorImplTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/cron/quartz/CronPredictorImplTest.java
@@ -15,9 +15,9 @@ package org.apache.aurora.scheduler.cron.quartz;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Optional;
 import java.util.TimeZone;
 
-import com.google.common.base.Optional;
 import com.google.common.collect.Lists;
 
 import org.apache.aurora.common.quantity.Amount;
@@ -66,7 +66,7 @@ public class CronPredictorImplTest {
   public void testInvalidPrediction() {
     // Too far in the future to represent as a Date.
     clock.advance(Amount.of(Long.MAX_VALUE, Time.DAYS));
-    assertEquals(Optional.absent(), cronPredictor.predictNextRun(CrontabEntry.parse("* * * * *")));
+    assertEquals(Optional.empty(), cronPredictor.predictNextRun(CrontabEntry.parse("* * * * *")));
   }
 
   @Test

http://git-wip-us.apache.org/repos/asf/aurora/blob/6fd765bc/src/test/java/org/apache/aurora/scheduler/discovery/CuratorDiscoveryModuleTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/discovery/CuratorDiscoveryModuleTest.java b/src/test/java/org/apache/aurora/scheduler/discovery/CuratorDiscoveryModuleTest.java
index f847882..ef49668 100644
--- a/src/test/java/org/apache/aurora/scheduler/discovery/CuratorDiscoveryModuleTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/discovery/CuratorDiscoveryModuleTest.java
@@ -14,8 +14,8 @@
 package org.apache.aurora.scheduler.discovery;
 
 import java.net.InetSocketAddress;
+import java.util.Optional;
 
-import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableList;
 import com.google.inject.AbstractModule;
 import com.google.inject.Guice;

http://git-wip-us.apache.org/repos/asf/aurora/blob/6fd765bc/src/test/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfigTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfigTest.java b/src/test/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfigTest.java
index f1ea9e6..906cfb4 100644
--- a/src/test/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfigTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfigTest.java
@@ -14,8 +14,8 @@
 package org.apache.aurora.scheduler.discovery;
 
 import java.net.InetSocketAddress;
+import java.util.Optional;
 
-import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableList;
 
 import org.apache.aurora.common.quantity.Amount;
@@ -38,11 +38,11 @@ public class ZooKeeperConfigTest {
   public void testEmptyServers() {
     new ZooKeeperConfig(
         ImmutableList.of(),
-        Optional.absent(),
+        Optional.empty(),
         false,
         Amount.of(1, Time.DAYS),
         Amount.of(1, Time.DAYS),
-        Optional.absent());
+        Optional.empty());
   }
 
   @Test
@@ -50,11 +50,11 @@ public class ZooKeeperConfigTest {
     ZooKeeperConfig config =
         new ZooKeeperConfig(
             SERVERS,
-            Optional.absent(),
+            Optional.empty(),
             false,
             Amount.of(1, Time.HOURS),
             Amount.of(1, Time.HOURS),
-            Optional.absent()); // credentials
+            Optional.empty()); // credentials
     assertFalse(config.getCredentials().isPresent());
 
     Credentials joeCreds = Credentials.digestCredentials("Joe", "Schmoe");

http://git-wip-us.apache.org/repos/asf/aurora/blob/6fd765bc/src/test/java/org/apache/aurora/scheduler/filter/AttributeAggregateTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/filter/AttributeAggregateTest.java b/src/test/java/org/apache/aurora/scheduler/filter/AttributeAggregateTest.java
index 7496a70..3c2599b 100644
--- a/src/test/java/org/apache/aurora/scheduler/filter/AttributeAggregateTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/filter/AttributeAggregateTest.java
@@ -13,7 +13,9 @@
  */
 package org.apache.aurora.scheduler.filter;
 
-import com.google.common.base.Optional;
+import java.util.NoSuchElementException;
+import java.util.Optional;
+
 import com.google.common.base.Suppliers;
 import com.google.common.collect.ImmutableMultiset;
 import com.google.common.collect.ImmutableSet;
@@ -52,9 +54,9 @@ public class AttributeAggregateTest extends EasyMockTest {
     assertAggregate(aggregate, "none", "alsoNone", 0);
   }
 
-  @Test(expected = IllegalStateException.class)
+  @Test(expected = NoSuchElementException.class)
   public void testAttributesMissing() {
-    expect(attributeStore.getHostAttributes("a")).andReturn(Optional.absent());
+    expect(attributeStore.getHostAttributes("a")).andReturn(Optional.empty());
 
     control.replay();
 

http://git-wip-us.apache.org/repos/asf/aurora/blob/6fd765bc/src/test/java/org/apache/aurora/scheduler/filter/SchedulingFilterImplTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/filter/SchedulingFilterImplTest.java b/src/test/java/org/apache/aurora/scheduler/filter/SchedulingFilterImplTest.java
index d2fe7a3..0de90d7 100644
--- a/src/test/java/org/apache/aurora/scheduler/filter/SchedulingFilterImplTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/filter/SchedulingFilterImplTest.java
@@ -15,9 +15,9 @@ package org.apache.aurora.scheduler.filter;
 
 import java.time.Instant;
 import java.util.Arrays;
+import java.util.Optional;
 import java.util.Set;
 
-import com.google.common.base.Optional;
 import com.google.common.base.Suppliers;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;

http://git-wip-us.apache.org/repos/asf/aurora/blob/6fd765bc/src/test/java/org/apache/aurora/scheduler/http/LeaderRedirectTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/http/LeaderRedirectTest.java b/src/test/java/org/apache/aurora/scheduler/http/LeaderRedirectTest.java
index 1bd4440..a127eb8 100644
--- a/src/test/java/org/apache/aurora/scheduler/http/LeaderRedirectTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/http/LeaderRedirectTest.java
@@ -14,12 +14,12 @@
 package org.apache.aurora.scheduler.http;
 
 import java.util.Arrays;
+import java.util.Optional;
 import java.util.concurrent.atomic.AtomicReference;
 
 import javax.servlet.http.HttpServletRequest;
 
 import com.google.common.base.Function;
-import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
@@ -77,7 +77,7 @@ public class LeaderRedirectTest extends EasyMockTest {
     replayAndMonitor(3);
     publishSchedulers(localPort(HTTP_PORT));
 
-    assertEquals(Optional.absent(), leaderRedirector.getRedirect());
+    assertEquals(Optional.empty(), leaderRedirector.getRedirect());
 
     // NB: LEADING takes 2 tests of the server group membership to calculate; thus we expect 3
     // server group get calls, 1 for the getRedirect() above and 2 here.
@@ -116,7 +116,7 @@ public class LeaderRedirectTest extends EasyMockTest {
   public void testNoLeaders() throws Exception {
     replayAndMonitor(2);
 
-    assertEquals(Optional.absent(), leaderRedirector.getRedirect());
+    assertEquals(Optional.empty(), leaderRedirector.getRedirect());
     assertEquals(LeaderStatus.NO_LEADER, leaderRedirector.getLeaderStatus());
   }
 
@@ -126,7 +126,7 @@ public class LeaderRedirectTest extends EasyMockTest {
 
     publishSchedulers(HostAndPort.fromParts("foobar", 500), HostAndPort.fromParts("baz", 800));
 
-    assertEquals(Optional.absent(), leaderRedirector.getRedirect());
+    assertEquals(Optional.empty(), leaderRedirector.getRedirect());
     assertEquals(LeaderStatus.NO_LEADER, leaderRedirector.getLeaderStatus());
   }
 

http://git-wip-us.apache.org/repos/asf/aurora/blob/6fd765bc/src/test/java/org/apache/aurora/scheduler/http/MnameTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/http/MnameTest.java b/src/test/java/org/apache/aurora/scheduler/http/MnameTest.java
index c25264f..5f9e6fb 100644
--- a/src/test/java/org/apache/aurora/scheduler/http/MnameTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/http/MnameTest.java
@@ -14,12 +14,12 @@
 package org.apache.aurora.scheduler.http;
 
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 
 import javax.ws.rs.HttpMethod;
 import javax.ws.rs.core.HttpHeaders;
 
-import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.sun.jersey.api.client.ClientResponse;
@@ -149,9 +149,9 @@ public class MnameTest extends AbstractJettyTest {
   public void testRedirectPort() {
     replayAndStart();
 
-    assertEquals(Optional.absent(), getRedirectPort(null));
-    assertEquals(Optional.absent(), getRedirectPort(ImmutableMap.of()));
-    assertEquals(Optional.absent(), getRedirectPort(ImmutableMap.of("thrift", 5)));
+    assertEquals(Optional.empty(), getRedirectPort(null));
+    assertEquals(Optional.empty(), getRedirectPort(ImmutableMap.of()));
+    assertEquals(Optional.empty(), getRedirectPort(ImmutableMap.of("thrift", 5)));
     assertEquals(Optional.of(5), getRedirectPort(ImmutableMap.of("health", 5, "http", 6)));
     assertEquals(Optional.of(6), getRedirectPort(ImmutableMap.of("http", 6)));
     assertEquals(Optional.of(7), getRedirectPort(ImmutableMap.of("HTTP", 7)));

http://git-wip-us.apache.org/repos/asf/aurora/blob/6fd765bc/src/test/java/org/apache/aurora/scheduler/http/ServletFilterTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/http/ServletFilterTest.java b/src/test/java/org/apache/aurora/scheduler/http/ServletFilterTest.java
index 62f5695..5a4dc5d 100644
--- a/src/test/java/org/apache/aurora/scheduler/http/ServletFilterTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/http/ServletFilterTest.java
@@ -16,11 +16,11 @@ package org.apache.aurora.scheduler.http;
 import java.io.IOException;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
+import java.util.Optional;
 
 import javax.ws.rs.core.HttpHeaders;
 import javax.ws.rs.core.MediaType;
 
-import com.google.common.base.Optional;
 import com.google.common.io.Resources;
 import com.sun.jersey.api.client.ClientResponse;
 import com.sun.jersey.api.client.ClientResponse.Status;
@@ -46,7 +46,9 @@ public class ServletFilterTest extends AbstractJettyTest {
   }
 
   private void assertContentEncoding(ClientResponse response, Optional<String> encoding) {
-    assertEquals(encoding.orNull(), response.getHeaders().getFirst(HttpHeaders.CONTENT_ENCODING));
+    assertEquals(
+        encoding.orElse(null),
+        response.getHeaders().getFirst(HttpHeaders.CONTENT_ENCODING));
   }
 
   private void assertGzipEncodedGet(String path) {
@@ -102,7 +104,7 @@ public class ServletFilterTest extends AbstractJettyTest {
   public void testLeaderRedirect() throws Exception {
     replayAndStart();
 
-    assertResponseStatus("/", Status.OK, Optional.absent());
+    assertResponseStatus("/", Status.OK, Optional.empty());
 
     // If there's no leader, we should send service unavailable and an error page.
     unsetLeadingSchduler();
@@ -115,11 +117,11 @@ public class ServletFilterTest extends AbstractJettyTest {
 
     // This process is leading
     setLeadingScheduler(httpServer.getHost(), httpServer.getPort());
-    leaderRedirectSmokeTest(Status.OK, Optional.absent());
+    leaderRedirectSmokeTest(Status.OK, Optional.empty());
 
     setLeadingScheduler("otherHost", 1234);
-    leaderRedirectSmokeTest(Status.TEMPORARY_REDIRECT, Optional.absent());
-    assertResponseStatus("/", Status.OK, Optional.absent());
+    leaderRedirectSmokeTest(Status.TEMPORARY_REDIRECT, Optional.empty());
+    assertResponseStatus("/", Status.OK, Optional.empty());
   }
 
   @Test

http://git-wip-us.apache.org/repos/asf/aurora/blob/6fd765bc/src/test/java/org/apache/aurora/scheduler/http/api/security/ShiroAuthorizingParamInterceptorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/http/api/security/ShiroAuthorizingParamInterceptorTest.java b/src/test/java/org/apache/aurora/scheduler/http/api/security/ShiroAuthorizingParamInterceptorTest.java
index cda6ca2..a42b0d8 100644
--- a/src/test/java/org/apache/aurora/scheduler/http/api/security/ShiroAuthorizingParamInterceptorTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/http/api/security/ShiroAuthorizingParamInterceptorTest.java
@@ -14,10 +14,10 @@
 package org.apache.aurora.scheduler.http.api.security;
 
 import java.lang.reflect.Method;
+import java.util.Optional;
 import java.util.concurrent.atomic.AtomicLong;
 
 import com.google.common.base.Function;
-import com.google.common.base.Optional;
 import com.google.common.util.concurrent.UncheckedExecutionException;
 import com.google.inject.AbstractModule;
 import com.google.inject.Guice;

http://git-wip-us.apache.org/repos/asf/aurora/blob/6fd765bc/src/test/java/org/apache/aurora/scheduler/http/api/security/ThriftFieldGetterTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/http/api/security/ThriftFieldGetterTest.java b/src/test/java/org/apache/aurora/scheduler/http/api/security/ThriftFieldGetterTest.java
index b0a8d75..2b599f2 100644
--- a/src/test/java/org/apache/aurora/scheduler/http/api/security/ThriftFieldGetterTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/http/api/security/ThriftFieldGetterTest.java
@@ -31,7 +31,7 @@ public class ThriftFieldGetterTest {
 
     JobConfiguration jobConfiguration = new JobConfiguration().setKey(jobKey);
 
-    assertSame(jobKey, fieldGetter.apply(jobConfiguration).orNull());
+    assertSame(jobKey, fieldGetter.apply(jobConfiguration).orElse(null));
   }
 
   @Test
@@ -41,6 +41,6 @@ public class ThriftFieldGetterTest {
 
     JobConfiguration jobConfiguration = new JobConfiguration().setInstanceCount(5);
 
-    assertNull(fieldGetter.apply(jobConfiguration).orNull());
+    assertNull(fieldGetter.apply(jobConfiguration).orElse(null));
   }
 }

http://git-wip-us.apache.org/repos/asf/aurora/blob/6fd765bc/src/test/java/org/apache/aurora/scheduler/mesos/CommandLineDriverSettingsModuleTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/mesos/CommandLineDriverSettingsModuleTest.java b/src/test/java/org/apache/aurora/scheduler/mesos/CommandLineDriverSettingsModuleTest.java
index a86184c..97be6b1 100644
--- a/src/test/java/org/apache/aurora/scheduler/mesos/CommandLineDriverSettingsModuleTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/mesos/CommandLineDriverSettingsModuleTest.java
@@ -16,9 +16,9 @@ package org.apache.aurora.scheduler.mesos;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.util.Optional;
 import java.util.Properties;
 
-import com.google.common.base.Optional;
 import com.google.common.base.Throwables;
 
 import org.apache.aurora.common.quantity.Amount;
@@ -79,12 +79,12 @@ public class CommandLineDriverSettingsModuleTest {
     Protos.FrameworkInfo info = CommandLineDriverSettingsModule.buildFrameworkInfo(
         "aurora",
         "user",
-        Optional.absent(),
+        Optional.empty(),
         Amount.of(1L, Time.MINUTES),
         false, // revocable
         false, // allow gpu
         false, // partition aware
-        Optional.absent());
+        Optional.empty());
     assertEquals("", info.getPrincipal());
     assertEquals(0, info.getCapabilitiesCount());
     assertFalse(info.hasRole());
@@ -95,12 +95,12 @@ public class CommandLineDriverSettingsModuleTest {
     Protos.FrameworkInfo info = CommandLineDriverSettingsModule.buildFrameworkInfo(
         "aurora",
         "user",
-        Optional.absent(),
+        Optional.empty(),
         Amount.of(1L, Time.MINUTES),
         true, // revocable
         false, // allow gpu
         false, // partition aware
-        Optional.absent());
+        Optional.empty());
     assertEquals("", info.getPrincipal());
     assertEquals(1, info.getCapabilitiesCount());
     assertEquals(REVOCABLE_RESOURCES, info.getCapabilities(0).getType());
@@ -112,12 +112,12 @@ public class CommandLineDriverSettingsModuleTest {
     Protos.FrameworkInfo info = CommandLineDriverSettingsModule.buildFrameworkInfo(
         "aurora",
         "user",
-        Optional.absent(),
+        Optional.empty(),
         Amount.of(1L, Time.MINUTES),
         false, // revocable
         true, // allow gpu
         false, // partition aware
-        Optional.absent());
+        Optional.empty());
     assertEquals("", info.getPrincipal());
     assertEquals(1, info.getCapabilitiesCount());
     assertEquals(GPU_RESOURCES, info.getCapabilities(0).getType());
@@ -129,12 +129,12 @@ public class CommandLineDriverSettingsModuleTest {
     Protos.FrameworkInfo info = CommandLineDriverSettingsModule.buildFrameworkInfo(
         "aurora",
         "user",
-        Optional.absent(),
+        Optional.empty(),
         Amount.of(1L, Time.MINUTES),
         false, // revocable
         false, // allow gpu
         true, // partition aware
-        Optional.absent());
+        Optional.empty());
     assertEquals("", info.getPrincipal());
     assertEquals(1, info.getCapabilitiesCount());
     assertEquals(PARTITION_AWARE, info.getCapabilities(0).getType());
@@ -151,7 +151,7 @@ public class CommandLineDriverSettingsModuleTest {
         false, // revocable
         false, // allow gpu
         false, // partition aware
-        Optional.absent());
+        Optional.empty());
     assertEquals("auroraprincipal", info.getPrincipal());
     assertEquals(0, info.getCapabilitiesCount());
     assertFalse(info.hasRole());

http://git-wip-us.apache.org/repos/asf/aurora/blob/6fd765bc/src/test/java/org/apache/aurora/scheduler/mesos/MesosCallbackHandlerTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/mesos/MesosCallbackHandlerTest.java b/src/test/java/org/apache/aurora/scheduler/mesos/MesosCallbackHandlerTest.java
index d79a973..c6163bb 100644
--- a/src/test/java/org/apache/aurora/scheduler/mesos/MesosCallbackHandlerTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/mesos/MesosCallbackHandlerTest.java
@@ -15,10 +15,10 @@ package org.apache.aurora.scheduler.mesos;
 
 import java.util.LinkedList;
 import java.util.NoSuchElementException;
+import java.util.Optional;
 import java.util.Queue;
 import java.util.concurrent.Executor;
 
-import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.net.InetAddresses;
@@ -249,7 +249,7 @@ public class MesosCallbackHandlerTest extends EasyMockTest {
 
   private void expectOfferAttributesSaved(HostOffer offer) {
     expect(storageUtil.attributeStore.getHostAttributes(offer.getOffer().getHostname()))
-        .andReturn(Optional.absent());
+        .andReturn(Optional.empty());
     IHostAttributes defaultMode = IHostAttributes.build(
         Conversions.getAttributes(offer.getOffer()).newBuilder().setMode(NONE));
     expect(storageUtil.attributeStore.saveHostAttributes(defaultMode)).andReturn(true);
@@ -378,8 +378,8 @@ public class MesosCallbackHandlerTest extends EasyMockTest {
   public void testUpdate() {
     eventSink.post(new PubsubEvent.TaskStatusReceived(
         STATUS.getState(),
-        Optional.fromNullable(STATUS.getSource()),
-        Optional.fromNullable(STATUS.getReason()),
+        Optional.ofNullable(STATUS.getSource()),
+        Optional.ofNullable(STATUS.getReason()),
         Optional.of(1000000L)
     ));
     statusHandler.statusUpdate(STATUS);
@@ -396,8 +396,8 @@ public class MesosCallbackHandlerTest extends EasyMockTest {
 
     eventSink.post(new PubsubEvent.TaskStatusReceived(
         status.getState(),
-        Optional.absent(),
-        Optional.fromNullable(status.getReason()),
+        Optional.empty(),
+        Optional.ofNullable(status.getReason()),
         Optional.of(1000000L)
     ));
     statusHandler.statusUpdate(status);
@@ -414,8 +414,8 @@ public class MesosCallbackHandlerTest extends EasyMockTest {
 
     eventSink.post(new PubsubEvent.TaskStatusReceived(
         status.getState(),
-        Optional.fromNullable(status.getSource()),
-        Optional.absent(),
+        Optional.ofNullable(status.getSource()),
+        Optional.empty(),
         Optional.of(1000000L)
     ));
     statusHandler.statusUpdate(status);
@@ -432,8 +432,8 @@ public class MesosCallbackHandlerTest extends EasyMockTest {
 
     eventSink.post(new PubsubEvent.TaskStatusReceived(
         status.getState(),
-        Optional.fromNullable(status.getSource()),
-        Optional.fromNullable(status.getReason()),
+        Optional.ofNullable(status.getSource()),
+        Optional.ofNullable(status.getReason()),
         Optional.of(1000000L)
     ));
     statusHandler.statusUpdate(status);
@@ -448,8 +448,8 @@ public class MesosCallbackHandlerTest extends EasyMockTest {
   public void testUpdateWithException() {
     eventSink.post(new PubsubEvent.TaskStatusReceived(
         STATUS.getState(),
-        Optional.fromNullable(STATUS.getSource()),
-        Optional.fromNullable(STATUS.getReason()),
+        Optional.ofNullable(STATUS.getSource()),
+        Optional.ofNullable(STATUS.getReason()),
         Optional.of(1000000L)
     ));
     statusHandler.statusUpdate(STATUS);
@@ -472,8 +472,8 @@ public class MesosCallbackHandlerTest extends EasyMockTest {
 
     eventSink.post(new PubsubEvent.TaskStatusReceived(
         STATUS_RECONCILIATION.getState(),
-        Optional.fromNullable(STATUS_RECONCILIATION.getSource()),
-        Optional.fromNullable(STATUS_RECONCILIATION.getReason()),
+        Optional.ofNullable(STATUS_RECONCILIATION.getSource()),
+        Optional.ofNullable(STATUS_RECONCILIATION.getReason()),
         Optional.of(1000000L)
     ));
 

http://git-wip-us.apache.org/repos/asf/aurora/blob/6fd765bc/src/test/java/org/apache/aurora/scheduler/mesos/SchedulerDriverServiceTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/mesos/SchedulerDriverServiceTest.java b/src/test/java/org/apache/aurora/scheduler/mesos/SchedulerDriverServiceTest.java
index be6e481..33851ae 100644
--- a/src/test/java/org/apache/aurora/scheduler/mesos/SchedulerDriverServiceTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/mesos/SchedulerDriverServiceTest.java
@@ -13,7 +13,7 @@
  */
 package org.apache.aurora.scheduler.mesos;
 
-import com.google.common.base.Optional;
+import java.util.Optional;
 
 import org.apache.aurora.common.testing.easymock.EasyMockTest;
 import org.apache.aurora.scheduler.storage.testing.StorageTestUtil;
@@ -32,7 +32,7 @@ import static org.easymock.EasyMock.expect;
 public class SchedulerDriverServiceTest extends EasyMockTest {
 
   private static final Optional<String> FRAMEWORK_ID = Optional.of("test framework");
-  private static final Optional<String> NEW_FRAMEWORK_ID = Optional.absent();
+  private static final Optional<String> NEW_FRAMEWORK_ID = Optional.empty();
 
   private static final FrameworkInfo BASE_INFO = FrameworkInfo.newBuilder()
           .setUser("framework user")
@@ -40,7 +40,7 @@ public class SchedulerDriverServiceTest extends EasyMockTest {
           .build();
   private static final DriverSettings SETTINGS = new DriverSettings(
       "fakemaster",
-      Optional.absent());
+      Optional.empty());
 
   private static final String TASK_1 = "1";
   private static final String TASK_2 = "2";

http://git-wip-us.apache.org/repos/asf/aurora/blob/6fd765bc/src/test/java/org/apache/aurora/scheduler/mesos/TaskStatusStatsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/mesos/TaskStatusStatsTest.java b/src/test/java/org/apache/aurora/scheduler/mesos/TaskStatusStatsTest.java
index abef3f0..a410ece 100644
--- a/src/test/java/org/apache/aurora/scheduler/mesos/TaskStatusStatsTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/mesos/TaskStatusStatsTest.java
@@ -13,9 +13,9 @@
  */
 package org.apache.aurora.scheduler.mesos;
 
+import java.util.Optional;
 import java.util.concurrent.atomic.AtomicLong;
 
-import com.google.common.base.Optional;
 import com.google.common.eventbus.EventBus;
 
 import org.apache.aurora.common.quantity.Amount;
@@ -88,7 +88,7 @@ public class TaskStatusStatsTest extends EasyMockTest {
     eventBus.post(new TaskStatusReceived(
         TaskState.TASK_RUNNING,
         Optional.of(Source.SOURCE_MASTER),
-        Optional.absent(),
+        Optional.empty(),
         Optional.of(agoMicros(ONE_SECOND))));
 
     clock.advance(ONE_SECOND);
@@ -111,19 +111,19 @@ public class TaskStatusStatsTest extends EasyMockTest {
     // No counting for these since they do not have both a source and timestamp.
     eventBus.post(new TaskStatusReceived(
         TaskState.TASK_LOST,
-        Optional.absent(),
-        Optional.absent(),
-        Optional.absent()));
+        Optional.empty(),
+        Optional.empty(),
+        Optional.empty()));
     eventBus.post(new TaskStatusReceived(
         TaskState.TASK_LOST,
-        Optional.absent(),
-        Optional.absent(),
+        Optional.empty(),
+        Optional.empty(),
         Optional.of(agoMicros(ONE_SECOND))));
     eventBus.post(new TaskStatusReceived(
         TaskState.TASK_LOST,
         Optional.of(Source.SOURCE_MASTER),
         Optional.of(Reason.REASON_AGENT_DISCONNECTED),
-        Optional.absent()));
+        Optional.empty()));
 
     // No time tracking for this since the timestamp is the current time.
     eventBus.post(new TaskStatusReceived(

http://git-wip-us.apache.org/repos/asf/aurora/blob/6fd765bc/src/test/java/org/apache/aurora/scheduler/mesos/VersionedMesosSchedulerImplTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/mesos/VersionedMesosSchedulerImplTest.java b/src/test/java/org/apache/aurora/scheduler/mesos/VersionedMesosSchedulerImplTest.java
index 8c259bf..dc40247 100644
--- a/src/test/java/org/apache/aurora/scheduler/mesos/VersionedMesosSchedulerImplTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/mesos/VersionedMesosSchedulerImplTest.java
@@ -13,9 +13,9 @@
  */
 package org.apache.aurora.scheduler.mesos;
 
+import java.util.Optional;
 import java.util.concurrent.Executors;
 
-import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableList;
 import com.google.common.net.InetAddresses;
 import com.google.protobuf.ByteString;

http://git-wip-us.apache.org/repos/asf/aurora/blob/6fd765bc/src/test/java/org/apache/aurora/scheduler/mesos/VersionedSchedulerDriverServiceTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/mesos/VersionedSchedulerDriverServiceTest.java b/src/test/java/org/apache/aurora/scheduler/mesos/VersionedSchedulerDriverServiceTest.java
index a72bd4d..d4a65a4 100644
--- a/src/test/java/org/apache/aurora/scheduler/mesos/VersionedSchedulerDriverServiceTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/mesos/VersionedSchedulerDriverServiceTest.java
@@ -13,7 +13,8 @@
  */
 package org.apache.aurora.scheduler.mesos;
 
-import com.google.common.base.Optional;
+import java.util.Optional;
+
 import com.google.common.collect.ImmutableList;
 
 import org.apache.aurora.common.testing.easymock.EasyMockTest;
@@ -46,7 +47,7 @@ public class VersionedSchedulerDriverServiceTest extends EasyMockTest {
           .build();
   private static final DriverSettings SETTINGS = new DriverSettings(
       "fakemaster",
-      Optional.absent());
+      Optional.empty());
 
   private StorageTestUtil storage;
   private Scheduler scheduler;

http://git-wip-us.apache.org/repos/asf/aurora/blob/6fd765bc/src/test/java/org/apache/aurora/scheduler/offers/OfferManagerImplTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/offers/OfferManagerImplTest.java b/src/test/java/org/apache/aurora/scheduler/offers/OfferManagerImplTest.java
index 75aedf5..1e9532b 100644
--- a/src/test/java/org/apache/aurora/scheduler/offers/OfferManagerImplTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/offers/OfferManagerImplTest.java
@@ -14,9 +14,9 @@
 package org.apache.aurora.scheduler.offers;
 
 import java.util.List;
+import java.util.Optional;
 import java.util.concurrent.ScheduledExecutorService;
 
-import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
@@ -639,7 +639,7 @@ public class OfferManagerImplTest extends EasyMockTest {
     offerManager.add(OFFER_A);
     assertEquals(0, statsProvider.getLongValue(GLOBALLY_BANNED_OFFERS));
     offerManager.ban(OFFER_A_ID);
-    assertEquals(Optional.absent(),
+    assertEquals(Optional.empty(),
         offerManager.getMatching(OFFER_A.getOffer().getAgentId(), EMPTY_REQUEST, false));
     assertEquals(1, statsProvider.getLongValue(GLOBALLY_BANNED_OFFERS));
   }
@@ -654,7 +654,7 @@ public class OfferManagerImplTest extends EasyMockTest {
     control.replay();
     offerManager.add(OFFER_A);
     assertEquals(0, statsProvider.getLongValue(STATICALLY_BANNED_OFFERS));
-    assertEquals(Optional.absent(),
+    assertEquals(Optional.empty(),
         offerManager.getMatching(OFFER_A.getOffer().getAgentId(), EMPTY_REQUEST, false));
     assertEquals(0, statsProvider.getLongValue(STATICALLY_BANNED_OFFERS));
   }

http://git-wip-us.apache.org/repos/asf/aurora/blob/6fd765bc/src/test/java/org/apache/aurora/scheduler/preemptor/BiCacheTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/preemptor/BiCacheTest.java b/src/test/java/org/apache/aurora/scheduler/preemptor/BiCacheTest.java
index 4e27fbb..f203ad9 100644
--- a/src/test/java/org/apache/aurora/scheduler/preemptor/BiCacheTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/preemptor/BiCacheTest.java
@@ -14,8 +14,8 @@
 package org.apache.aurora.scheduler.preemptor;
 
 import java.util.Map;
+import java.util.Optional;
 
-import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 
@@ -38,7 +38,7 @@ public class BiCacheTest {
   private static final String CACHE_EXPIRATION_REMOVAL_STAT_NAME = "TEST_cache_expiration_removals";
   private static final String KEY_1 = "Key 1";
   private static final String KEY_2 = "Key 2";
-  private static final Optional<Integer> NO_VALUE = Optional.absent();
+  private static final Optional<Integer> NO_VALUE = Optional.empty();
 
   private FakeStatsProvider statsProvider;
   private FakeClock clock;

http://git-wip-us.apache.org/repos/asf/aurora/blob/6fd765bc/src/test/java/org/apache/aurora/scheduler/preemptor/PendingTaskProcessorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/preemptor/PendingTaskProcessorTest.java b/src/test/java/org/apache/aurora/scheduler/preemptor/PendingTaskProcessorTest.java
index 9ef55c8..35e9348 100644
--- a/src/test/java/org/apache/aurora/scheduler/preemptor/PendingTaskProcessorTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/preemptor/PendingTaskProcessorTest.java
@@ -14,10 +14,10 @@
 package org.apache.aurora.scheduler.preemptor;
 
 import java.util.Arrays;
+import java.util.Optional;
 
 import javax.annotation.Nullable;
 
-import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMultiset;
 import com.google.common.collect.ImmutableSet;
@@ -316,7 +316,7 @@ public class PendingTaskProcessorTest extends EasyMockTest {
         eq(storageUtil.storeProvider)));
     expectLastCall().andReturn(
         victims.length == 0
-            ? Optional.absent()
+            ? Optional.empty()
             : Optional.of(ImmutableSet.copyOf(getVictims(victims).values())))
         .anyTimes();
   }

http://git-wip-us.apache.org/repos/asf/aurora/blob/6fd765bc/src/test/java/org/apache/aurora/scheduler/preemptor/PreemptionVictimFilterTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/preemptor/PreemptionVictimFilterTest.java b/src/test/java/org/apache/aurora/scheduler/preemptor/PreemptionVictimFilterTest.java
index 40a5d4c..348386e 100644
--- a/src/test/java/org/apache/aurora/scheduler/preemptor/PreemptionVictimFilterTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/preemptor/PreemptionVictimFilterTest.java
@@ -14,10 +14,10 @@
 package org.apache.aurora.scheduler.preemptor;
 
 import java.util.List;
+import java.util.Optional;
 import java.util.Set;
 import java.util.stream.IntStream;
 
-import com.google.common.base.Optional;
 import com.google.common.collect.FluentIterable;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
@@ -103,7 +103,7 @@ public class PreemptionVictimFilterTest extends EasyMockTest {
   private static final String RACK_ATTRIBUTE = "rack";
   private static final String HOST_ATTRIBUTE = "host";
   private static final String OFFER = "offer";
-  private static final Optional<HostOffer> NO_OFFER = Optional.absent();
+  private static final Optional<HostOffer> NO_OFFER = Optional.empty();
   private static final Amount<Long, Time> UNAVAILABLITY_THRESHOLD = Amount.of(1L, Time.MINUTES);
 
   private StorageTestUtil storageUtil;
@@ -527,7 +527,7 @@ public class PreemptionVictimFilterTest extends EasyMockTest {
     assignToHost(a1);
     expectGetTier(a1, DEV_TIER);
 
-    expect(storageUtil.attributeStore.getHostAttributes(HOST_A)).andReturn(Optional.absent());
+    expect(storageUtil.attributeStore.getHostAttributes(HOST_A)).andReturn(Optional.empty());
 
     control.replay();
 
@@ -604,7 +604,7 @@ public class PreemptionVictimFilterTest extends EasyMockTest {
   }
 
   private static void assertNoVictims(Optional<ImmutableSet<PreemptionVictim>> actual) {
-    assertEquals(Optional.<ImmutableSet<PreemptionVictim>>absent(), actual);
+    assertEquals(Optional.<ImmutableSet<PreemptionVictim>>empty(), actual);
   }
 
   private Optional<HostOffer> makeOffer(
@@ -621,7 +621,7 @@ public class PreemptionVictimFilterTest extends EasyMockTest {
         mesosScalar(DISK_MB, disk.getValue()),
         mesosRange(
             PORTS,
-            Optional.absent(),
+            Optional.empty(),
             IntStream.range(1, numPorts).boxed().collect(toSet())));
     if (revocable) {
       resources = ImmutableList.<Resource>builder()
@@ -649,7 +649,7 @@ public class PreemptionVictimFilterTest extends EasyMockTest {
   }
 
   private IExpectationSetters<Set<SchedulingFilter.Veto>> expectFiltering() {
-    return expectFiltering(Optional.absent());
+    return expectFiltering(Optional.empty());
   }
 
   private IExpectationSetters<Set<SchedulingFilter.Veto>> expectFiltering(
@@ -658,8 +658,7 @@ public class PreemptionVictimFilterTest extends EasyMockTest {
     return expect(schedulingFilter.filter(
         EasyMock.anyObject(),
         EasyMock.anyObject()))
-        .andAnswer(
-            veto::asSet);
+        .andAnswer(() -> veto.map(ImmutableSet::of).orElse(ImmutableSet.of()));
   }
 
   private IExpectationSetters<TierInfo> expectGetTier(ScheduledTask task, TierInfo tier) {

http://git-wip-us.apache.org/repos/asf/aurora/blob/6fd765bc/src/test/java/org/apache/aurora/scheduler/preemptor/PreemptorImplTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/preemptor/PreemptorImplTest.java b/src/test/java/org/apache/aurora/scheduler/preemptor/PreemptorImplTest.java
index 3d2c7fa..0ef29d5 100644
--- a/src/test/java/org/apache/aurora/scheduler/preemptor/PreemptorImplTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/preemptor/PreemptorImplTest.java
@@ -13,9 +13,9 @@
  */
 package org.apache.aurora.scheduler.preemptor;
 
+import java.util.Optional;
 import java.util.Set;
 
-import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableSet;
 
 import org.apache.aurora.common.testing.easymock.EasyMockTest;
@@ -63,7 +63,7 @@ public class PreemptorImplTest extends EasyMockTest {
       TaskGroupKey.from(ITaskConfig.build(makeTask().getAssignedTask().getTask()));
 
   private static final Set<PreemptionProposal> NO_SLOTS = ImmutableSet.of();
-  private static final Optional<String> EMPTY_RESULT = Optional.absent();
+  private static final Optional<String> EMPTY_RESULT = Optional.empty();
   private static final HostOffer OFFER =
       new HostOffer(Protos.Offer.getDefaultInstance(), IHostAttributes.build(new HostAttributes()));
 
@@ -115,7 +115,7 @@ public class PreemptorImplTest extends EasyMockTest {
   public void testPreemptTasksValidationFailed() throws Exception {
     expect(slotCache.getByValue(GROUP_KEY)).andReturn(ImmutableSet.of(PROPOSAL_1));
     slotCache.remove(PROPOSAL_1, GROUP_KEY);
-    expectSlotValidation(PROPOSAL_1, Optional.absent());
+    expectSlotValidation(PROPOSAL_1, Optional.empty());
 
     control.replay();
 
@@ -129,7 +129,7 @@ public class PreemptorImplTest extends EasyMockTest {
   public void testMultiplePreemptionProposalsSuccessful() throws Exception {
     expect(slotCache.getByValue(GROUP_KEY)).andReturn(ImmutableSet.of(PROPOSAL_1, PROPOSAL_2));
     slotCache.remove(PROPOSAL_1, GROUP_KEY);
-    expectSlotValidation(PROPOSAL_1, Optional.absent());
+    expectSlotValidation(PROPOSAL_1, Optional.empty());
     slotCache.remove(PROPOSAL_2, GROUP_KEY);
     expectSlotValidation(PROPOSAL_2, Optional.of(ImmutableSet.of(
         PreemptionVictim.fromTask(TASK.getAssignedTask()))));
@@ -148,9 +148,9 @@ public class PreemptorImplTest extends EasyMockTest {
   public void testMultiplePreemptionProposalsFailed() throws Exception {
     expect(slotCache.getByValue(GROUP_KEY)).andReturn(ImmutableSet.of(PROPOSAL_1, PROPOSAL_2));
     slotCache.remove(PROPOSAL_1, GROUP_KEY);
-    expectSlotValidation(PROPOSAL_1, Optional.absent());
+    expectSlotValidation(PROPOSAL_1, Optional.empty());
     slotCache.remove(PROPOSAL_2, GROUP_KEY);
-    expectSlotValidation(PROPOSAL_2, Optional.absent());
+    expectSlotValidation(PROPOSAL_2, Optional.empty());
 
     control.replay();
 
@@ -192,7 +192,7 @@ public class PreemptorImplTest extends EasyMockTest {
     expect(stateManager.changeState(
         anyObject(Storage.MutableStoreProvider.class),
         eq(Tasks.id(preempted)),
-        eq(Optional.absent()),
+        eq(Optional.empty()),
         eq(ScheduleStatus.PREEMPTING),
         anyObject()))
         .andReturn(StateChangeResult.SUCCESS);

http://git-wip-us.apache.org/repos/asf/aurora/blob/6fd765bc/src/test/java/org/apache/aurora/scheduler/preemptor/PreemptorModuleTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/preemptor/PreemptorModuleTest.java b/src/test/java/org/apache/aurora/scheduler/preemptor/PreemptorModuleTest.java
index 815a3ef..2571b6b 100644
--- a/src/test/java/org/apache/aurora/scheduler/preemptor/PreemptorModuleTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/preemptor/PreemptorModuleTest.java
@@ -13,7 +13,8 @@
  */
 package org.apache.aurora.scheduler.preemptor;
 
-import com.google.common.base.Optional;
+import java.util.Optional;
+
 import com.google.common.collect.ImmutableList;
 import com.google.inject.AbstractModule;
 import com.google.inject.Guice;
@@ -87,7 +88,7 @@ public class PreemptorModuleTest extends EasyMockTest {
 
     injector.getBindings();
     assertEquals(
-        Optional.absent(),
+        Optional.empty(),
         injector.getInstance(Preemptor.class).attemptPreemptionFor(
             IAssignedTask.build(new AssignedTask()),
             AttributeAggregate.empty(),

http://git-wip-us.apache.org/repos/asf/aurora/blob/6fd765bc/src/test/java/org/apache/aurora/scheduler/quota/QuotaManagerImplTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/quota/QuotaManagerImplTest.java b/src/test/java/org/apache/aurora/scheduler/quota/QuotaManagerImplTest.java
index c1825f6..cbcde23 100644
--- a/src/test/java/org/apache/aurora/scheduler/quota/QuotaManagerImplTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/quota/QuotaManagerImplTest.java
@@ -13,7 +13,8 @@
  */
 package org.apache.aurora.scheduler.quota;
 
-import com.google.common.base.Optional;
+import java.util.Optional;
+
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 
@@ -272,7 +273,7 @@ public class QuotaManagerImplTest extends EasyMockTest {
   @Test
   public void testCheckQuotaNoQuotaSet() {
     expect(storageUtil.quotaStore.fetchQuota(ROLE))
-        .andReturn(Optional.absent());
+        .andReturn(Optional.empty());
 
     expectNoTasks();
     expectNoJobUpdates();
@@ -886,7 +887,7 @@ public class QuotaManagerImplTest extends EasyMockTest {
 
   private IExpectationSetters<?> expectNoCronJob() {
     return expect(storageUtil.jobStore.fetchJob(anyObject(IJobKey.class)))
-        .andReturn(Optional.absent());
+        .andReturn(Optional.empty());
   }
 
   private IExpectationSetters<Optional<IResourceAggregate>> expectQuota(IResourceAggregate quota) {

http://git-wip-us.apache.org/repos/asf/aurora/blob/6fd765bc/src/test/java/org/apache/aurora/scheduler/reconciliation/TaskReconcilerTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/reconciliation/TaskReconcilerTest.java b/src/test/java/org/apache/aurora/scheduler/reconciliation/TaskReconcilerTest.java
index fb489ad..29c21a8 100644
--- a/src/test/java/org/apache/aurora/scheduler/reconciliation/TaskReconcilerTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/reconciliation/TaskReconcilerTest.java
@@ -14,10 +14,10 @@
 package org.apache.aurora.scheduler.reconciliation;
 
 import java.util.List;
+import java.util.Optional;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.atomic.AtomicLong;
 
-import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
@@ -145,7 +145,7 @@ public class TaskReconcilerTest extends EasyMockTest {
     reconciler.triggerImplicitReconciliation();
     assertEquals(3L, implicitRuns.get());
 
-    reconciler.triggerExplicitReconciliation(Optional.absent());
+    reconciler.triggerExplicitReconciliation(Optional.empty());
     assertEquals(7L, explicitRuns.get());
     assertEquals(3L, implicitRuns.get());
   }

http://git-wip-us.apache.org/repos/asf/aurora/blob/6fd765bc/src/test/java/org/apache/aurora/scheduler/reconciliation/TaskTimeoutTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/reconciliation/TaskTimeoutTest.java b/src/test/java/org/apache/aurora/scheduler/reconciliation/TaskTimeoutTest.java
index 71125bc..8e0e793 100644
--- a/src/test/java/org/apache/aurora/scheduler/reconciliation/TaskTimeoutTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/reconciliation/TaskTimeoutTest.java
@@ -13,11 +13,11 @@
  */
 package org.apache.aurora.scheduler.reconciliation;
 
+import java.util.Optional;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
 
-import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableList;
 
 import org.apache.aurora.common.quantity.Amount;

http://git-wip-us.apache.org/repos/asf/aurora/blob/6fd765bc/src/test/java/org/apache/aurora/scheduler/resources/AcceptedOfferTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/resources/AcceptedOfferTest.java b/src/test/java/org/apache/aurora/scheduler/resources/AcceptedOfferTest.java
index 468dcac..f4a19fe 100644
--- a/src/test/java/org/apache/aurora/scheduler/resources/AcceptedOfferTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/resources/AcceptedOfferTest.java
@@ -14,9 +14,9 @@
 package org.apache.aurora.scheduler.resources;
 
 import java.util.Collections;
+import java.util.Optional;
 import java.util.Set;
 
-import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableSet;
 
 import org.apache.aurora.gen.AssignedTask;
@@ -45,7 +45,7 @@ import static org.junit.Assert.assertTrue;
 
 public class AcceptedOfferTest {
   private static final Optional<String> TEST_ROLE = Optional.of("test-role");
-  private static final Optional<String> ABSENT_ROLE = Optional.absent();
+  private static final Optional<String> ABSENT_ROLE = Optional.empty();
   private static final IAssignedTask TASK = makeTask("id", JOB).getAssignedTask();
   private static final ResourceBag EXECUTOR_BAG = bag(0.25, 25, 75);
   private static final ResourceBag TOTAL_BAG =

http://git-wip-us.apache.org/repos/asf/aurora/blob/6fd765bc/src/test/java/org/apache/aurora/scheduler/resources/MesosResourceConverterTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/resources/MesosResourceConverterTest.java b/src/test/java/org/apache/aurora/scheduler/resources/MesosResourceConverterTest.java
index e13fe71..c29720d 100644
--- a/src/test/java/org/apache/aurora/scheduler/resources/MesosResourceConverterTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/resources/MesosResourceConverterTest.java
@@ -14,8 +14,8 @@
 package org.apache.aurora.scheduler.resources;
 
 import java.util.List;
+import java.util.Optional;
 
-import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 
@@ -55,15 +55,15 @@ public class MesosResourceConverterTest {
   @Test
   public void testAllocateRange() {
     List<Resource> expected = ImmutableList.<Resource>builder()
-        .add(mesosRange(PORTS, Optional.absent(), 80))
-        .add(mesosRange(PORTS, Optional.absent(), 90, 100))
+        .add(mesosRange(PORTS, Optional.empty(), 80))
+        .add(mesosRange(PORTS, Optional.empty(), 90, 100))
         .build();
 
     Iterable<Resource> actual = RANGES.toMesosResource(
         ImmutableSet.of(
-            mesosRange(PORTS, Optional.absent(), 79).toBuilder(),
-            mesosRange(PORTS, Optional.absent(), 80).toBuilder(),
-            mesosRange(PORTS, Optional.absent(), 80, 90, 91, 92, 100).toBuilder()),
+            mesosRange(PORTS, Optional.empty(), 79).toBuilder(),
+            mesosRange(PORTS, Optional.empty(), 80).toBuilder(),
+            mesosRange(PORTS, Optional.empty(), 80, 90, 91, 92, 100).toBuilder()),
         () -> ImmutableSet.of(80, 90, 100),
         false);
     assertEquals(expected, actual);
@@ -71,7 +71,7 @@ public class MesosResourceConverterTest {
 
   @Test
   public void testAllocateRangeRevocable() {
-    Resource.Builder builder = mesosRange(PORTS, Optional.absent(), 80).toBuilder()
+    Resource.Builder builder = mesosRange(PORTS, Optional.empty(), 80).toBuilder()
         .setRevocable(Resource.RevocableInfo.newBuilder());
 
     List<Resource> expected = ImmutableList.<Resource>builder().add(builder.build()).build();
@@ -86,7 +86,7 @@ public class MesosResourceConverterTest {
   @Test(expected = ResourceManager.InsufficientResourcesException.class)
   public void testAllocateRangeInsufficent() {
     RANGES.toMesosResource(
-        ImmutableSet.of(mesosRange(PORTS, Optional.absent(), 80, 81, 90, 91, 92).toBuilder()),
+        ImmutableSet.of(mesosRange(PORTS, Optional.empty(), 80, 81, 90, 91, 92).toBuilder()),
         () -> ImmutableSet.of(80, 90, 100),
         false);
   }

http://git-wip-us.apache.org/repos/asf/aurora/blob/6fd765bc/src/test/java/org/apache/aurora/scheduler/resources/ResourceTestUtil.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/resources/ResourceTestUtil.java b/src/test/java/org/apache/aurora/scheduler/resources/ResourceTestUtil.java
index 9739e91..567586f 100644
--- a/src/test/java/org/apache/aurora/scheduler/resources/ResourceTestUtil.java
+++ b/src/test/java/org/apache/aurora/scheduler/resources/ResourceTestUtil.java
@@ -14,10 +14,10 @@
 package org.apache.aurora.scheduler.resources;
 
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
 
@@ -79,11 +79,11 @@ public final class ResourceTestUtil {
   }
 
   public static Protos.Resource mesosScalar(ResourceType type, double value) {
-    return mesosScalar(type, Optional.absent(), false, value);
+    return mesosScalar(type, Optional.empty(), false, value);
   }
 
   public static Protos.Resource mesosScalar(ResourceType type, double value, boolean revocable) {
-    return mesosScalar(type, Optional.absent(), revocable, value);
+    return mesosScalar(type, Optional.empty(), revocable, value);
   }
 
   public static Protos.Resource mesosScalar(
@@ -98,7 +98,7 @@ public final class ResourceTestUtil {
   }
 
   public static Protos.Resource mesosRange(ResourceType type, Integer... values) {
-    return mesosRange(type, Optional.absent(), values);
+    return mesosRange(type, Optional.empty(), values);
   }
 
   public static Protos.Resource mesosRange(

http://git-wip-us.apache.org/repos/asf/aurora/blob/6fd765bc/src/test/java/org/apache/aurora/scheduler/scheduling/TaskAssignerImplTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/scheduling/TaskAssignerImplTest.java b/src/test/java/org/apache/aurora/scheduler/scheduling/TaskAssignerImplTest.java
index a0e8634..78e1269 100644
--- a/src/test/java/org/apache/aurora/scheduler/scheduling/TaskAssignerImplTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/scheduling/TaskAssignerImplTest.java
@@ -14,9 +14,9 @@
 package org.apache.aurora.scheduler.scheduling;
 
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 
-import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 
@@ -288,7 +288,7 @@ public class TaskAssignerImplTest extends EasyMockTest {
     expect(updateAgentReserver.hasReservations(GROUP_KEY)).andReturn(true);
     expect(updateAgentReserver.getAgent(INSTANCE_KEY)).andReturn(Optional.of(SLAVE_ID));
     expect(offerManager.getMatching(MESOS_OFFER.getAgentId(), resourceRequest, false))
-        .andReturn(Optional.absent());
+        .andReturn(Optional.empty());
     expect(tierManager.getTier(TASK.getAssignedTask().getTask())).andReturn(DEV_TIER);
     expectLastCall();
 
@@ -326,7 +326,7 @@ public class TaskAssignerImplTest extends EasyMockTest {
         .setTaskId(TaskID.newBuilder().setValue(Tasks.id(secondTask)))
         .setAgentId(MESOS_OFFER.getAgentId())
         .build();
-    expect(updateAgentReserver.getAgent(InstanceKeys.from(JOB, 9999))).andReturn(Optional.absent());
+    expect(updateAgentReserver.getAgent(InstanceKeys.from(JOB, 9999))).andReturn(Optional.empty());
     ImmutableSet<HostOffer> matchingOffers = ImmutableSet.of(OFFER);
     expect(offerManager.getAllMatching(GROUP_KEY, resourceRequest, false))
         .andReturn(matchingOffers);

http://git-wip-us.apache.org/repos/asf/aurora/blob/6fd765bc/src/test/java/org/apache/aurora/scheduler/scheduling/TaskSchedulerImplTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/scheduling/TaskSchedulerImplTest.java b/src/test/java/org/apache/aurora/scheduler/scheduling/TaskSchedulerImplTest.java
index 260ff9d..ecf2987 100644
--- a/src/test/java/org/apache/aurora/scheduler/scheduling/TaskSchedulerImplTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/scheduling/TaskSchedulerImplTest.java
@@ -14,11 +14,11 @@
 package org.apache.aurora.scheduler.scheduling;
 
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.Executor;
 
 import com.google.common.base.Function;
-import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.util.concurrent.MoreExecutors;
@@ -223,7 +223,7 @@ public class TaskSchedulerImplTest extends EasyMockTest {
     expectAssigned(TASK_A, NO_RESERVATION).andReturn(NOT_SCHEDULED_RESULT);
     expectAsMap(NO_RESERVATION);
     expectNoReservation(TASK_A);
-    expectPreemptorCall(TASK_A, Optional.absent());
+    expectPreemptorCall(TASK_A, Optional.empty());
 
     // Slave is reserved.
     expectTaskStillPendingQuery(TASK_A);

http://git-wip-us.apache.org/repos/asf/aurora/blob/6fd765bc/src/test/java/org/apache/aurora/scheduler/scheduling/TaskThrottlerTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/scheduling/TaskThrottlerTest.java b/src/test/java/org/apache/aurora/scheduler/scheduling/TaskThrottlerTest.java
index 2501618..2b4e057 100644
--- a/src/test/java/org/apache/aurora/scheduler/scheduling/TaskThrottlerTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/scheduling/TaskThrottlerTest.java
@@ -13,10 +13,10 @@
  */
 package org.apache.aurora.scheduler.scheduling;
 
+import java.util.Optional;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
-import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableList;
 
 import org.apache.aurora.common.quantity.Amount;
@@ -135,7 +135,7 @@ public class TaskThrottlerTest extends EasyMockTest {
         Tasks.id(task),
         Optional.of(THROTTLED),
         PENDING,
-        Optional.absent()))
+        Optional.empty()))
         .andReturn(StateChangeResult.SUCCESS);
   }
 

http://git-wip-us.apache.org/repos/asf/aurora/blob/6fd765bc/src/test/java/org/apache/aurora/scheduler/sla/MetricCalculatorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/sla/MetricCalculatorTest.java b/src/test/java/org/apache/aurora/scheduler/sla/MetricCalculatorTest.java
index 953b65f..e3f7fad 100644
--- a/src/test/java/org/apache/aurora/scheduler/sla/MetricCalculatorTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/sla/MetricCalculatorTest.java
@@ -107,11 +107,11 @@ public class MetricCalculatorTest extends EasyMockTest {
 
   private Set<String> generateMetricNames(
       Set<IScheduledTask> tasks,
-      Set<Multimap<AlgorithmType, SlaGroup.GroupType>> definitions) {
+      Set<Multimap<AlgorithmType, GroupType>> definitions) {
 
     ImmutableSet.Builder<String> names = ImmutableSet.builder();
-    for (Multimap<AlgorithmType, SlaGroup.GroupType> definition : definitions) {
-      for (Map.Entry<AlgorithmType, SlaGroup.GroupType> entry : definition.entries()) {
+    for (Multimap<AlgorithmType, GroupType> definition : definitions) {
+      for (Map.Entry<AlgorithmType, GroupType> entry : definition.entries()) {
         for (String metric : entry.getValue().getSlaGroup().createNamedGroups(tasks).keys()) {
           names.add(metric + entry.getKey().getAlgorithmName() + NAME_QUALIFIER_PROD);
           names.add(metric + entry.getKey().getAlgorithmName() + NAME_QUALIFIER_NON_PROD);

http://git-wip-us.apache.org/repos/asf/aurora/blob/6fd765bc/src/test/java/org/apache/aurora/scheduler/state/MaintenanceControllerImplTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/state/MaintenanceControllerImplTest.java b/src/test/java/org/apache/aurora/scheduler/state/MaintenanceControllerImplTest.java
index 0f1d4d4..770846e 100644
--- a/src/test/java/org/apache/aurora/scheduler/state/MaintenanceControllerImplTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/state/MaintenanceControllerImplTest.java
@@ -13,10 +13,10 @@
  */
 package org.apache.aurora.scheduler.state;
 
+import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.Executor;
 
-import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.util.concurrent.MoreExecutors;
 import com.google.inject.AbstractModule;
@@ -173,7 +173,7 @@ public class MaintenanceControllerImplTest extends EasyMockTest {
   @Test
   public void testUnknownHost() {
     expect(storageUtil.attributeStore.getHostAttributes("b"))
-        .andReturn(Optional.absent());
+        .andReturn(Optional.empty());
 
     control.replay();
 
@@ -217,7 +217,7 @@ public class MaintenanceControllerImplTest extends EasyMockTest {
   public void testGetMode() {
     expect(storageUtil.attributeStore.getHostAttributes(HOST_A)).andReturn(Optional.of(
         IHostAttributes.build(new HostAttributes().setHost(HOST_A).setMode(DRAINING))));
-    expect(storageUtil.attributeStore.getHostAttributes("unknown")).andReturn(Optional.absent());
+    expect(storageUtil.attributeStore.getHostAttributes("unknown")).andReturn(Optional.empty());
 
     control.replay();
 
@@ -239,7 +239,7 @@ public class MaintenanceControllerImplTest extends EasyMockTest {
     expect(stateManager.changeState(
         storageUtil.mutableStoreProvider,
         Tasks.id(task),
-        Optional.absent(),
+        Optional.empty(),
         ScheduleStatus.DRAINING,
         MaintenanceControllerImpl.DRAINING_MESSAGE))
         .andReturn(StateChangeResult.SUCCESS);

http://git-wip-us.apache.org/repos/asf/aurora/blob/6fd765bc/src/test/java/org/apache/aurora/scheduler/state/PartitionManagerTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/state/PartitionManagerTest.java b/src/test/java/org/apache/aurora/scheduler/state/PartitionManagerTest.java
index 8f654db..3d46413 100644
--- a/src/test/java/org/apache/aurora/scheduler/state/PartitionManagerTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/state/PartitionManagerTest.java
@@ -13,13 +13,12 @@
  */
 package org.apache.aurora.scheduler.state;
 
+import java.util.Optional;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 
-import com.google.common.base.Optional;
-
 import org.apache.aurora.common.testing.easymock.EasyMockTest;
 import org.apache.aurora.common.util.testing.FakeClock;
 import org.apache.aurora.gen.PartitionPolicy;
@@ -77,7 +76,7 @@ public class PartitionManagerTest extends EasyMockTest {
   }
 
   private static TaskStateChange makeStateChange(IScheduledTask task, ScheduleStatus newState) {
-    return makeStateChange(task, Optional.absent(), newState);
+    return makeStateChange(task, Optional.empty(), newState);
   }
 
   private static IScheduledTask taskWithoutPartitionPolicy() {

http://git-wip-us.apache.org/repos/asf/aurora/blob/6fd765bc/src/test/java/org/apache/aurora/scheduler/state/StateManagerImplTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/state/StateManagerImplTest.java b/src/test/java/org/apache/aurora/scheduler/state/StateManagerImplTest.java
index 4cff10b..4065056 100644
--- a/src/test/java/org/apache/aurora/scheduler/state/StateManagerImplTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/state/StateManagerImplTest.java
@@ -16,11 +16,11 @@ package org.apache.aurora.scheduler.state;
 import java.util.List;
 import java.util.Map;
 import java.util.NoSuchElementException;
+import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
 
-import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
@@ -210,8 +210,8 @@ public class StateManagerImplTest extends EasyMockTest {
             .setTaskId(taskId)
             .setTask(NON_SERVICE_CONFIG.newBuilder()));
     assertEquals(
-        ImmutableSet.of(IScheduledTask.build(expected)),
-        Storage.Util.fetchTask(storage, taskId).asSet());
+        Optional.of(IScheduledTask.build(expected)),
+        Storage.Util.fetchTask(storage, taskId));
   }
 
   @Test
@@ -454,12 +454,12 @@ public class StateManagerImplTest extends EasyMockTest {
         taskId,
         Optional.of(PENDING),
         RUNNING,
-        Optional.absent()));
+        Optional.empty()));
     assertEquals(SUCCESS, changeState(
         taskId,
         Optional.of(ASSIGNED),
         FAILED,
-        Optional.absent()));
+        Optional.empty()));
   }
 
   @Test
@@ -470,7 +470,7 @@ public class StateManagerImplTest extends EasyMockTest {
         "a",
         Optional.of(PENDING),
         ASSIGNED,
-        Optional.absent()));
+        Optional.empty()));
   }
 
   @Test
@@ -631,9 +631,9 @@ public class StateManagerImplTest extends EasyMockTest {
   private StateChangeResult changeState(String taskId, ScheduleStatus status) {
     return changeState(
         taskId,
-        Optional.absent(),
+        Optional.empty(),
         status,
-        Optional.absent());
+        Optional.empty());
   }
 
   private void assignTask(String taskId, IHostAttributes host) {

http://git-wip-us.apache.org/repos/asf/aurora/blob/6fd765bc/src/test/java/org/apache/aurora/scheduler/state/TaskStateMachineTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/state/TaskStateMachineTest.java b/src/test/java/org/apache/aurora/scheduler/state/TaskStateMachineTest.java
index bb4e752..3d98fe6 100644
--- a/src/test/java/org/apache/aurora/scheduler/state/TaskStateMachineTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/state/TaskStateMachineTest.java
@@ -14,12 +14,13 @@
 package org.apache.aurora.scheduler.state;
 
 import java.util.Map;
+import java.util.NoSuchElementException;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.Set;
 
 import com.google.common.base.Function;
 import com.google.common.base.MoreObjects;
-import com.google.common.base.Optional;
 import com.google.common.collect.FluentIterable;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
@@ -278,7 +279,7 @@ public class TaskStateMachineTest {
   }
 
   private static final Function<Action, SideEffect> TO_SIDE_EFFECT =
-      action -> new SideEffect(action, Optional.absent());
+      action -> new SideEffect(action, Optional.empty());
 
   private void legalTransition(TaskState state, SideEffect.Action... expectedActions) {
     legalTransition(state, ImmutableSet.copyOf(expectedActions));
@@ -325,38 +326,38 @@ public class TaskStateMachineTest {
 
   private static final TransitionResult SAVE = new TransitionResult(
       SUCCESS,
-      ImmutableSet.of(new SideEffect(Action.SAVE_STATE, Optional.absent())));
+      ImmutableSet.of(new SideEffect(Action.SAVE_STATE, Optional.empty())));
   private static final TransitionResult SAVE_AND_KILL = new TransitionResult(
       SUCCESS,
       ImmutableSet.of(
-          new SideEffect(Action.SAVE_STATE, Optional.absent()),
-          new SideEffect(Action.KILL, Optional.absent())));
+          new SideEffect(Action.SAVE_STATE, Optional.empty()),
+          new SideEffect(Action.KILL, Optional.empty())));
   private static final TransitionResult SAVE_AND_RESCHEDULE = new TransitionResult(
       SUCCESS,
       ImmutableSet.of(
-          new SideEffect(Action.SAVE_STATE, Optional.absent()),
-          new SideEffect(Action.RESCHEDULE, Optional.absent())));
+          new SideEffect(Action.SAVE_STATE, Optional.empty()),
+          new SideEffect(Action.RESCHEDULE, Optional.empty())));
   private static final TransitionResult SAVE_KILL_AND_RESCHEDULE = new TransitionResult(
       SUCCESS,
       ImmutableSet.of(
-          new SideEffect(Action.SAVE_STATE, Optional.absent()),
-          new SideEffect(Action.KILL, Optional.absent()),
-          new SideEffect(Action.RESCHEDULE, Optional.absent())));
+          new SideEffect(Action.SAVE_STATE, Optional.empty()),
+          new SideEffect(Action.KILL, Optional.empty()),
+          new SideEffect(Action.RESCHEDULE, Optional.empty())));
   private static final TransitionResult ILLEGAL_KILL = new TransitionResult(
       ILLEGAL_WITH_SIDE_EFFECTS,
-      ImmutableSet.of(new SideEffect(Action.KILL, Optional.absent())));
+      ImmutableSet.of(new SideEffect(Action.KILL, Optional.empty())));
   private static final TransitionResult TRANSITION_TO_LOST = new TransitionResult(
       SUCCESS,
-      ImmutableSet.of(new SideEffect(Action.TRANSITION_TO_LOST, Optional.absent()),
-          new SideEffect(Action.SAVE_STATE, Optional.absent())));
+      ImmutableSet.of(new SideEffect(Action.TRANSITION_TO_LOST, Optional.empty()),
+          new SideEffect(Action.SAVE_STATE, Optional.empty())));
   private static final TransitionResult RECORD_FAILURE = new TransitionResult(
       SUCCESS,
       ImmutableSet.of(
-          new SideEffect(Action.SAVE_STATE, Optional.absent()),
-          new SideEffect(Action.INCREMENT_FAILURES, Optional.absent())));
+          new SideEffect(Action.SAVE_STATE, Optional.empty()),
+          new SideEffect(Action.INCREMENT_FAILURES, Optional.empty())));
   private static final TransitionResult DELETE_TASK = new TransitionResult(
       SUCCESS,
-      ImmutableSet.of(new SideEffect(Action.DELETE, Optional.absent())));
+      ImmutableSet.of(new SideEffect(Action.DELETE, Optional.empty())));
 
   private static final class TestCase {
     private final boolean taskPresent;
@@ -592,7 +593,7 @@ public class TaskStateMachineTest {
               if (expectException) {
                 fail();
               }
-            } catch (IllegalStateException e) {
+            } catch (NoSuchElementException e) {
               if (expectException) {
                 continue;
               } else {

http://git-wip-us.apache.org/repos/asf/aurora/blob/6fd765bc/src/test/java/org/apache/aurora/scheduler/stats/ResourceCounterTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/stats/ResourceCounterTest.java b/src/test/java/org/apache/aurora/scheduler/stats/ResourceCounterTest.java
index 04350fa..a30d74e 100644
--- a/src/test/java/org/apache/aurora/scheduler/stats/ResourceCounterTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/stats/ResourceCounterTest.java
@@ -14,9 +14,9 @@
 package org.apache.aurora.scheduler.stats;
 
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 
-import com.google.common.base.Optional;
 import com.google.common.base.Predicates;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
@@ -64,7 +64,7 @@ public class ResourceCounterTest {
 
   private static final Metric ZERO = new Metric(TOTAL_CONSUMED, ResourceBag.EMPTY);
   private static final long GB = 1024;
-  private static final Optional<String> NOT_DEDICATED = Optional.absent();
+  private static final Optional<String> NOT_DEDICATED = Optional.empty();
 
   private static final boolean PRODUCTION = true;
   private static final boolean NONPRODUCTION = false;

http://git-wip-us.apache.org/repos/asf/aurora/blob/6fd765bc/src/test/java/org/apache/aurora/scheduler/storage/AbstractAttributeStoreTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/storage/AbstractAttributeStoreTest.java b/src/test/java/org/apache/aurora/scheduler/storage/AbstractAttributeStoreTest.java
index 1ad4680..687fd96 100644
--- a/src/test/java/org/apache/aurora/scheduler/storage/AbstractAttributeStoreTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/storage/AbstractAttributeStoreTest.java
@@ -14,9 +14,9 @@
 package org.apache.aurora.scheduler.storage;
 
 import java.io.IOException;
+import java.util.Optional;
 import java.util.Set;
 
-import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableSet;
 
 import org.apache.aurora.gen.Attribute;
@@ -67,7 +67,7 @@ public abstract class AbstractAttributeStoreTest {
 
   @Test
   public void testSaveAttributes() {
-    assertEquals(Optional.absent(), read(HOST_A));
+    assertEquals(Optional.empty(), read(HOST_A));
 
     // Initial save returns true since it changes previous attributes
     assertTrue(insert(HOST_A_ATTRS));
@@ -79,7 +79,7 @@ public abstract class AbstractAttributeStoreTest {
 
   @Test
   public void testCrud() {
-    assertEquals(Optional.absent(), read(HOST_A));
+    assertEquals(Optional.empty(), read(HOST_A));
     assertEquals(ImmutableSet.of(), readAll());
 
     assertTrue(insert(HOST_A_ATTRS));
@@ -103,7 +103,7 @@ public abstract class AbstractAttributeStoreTest {
     assertEquals(ImmutableSet.of(updatedMode, HOST_B_ATTRS), readAll());
 
     truncate();
-    assertEquals(Optional.absent(), read(HOST_A));
+    assertEquals(Optional.empty(), read(HOST_A));
     assertEquals(ImmutableSet.of(), readAll());
   }
 


Mime
View raw message