aurora-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wfar...@apache.org
Subject [3/3] aurora git commit: Remove unnecessary uses of type witness.
Date Wed, 01 Jul 2015 19:29:53 GMT
Remove unnecessary uses of type witness.

Reviewed at https://reviews.apache.org/r/35932/


Project: http://git-wip-us.apache.org/repos/asf/aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/aurora/commit/013ba6ff
Tree: http://git-wip-us.apache.org/repos/asf/aurora/tree/013ba6ff
Diff: http://git-wip-us.apache.org/repos/asf/aurora/diff/013ba6ff

Branch: refs/heads/master
Commit: 013ba6ffa0aa80badd73956e3b68986e890d7e9e
Parents: 97520ba
Author: Bill Farner <wfarner@apache.org>
Authored: Wed Jul 1 12:29:27 2015 -0700
Committer: Bill Farner <wfarner@apache.org>
Committed: Wed Jul 1 12:29:27 2015 -0700

----------------------------------------------------------------------
 .../aurora/benchmark/StatusUpdateBenchmark.java |  3 +-
 .../java/org/apache/aurora/benchmark/Tasks.java |  2 +-
 .../benchmark/fakes/FakeStatsProvider.java      |  1 -
 src/main/java/org/apache/aurora/GuiceUtils.java |  2 +-
 .../aurora/auth/UnsecureSessionContext.java     |  1 -
 .../aurora/scheduler/SchedulerModule.java       |  1 -
 .../aurora/scheduler/TaskStatusHandlerImpl.java |  3 +-
 .../aurora/scheduler/app/SchedulerMain.java     |  7 +-
 .../aurora/scheduler/async/TaskThrottler.java   |  2 +-
 .../scheduler/async/preemptor/BiCache.java      |  1 -
 .../async/preemptor/ClusterStateImpl.java       |  2 +-
 .../async/preemptor/PendingTaskProcessor.java   |  1 -
 .../scheduler/async/preemptor/Preemptor.java    |  3 +-
 .../aurora/scheduler/base/CommandUtil.java      |  2 +-
 .../configuration/ConfigurationManager.java     | 15 ++---
 .../scheduler/configuration/Resources.java      |  2 +-
 .../scheduler/cron/quartz/AuroraCronJob.java    |  3 +-
 .../cron/quartz/CronJobManagerImpl.java         |  2 +-
 .../aurora/scheduler/events/PubsubEvent.java    |  2 +-
 .../scheduler/filter/AttributeAggregate.java    |  3 +-
 .../scheduler/filter/ConstraintMatcher.java     |  6 +-
 .../org/apache/aurora/scheduler/http/Cron.java  |  2 +-
 .../aurora/scheduler/http/LeaderRedirect.java   |  2 +-
 .../org/apache/aurora/scheduler/http/Mname.java | 10 +--
 .../http/api/security/HttpSecurityModule.java   |  2 +-
 .../http/api/security/Kerberos5Realm.java       |  2 +-
 .../ShiroAuthorizingParamInterceptor.java       |  4 +-
 .../scheduler/mesos/MesosTaskFactory.java       |  2 +-
 .../scheduler/quota/QuotaCheckResult.java       |  2 +-
 .../aurora/scheduler/quota/QuotaManager.java    |  6 +-
 .../scheduler/state/MaintenanceController.java  |  2 +-
 .../scheduler/state/StateManagerImpl.java       | 10 +--
 .../scheduler/state/TaskStateMachine.java       |  6 +-
 .../aurora/scheduler/stats/ResourceCounter.java |  2 +-
 .../scheduler/storage/AttributeStore.java       |  2 +-
 .../scheduler/storage/mem/MemTaskStore.java     |  2 +-
 .../scheduler/thrift/ReadOnlySchedulerImpl.java |  4 +-
 .../aurora/scheduler/thrift/Responses.java      |  2 +-
 .../thrift/SchedulerThriftInterface.java        |  8 +--
 .../aurora/scheduler/thrift/aop/AopModule.java  |  4 +-
 .../thrift/aop/LoggingInterceptor.java          |  2 +-
 .../scheduler/thrift/auth/ThriftAuthModule.java |  4 +-
 .../scheduler/updater/InstanceAction.java       |  8 +--
 .../updater/InstanceActionHandler.java          |  2 +-
 .../aurora/scheduler/updater/JobDiff.java       |  2 +-
 .../updater/JobUpdateControllerImpl.java        |  6 +-
 .../scheduler/updater/StateEvaluator.java       |  4 +-
 .../aurora/scheduler/updater/UpdateFactory.java |  8 +--
 .../updater/strategy/BatchStrategy.java         |  2 +-
 .../aurora/tools/java/thrift_wrapper_codegen.py |  2 +-
 .../scheduler/SchedulerLifecycleTest.java       | 17 +++--
 .../scheduler/TaskStatusHandlerImplTest.java    | 10 ++-
 .../apache/aurora/scheduler/TaskVarsTest.java   |  2 +-
 .../aurora/scheduler/app/SchedulerIT.java       |  7 +-
 .../aurora/scheduler/app/local/FakeMaster.java  |  9 +--
 .../scheduler/app/local/LocalSchedulerMain.java |  2 +-
 .../async/JobUpdateHistoryPrunerTest.java       |  3 +-
 .../scheduler/async/TaskSchedulerImplTest.java  | 10 +--
 .../scheduler/async/TaskSchedulerTest.java      | 22 +++----
 .../scheduler/async/TaskThrottlerTest.java      |  2 +-
 .../scheduler/async/preemptor/BiCacheTest.java  |  1 -
 .../preemptor/PendingTaskProcessorTest.java     |  6 +-
 .../preemptor/PreemptionVictimFilterTest.java   | 10 ++-
 .../async/preemptor/PreemptorImplTest.java      |  6 +-
 .../async/preemptor/PreemptorModuleTest.java    |  2 +-
 .../apache/aurora/scheduler/base/TasksTest.java |  4 +-
 .../configuration/ConfigurationManagerTest.java |  4 +-
 .../scheduler/configuration/ResourcesTest.java  |  6 +-
 .../cron/quartz/AuroraCronJobTest.java          | 19 +++---
 .../cron/quartz/CronJobManagerImplTest.java     | 18 +++--
 .../scheduler/events/PubsubEventModuleTest.java |  1 -
 .../filter/AttributeAggregateTest.java          |  8 +--
 .../filter/SchedulingFilterImplTest.java        | 10 +--
 .../scheduler/http/LeaderRedirectTest.java      |  8 +--
 .../apache/aurora/scheduler/http/LocksTest.java |  2 +-
 .../apache/aurora/scheduler/http/MnameTest.java |  6 +-
 .../http/api/security/HttpSecurityIT.java       |  4 +-
 .../security/Kerberos5ShiroRealmModuleTest.java |  3 +-
 .../scheduler/log/mesos/MesosLogTest.java       |  6 +-
 .../scheduler/mesos/MesosSchedulerImplTest.java | 11 ++--
 .../mesos/MesosTaskFactoryImplTest.java         |  4 +-
 .../mesos/SchedulerDriverServiceTest.java       |  2 +-
 .../scheduler/mesos/TaskStatusStatsTest.java    | 14 ++--
 .../scheduler/metadata/NearestFitTest.java      |  5 +-
 .../scheduler/quota/QuotaManagerImplTest.java   | 10 +--
 .../scheduler/sla/MetricCalculatorTest.java     |  6 +-
 .../aurora/scheduler/sla/SlaModuleTest.java     |  5 +-
 .../scheduler/state/LockManagerImplTest.java    | 12 ++--
 .../state/MaintenanceControllerImplTest.java    | 13 ++--
 .../scheduler/state/StateManagerImplTest.java   | 26 ++++----
 .../scheduler/state/TaskAssignerImplTest.java   |  2 +-
 .../scheduler/state/TaskStateMachineTest.java   | 30 ++++-----
 .../scheduler/stats/ResourceCounterTest.java    |  8 +--
 .../storage/AbstractCronJobStoreTest.java       |  4 +-
 .../storage/AbstractTaskStoreTest.java          |  8 +--
 .../scheduler/storage/backup/RecoveryTest.java  | 17 ++---
 .../storage/db/DbAttributeStoreTest.java        | 16 ++---
 .../storage/db/DbJobUpdateStoreTest.java        | 66 +++++++++----------
 .../scheduler/storage/db/DbLockStoreTest.java   |  8 +--
 .../scheduler/storage/db/DbQuotaStoreTest.java  | 20 +++---
 .../storage/db/DbSchedulerStoreTest.java        |  2 +-
 .../scheduler/storage/db/DbStorageTest.java     |  8 +--
 .../storage/db/RowGarbageCollectorTest.java     | 15 ++---
 .../scheduler/storage/log/LogManagerTest.java   |  3 +-
 .../scheduler/storage/log/LogStorageTest.java   | 12 ++--
 .../storage/log/SnapshotStoreImplTest.java      |  4 +-
 .../storage/log/WriteAheadStorageTest.java      |  2 +-
 .../storage/mem/StorageTransactionTest.java     |  2 +-
 .../testing/FakeScheduledExecutor.java          |  8 +--
 .../aurora/scheduler/thrift/Fixtures.java       |  4 +-
 .../thrift/ReadOnlySchedulerImplTest.java       | 12 ++--
 .../thrift/SchedulerThriftInterfaceTest.java    | 69 ++++++++++----------
 .../scheduler/thrift/aop/AopModuleTest.java     |  4 +-
 .../aop/FeatureToggleInterceptorTest.java       |  4 +-
 .../thrift/aop/ServerInfoInterceptorTest.java   |  4 +-
 .../aop/ThriftStatsExporterInterceptorTest.java |  3 +-
 .../scheduler/updater/InstanceUpdaterTest.java  |  2 +-
 .../aurora/scheduler/updater/JobDiffTest.java   |  6 +-
 .../aurora/scheduler/updater/JobUpdaterIT.java  | 12 ++--
 .../scheduler/updater/OneWayJobUpdaterTest.java | 15 ++---
 .../updater/UpdateFactoryImplTest.java          |  2 +-
 121 files changed, 405 insertions(+), 461 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/src/jmh/java/org/apache/aurora/benchmark/StatusUpdateBenchmark.java
----------------------------------------------------------------------
diff --git a/src/jmh/java/org/apache/aurora/benchmark/StatusUpdateBenchmark.java b/src/jmh/java/org/apache/aurora/benchmark/StatusUpdateBenchmark.java
index 308bbd9..e08d16e 100644
--- a/src/jmh/java/org/apache/aurora/benchmark/StatusUpdateBenchmark.java
+++ b/src/jmh/java/org/apache/aurora/benchmark/StatusUpdateBenchmark.java
@@ -32,7 +32,6 @@ import com.google.inject.AbstractModule;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 import com.google.inject.TypeLiteral;
-
 import com.twitter.common.application.ShutdownStage;
 import com.twitter.common.base.Command;
 import com.twitter.common.quantity.Amount;
@@ -221,7 +220,7 @@ public class StatusUpdateBenchmark {
             bind(DriverSettings.class).toInstance(
                 new DriverSettings(
                     "fakemaster",
-                    Optional.<Protos.Credential>absent(),
+                    Optional.absent(),
                     Protos.FrameworkInfo.newBuilder()
                         .setUser("framework user")
                         .setName("test framework")

http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/src/jmh/java/org/apache/aurora/benchmark/Tasks.java
----------------------------------------------------------------------
diff --git a/src/jmh/java/org/apache/aurora/benchmark/Tasks.java b/src/jmh/java/org/apache/aurora/benchmark/Tasks.java
index d3e1295..15db4b2 100644
--- a/src/jmh/java/org/apache/aurora/benchmark/Tasks.java
+++ b/src/jmh/java/org/apache/aurora/benchmark/Tasks.java
@@ -146,7 +146,7 @@ final class Tasks {
             .setRamMb(ram.as(Data.MB))
             .setDiskMb(disk.as(Data.MB))
             .setProduction(isProduction)
-            .setRequestedPorts(ImmutableSet.<String>of());
+            .setRequestedPorts(ImmutableSet.of());
         tasks.add(IScheduledTask.build(builder));
       }
 

http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/src/jmh/java/org/apache/aurora/benchmark/fakes/FakeStatsProvider.java
----------------------------------------------------------------------
diff --git a/src/jmh/java/org/apache/aurora/benchmark/fakes/FakeStatsProvider.java b/src/jmh/java/org/apache/aurora/benchmark/fakes/FakeStatsProvider.java
index 3413b0a..3d46a2c 100644
--- a/src/jmh/java/org/apache/aurora/benchmark/fakes/FakeStatsProvider.java
+++ b/src/jmh/java/org/apache/aurora/benchmark/fakes/FakeStatsProvider.java
@@ -16,7 +16,6 @@ package org.apache.aurora.benchmark.fakes;
 import java.util.concurrent.atomic.AtomicLong;
 
 import com.google.common.base.Supplier;
-
 import com.twitter.common.stats.Stat;
 import com.twitter.common.stats.StatsProvider;
 

http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/src/main/java/org/apache/aurora/GuiceUtils.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/GuiceUtils.java b/src/main/java/org/apache/aurora/GuiceUtils.java
index 5d0af1e..03f4075 100644
--- a/src/main/java/org/apache/aurora/GuiceUtils.java
+++ b/src/main/java/org/apache/aurora/GuiceUtils.java
@@ -165,7 +165,7 @@ public final class GuiceUtils {
         "Non-void methods must be explicitly whitelisted with @AllowUnchecked: " + disallowed);
 
     Matcher<Method> matcher =
-        Matchers.<Method>not(WHITELIST_MATCHER).and(interfaceMatcher(wrapInterface, false));
+        Matchers.not(WHITELIST_MATCHER).and(interfaceMatcher(wrapInterface, false));
     binder.bindInterceptor(Matchers.subclassesOf(wrapInterface), matcher,
         new MethodInterceptor() {
           @Override

http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/src/main/java/org/apache/aurora/auth/UnsecureSessionContext.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/auth/UnsecureSessionContext.java b/src/main/java/org/apache/aurora/auth/UnsecureSessionContext.java
index 9e1f35a..f547c44 100644
--- a/src/main/java/org/apache/aurora/auth/UnsecureSessionContext.java
+++ b/src/main/java/org/apache/aurora/auth/UnsecureSessionContext.java
@@ -20,7 +20,6 @@ import javax.inject.Provider;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.inject.Inject;
-
 import com.twitter.common.stats.StatsProvider;
 
 import org.apache.shiro.subject.Subject;

http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/src/main/java/org/apache/aurora/scheduler/SchedulerModule.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/SchedulerModule.java b/src/main/java/org/apache/aurora/scheduler/SchedulerModule.java
index 26093ef..45265ea 100644
--- a/src/main/java/org/apache/aurora/scheduler/SchedulerModule.java
+++ b/src/main/java/org/apache/aurora/scheduler/SchedulerModule.java
@@ -23,7 +23,6 @@ import javax.inject.Singleton;
 import com.google.inject.AbstractModule;
 import com.google.inject.PrivateModule;
 import com.google.inject.TypeLiteral;
-
 import com.twitter.common.args.Arg;
 import com.twitter.common.args.CmdLine;
 import com.twitter.common.args.constraints.Positive;

http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/src/main/java/org/apache/aurora/scheduler/TaskStatusHandlerImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/TaskStatusHandlerImpl.java b/src/main/java/org/apache/aurora/scheduler/TaskStatusHandlerImpl.java
index 538cb75..ede8517 100644
--- a/src/main/java/org/apache/aurora/scheduler/TaskStatusHandlerImpl.java
+++ b/src/main/java/org/apache/aurora/scheduler/TaskStatusHandlerImpl.java
@@ -29,7 +29,6 @@ import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Optional;
 import com.google.common.util.concurrent.AbstractExecutionThreadService;
 import com.google.common.util.concurrent.MoreExecutors;
-
 import com.twitter.common.stats.Stats;
 
 import org.apache.aurora.gen.ScheduleStatus;
@@ -167,7 +166,7 @@ public class TaskStatusHandlerImpl extends AbstractExecutionThreadService
               StateChangeResult result = stateManager.changeState(
                   storeProvider,
                   status.getTaskId().getValue(),
-                  Optional.<ScheduleStatus>absent(),
+                  Optional.absent(),
                   translatedState,
                   message);
 

http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/src/main/java/org/apache/aurora/scheduler/app/SchedulerMain.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/app/SchedulerMain.java b/src/main/java/org/apache/aurora/scheduler/app/SchedulerMain.java
index 968aca6..554a380 100644
--- a/src/main/java/org/apache/aurora/scheduler/app/SchedulerMain.java
+++ b/src/main/java/org/apache/aurora/scheduler/app/SchedulerMain.java
@@ -87,7 +87,7 @@ public class SchedulerMain extends AbstractApplication {
           + "Note: if thermos_executor_path is not the thermos_executor.pex file itself, "
           + "this must include it.")
   private static final Arg<List<String>> THERMOS_EXECUTOR_RESOURCES =
-      Arg.<List<String>>create(ImmutableList.<String>of());
+      Arg.create(ImmutableList.of());
 
   @CmdLine(name = "thermos_executor_flags",
       help = "Extra arguments to be passed to the thermos executor")
@@ -115,7 +115,7 @@ public class SchedulerMain extends AbstractApplication {
   @CmdLine(name = "extra_modules",
       help = "A list of modules that provide additional functionality.")
   private static final Arg<List<Class<? extends Module>>> EXTRA_MODULES =
-      Arg.create((List<Class<? extends Module>>) ImmutableList.<Class<? extends Module>>of());
+      Arg.create(ImmutableList.of());
 
   // TODO(Suman Karumuri): Rename viz_job_url_prefix to stats_job_url_prefix for consistency.
   @CmdLine(name = "viz_job_url_prefix", help = "URL prefix for job container stats.")
@@ -124,8 +124,7 @@ public class SchedulerMain extends AbstractApplication {
   @CmdLine(name = "global_container_mounts",
       help = "A comma seperated list of mount points (in host:container form) to mount "
           + "into all (non-mesos) containers.")
-  private static final Arg<List<Volume>> GLOBAL_CONTAINER_MOUNTS =
-      Arg.<List<Volume>>create(ImmutableList.<Volume>of());
+  private static final Arg<List<Volume>> GLOBAL_CONTAINER_MOUNTS = Arg.create(ImmutableList.of());
 
   @Inject private SingletonService schedulerService;
   @Inject private HttpService httpService;

http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/src/main/java/org/apache/aurora/scheduler/async/TaskThrottler.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/async/TaskThrottler.java b/src/main/java/org/apache/aurora/scheduler/async/TaskThrottler.java
index f0dea48..c8f2005 100644
--- a/src/main/java/org/apache/aurora/scheduler/async/TaskThrottler.java
+++ b/src/main/java/org/apache/aurora/scheduler/async/TaskThrottler.java
@@ -84,7 +84,7 @@ class TaskThrottler implements EventSubscriber {
                       stateChange.getTaskId(),
                       Optional.of(THROTTLED),
                       PENDING,
-                      Optional.<String>absent());
+                      Optional.absent());
                 }
               });
             }

http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/src/main/java/org/apache/aurora/scheduler/async/preemptor/BiCache.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/async/preemptor/BiCache.java b/src/main/java/org/apache/aurora/scheduler/async/preemptor/BiCache.java
index f5a1833..382099f 100644
--- a/src/main/java/org/apache/aurora/scheduler/async/preemptor/BiCache.java
+++ b/src/main/java/org/apache/aurora/scheduler/async/preemptor/BiCache.java
@@ -28,7 +28,6 @@ import com.google.common.cache.RemovalNotification;
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Multimap;
-
 import com.twitter.common.quantity.Amount;
 import com.twitter.common.quantity.Time;
 import com.twitter.common.stats.StatsProvider;

http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/src/main/java/org/apache/aurora/scheduler/async/preemptor/ClusterStateImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/async/preemptor/ClusterStateImpl.java b/src/main/java/org/apache/aurora/scheduler/async/preemptor/ClusterStateImpl.java
index cd016af..d7a0c54 100644
--- a/src/main/java/org/apache/aurora/scheduler/async/preemptor/ClusterStateImpl.java
+++ b/src/main/java/org/apache/aurora/scheduler/async/preemptor/ClusterStateImpl.java
@@ -28,7 +28,7 @@ import org.apache.aurora.scheduler.events.PubsubEvent.TaskStateChange;
 public class ClusterStateImpl implements ClusterState, PubsubEvent.EventSubscriber {
 
   private final Multimap<String, PreemptionVictim> victims =
-      Multimaps.synchronizedMultimap(HashMultimap.<String, PreemptionVictim>create());
+      Multimaps.synchronizedMultimap(HashMultimap.create());
 
   @Override
   public Multimap<String, PreemptionVictim> getSlavesToActiveTasks() {

http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/src/main/java/org/apache/aurora/scheduler/async/preemptor/PendingTaskProcessor.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/async/preemptor/PendingTaskProcessor.java b/src/main/java/org/apache/aurora/scheduler/async/preemptor/PendingTaskProcessor.java
index c1114a4..1f1eb4c 100644
--- a/src/main/java/org/apache/aurora/scheduler/async/preemptor/PendingTaskProcessor.java
+++ b/src/main/java/org/apache/aurora/scheduler/async/preemptor/PendingTaskProcessor.java
@@ -42,7 +42,6 @@ import com.google.common.collect.Maps;
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Multiset;
 import com.google.common.collect.Sets;
-
 import com.twitter.common.quantity.Amount;
 import com.twitter.common.quantity.Time;
 import com.twitter.common.util.Clock;

http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/src/main/java/org/apache/aurora/scheduler/async/preemptor/Preemptor.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/async/preemptor/Preemptor.java b/src/main/java/org/apache/aurora/scheduler/async/preemptor/Preemptor.java
index 41591b8..a2d5fcf 100644
--- a/src/main/java/org/apache/aurora/scheduler/async/preemptor/Preemptor.java
+++ b/src/main/java/org/apache/aurora/scheduler/async/preemptor/Preemptor.java
@@ -20,7 +20,6 @@ import javax.inject.Inject;
 import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableSet;
 
-import org.apache.aurora.gen.ScheduleStatus;
 import org.apache.aurora.scheduler.async.OfferManager;
 import org.apache.aurora.scheduler.base.TaskGroupKey;
 import org.apache.aurora.scheduler.filter.AttributeAggregate;
@@ -109,7 +108,7 @@ public interface Preemptor {
           stateManager.changeState(
               store,
               toPreempt.getTaskId(),
-              Optional.<ScheduleStatus>absent(),
+              Optional.absent(),
               PREEMPTING,
               Optional.of("Preempting in favor of " + pendingTask.getTaskId()));
         }

http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/src/main/java/org/apache/aurora/scheduler/base/CommandUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/base/CommandUtil.java b/src/main/java/org/apache/aurora/scheduler/base/CommandUtil.java
index 7f166e2..caafe2e 100644
--- a/src/main/java/org/apache/aurora/scheduler/base/CommandUtil.java
+++ b/src/main/java/org/apache/aurora/scheduler/base/CommandUtil.java
@@ -71,7 +71,7 @@ public final class CommandUtil {
         executorUri,
         executorResources,
         "./",
-        Optional.<String>absent()).build();
+        Optional.absent()).build();
   }
 
   /**

http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/src/main/java/org/apache/aurora/scheduler/configuration/ConfigurationManager.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/configuration/ConfigurationManager.java b/src/main/java/org/apache/aurora/scheduler/configuration/ConfigurationManager.java
index a1ca93e..be79e70 100644
--- a/src/main/java/org/apache/aurora/scheduler/configuration/ConfigurationManager.java
+++ b/src/main/java/org/apache/aurora/scheduler/configuration/ConfigurationManager.java
@@ -33,7 +33,6 @@ import com.twitter.common.args.Arg;
 import com.twitter.common.args.CmdLine;
 import com.twitter.common.base.Closure;
 
-import org.apache.aurora.gen.Constraint;
 import org.apache.aurora.gen.Container;
 import org.apache.aurora.gen.JobConfiguration;
 import org.apache.aurora.gen.MesosContainer;
@@ -62,7 +61,7 @@ public final class ConfigurationManager {
   @CmdLine(name = "allowed_container_types",
       help = "Container types that are allowed to be used by jobs.")
   private static final Arg<List<Container._Fields>> ALLOWED_CONTAINER_TYPES =
-      Arg.<List<Container._Fields>>create(ImmutableList.of(Container._Fields.MESOS));
+      Arg.create(ImmutableList.of(Container._Fields.MESOS));
 
   public static final String DEDICATED_ATTRIBUTE = "dedicated";
 
@@ -128,20 +127,20 @@ public final class ConfigurationManager {
   }
 
   private static final Iterable<Closure<TaskConfig>> DEFAULT_FIELD_POPULATORS =
-      ImmutableList.<Closure<TaskConfig>>of(
+      ImmutableList.of(
           new DefaultField(_Fields.IS_SERVICE, false),
           new DefaultField(_Fields.PRIORITY, 0),
           new DefaultField(_Fields.PRODUCTION, false),
           new DefaultField(_Fields.MAX_TASK_FAILURES, 1),
-          new DefaultField(_Fields.TASK_LINKS, Maps.<String, String>newHashMap()),
-          new DefaultField(_Fields.REQUESTED_PORTS, Sets.<String>newHashSet()),
-          new DefaultField(_Fields.CONSTRAINTS, Sets.<Constraint>newHashSet()),
+          new DefaultField(_Fields.TASK_LINKS, Maps.newHashMap()),
+          new DefaultField(_Fields.REQUESTED_PORTS, Sets.newHashSet()),
+          new DefaultField(_Fields.CONSTRAINTS, Sets.newHashSet()),
           // TODO(wfarner): Explore replacing these with thrift defaults.
           new DefaultField(_Fields.CONTAINER,
               Container.mesos(new MesosContainer())));
 
   private static final Iterable<RequiredFieldValidator<?>> REQUIRED_FIELDS_VALIDATORS =
-      ImmutableList.<RequiredFieldValidator<?>>of(
+      ImmutableList.of(
           new RequiredFieldValidator<>(_Fields.NUM_CPUS, new GreaterThan(0.0, "num_cpus")),
           new RequiredFieldValidator<>(_Fields.RAM_MB, new GreaterThan(0.0, "ram_mb")),
           new RequiredFieldValidator<>(_Fields.DISK_MB, new GreaterThan(0.0, "disk_mb")));
@@ -269,7 +268,7 @@ public final class ConfigurationManager {
     TaskConfig builder = config.newBuilder();
 
     if (!builder.isSetRequestedPorts()) {
-      builder.setRequestedPorts(ImmutableSet.<String>of());
+      builder.setRequestedPorts(ImmutableSet.of());
     }
 
     maybeFillLinks(builder);

http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/src/main/java/org/apache/aurora/scheduler/configuration/Resources.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/configuration/Resources.java b/src/main/java/org/apache/aurora/scheduler/configuration/Resources.java
index 673a690..ea7ce24 100644
--- a/src/main/java/org/apache/aurora/scheduler/configuration/Resources.java
+++ b/src/main/java/org/apache/aurora/scheduler/configuration/Resources.java
@@ -126,7 +126,7 @@ public class Resources {
    * @return Mesos resources.
    */
   public List<Resource> toResourceList() {
-    return toResourceList(ImmutableSet.<Integer>of());
+    return toResourceList(ImmutableSet.of());
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/src/main/java/org/apache/aurora/scheduler/cron/quartz/AuroraCronJob.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/cron/quartz/AuroraCronJob.java b/src/main/java/org/apache/aurora/scheduler/cron/quartz/AuroraCronJob.java
index df180a4..a33bb8b 100644
--- a/src/main/java/org/apache/aurora/scheduler/cron/quartz/AuroraCronJob.java
+++ b/src/main/java/org/apache/aurora/scheduler/cron/quartz/AuroraCronJob.java
@@ -29,7 +29,6 @@ import com.twitter.common.stats.Stats;
 import com.twitter.common.util.BackoffHelper;
 
 import org.apache.aurora.gen.CronCollisionPolicy;
-import org.apache.aurora.gen.ScheduleStatus;
 import org.apache.aurora.scheduler.base.JobKeys;
 import org.apache.aurora.scheduler.base.Query;
 import org.apache.aurora.scheduler.base.Tasks;
@@ -185,7 +184,7 @@ class AuroraCronJob implements Job {
           stateManager.changeState(
               storeProvider,
               taskId,
-              Optional.<ScheduleStatus>absent(),
+              Optional.absent(),
               KILLING,
               KILL_AUDIT_MESSAGE);
         }

http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/src/main/java/org/apache/aurora/scheduler/cron/quartz/CronJobManagerImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/cron/quartz/CronJobManagerImpl.java b/src/main/java/org/apache/aurora/scheduler/cron/quartz/CronJobManagerImpl.java
index 770672c..0081c5c 100644
--- a/src/main/java/org/apache/aurora/scheduler/cron/quartz/CronJobManagerImpl.java
+++ b/src/main/java/org/apache/aurora/scheduler/cron/quartz/CronJobManagerImpl.java
@@ -206,7 +206,7 @@ class CronJobManagerImpl implements CronJobManager {
     // for debugging.
     ImmutableMap.Builder<IJobKey, CrontabEntry> scheduledJobs = ImmutableMap.builder();
     try {
-      for (JobKey jobKey : scheduler.getJobKeys(GroupMatcher.<JobKey>anyGroup())) {
+      for (JobKey jobKey : scheduler.getJobKeys(GroupMatcher.anyGroup())) {
         // The quartz API allows jobs to have multiple triggers. We don't use that feature but
         // we're defensive here since this function is used for debugging.
         Optional<CronTrigger> trigger = FluentIterable.from(scheduler.getTriggersOfJob(jobKey))

http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/src/main/java/org/apache/aurora/scheduler/events/PubsubEvent.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/events/PubsubEvent.java b/src/main/java/org/apache/aurora/scheduler/events/PubsubEvent.java
index 0063aea..298ac74 100644
--- a/src/main/java/org/apache/aurora/scheduler/events/PubsubEvent.java
+++ b/src/main/java/org/apache/aurora/scheduler/events/PubsubEvent.java
@@ -98,7 +98,7 @@ public interface PubsubEvent {
      * @return A state change event.
      */
     public static TaskStateChange initialized(IScheduledTask task) {
-      return new TaskStateChange(task, Optional.<ScheduleStatus>absent());
+      return new TaskStateChange(task, Optional.absent());
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/src/main/java/org/apache/aurora/scheduler/filter/AttributeAggregate.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/filter/AttributeAggregate.java b/src/main/java/org/apache/aurora/scheduler/filter/AttributeAggregate.java
index bd74f89..ae7458c 100644
--- a/src/main/java/org/apache/aurora/scheduler/filter/AttributeAggregate.java
+++ b/src/main/java/org/apache/aurora/scheduler/filter/AttributeAggregate.java
@@ -126,8 +126,7 @@ public final class AttributeAggregate {
 
   @VisibleForTesting
   public static final AttributeAggregate EMPTY =
-      new AttributeAggregate(Suppliers.<Multiset<Pair<String, String>>>ofInstance(
-          ImmutableMultiset.<Pair<String, String>>of()));
+      new AttributeAggregate(Suppliers.ofInstance(ImmutableMultiset.of()));
 
   /**
    * Gets the total number of tasks with a given attribute name and value combination.

http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/src/main/java/org/apache/aurora/scheduler/filter/ConstraintMatcher.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/filter/ConstraintMatcher.java b/src/main/java/org/apache/aurora/scheduler/filter/ConstraintMatcher.java
index ecba276..2b47821 100644
--- a/src/main/java/org/apache/aurora/scheduler/filter/ConstraintMatcher.java
+++ b/src/main/java/org/apache/aurora/scheduler/filter/ConstraintMatcher.java
@@ -72,10 +72,10 @@ final class ConstraintMatcher {
     switch (taskConstraint.getSetField()) {
       case VALUE:
         boolean matches = AttributeFilter.matches(
-            attribute.transform(GET_VALUES).or(ImmutableSet.<String>of()),
+            attribute.transform(GET_VALUES).or(ImmutableSet.of()),
             taskConstraint.getValue());
         return matches
-            ? Optional.<Veto>absent()
+            ? Optional.absent()
             : Optional.of(Veto.constraintMismatch(constraint.getName()));
 
       case LIMIT:
@@ -88,7 +88,7 @@ final class ConstraintMatcher {
             taskConstraint.getLimit().getLimit(),
             cachedjobState);
         return satisfied
-            ? Optional.<Veto>absent()
+            ? Optional.absent()
             : Optional.of(Veto.unsatisfiedLimit(constraint.getName()));
 
       default:

http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/src/main/java/org/apache/aurora/scheduler/http/Cron.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/http/Cron.java b/src/main/java/org/apache/aurora/scheduler/http/Cron.java
index fd658e1..e81ab25 100644
--- a/src/main/java/org/apache/aurora/scheduler/http/Cron.java
+++ b/src/main/java/org/apache/aurora/scheduler/http/Cron.java
@@ -54,6 +54,6 @@ public class Cron {
       scheduled.put(JobKeys.canonicalString(entry.getKey()), entry.getValue().toString());
     }
 
-    return Response.ok(ImmutableMap.<String, Object>of("scheduled", scheduled.build())).build();
+    return Response.ok(ImmutableMap.of("scheduled", scheduled.build())).build();
   }
 }

http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/src/main/java/org/apache/aurora/scheduler/http/LeaderRedirect.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/http/LeaderRedirect.java b/src/main/java/org/apache/aurora/scheduler/http/LeaderRedirect.java
index fcf5e44..0c78208 100644
--- a/src/main/java/org/apache/aurora/scheduler/http/LeaderRedirect.java
+++ b/src/main/java/org/apache/aurora/scheduler/http/LeaderRedirect.java
@@ -85,7 +85,7 @@ public class LeaderRedirect {
 
   private Optional<HostAndPort> getLocalHttp() {
     HostAndPort localHttp = httpService.getAddress();
-    return (localHttp == null) ? Optional.<HostAndPort>absent()
+    return (localHttp == null) ? Optional.absent()
         : Optional.of(HostAndPort.fromParts(localHttp.getHostText(), localHttp.getPort()));
   }
 

http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/src/main/java/org/apache/aurora/scheduler/http/Mname.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/http/Mname.java b/src/main/java/org/apache/aurora/scheduler/http/Mname.java
index d735cbc..d6e5fc4 100644
--- a/src/main/java/org/apache/aurora/scheduler/http/Mname.java
+++ b/src/main/java/org/apache/aurora/scheduler/http/Mname.java
@@ -137,7 +137,7 @@ public class Mname {
       @PathParam("instance") int instanceId,
       @Context UriInfo uriInfo) {
 
-    return get(role, env, job, instanceId, uriInfo, Optional.<String>absent());
+    return get(role, env, job, instanceId, uriInfo, Optional.absent());
   }
 
   @PUT
@@ -149,7 +149,7 @@ public class Mname {
       @PathParam("instance") int instanceId,
       @Context UriInfo uriInfo) {
 
-    return get(role, env, job, instanceId, uriInfo, Optional.<String>absent());
+    return get(role, env, job, instanceId, uriInfo, Optional.absent());
   }
 
   @POST
@@ -161,7 +161,7 @@ public class Mname {
       @PathParam("instance") int instanceId,
       @Context UriInfo uriInfo) {
 
-    return get(role, env, job, instanceId, uriInfo, Optional.<String>absent());
+    return get(role, env, job, instanceId, uriInfo, Optional.absent());
   }
 
   @DELETE
@@ -173,7 +173,7 @@ public class Mname {
       @PathParam("instance") int instanceId,
       @Context UriInfo uriInfo) {
 
-    return get(role, env, job, instanceId, uriInfo, Optional.<String>absent());
+    return get(role, env, job, instanceId, uriInfo, Optional.absent());
   }
 
   private Response get(
@@ -219,7 +219,7 @@ public class Mname {
   @VisibleForTesting
   static Optional<Integer> getRedirectPort(IAssignedTask task) {
     Map<String, Integer> ports = task.isSetAssignedPorts()
-        ? task.getAssignedPorts() : ImmutableMap.<String, Integer>of();
+        ? task.getAssignedPorts() : ImmutableMap.of();
     for (String httpPortName : HTTP_PORT_NAMES) {
       Integer port = ports.get(httpPortName);
       if (port != null) {

http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/src/main/java/org/apache/aurora/scheduler/http/api/security/HttpSecurityModule.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/http/api/security/HttpSecurityModule.java b/src/main/java/org/apache/aurora/scheduler/http/api/security/HttpSecurityModule.java
index 1e9b1c3..a3b0a6b 100644
--- a/src/main/java/org/apache/aurora/scheduler/http/api/security/HttpSecurityModule.java
+++ b/src/main/java/org/apache/aurora/scheduler/http/api/security/HttpSecurityModule.java
@@ -70,7 +70,7 @@ public class HttpSecurityModule extends ServletModule {
 
   @CmdLine(name = "shiro_realm_modules",
       help = "Guice modules for configuring Shiro Realms.")
-  private static final Arg<Set<Module>> SHIRO_REALM_MODULE = Arg.<Set<Module>>create(
+  private static final Arg<Set<Module>> SHIRO_REALM_MODULE = Arg.create(
       ImmutableSet.of(Modules.lazilyInstantiated(IniShiroRealmModule.class)));
 
   @VisibleForTesting

http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/src/main/java/org/apache/aurora/scheduler/http/api/security/Kerberos5Realm.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/http/api/security/Kerberos5Realm.java b/src/main/java/org/apache/aurora/scheduler/http/api/security/Kerberos5Realm.java
index b224983..425f02e 100644
--- a/src/main/java/org/apache/aurora/scheduler/http/api/security/Kerberos5Realm.java
+++ b/src/main/java/org/apache/aurora/scheduler/http/api/security/Kerberos5Realm.java
@@ -83,7 +83,7 @@ class Kerberos5Realm implements Realm {
             new KerberosPrincipal(context.getSrcName().toString());
         return new SimpleAuthenticationInfo(
             new SimplePrincipalCollection(
-                ImmutableList.<Object>of(
+                ImmutableList.of(
                     // We assume there's a single Kerberos realm in use here. Most Authorizer
                     // implementations care about the "simple" username instead of the full
                     // principal.

http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/src/main/java/org/apache/aurora/scheduler/http/api/security/ShiroAuthorizingParamInterceptor.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/http/api/security/ShiroAuthorizingParamInterceptor.java b/src/main/java/org/apache/aurora/scheduler/http/api/security/ShiroAuthorizingParamInterceptor.java
index 7425b93..a95e1ec 100644
--- a/src/main/java/org/apache/aurora/scheduler/http/api/security/ShiroAuthorizingParamInterceptor.java
+++ b/src/main/java/org/apache/aurora/scheduler/http/api/security/ShiroAuthorizingParamInterceptor.java
@@ -136,7 +136,7 @@ class ShiroAuthorizingParamInterceptor implements MethodInterceptor {
 
   @SuppressWarnings("unchecked")
   private static final Set<FieldGetter<?, JobKey>> FIELD_GETTERS =
-      ImmutableSet.<FieldGetter<?, JobKey>>of(
+      ImmutableSet.of(
           FieldGetters.compose(UPDATE_REQUEST_GETTER, TASK_CONFIG_GETTER),
           TASK_CONFIG_GETTER,
           JOB_CONFIGURATION_GETTER,
@@ -286,7 +286,7 @@ class ShiroAuthorizingParamInterceptor implements MethodInterceptor {
       };
 
   private final LoadingCache<Method, Function<Object[], Optional<JobKey>>> authorizingParamGetters =
-      CacheBuilder.<Method, Function<Object[], Optional<JobKey>>>newBuilder().build(LOADER);
+      CacheBuilder.newBuilder().build(LOADER);
 
   private final Domain domain;
 

http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/src/main/java/org/apache/aurora/scheduler/mesos/MesosTaskFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/mesos/MesosTaskFactory.java b/src/main/java/org/apache/aurora/scheduler/mesos/MesosTaskFactory.java
index e934f57..c0d165a 100644
--- a/src/main/java/org/apache/aurora/scheduler/mesos/MesosTaskFactory.java
+++ b/src/main/java/org/apache/aurora/scheduler/mesos/MesosTaskFactory.java
@@ -134,7 +134,7 @@ public interface MesosTaskFactory {
       List<Resource> resources = resourceSlot
           .toResourceList(task.isSetAssignedPorts()
               ? ImmutableSet.copyOf(task.getAssignedPorts().values())
-              : ImmutableSet.<Integer>of());
+              : ImmutableSet.of());
 
       if (LOG.isLoggable(Level.FINE)) {
         LOG.fine("Setting task resources to "

http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/src/main/java/org/apache/aurora/scheduler/quota/QuotaCheckResult.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/quota/QuotaCheckResult.java b/src/main/java/org/apache/aurora/scheduler/quota/QuotaCheckResult.java
index 5bf4d9a..cf1b919 100644
--- a/src/main/java/org/apache/aurora/scheduler/quota/QuotaCheckResult.java
+++ b/src/main/java/org/apache/aurora/scheduler/quota/QuotaCheckResult.java
@@ -60,7 +60,7 @@ public class QuotaCheckResult {
 
   @VisibleForTesting
   public QuotaCheckResult(Result result) {
-    this(result, Optional.<String>absent());
+    this(result, Optional.absent());
   }
 
   private QuotaCheckResult(Result result, Optional<String> details) {

http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/src/main/java/org/apache/aurora/scheduler/quota/QuotaManager.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/quota/QuotaManager.java b/src/main/java/org/apache/aurora/scheduler/quota/QuotaManager.java
index e30b229..61b8e57 100644
--- a/src/main/java/org/apache/aurora/scheduler/quota/QuotaManager.java
+++ b/src/main/java/org/apache/aurora/scheduler/quota/QuotaManager.java
@@ -167,7 +167,7 @@ public interface QuotaManager {
 
     @Override
     public QuotaInfo getQuotaInfo(String role, StoreProvider storeProvider) {
-      return getQuotaInfo(role, Optional.<IJobUpdate>absent(), storeProvider);
+      return getQuotaInfo(role, Optional.absent(), storeProvider);
     }
 
     @Override
@@ -215,7 +215,7 @@ public interface QuotaManager {
       }
 
       QuotaInfo quotaInfo =
-          getQuotaInfo(cronConfig.getKey().getRole(), Optional.<IJobUpdate>absent(), storeProvider);
+          getQuotaInfo(cronConfig.getKey().getRole(), Optional.absent(), storeProvider);
 
       Optional<IJobConfiguration> oldCron =
           storeProvider.getCronJobStore().fetchJob(cronConfig.getKey());
@@ -375,7 +375,7 @@ public interface QuotaManager {
             RangeSet<Integer> initialInstances = getInstanceIds(instructions.getInitialState());
             RangeSet<Integer> desiredInstances = getInstanceIds(instructions.isSetDesiredState()
                 ? ImmutableSet.of(instructions.getDesiredState())
-                : ImmutableSet.<IInstanceTaskConfig>of());
+                : ImmutableSet.of());
 
             int instanceId = task.getInstanceId();
             return !initialInstances.contains(instanceId) && !desiredInstances.contains(instanceId);

http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/src/main/java/org/apache/aurora/scheduler/state/MaintenanceController.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/state/MaintenanceController.java b/src/main/java/org/apache/aurora/scheduler/state/MaintenanceController.java
index a6d7ab7..441f828 100644
--- a/src/main/java/org/apache/aurora/scheduler/state/MaintenanceController.java
+++ b/src/main/java/org/apache/aurora/scheduler/state/MaintenanceController.java
@@ -131,7 +131,7 @@ public interface MaintenanceController {
             stateManager.changeState(
                 store,
                 taskId,
-                Optional.<ScheduleStatus>absent(),
+                Optional.absent(),
                 ScheduleStatus.DRAINING,
                 DRAINING_MESSAGE);
           }

http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/src/main/java/org/apache/aurora/scheduler/state/StateManagerImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/state/StateManagerImpl.java b/src/main/java/org/apache/aurora/scheduler/state/StateManagerImpl.java
index 1b8733b..ff33d0b 100644
--- a/src/main/java/org/apache/aurora/scheduler/state/StateManagerImpl.java
+++ b/src/main/java/org/apache/aurora/scheduler/state/StateManagerImpl.java
@@ -146,7 +146,7 @@ public class StateManagerImpl implements StateManager {
           Tasks.id(scheduledTask),
           Optional.of(scheduledTask),
           Optional.of(PENDING),
-          Optional.<String>absent());
+          Optional.absent());
     }
   }
 
@@ -196,10 +196,10 @@ public class StateManagerImpl implements StateManager {
 
     StateChangeResult changeResult = updateTaskAndExternalState(
         storeProvider.getUnsafeTaskStore(),
-        Optional.<ScheduleStatus>absent(),
+        Optional.absent(),
         taskId,
         ASSIGNED,
-        Optional.<String>absent());
+        Optional.absent());
 
     Preconditions.checkState(
         changeResult == SUCCESS,
@@ -415,8 +415,8 @@ public class StateManagerImpl implements StateManager {
           storeProvider.getUnsafeTaskStore(),
           entry.getKey(),
           Optional.of(entry.getValue()),
-          Optional.<ScheduleStatus>absent(),
-          Optional.<String>absent());
+          Optional.absent(),
+          Optional.absent());
     }
   }
 

http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/src/main/java/org/apache/aurora/scheduler/state/TaskStateMachine.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/state/TaskStateMachine.java b/src/main/java/org/apache/aurora/scheduler/state/TaskStateMachine.java
index 48d0ff6..4f453e4 100644
--- a/src/main/java/org/apache/aurora/scheduler/state/TaskStateMachine.java
+++ b/src/main/java/org/apache/aurora/scheduler/state/TaskStateMachine.java
@@ -144,7 +144,7 @@ class TaskStateMachine {
    * @param name Name of the state machine, for logging.
    */
   public TaskStateMachine(String name) {
-    this(name, Optional.<IScheduledTask>absent());
+    this(name, Optional.absent());
   }
 
   /**
@@ -486,7 +486,7 @@ class TaskStateMachine {
   }
 
   private void addFollowup(Action action) {
-    addFollowup(new SideEffect(action, Optional.<ScheduleStatus>absent()));
+    addFollowup(new SideEffect(action, Optional.absent()));
   }
 
   private void addFollowup(SideEffect sideEffect) {
@@ -527,7 +527,7 @@ class TaskStateMachine {
      */
     TaskState taskState = status.transform(STATUS_TO_TASK_STATE).or(TaskState.DELETED);
     if (stateMachine.getState() == taskState) {
-      return new TransitionResult(NOOP, ImmutableSet.<SideEffect>of());
+      return new TransitionResult(NOOP, ImmutableSet.of());
     }
 
     boolean success = stateMachine.transition(taskState);

http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/src/main/java/org/apache/aurora/scheduler/stats/ResourceCounter.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/stats/ResourceCounter.java b/src/main/java/org/apache/aurora/scheduler/stats/ResourceCounter.java
index e5c0322..ca0c0b5 100644
--- a/src/main/java/org/apache/aurora/scheduler/stats/ResourceCounter.java
+++ b/src/main/java/org/apache/aurora/scheduler/stats/ResourceCounter.java
@@ -132,7 +132,7 @@ public class ResourceCounter {
   }
 
   public enum MetricType {
-    TOTAL_CONSUMED(Predicates.<ITaskConfig>alwaysTrue()),
+    TOTAL_CONSUMED(Predicates.alwaysTrue()),
     DEDICATED_CONSUMED(new Predicate<ITaskConfig>() {
       @Override
       public boolean apply(ITaskConfig task) {

http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/src/main/java/org/apache/aurora/scheduler/storage/AttributeStore.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/storage/AttributeStore.java b/src/main/java/org/apache/aurora/scheduler/storage/AttributeStore.java
index 97f9ee8..eef758b 100644
--- a/src/main/java/org/apache/aurora/scheduler/storage/AttributeStore.java
+++ b/src/main/java/org/apache/aurora/scheduler/storage/AttributeStore.java
@@ -81,7 +81,7 @@ public interface AttributeStore {
     public static Iterable<IAttribute> attributesOrNone(StoreProvider store, String host) {
       Optional<IHostAttributes> attributes = store.getAttributeStore().getHostAttributes(host);
       return attributes.isPresent()
-          ? attributes.get().getAttributes() : ImmutableList.<IAttribute>of();
+          ? attributes.get().getAttributes() : ImmutableList.of();
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/src/main/java/org/apache/aurora/scheduler/storage/mem/MemTaskStore.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/storage/mem/MemTaskStore.java b/src/main/java/org/apache/aurora/scheduler/storage/mem/MemTaskStore.java
index b871575..42c1119 100644
--- a/src/main/java/org/apache/aurora/scheduler/storage/mem/MemTaskStore.java
+++ b/src/main/java/org/apache/aurora/scheduler/storage/mem/MemTaskStore.java
@@ -344,7 +344,7 @@ class MemTaskStore implements TaskStore.Mutable {
    */
   private static class SecondaryIndex<K> {
     private final Multimap<K, String> index =
-        Multimaps.synchronizedSetMultimap(HashMultimap.<K, String>create());
+        Multimaps.synchronizedSetMultimap(HashMultimap.create());
     private final Function<IScheduledTask, K> indexer;
     private final Function<Query.Builder, Optional<Set<K>>> queryExtractor;
     private final AtomicLong hitCount;

http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/src/main/java/org/apache/aurora/scheduler/thrift/ReadOnlySchedulerImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/thrift/ReadOnlySchedulerImpl.java b/src/main/java/org/apache/aurora/scheduler/thrift/ReadOnlySchedulerImpl.java
index 41e144b..92c970c 100644
--- a/src/main/java/org/apache/aurora/scheduler/thrift/ReadOnlySchedulerImpl.java
+++ b/src/main/java/org/apache/aurora/scheduler/thrift/ReadOnlySchedulerImpl.java
@@ -217,7 +217,7 @@ class ReadOnlySchedulerImpl implements ReadOnlyScheduler.Iface {
         Tasks.ASSIGNED_TO_INFO);
     Multimap<ITaskConfig, Integer> instancesByDetails = Multimaps.invertFrom(
         Multimaps.forMap(tasksByInstance),
-        HashMultimap.<ITaskConfig, Integer>create());
+        HashMultimap.create());
     Iterable<ConfigGroup> groups = Iterables.transform(
         instancesByDetails.asMap().entrySet(), TO_GROUP);
 
@@ -400,7 +400,7 @@ class ReadOnlySchedulerImpl implements ReadOnlyScheduler.Iface {
     // been created above.
     Predicate<IJobConfiguration> configFilter = ownerRole.isPresent()
         ? Predicates.compose(Predicates.equalTo(ownerRole.get()), JobKeys.CONFIG_TO_ROLE)
-        : Predicates.<IJobConfiguration>alwaysTrue();
+        : Predicates.alwaysTrue();
     jobs.putAll(Maps.uniqueIndex(
         FluentIterable.from(Storage.Util.fetchCronJobs(storage)).filter(configFilter),
         JobKeys.FROM_CONFIG));

http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/src/main/java/org/apache/aurora/scheduler/thrift/Responses.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/thrift/Responses.java b/src/main/java/org/apache/aurora/scheduler/thrift/Responses.java
index ffca661..2ffaf50 100644
--- a/src/main/java/org/apache/aurora/scheduler/thrift/Responses.java
+++ b/src/main/java/org/apache/aurora/scheduler/thrift/Responses.java
@@ -40,7 +40,7 @@ public final class Responses {
    * @return An empty response message.
    */
   public static Response empty() {
-    return new Response().setDetails(Lists.<ResponseDetail>newArrayList());
+    return new Response().setDetails(Lists.newArrayList());
   }
 
   /**

http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/src/main/java/org/apache/aurora/scheduler/thrift/SchedulerThriftInterface.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/thrift/SchedulerThriftInterface.java b/src/main/java/org/apache/aurora/scheduler/thrift/SchedulerThriftInterface.java
index dea8107..12a1732 100644
--- a/src/main/java/org/apache/aurora/scheduler/thrift/SchedulerThriftInterface.java
+++ b/src/main/java/org/apache/aurora/scheduler/thrift/SchedulerThriftInterface.java
@@ -488,7 +488,7 @@ class SchedulerThriftInterface implements AnnotatedAuroraAdmin {
     // Authenticate the session against any affected roles, always including the role for a
     // role-scoped query.
     ImmutableSet.Builder<String> targetRoles = ImmutableSet.builder();
-    Set<IJobKey> keys = JobKeys.from(taskQuery).or(ImmutableSet.<IJobKey>of());
+    Set<IJobKey> keys = JobKeys.from(taskQuery).or(ImmutableSet.of());
     targetRoles.addAll(FluentIterable.from(keys).transform(JobKeys.TO_ROLE));
 
     if (taskQuery.get().isSetRole()) {
@@ -569,7 +569,7 @@ class SchedulerThriftInterface implements AnnotatedAuroraAdmin {
           tasksKilled |= StateChangeResult.SUCCESS == stateManager.changeState(
               storeProvider,
               taskId,
-              Optional.<ScheduleStatus>absent(),
+              Optional.absent(),
               ScheduleStatus.KILLING,
               killedByMessage(context.getIdentity()));
         }
@@ -625,7 +625,7 @@ class SchedulerThriftInterface implements AnnotatedAuroraAdmin {
               stateManager.changeState(
                   storeProvider,
                   taskId,
-                  Optional.<ScheduleStatus>absent(),
+                  Optional.absent(),
                   ScheduleStatus.RESTARTING,
                   restartedByMessage(context.getIdentity()));
             }
@@ -722,7 +722,7 @@ class SchedulerThriftInterface implements AnnotatedAuroraAdmin {
         stateManager.changeState(
             storeProvider,
             taskId,
-            Optional.<ScheduleStatus>absent(),
+            Optional.absent(),
             status,
             transitionMessage(context.getIdentity()));
       }

http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/src/main/java/org/apache/aurora/scheduler/thrift/aop/AopModule.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/thrift/aop/AopModule.java b/src/main/java/org/apache/aurora/scheduler/thrift/aop/AopModule.java
index 3490394..4734c6c 100644
--- a/src/main/java/org/apache/aurora/scheduler/thrift/aop/AopModule.java
+++ b/src/main/java/org/apache/aurora/scheduler/thrift/aop/AopModule.java
@@ -159,8 +159,8 @@ public class AopModule extends AbstractModule {
       for (Map.Entry<String, Boolean> toggleMethod : toggleMethods.entrySet()) {
         Predicate<String> enableMethod = Predicates.or(
             toggleMethod.getValue()
-                ? Predicates.<String>alwaysTrue()
-                : Predicates.<String>alwaysFalse(),
+                ? Predicates.alwaysTrue()
+                : Predicates.alwaysFalse(),
             Predicates.not(Predicates.equalTo(toggleMethod.getKey())));
         builder = Predicates.and(builder, enableMethod);
       }

http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/src/main/java/org/apache/aurora/scheduler/thrift/aop/LoggingInterceptor.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/thrift/aop/LoggingInterceptor.java b/src/main/java/org/apache/aurora/scheduler/thrift/aop/LoggingInterceptor.java
index d29cbae..7c8f8b9 100644
--- a/src/main/java/org/apache/aurora/scheduler/thrift/aop/LoggingInterceptor.java
+++ b/src/main/java/org/apache/aurora/scheduler/thrift/aop/LoggingInterceptor.java
@@ -61,7 +61,7 @@ class LoggingInterceptor implements MethodInterceptor {
   }
 
   private final Map<Class<?>, Function<Object, String>> printFunctions =
-      ImmutableMap.<Class<?>, Function<Object, String>>of(
+      ImmutableMap.of(
           JobConfiguration.class,
           new Function<Object, String>() {
             @Override

http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/src/main/java/org/apache/aurora/scheduler/thrift/auth/ThriftAuthModule.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/thrift/auth/ThriftAuthModule.java b/src/main/java/org/apache/aurora/scheduler/thrift/auth/ThriftAuthModule.java
index 3893e3d..472b3e7 100644
--- a/src/main/java/org/apache/aurora/scheduler/thrift/auth/ThriftAuthModule.java
+++ b/src/main/java/org/apache/aurora/scheduler/thrift/auth/ThriftAuthModule.java
@@ -50,10 +50,10 @@ public class ThriftAuthModule extends AbstractModule {
 
   @CmdLine(name = "auth_module",
       help = "A Guice module to provide auth bindings. NOTE: The default is unsecure.")
-  private static final Arg<Module> AUTH_MODULE = Arg.<Module>create(new UnsecureAuthModule());
+  private static final Arg<Module> AUTH_MODULE = Arg.create(new UnsecureAuthModule());
 
   private static final Iterable<Class<?>> AUTH_MODULE_CLASSES =
-      ImmutableList.<Class<?>>of(SessionValidator.class, CapabilityValidator.class);
+      ImmutableList.of(SessionValidator.class, CapabilityValidator.class);
 
   private Map<Capability, String> capabilities;
   private final Module authModule;

http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/src/main/java/org/apache/aurora/scheduler/updater/InstanceAction.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/updater/InstanceAction.java b/src/main/java/org/apache/aurora/scheduler/updater/InstanceAction.java
index b553f97..a329b07 100644
--- a/src/main/java/org/apache/aurora/scheduler/updater/InstanceAction.java
+++ b/src/main/java/org/apache/aurora/scheduler/updater/InstanceAction.java
@@ -20,13 +20,13 @@ import static org.apache.aurora.scheduler.updater.InstanceActionHandler.KillTask
 import static org.apache.aurora.scheduler.updater.InstanceActionHandler.WatchRunningTask;
 
 enum InstanceAction {
-  KILL_TASK(Optional.<InstanceActionHandler>of(new KillTask())),
+  KILL_TASK(Optional.of(new KillTask())),
   // TODO(wfarner): Build this action into the scheduler state machine instead.  Rather than
   // killing a task and re-recreating it, choose the updated or rolled-back task when we are
   // deciding to reschedule the task.
-  ADD_TASK(Optional.<InstanceActionHandler>of(new AddTask())),
-  WATCH_TASK(Optional.<InstanceActionHandler>of(new WatchRunningTask())),
-  AWAIT_STATE_CHANGE(Optional.<InstanceActionHandler>absent());
+  ADD_TASK(Optional.of(new AddTask())),
+  WATCH_TASK(Optional.of(new WatchRunningTask())),
+  AWAIT_STATE_CHANGE(Optional.absent());
 
   private final Optional<InstanceActionHandler> handler;
 

http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/src/main/java/org/apache/aurora/scheduler/updater/InstanceActionHandler.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/updater/InstanceActionHandler.java b/src/main/java/org/apache/aurora/scheduler/updater/InstanceActionHandler.java
index 3b9919d..1ae4087 100644
--- a/src/main/java/org/apache/aurora/scheduler/updater/InstanceActionHandler.java
+++ b/src/main/java/org/apache/aurora/scheduler/updater/InstanceActionHandler.java
@@ -107,7 +107,7 @@ interface InstanceActionHandler {
       stateManager.changeState(
           storeProvider,
           taskId,
-          Optional.<ScheduleStatus>absent(),
+          Optional.absent(),
           ScheduleStatus.KILLING,
           Optional.of("Killed for job update."));
       return Amount.of(

http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/src/main/java/org/apache/aurora/scheduler/updater/JobDiff.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/updater/JobDiff.java b/src/main/java/org/apache/aurora/scheduler/updater/JobDiff.java
index 88a25e6..bd31963 100644
--- a/src/main/java/org/apache/aurora/scheduler/updater/JobDiff.java
+++ b/src/main/java/org/apache/aurora/scheduler/updater/JobDiff.java
@@ -141,7 +141,7 @@ public final class JobDiff {
 
     Map<Integer, ITaskConfig> removedInstances = ImmutableMap.<Integer, ITaskConfig>builder()
         .putAll(diff.entriesOnlyOnLeft())
-        .putAll(Maps.transformValues(diff.entriesDiffering(), JobDiff.<ITaskConfig>leftValue()))
+        .putAll(Maps.transformValues(diff.entriesDiffering(), JobDiff.leftValue()))
         .build();
 
     Set<Integer> addedInstances = ImmutableSet.<Integer>builder()

http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/src/main/java/org/apache/aurora/scheduler/updater/JobUpdateControllerImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/updater/JobUpdateControllerImpl.java b/src/main/java/org/apache/aurora/scheduler/updater/JobUpdateControllerImpl.java
index dc08587..ff06701 100644
--- a/src/main/java/org/apache/aurora/scheduler/updater/JobUpdateControllerImpl.java
+++ b/src/main/java/org/apache/aurora/scheduler/updater/JobUpdateControllerImpl.java
@@ -119,7 +119,7 @@ class JobUpdateControllerImpl implements JobUpdateController {
   // Currently-active updaters. An active updater is one that is rolling forward or back. Paused
   // and completed updates are represented only in storage, not here.
   private final Map<IJobKey, UpdateFactory.Update> updates =
-      Collections.synchronizedMap(Maps.<IJobKey, UpdateFactory.Update>newHashMap());
+      Collections.synchronizedMap(Maps.newHashMap());
 
   @Inject
   JobUpdateControllerImpl(
@@ -340,7 +340,7 @@ class JobUpdateControllerImpl implements JobUpdateController {
   public void instanceDeleted(IInstanceKey instance) {
     // This is primarily used to detect when an instance was stuck in PENDING and killed, which
     // results in deletion.
-    instanceChanged(instance, Optional.<IScheduledTask>absent());
+    instanceChanged(instance, Optional.absent());
   }
 
   private void instanceChanged(final IInstanceKey instance, final Optional<IScheduledTask> state) {
@@ -509,7 +509,7 @@ class JobUpdateControllerImpl implements JobUpdateController {
           storeProvider,
           update,
           jobUpdate.getSummary(),
-          ImmutableMap.<Integer, Optional<IScheduledTask>>of());
+          ImmutableMap.of());
     }
   }
 

http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/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 6815f67..c95943d 100644
--- a/src/main/java/org/apache/aurora/scheduler/updater/StateEvaluator.java
+++ b/src/main/java/org/apache/aurora/scheduler/updater/StateEvaluator.java
@@ -54,8 +54,8 @@ interface StateEvaluator<T> {
     REPLACE_TASK_AND_EVALUATE_ON_STATE_CHANGE(Optional.of(InstanceAction.ADD_TASK), NO_FAILURE),
     KILL_TASK_AND_EVALUATE_ON_STATE_CHANGE(Optional.of(InstanceAction.KILL_TASK), NO_FAILURE),
     EVALUATE_AFTER_MIN_RUNNING_MS(Optional.of(InstanceAction.WATCH_TASK), NO_FAILURE),
-    SUCCEEDED(Optional.<InstanceAction>absent(), NO_FAILURE),
-    FAILED_TERMINATED(Optional.<InstanceAction>absent(), Optional.of(Failure.EXITED));
+    SUCCEEDED(Optional.absent(), NO_FAILURE),
+    FAILED_TERMINATED(Optional.absent(), Optional.of(Failure.EXITED));
 
     private final Optional<InstanceAction> action;
     private final Optional<Failure> failure;

http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/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 927a7d1..c31588c 100644
--- a/src/main/java/org/apache/aurora/scheduler/updater/UpdateFactory.java
+++ b/src/main/java/org/apache/aurora/scheduler/updater/UpdateFactory.java
@@ -90,7 +90,7 @@ interface UpdateFactory {
       Set<Integer> instances;
       Set<Integer> desiredInstances = instructions.isSetDesiredState()
           ? expandInstanceIds(ImmutableSet.of(instructions.getDesiredState()))
-          : ImmutableSet.<Integer>of();
+          : ImmutableSet.of();
 
       if (settings.getUpdateOnlyTheseInstances().isEmpty()) {
         // In a full job update, the working set is the union of instance IDs before and after.
@@ -107,7 +107,7 @@ interface UpdateFactory {
         if (rollingForward) {
           desiredStateConfig = desiredInstances.contains(instanceId)
               ? Optional.of(instructions.getDesiredState().getTask())
-              : Optional.<ITaskConfig>absent();
+              : Optional.absent();
         } else {
           desiredStateConfig = getConfig(instanceId, instructions.getInitialState());
         }
@@ -122,8 +122,8 @@ interface UpdateFactory {
       }
 
       Ordering<Integer> updateOrder = rollingForward
-          ? Ordering.<Integer>natural()
-          : Ordering.<Integer>natural().reverse();
+          ? Ordering.natural()
+          : Ordering.natural().reverse();
 
       UpdateStrategy<Integer> strategy = settings.isWaitForBatchCompletion()
           ? new BatchStrategy<>(updateOrder, settings.getUpdateGroupSize())

http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/src/main/java/org/apache/aurora/scheduler/updater/strategy/BatchStrategy.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/updater/strategy/BatchStrategy.java b/src/main/java/org/apache/aurora/scheduler/updater/strategy/BatchStrategy.java
index 67d595b..7d5890e 100644
--- a/src/main/java/org/apache/aurora/scheduler/updater/strategy/BatchStrategy.java
+++ b/src/main/java/org/apache/aurora/scheduler/updater/strategy/BatchStrategy.java
@@ -36,6 +36,6 @@ public class BatchStrategy<T extends Comparable<T>> extends ActiveLimitedStrateg
 
   @Override
   Set<T> doGetNextGroup(Set<T> idle, Set<T> active) {
-    return active.isEmpty() ? idle : ImmutableSet.<T>of();
+    return active.isEmpty() ? idle : ImmutableSet.of();
   }
 }

http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/src/main/python/apache/aurora/tools/java/thrift_wrapper_codegen.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/tools/java/thrift_wrapper_codegen.py b/src/main/python/apache/aurora/tools/java/thrift_wrapper_codegen.py
index 7d8f848..f3d9288 100644
--- a/src/main/python/apache/aurora/tools/java/thrift_wrapper_codegen.py
+++ b/src/main/python/apache/aurora/tools/java/thrift_wrapper_codegen.py
@@ -123,7 +123,7 @@ STRUCT_ASSIGNMENT = '''this.%(field)s = !wrapped.%(isset)s()
 IMMUTABLE_COLLECTION_DECLARATION = (
     '''private final Immutable%(collection)s<%(params)s> %(field)s;''')
 IMMUTABLE_COLLECTION_ASSIGNMENT = '''this.%(field)s = !wrapped.%(isset)s()
-        ? Immutable%(collection)s.<%(params)s>of()
+        ? Immutable%(collection)s.of()
         : Immutable%(collection)s.copyOf(wrapped.%(fn_name)s());'''
 
 

http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/src/test/java/org/apache/aurora/scheduler/SchedulerLifecycleTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/SchedulerLifecycleTest.java b/src/test/java/org/apache/aurora/scheduler/SchedulerLifecycleTest.java
index 8476b34..ffeca8a 100644
--- a/src/test/java/org/apache/aurora/scheduler/SchedulerLifecycleTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/SchedulerLifecycleTest.java
@@ -29,7 +29,6 @@ import org.apache.aurora.scheduler.SchedulerLifecycle.DelayedActions;
 import org.apache.aurora.scheduler.events.EventSink;
 import org.apache.aurora.scheduler.events.PubsubEvent.DriverRegistered;
 import org.apache.aurora.scheduler.mesos.Driver;
-import org.apache.aurora.scheduler.storage.Storage.MutateWork.NoResult.Quiet;
 import org.apache.aurora.scheduler.storage.Storage.StorageException;
 import org.apache.aurora.scheduler.storage.testing.StorageTestUtil;
 import org.apache.aurora.scheduler.testing.FakeStatsProvider;
@@ -102,14 +101,14 @@ public class SchedulerLifecycleTest extends EasyMockTest {
   }
 
   private void expectLoadStorage() {
-    storageUtil.storage.start(EasyMock.<Quiet>anyObject());
+    storageUtil.storage.start(EasyMock.anyObject());
     storageUtil.expectOperations();
   }
 
   private void expectInitializeDriver() {
     expect(driver.startAsync()).andReturn(driver);
     driver.awaitRunning();
-    delayedActions.blockingDriverJoin(EasyMock.<Runnable>anyObject());
+    delayedActions.blockingDriverJoin(EasyMock.anyObject());
   }
 
   private void expectFullStartup() throws Exception {
@@ -137,7 +136,7 @@ public class SchedulerLifecycleTest extends EasyMockTest {
     expectLoadStorage();
     Capture<Runnable> triggerFailover = createCapture();
     delayedActions.onAutoFailover(capture(triggerFailover));
-    delayedActions.onRegistrationTimeout(EasyMock.<Runnable>anyObject());
+    delayedActions.onRegistrationTimeout(EasyMock.anyObject());
     expectInitializeDriver();
 
     expectFullStartup();
@@ -160,7 +159,7 @@ public class SchedulerLifecycleTest extends EasyMockTest {
   public void testRegistrationTimeout() throws Exception {
     storageUtil.storage.prepare();
     expectLoadStorage();
-    delayedActions.onAutoFailover(EasyMock.<Runnable>anyObject());
+    delayedActions.onAutoFailover(EasyMock.anyObject());
     Capture<Runnable> registrationTimeout = createCapture();
     delayedActions.onRegistrationTimeout(capture(registrationTimeout));
     expect(driver.startAsync()).andReturn(driver);
@@ -179,8 +178,8 @@ public class SchedulerLifecycleTest extends EasyMockTest {
   public void testDefeatedBeforeRegistered() throws Exception {
     storageUtil.storage.prepare();
     expectLoadStorage();
-    delayedActions.onAutoFailover(EasyMock.<Runnable>anyObject());
-    delayedActions.onRegistrationTimeout(EasyMock.<Runnable>anyObject());
+    delayedActions.onAutoFailover(EasyMock.anyObject());
+    delayedActions.onRegistrationTimeout(EasyMock.anyObject());
     expect(driver.startAsync()).andReturn(driver);
     driver.awaitRunning();
 
@@ -198,7 +197,7 @@ public class SchedulerLifecycleTest extends EasyMockTest {
   public void testStorageStartFails() throws Exception {
     storageUtil.storage.prepare();
     storageUtil.expectOperations();
-    storageUtil.storage.start(EasyMock.<Quiet>anyObject());
+    storageUtil.storage.start(EasyMock.anyObject());
     expectLastCall().andThrow(new StorageException("Recovery failed."));
     expectShutdown();
 
@@ -220,7 +219,7 @@ public class SchedulerLifecycleTest extends EasyMockTest {
     expectLoadStorage();
     Capture<Runnable> triggerFailover = createCapture();
     delayedActions.onAutoFailover(capture(triggerFailover));
-    delayedActions.onRegistrationTimeout(EasyMock.<Runnable>anyObject());
+    delayedActions.onRegistrationTimeout(EasyMock.anyObject());
     expectInitializeDriver();
 
     expectFullStartup();

http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/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 9d1e251..83dcb4b 100644
--- a/src/test/java/org/apache/aurora/scheduler/TaskStatusHandlerImplTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/TaskStatusHandlerImplTest.java
@@ -19,10 +19,8 @@ import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeUnit;
 
 import com.google.common.base.Optional;
-
 import com.twitter.common.testing.easymock.EasyMockTest;
 
-import org.apache.aurora.gen.ScheduleStatus;
 import org.apache.aurora.scheduler.mesos.Driver;
 import org.apache.aurora.scheduler.state.StateChangeResult;
 import org.apache.aurora.scheduler.state.StateManager;
@@ -96,7 +94,7 @@ public class TaskStatusHandlerImplTest extends EasyMockTest {
     expect(stateManager.changeState(
         storageUtil.mutableStoreProvider,
         TASK_ID_A,
-        Optional.<ScheduleStatus>absent(),
+        Optional.absent(),
         RUNNING,
         Optional.of("fake message")))
         .andReturn(StateChangeResult.SUCCESS);
@@ -125,7 +123,7 @@ public class TaskStatusHandlerImplTest extends EasyMockTest {
     expect(stateManager.changeState(
         storageUtil.mutableStoreProvider,
         TASK_ID_A,
-        Optional.<ScheduleStatus>absent(),
+        Optional.absent(),
         RUNNING,
         Optional.of("fake message")))
         .andAnswer(() -> {
@@ -189,7 +187,7 @@ public class TaskStatusHandlerImplTest extends EasyMockTest {
     stateManager = createMock(StateManager.class);
     storageUtil = new StorageTestUtil(this);
     driver = createMock(Driver.class);
-    queue = createMock(BlockingQueue.class);
+    queue = createMock(new Clazz<BlockingQueue<TaskStatus>>() { });
 
     statusHandler = new TaskStatusHandlerImpl(
         storageUtil.storage,
@@ -199,7 +197,7 @@ public class TaskStatusHandlerImplTest extends EasyMockTest {
         1000,
         new CachedCounters(stats));
 
-    expect(queue.add(EasyMock.<TaskStatus>anyObject()))
+    expect(queue.add(EasyMock.anyObject()))
         .andReturn(true);
 
     expect(queue.take())

http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/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 256ee77..6cfd9e4 100644
--- a/src/test/java/org/apache/aurora/scheduler/TaskVarsTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/TaskVarsTest.java
@@ -341,7 +341,7 @@ public class TaskVarsTest extends EasyMockTest {
   public void testRackMissing() {
     expectStatusCountersInitialized();
     expect(storageUtil.attributeStore.getHostAttributes("a"))
-        .andReturn(Optional.<IHostAttributes>absent());
+        .andReturn(Optional.absent());
 
     IScheduledTask a = makeTask(JOB_A, RUNNING, "a");
     expectStatExport(jobStatName(a, LOST), untrackedProvider);

http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/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 975920a..23c2693 100644
--- a/src/test/java/org/apache/aurora/scheduler/app/SchedulerIT.java
+++ b/src/test/java/org/apache/aurora/scheduler/app/SchedulerIT.java
@@ -91,7 +91,6 @@ import org.apache.aurora.scheduler.storage.log.LogStorageModule;
 import org.apache.aurora.scheduler.storage.log.SnapshotStoreImpl;
 import org.apache.aurora.scheduler.storage.log.testing.LogOpMatcher;
 import org.apache.aurora.scheduler.storage.log.testing.LogOpMatcher.StreamMatcher;
-import org.apache.mesos.Protos;
 import org.apache.mesos.Protos.FrameworkID;
 import org.apache.mesos.Protos.MasterInfo;
 import org.apache.mesos.Protos.Status;
@@ -126,7 +125,7 @@ public class SchedulerIT extends BaseZooKeeperTest {
 
   private static final DriverSettings SETTINGS = new DriverSettings(
       "fakemaster",
-      Optional.<Protos.Credential>absent(),
+      Optional.absent(),
       FrameworkInfo.newBuilder()
           .setUser("framework user")
           .setName("test framework")
@@ -135,7 +134,7 @@ public class SchedulerIT extends BaseZooKeeperTest {
   private ExecutorService executor = Executors.newCachedThreadPool(
       new ThreadFactoryBuilder().setNameFormat("SchedulerIT-%d").setDaemon(true).build());
   private AtomicReference<Optional<RuntimeException>> mainException =
-      Atomics.newReference(Optional.<RuntimeException>absent());
+      Atomics.newReference(Optional.absent());
 
   private IMocksControl control;
   private Injector injector;
@@ -347,7 +346,7 @@ public class SchedulerIT extends BaseZooKeeperTest {
     expect(logStream.readAll()).andReturn(recoveredEntries.iterator()).anyTimes();
     // An empty saveTasks is an artifact of the fact that mutateTasks always writes a log operation
     // even if nothing is changed.
-    streamMatcher.expectTransaction(Op.saveTasks(new SaveTasks(ImmutableSet.<ScheduledTask>of())))
+    streamMatcher.expectTransaction(Op.saveTasks(new SaveTasks(ImmutableSet.of())))
         .andReturn(nextPosition());
     streamMatcher.expectTransaction(Op.saveFrameworkId(new SaveFrameworkId(FRAMEWORK_ID)))
         .andReturn(nextPosition());

http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/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 1a0f14c..aeb8946 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
@@ -68,12 +68,9 @@ public class FakeMaster implements SchedulerDriver, DriverFactory {
 
   private static final Logger LOG = Logger.getLogger(FakeMaster.class.getName());
 
-  private final Map<TaskID, Task> activeTasks =
-      Collections.synchronizedMap(Maps.<TaskID, Task>newHashMap());
-  private final Map<OfferID, Offer> idleOffers =
-      Collections.synchronizedMap(Maps.<OfferID, Offer>newHashMap());
-  private final Map<OfferID, Offer> sentOffers =
-      Collections.synchronizedMap(Maps.<OfferID, Offer>newHashMap());
+  private final Map<TaskID, Task> activeTasks = Collections.synchronizedMap(Maps.newHashMap());
+  private final Map<OfferID, Offer> idleOffers = Collections.synchronizedMap(Maps.newHashMap());
+  private final Map<OfferID, Offer> sentOffers = Collections.synchronizedMap(Maps.newHashMap());
 
   private final ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor();
   private final CountDownLatch stopped = new CountDownLatch(1);

http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/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 7dc03b6..1597725 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
@@ -46,7 +46,7 @@ public class LocalSchedulerMain extends SchedulerMain {
 
   private static final DriverSettings DRIVER_SETTINGS = new DriverSettings(
       "fakemaster",
-      Optional.<Protos.Credential>absent(),
+      Optional.absent(),
       Protos.FrameworkInfo.newBuilder()
           .setUser("framework user")
           .setName("test framework")

http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/src/test/java/org/apache/aurora/scheduler/async/JobUpdateHistoryPrunerTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/async/JobUpdateHistoryPrunerTest.java b/src/test/java/org/apache/aurora/scheduler/async/JobUpdateHistoryPrunerTest.java
index f73b2c6..cb549a1 100644
--- a/src/test/java/org/apache/aurora/scheduler/async/JobUpdateHistoryPrunerTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/async/JobUpdateHistoryPrunerTest.java
@@ -48,8 +48,7 @@ public class JobUpdateHistoryPrunerTest extends EasyMockTest {
         .andReturn(ImmutableSet.of(
             IJobUpdateKey.build(
                 new JobUpdateKey().setJob(new JobKey("role", "env", "job")).setId("id1"))));
-    expect(storageUtil.jobUpdateStore.pruneHistory(1, 1))
-        .andReturn(ImmutableSet.<IJobUpdateKey>of());
+    expect(storageUtil.jobUpdateStore.pruneHistory(1, 1)).andReturn(ImmutableSet.of());
 
     control.replay();
 

http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/src/test/java/org/apache/aurora/scheduler/async/TaskSchedulerImplTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/async/TaskSchedulerImplTest.java b/src/test/java/org/apache/aurora/scheduler/async/TaskSchedulerImplTest.java
index 53b21cb..9afd7df 100644
--- a/src/test/java/org/apache/aurora/scheduler/async/TaskSchedulerImplTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/async/TaskSchedulerImplTest.java
@@ -186,7 +186,7 @@ public class TaskSchedulerImplTest extends EasyMockTest {
     AssignmentCapture firstAssignment = expectLaunchAttempt(false);
     expectGetReservation(SLAVE_ID, TASK_A);
     expectReservationCheck(TASK_B);
-    expectPreemptorCall(TASK_B, Optional.<String>absent());
+    expectPreemptorCall(TASK_B, Optional.absent());
 
     // Status changed -> reservation removed.
     reservations.remove(SLAVE_ID, TaskGroupKey.from(TASK_A.getAssignedTask().getTask()));
@@ -264,7 +264,7 @@ public class TaskSchedulerImplTest extends EasyMockTest {
     expectGetNoReservation(SLAVE_ID);
     AssignmentCapture assignment = expectLaunchAttempt(true);
     expect(assigner.maybeAssign(
-        EasyMock.<MutableStoreProvider>anyObject(),
+        EasyMock.anyObject(),
         eq(OFFER),
         eq(new ResourceRequest(taskA.getAssignedTask().getTask(), EMPTY)),
         eq(Tasks.id(taskA)))).andReturn(Assignment.success(TaskInfo.getDefaultInstance()));
@@ -316,7 +316,7 @@ public class TaskSchedulerImplTest extends EasyMockTest {
     storageUtil.expectTaskFetch(
         Query.jobScoped(Tasks.SCHEDULED_TO_JOB_KEY.apply(task))
             .byStatus(Tasks.SLAVE_ASSIGNED_STATES),
-        ImmutableSet.<IScheduledTask>of());
+        ImmutableSet.of());
   }
 
   private void expectAddReservation(String slaveId, IScheduledTask task) {
@@ -329,11 +329,11 @@ public class TaskSchedulerImplTest extends EasyMockTest {
   }
 
   private IExpectationSetters<?> expectGetNoReservation(String slaveId) {
-    return expect(reservations.get(slaveId)).andReturn(Optional.<TaskGroupKey>absent());
+    return expect(reservations.get(slaveId)).andReturn(Optional.absent());
   }
 
   private IExpectationSetters<?> expectReservationCheck(IScheduledTask task) {
     return expect(reservations.getByValue(TaskGroupKey.from(task.getAssignedTask().getTask())))
-        .andReturn(ImmutableSet.<String>of());
+        .andReturn(ImmutableSet.of());
   }
 }

http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/src/test/java/org/apache/aurora/scheduler/async/TaskSchedulerTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/async/TaskSchedulerTest.java b/src/test/java/org/apache/aurora/scheduler/async/TaskSchedulerTest.java
index f348541..ed15401 100644
--- a/src/test/java/org/apache/aurora/scheduler/async/TaskSchedulerTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/async/TaskSchedulerTest.java
@@ -30,7 +30,6 @@ import com.twitter.common.quantity.Time;
 import com.twitter.common.testing.easymock.EasyMockTest;
 import com.twitter.common.util.BackoffStrategy;
 
-import org.apache.aurora.gen.Attribute;
 import org.apache.aurora.gen.HostAttributes;
 import org.apache.aurora.gen.MaintenanceMode;
 import org.apache.aurora.gen.ScheduleStatus;
@@ -68,7 +67,6 @@ import org.apache.aurora.scheduler.storage.entities.IAssignedTask;
 import org.apache.aurora.scheduler.storage.entities.IHostAttributes;
 import org.apache.aurora.scheduler.storage.entities.IScheduledTask;
 import org.apache.aurora.scheduler.storage.entities.ITaskConfig;
-import org.apache.mesos.Protos.OfferID;
 import org.apache.mesos.Protos.SlaveID;
 import org.apache.mesos.Protos.TaskID;
 import org.apache.mesos.Protos.TaskInfo;
@@ -286,19 +284,19 @@ public class TaskSchedulerTest extends EasyMockTest {
       AttributeAggregate jobAggregate) {
 
     return expect(assigner.maybeAssign(
-        EasyMock.<MutableStoreProvider>anyObject(),
+        EasyMock.anyObject(),
         eq(offer),
         eq(new ResourceRequest(task.getAssignedTask().getTask(), jobAggregate)),
         eq(Tasks.id(task))));
   }
 
   private IExpectationSetters<?> expectNoReservation(String slaveId) {
-    return expect(reservations.get(slaveId)).andReturn(Optional.<TaskGroupKey>absent());
+    return expect(reservations.get(slaveId)).andReturn(Optional.absent());
   }
 
   private IExpectationSetters<?> expectReservationCheck(IScheduledTask task) {
     return expect(reservations.getByValue(TaskGroupKey.from(task.getAssignedTask().getTask())))
-        .andReturn(ImmutableSet.<String>of());
+        .andReturn(ImmutableSet.of());
   }
 
   @Test
@@ -354,7 +352,7 @@ public class TaskSchedulerTest extends EasyMockTest {
     driver.launchTask(OFFER_A.getOffer().getId(), mesosTask);
     expectLastCall().andThrow(new IllegalStateException("Driver not ready."));
     expect(stateManager.changeState(
-        EasyMock.<MutableStoreProvider>anyObject(),
+        EasyMock.anyObject(),
         eq("a"),
         eq(Optional.of(PENDING)),
         eq(LOST),
@@ -539,11 +537,11 @@ public class TaskSchedulerTest extends EasyMockTest {
     TaskInfo mesosTask = makeTaskInfo(task);
     Capture<String> taskId = createCapture();
     expect(assigner.maybeAssign(
-        EasyMock.<MutableStoreProvider>anyObject(),
-        EasyMock.<HostOffer>anyObject(),
-        EasyMock.<ResourceRequest>anyObject(),
+        EasyMock.anyObject(),
+        EasyMock.anyObject(),
+        EasyMock.anyObject(),
         capture(taskId))).andReturn(Assignment.success(mesosTask));
-    driver.launchTask(EasyMock.<OfferID>anyObject(), eq(mesosTask));
+    driver.launchTask(EasyMock.anyObject(), eq(mesosTask));
     return taskId;
   }
 
@@ -658,7 +656,7 @@ public class TaskSchedulerTest extends EasyMockTest {
         IHostAttributes.build(new HostAttributes()
             .setHost(hostName)
             .setSlaveId(offer.getSlaveId().getValue())
-            .setAttributes(ImmutableSet.<Attribute>of())
+            .setAttributes(ImmutableSet.of())
             .setMode(mode)));
   }
 
@@ -666,6 +664,6 @@ public class TaskSchedulerTest extends EasyMockTest {
     expect(preemptor.attemptPreemptionFor(
         eq(task),
         eq(EMPTY),
-        EasyMock.<MutableStoreProvider>anyObject())).andReturn(Optional.<String>absent());
+        EasyMock.anyObject())).andReturn(Optional.absent());
   }
 }

http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/src/test/java/org/apache/aurora/scheduler/async/TaskThrottlerTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/async/TaskThrottlerTest.java b/src/test/java/org/apache/aurora/scheduler/async/TaskThrottlerTest.java
index 5772e15..cfa9d81 100644
--- a/src/test/java/org/apache/aurora/scheduler/async/TaskThrottlerTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/async/TaskThrottlerTest.java
@@ -130,7 +130,7 @@ public class TaskThrottlerTest extends EasyMockTest {
         Tasks.id(task),
         Optional.of(THROTTLED),
         PENDING,
-        Optional.<String>absent()))
+        Optional.absent()))
         .andReturn(StateChangeResult.SUCCESS);
   }
 

http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/src/test/java/org/apache/aurora/scheduler/async/preemptor/BiCacheTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/async/preemptor/BiCacheTest.java b/src/test/java/org/apache/aurora/scheduler/async/preemptor/BiCacheTest.java
index 4734776..babc17f 100644
--- a/src/test/java/org/apache/aurora/scheduler/async/preemptor/BiCacheTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/async/preemptor/BiCacheTest.java
@@ -15,7 +15,6 @@ package org.apache.aurora.scheduler.async.preemptor;
 
 import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableSet;
-
 import com.twitter.common.quantity.Amount;
 import com.twitter.common.quantity.Time;
 import com.twitter.common.util.testing.FakeClock;


Mime
View raw message