http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/src/test/java/org/apache/aurora/scheduler/async/preemptor/PendingTaskProcessorTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/async/preemptor/PendingTaskProcessorTest.java b/src/test/java/org/apache/aurora/scheduler/async/preemptor/PendingTaskProcessorTest.java index 0280a0b..a0dbb25 100644 --- a/src/test/java/org/apache/aurora/scheduler/async/preemptor/PendingTaskProcessorTest.java +++ b/src/test/java/org/apache/aurora/scheduler/async/preemptor/PendingTaskProcessorTest.java @@ -241,13 +241,13 @@ public class PendingTaskProcessorTest extends EasyMockTest { private void expectSlotSearch(ITaskConfig config, IScheduledTask... victims) { expect(preemptionVictimFilter.filterPreemptionVictims( eq(config), - EasyMock.<Iterable<PreemptionVictim>>anyObject(), + EasyMock.anyObject(), anyObject(AttributeAggregate.class), - EasyMock.<Optional<HostOffer>>anyObject(), + EasyMock.anyObject(), eq(storageUtil.storeProvider))); expectLastCall().andReturn( victims.length == 0 - ? Optional.<ImmutableSet<PreemptionVictim>>absent() + ? Optional.absent() : Optional.of(ImmutableSet.copyOf(getVictims(victims).values()))) .anyTimes(); }
http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/src/test/java/org/apache/aurora/scheduler/async/preemptor/PreemptionVictimFilterTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/async/preemptor/PreemptionVictimFilterTest.java b/src/test/java/org/apache/aurora/scheduler/async/preemptor/PreemptionVictimFilterTest.java index 67dfb82..5fe8e2e 100644 --- a/src/test/java/org/apache/aurora/scheduler/async/preemptor/PreemptionVictimFilterTest.java +++ b/src/test/java/org/apache/aurora/scheduler/async/preemptor/PreemptionVictimFilterTest.java @@ -21,7 +21,6 @@ import com.google.common.base.Function; import com.google.common.base.Optional; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableSet; - import com.twitter.common.quantity.Amount; import com.twitter.common.quantity.Data; import com.twitter.common.testing.easymock.EasyMockTest; @@ -358,8 +357,7 @@ public class PreemptionVictimFilterTest extends EasyMockTest { a1.getAssignedTask().getTask().setNumCpus(1).setRamMb(512); assignToHost(a1); - expect(storageUtil.attributeStore.getHostAttributes(HOST)) - .andReturn(Optional.<IHostAttributes>absent()); + expect(storageUtil.attributeStore.getHostAttributes(HOST)).andReturn(Optional.absent()); control.replay(); @@ -429,15 +427,15 @@ public class PreemptionVictimFilterTest extends EasyMockTest { } private IExpectationSetters<Set<SchedulingFilter.Veto>> expectFiltering() { - return expectFiltering(Optional.<Veto>absent()); + return expectFiltering(Optional.absent()); } private IExpectationSetters<Set<SchedulingFilter.Veto>> expectFiltering( final Optional<Veto> veto) { return expect(schedulingFilter.filter( - EasyMock.<SchedulingFilter.UnusedResource>anyObject(), - EasyMock.<SchedulingFilter.ResourceRequest>anyObject())) + EasyMock.anyObject(), + EasyMock.anyObject())) .andAnswer( new IAnswer<Set<SchedulingFilter.Veto>>() { @Override http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/src/test/java/org/apache/aurora/scheduler/async/preemptor/PreemptorImplTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/async/preemptor/PreemptorImplTest.java b/src/test/java/org/apache/aurora/scheduler/async/preemptor/PreemptorImplTest.java index 6ecdbd1..d36499f 100644 --- a/src/test/java/org/apache/aurora/scheduler/async/preemptor/PreemptorImplTest.java +++ b/src/test/java/org/apache/aurora/scheduler/async/preemptor/PreemptorImplTest.java @@ -113,7 +113,7 @@ public class PreemptorImplTest extends EasyMockTest { public void testPreemptTasksValidationFailed() throws Exception { expect(slotCache.getByValue(GROUP_KEY)).andReturn(ImmutableSet.of(PROPOSAL)); slotCache.remove(PROPOSAL, GROUP_KEY); - expectSlotValidation(PROPOSAL, Optional.<ImmutableSet<PreemptionVictim>>absent()); + expectSlotValidation(PROPOSAL, Optional.absent()); control.replay(); @@ -153,9 +153,9 @@ public class PreemptorImplTest extends EasyMockTest { expect(stateManager.changeState( anyObject(Storage.MutableStoreProvider.class), eq(Tasks.id(preempted)), - eq(Optional.<ScheduleStatus>absent()), + eq(Optional.absent()), eq(ScheduleStatus.PREEMPTING), - EasyMock.<Optional<String>>anyObject())) + EasyMock.anyObject())) .andReturn(StateChangeResult.SUCCESS); } http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/src/test/java/org/apache/aurora/scheduler/async/preemptor/PreemptorModuleTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/async/preemptor/PreemptorModuleTest.java b/src/test/java/org/apache/aurora/scheduler/async/preemptor/PreemptorModuleTest.java index 9d3820a..2c20571 100644 --- a/src/test/java/org/apache/aurora/scheduler/async/preemptor/PreemptorModuleTest.java +++ b/src/test/java/org/apache/aurora/scheduler/async/preemptor/PreemptorModuleTest.java @@ -82,7 +82,7 @@ public class PreemptorModuleTest extends EasyMockTest { injector.getBindings(); assertEquals( - Optional.<String>absent(), + Optional.absent(), injector.getInstance(Preemptor.class).attemptPreemptionFor( IAssignedTask.build(new AssignedTask()), AttributeAggregate.EMPTY, http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/src/test/java/org/apache/aurora/scheduler/base/TasksTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/base/TasksTest.java b/src/test/java/org/apache/aurora/scheduler/base/TasksTest.java index ed9a287..935622b 100644 --- a/src/test/java/org/apache/aurora/scheduler/base/TasksTest.java +++ b/src/test/java/org/apache/aurora/scheduler/base/TasksTest.java @@ -33,7 +33,7 @@ public class TasksTest { // OrderedTaskStatuses should contain all ScheduleStatus values except INIT. assertEquals( ImmutableSet.copyOf(ScheduleStatus.values()), - ImmutableSet.<ScheduleStatus>builder() + ImmutableSet.builder() .addAll(Tasks.ORDERED_TASK_STATUSES) .add(ScheduleStatus.INIT) .build()); @@ -49,7 +49,7 @@ public class TasksTest { IScheduledTask r3 = makeTask(RUNNING, 600); try { - getLatestActiveTask(ImmutableList.<IScheduledTask>of()); + getLatestActiveTask(ImmutableList.of()); fail("Should have thrown IllegalArgumentException."); } catch (IllegalArgumentException e) { // Expected when called with an empty task list. http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/src/test/java/org/apache/aurora/scheduler/configuration/ConfigurationManagerTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/configuration/ConfigurationManagerTest.java b/src/test/java/org/apache/aurora/scheduler/configuration/ConfigurationManagerTest.java index 92ba450..b231827 100644 --- a/src/test/java/org/apache/aurora/scheduler/configuration/ConfigurationManagerTest.java +++ b/src/test/java/org/apache/aurora/scheduler/configuration/ConfigurationManagerTest.java @@ -48,10 +48,10 @@ public class ConfigurationManagerTest { .setTaskConfig( new TaskConfig() .setIsService(false) - .setTaskLinks(ImmutableMap.<String, String>of()) + .setTaskLinks(ImmutableMap.of()) .setExecutorConfig(new ExecutorConfig("aurora", "config")) .setEnvironment("devel") - .setRequestedPorts(ImmutableSet.<String>of()) + .setRequestedPorts(ImmutableSet.of()) .setJobName(null) .setPriority(0) .setOwner(null) http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/src/test/java/org/apache/aurora/scheduler/configuration/ResourcesTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/configuration/ResourcesTest.java b/src/test/java/org/apache/aurora/scheduler/configuration/ResourcesTest.java index d6febb8..115dc08 100644 --- a/src/test/java/org/apache/aurora/scheduler/configuration/ResourcesTest.java +++ b/src/test/java/org/apache/aurora/scheduler/configuration/ResourcesTest.java @@ -84,7 +84,7 @@ public class ResourcesTest { @Test public void testGetNoPorts() { Resource portsResource = createPortRange(Pair.of(1, 5)); - assertEquals(ImmutableSet.<Integer>of(), Resources.getPorts(createOffer(portsResource), 0)); + assertEquals(ImmutableSet.of(), Resources.getPorts(createOffer(portsResource), 0)); } private static final Resources NEGATIVE_ONE = @@ -150,7 +150,7 @@ public class ResourcesTest { @Test public void testRangeResourceEmpty() { - expectRanges(ImmutableSet.<Pair<Long, Long>>of(), ImmutableSet.<Integer>of()); + expectRanges(ImmutableSet.of(), ImmutableSet.of()); } @Test @@ -242,7 +242,7 @@ public class ResourcesTest { Resources.makeMesosResource(Resources.CPUS, TASK.getNumCpus()), Resources.makeMesosResource(Resources.RAM_MB, TASK.getRamMb()), Resources.makeMesosResource(Resources.DISK_MB, TASK.getDiskMb())), - ImmutableSet.copyOf(resources.toResourceList(ImmutableSet.<Integer>of()))); + ImmutableSet.copyOf(resources.toResourceList(ImmutableSet.of()))); } private void expectRanges(Set<Pair<Long, Long>> expected, Set<Integer> values) { http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/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 4280762..7894668 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 @@ -13,8 +13,6 @@ */ package org.apache.aurora.scheduler.cron.quartz; -import java.util.Set; - import com.google.common.base.Optional; import com.google.common.collect.ImmutableSet; import com.twitter.common.base.Supplier; @@ -30,7 +28,6 @@ import org.apache.aurora.scheduler.state.StateManager; import org.apache.aurora.scheduler.storage.Storage; import org.apache.aurora.scheduler.storage.db.DbUtil; import org.apache.aurora.scheduler.storage.entities.IScheduledTask; -import org.apache.aurora.scheduler.storage.entities.ITaskConfig; import org.easymock.Capture; import org.easymock.EasyMock; import org.junit.Before; @@ -72,9 +69,9 @@ public class AuroraCronJobTest extends EasyMockTest { @Test public void testEmptyStorage() throws JobExecutionException { stateManager.insertPendingTasks( - EasyMock.<MutableStoreProvider>anyObject(), - EasyMock.<ITaskConfig>anyObject(), - EasyMock.<Set<Integer>>anyObject()); + EasyMock.anyObject(), + EasyMock.anyObject(), + EasyMock.anyObject()); expectLastCall().times(3); control.replay(); @@ -104,17 +101,17 @@ public class AuroraCronJobTest extends EasyMockTest { Capture<Supplier<Boolean>> capture = createCapture(); expect(stateManager.changeState( - EasyMock.<MutableStoreProvider>anyObject(), + EasyMock.anyObject(), eq(TASK_ID), - eq(Optional.<ScheduleStatus>absent()), + eq(Optional.absent()), eq(ScheduleStatus.KILLING), eq(AuroraCronJob.KILL_AUDIT_MESSAGE))) .andReturn(StateChangeResult.SUCCESS); backoffHelper.doUntilSuccess(EasyMock.capture(capture)); stateManager.insertPendingTasks( - EasyMock.<MutableStoreProvider>anyObject(), - EasyMock.<ITaskConfig>anyObject(), - EasyMock.<Set<Integer>>anyObject()); + EasyMock.anyObject(), + EasyMock.anyObject(), + EasyMock.anyObject()); control.replay(); http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/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 abb915d..b8d88c7 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 @@ -37,11 +37,9 @@ import org.junit.Before; import org.junit.Test; import org.quartz.CronTrigger; import org.quartz.JobDetail; -import org.quartz.JobKey; import org.quartz.Scheduler; import org.quartz.SchedulerException; import org.quartz.Trigger; -import org.quartz.impl.matchers.GroupMatcher; import static org.easymock.EasyMock.anyObject; import static org.easymock.EasyMock.expect; @@ -120,7 +118,7 @@ public class CronJobManagerImplTest extends EasyMockTest { // Expected. } - assertEquals(Optional.<IJobConfiguration>absent(), fetchFromStorage()); + assertEquals(Optional.absent(), fetchFromStorage()); } @Test @@ -181,7 +179,7 @@ public class CronJobManagerImplTest extends EasyMockTest { // Expected. } - assertEquals(Optional.<IJobConfiguration>absent(), fetchFromStorage()); + assertEquals(Optional.absent(), fetchFromStorage()); } @Test @@ -193,7 +191,7 @@ public class CronJobManagerImplTest extends EasyMockTest { assertFalse(cronJobManager.deleteJob(QuartzTestUtil.AURORA_JOB_KEY)); populateStorage(); assertTrue(cronJobManager.deleteJob(QuartzTestUtil.AURORA_JOB_KEY)); - assertEquals(Optional.<IJobConfiguration>absent(), fetchFromStorage()); + assertEquals(Optional.absent(), fetchFromStorage()); } @Test @@ -209,7 +207,7 @@ public class CronJobManagerImplTest extends EasyMockTest { @Test public void testGetScheduledJobs() throws Exception { CronTrigger cronTrigger = createMock(CronTrigger.class); - expect(scheduler.getJobKeys(EasyMock.<GroupMatcher<JobKey>>anyObject())) + expect(scheduler.getJobKeys(EasyMock.anyObject())) .andReturn(ImmutableSet.of(QuartzTestUtil.QUARTZ_JOB_KEY)); EasyMock. <List<? extends Trigger>>expect(scheduler.getTriggersOfJob(QuartzTestUtil.QUARTZ_JOB_KEY)) @@ -224,19 +222,19 @@ public class CronJobManagerImplTest extends EasyMockTest { @Test public void testGetScheduledJobsEmpty() throws Exception { - expect(scheduler.getJobKeys(EasyMock.<GroupMatcher<JobKey>>anyObject())) + expect(scheduler.getJobKeys(EasyMock.anyObject())) .andReturn(ImmutableSet.of(QuartzTestUtil.QUARTZ_JOB_KEY)); EasyMock. <List<? extends Trigger>>expect(scheduler.getTriggersOfJob(QuartzTestUtil.QUARTZ_JOB_KEY)) - .andReturn(ImmutableList.<CronTrigger>of()); + .andReturn(ImmutableList.of()); control.replay(); - assertEquals(ImmutableMap.<IJobKey, CrontabEntry>of(), cronJobManager.getScheduledJobs()); + assertEquals(ImmutableMap.of(), cronJobManager.getScheduledJobs()); } @Test(expected = RuntimeException.class) public void testGetScheduledJobsFails() throws Exception { - expect(scheduler.getJobKeys(EasyMock.<GroupMatcher<JobKey>>anyObject())) + expect(scheduler.getJobKeys(EasyMock.anyObject())) .andReturn(ImmutableSet.of(QuartzTestUtil.QUARTZ_JOB_KEY)); EasyMock. <List<? extends Trigger>>expect(scheduler.getTriggersOfJob(QuartzTestUtil.QUARTZ_JOB_KEY)) http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/src/test/java/org/apache/aurora/scheduler/events/PubsubEventModuleTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/events/PubsubEventModuleTest.java b/src/test/java/org/apache/aurora/scheduler/events/PubsubEventModuleTest.java index 0e0fabb..c6295e5 100644 --- a/src/test/java/org/apache/aurora/scheduler/events/PubsubEventModuleTest.java +++ b/src/test/java/org/apache/aurora/scheduler/events/PubsubEventModuleTest.java @@ -21,7 +21,6 @@ import com.google.inject.AbstractModule; import com.google.inject.Guice; import com.google.inject.Injector; import com.google.inject.Key; - import com.twitter.common.application.StartupStage; import com.twitter.common.application.modules.LifecycleModule; import com.twitter.common.base.ExceptionalCommand; http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/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 6b36062..c132ae8 100644 --- a/src/test/java/org/apache/aurora/scheduler/filter/AttributeAggregateTest.java +++ b/src/test/java/org/apache/aurora/scheduler/filter/AttributeAggregateTest.java @@ -54,7 +54,7 @@ public class AttributeAggregateTest extends EasyMockTest { @Test(expected = IllegalStateException.class) public void testAttributesMissing() { - expect(attributeStore.getHostAttributes("a")).andReturn(Optional.<IHostAttributes>absent()); + expect(attributeStore.getHostAttributes("a")).andReturn(Optional.absent()); control.replay(); @@ -135,7 +135,7 @@ public class AttributeAggregateTest extends EasyMockTest { private AttributeAggregate aggregate(IScheduledTask... activeTasks) { return AttributeAggregate.create( - Suppliers.<Iterable<IScheduledTask>>ofInstance(ImmutableSet.copyOf(activeTasks)), + Suppliers.ofInstance(ImmutableSet.copyOf(activeTasks)), attributeStore); } @@ -143,7 +143,7 @@ public class AttributeAggregateTest extends EasyMockTest { return expect(attributeStore.getHostAttributes(host)).andReturn(Optional.of( IHostAttributes.build(new HostAttributes() .setHost(host) - .setAttributes(ImmutableSet.<Attribute>builder().add(attributes).build())))); + .setAttributes(ImmutableSet.copyOf(attributes))))); } private void assertAggregate( @@ -165,6 +165,6 @@ public class AttributeAggregateTest extends EasyMockTest { private Attribute attribute(String name, String... values) { return new Attribute() .setName(name) - .setValues(ImmutableSet.<String>builder().add(values).build()); + .setValues(ImmutableSet.copyOf(values)); } } http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/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 15bb13b..6441ffd 100644 --- a/src/test/java/org/apache/aurora/scheduler/filter/SchedulingFilterImplTest.java +++ b/src/test/java/org/apache/aurora/scheduler/filter/SchedulingFilterImplTest.java @@ -114,7 +114,7 @@ public class SchedulingFilterImplTest extends EasyMockTest { ITaskConfig noPortTask = ITaskConfig.build(makeTask(DEFAULT_CPUS, DEFAULT_RAM, DEFAULT_DISK) .newBuilder() - .setRequestedPorts(ImmutableSet.<String>of())); + .setRequestedPorts(ImmutableSet.of())); ITaskConfig onePortTask = ITaskConfig.build(makeTask(DEFAULT_CPUS, DEFAULT_RAM, DEFAULT_DISK) .newBuilder() .setRequestedPorts(ImmutableSet.of("one"))); @@ -299,7 +299,7 @@ public class SchedulingFilterImplTest extends EasyMockTest { control.replay(); AttributeAggregate stateA = AttributeAggregate.create( - Suppliers.<Iterable<IAttribute>>ofInstance(ImmutableList.of( + Suppliers.ofInstance(ImmutableList.of( host(HOST_A), rack(RACK_A), host(HOST_B), @@ -309,7 +309,7 @@ public class SchedulingFilterImplTest extends EasyMockTest { host(HOST_C), rack(RACK_B)))); AttributeAggregate stateB = AttributeAggregate.create( - Suppliers.<Iterable<IAttribute>>ofInstance(ImmutableList.of( + Suppliers.ofInstance(ImmutableList.of( host(HOST_A), rack(RACK_A), host(HOST_A), @@ -407,7 +407,7 @@ public class SchedulingFilterImplTest extends EasyMockTest { ITaskConfig task = makeTask(OWNER_A, JOB_A, jvmConstraint, zoneConstraint); assertEquals( - ImmutableSet.<Veto>of(), + ImmutableSet.of(), defaultFilter.filter( new UnusedResource(DEFAULT_OFFER, hostA), new ResourceRequest(task, EMPTY))); @@ -452,7 +452,7 @@ public class SchedulingFilterImplTest extends EasyMockTest { public void testVetoGroups() { control.replay(); - assertEquals(VetoGroup.EMPTY, Veto.identifyGroup(ImmutableSet.<Veto>of())); + assertEquals(VetoGroup.EMPTY, Veto.identifyGroup(ImmutableSet.of())); assertEquals( VetoGroup.STATIC, http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/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 703b026..453de69 100644 --- a/src/test/java/org/apache/aurora/scheduler/http/LeaderRedirectTest.java +++ b/src/test/java/org/apache/aurora/scheduler/http/LeaderRedirectTest.java @@ -83,7 +83,7 @@ public class LeaderRedirectTest extends EasyMockTest { replayAndMonitor(); publishSchedulers(localPort(HTTP_PORT)); - assertEquals(Optional.<HostAndPort>absent(), leaderRedirector.getRedirect()); + assertEquals(Optional.absent(), leaderRedirector.getRedirect()); } @Test @@ -110,7 +110,7 @@ public class LeaderRedirectTest extends EasyMockTest { public void testNoLeaders() throws Exception { replayAndMonitor(); - assertEquals(Optional.<HostAndPort>absent(), leaderRedirector.getRedirect()); + assertEquals(Optional.absent(), leaderRedirector.getRedirect()); } @Test @@ -119,7 +119,7 @@ public class LeaderRedirectTest extends EasyMockTest { publishSchedulers(HostAndPort.fromParts("foobar", 500), HostAndPort.fromParts("baz", 800)); - assertEquals(Optional.<HostAndPort>absent(), leaderRedirector.getRedirect()); + assertEquals(Optional.absent(), leaderRedirector.getRedirect()); } @Test @@ -131,7 +131,7 @@ public class LeaderRedirectTest extends EasyMockTest { publishSchedulers(ImmutableSet.of(badLocal)); - assertEquals(Optional.<HostAndPort>absent(), leaderRedirector.getRedirect()); + assertEquals(Optional.absent(), leaderRedirector.getRedirect()); } private HttpServletRequest mockRequest(String attributeValue, String queryString) { http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/src/test/java/org/apache/aurora/scheduler/http/LocksTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/http/LocksTest.java b/src/test/java/org/apache/aurora/scheduler/http/LocksTest.java index 55fbc55..78d69cb 100644 --- a/src/test/java/org/apache/aurora/scheduler/http/LocksTest.java +++ b/src/test/java/org/apache/aurora/scheduler/http/LocksTest.java @@ -73,7 +73,7 @@ public class LocksTest extends EasyMockTest { @Test public void testDumpEmptyContents() throws Exception { - expect(lockManager.getLocks()).andReturn(ImmutableSet.<ILock>of()); + expect(lockManager.getLocks()).andReturn(ImmutableSet.of()); control.replay(); http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/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 cf61dd1..8f76230 100644 --- a/src/test/java/org/apache/aurora/scheduler/http/MnameTest.java +++ b/src/test/java/org/apache/aurora/scheduler/http/MnameTest.java @@ -149,9 +149,9 @@ public class MnameTest extends JettyServerModuleTest { public void testRedirectPort() { replayAndStart(); - assertEquals(Optional.<Integer>absent(), getRedirectPort(null)); - assertEquals(Optional.<Integer>absent(), getRedirectPort(ImmutableMap.<String, Integer>of())); - assertEquals(Optional.<Integer>absent(), getRedirectPort(ImmutableMap.of("thrift", 5))); + assertEquals(Optional.absent(), getRedirectPort(null)); + assertEquals(Optional.absent(), getRedirectPort(ImmutableMap.of())); + assertEquals(Optional.absent(), 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/013ba6ff/src/test/java/org/apache/aurora/scheduler/http/api/security/HttpSecurityIT.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/http/api/security/HttpSecurityIT.java b/src/test/java/org/apache/aurora/scheduler/http/api/security/HttpSecurityIT.java index 7cc4fa5..e725e10 100644 --- a/src/test/java/org/apache/aurora/scheduler/http/api/security/HttpSecurityIT.java +++ b/src/test/java/org/apache/aurora/scheduler/http/api/security/HttpSecurityIT.java @@ -89,10 +89,10 @@ public class HttpSecurityIT extends JettyServerModuleTest { new UsernamePasswordCredentials("nobody", "12345"); private static final Set<Credentials> INVALID_CREDENTIALS = - ImmutableSet.<Credentials>of(INCORRECT, NONEXISTENT); + ImmutableSet.of(INCORRECT, NONEXISTENT); private static final Set<Credentials> VALID_CREDENTIALS = - ImmutableSet.<Credentials>of(ROOT, WFARNER, UNPRIVILEGED, BACKUP_SERVICE); + ImmutableSet.of(ROOT, WFARNER, UNPRIVILEGED, BACKUP_SERVICE); private static final IJobKey ADS_STAGING_JOB = JobKeys.from("ads", "staging", "job"); http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/src/test/java/org/apache/aurora/scheduler/http/api/security/Kerberos5ShiroRealmModuleTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/http/api/security/Kerberos5ShiroRealmModuleTest.java b/src/test/java/org/apache/aurora/scheduler/http/api/security/Kerberos5ShiroRealmModuleTest.java index fda1644..e4270ff 100644 --- a/src/test/java/org/apache/aurora/scheduler/http/api/security/Kerberos5ShiroRealmModuleTest.java +++ b/src/test/java/org/apache/aurora/scheduler/http/api/security/Kerberos5ShiroRealmModuleTest.java @@ -24,7 +24,6 @@ import com.twitter.common.testing.easymock.EasyMockTest; import org.easymock.EasyMock; import org.ietf.jgss.GSSCredential; import org.ietf.jgss.GSSManager; -import org.ietf.jgss.GSSName; import org.ietf.jgss.Oid; import org.junit.Before; import org.junit.Test; @@ -58,7 +57,7 @@ public class Kerberos5ShiroRealmModuleTest extends EasyMockTest { expect(serverKeytab.getAbsolutePath()).andReturn("path.keytab"); expect( gssManager.createCredential( - EasyMock.<GSSName>isNull(), + EasyMock.isNull(), eq(GSSCredential.INDEFINITE_LIFETIME), anyObject(Oid[].class), eq(GSSCredential.ACCEPT_ONLY))) http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/src/test/java/org/apache/aurora/scheduler/log/mesos/MesosLogTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/log/mesos/MesosLogTest.java b/src/test/java/org/apache/aurora/scheduler/log/mesos/MesosLogTest.java index 5b6e064..dd8f9ce 100644 --- a/src/test/java/org/apache/aurora/scheduler/log/mesos/MesosLogTest.java +++ b/src/test/java/org/apache/aurora/scheduler/log/mesos/MesosLogTest.java @@ -275,9 +275,9 @@ public class MesosLogTest extends EasyMockTest { Position end = expectWrite(DUMMY_CONTENT, 3); expectDiscoverEntryRange(beginning, end); // SKipped entries. - expectRead(beginning).andReturn(ImmutableList.<Log.Entry>of()); - expectRead(middle).andReturn(ImmutableList.<Log.Entry>of()); - expectRead(end).andReturn(ImmutableList.<Log.Entry>of()); + expectRead(beginning).andReturn(ImmutableList.of()); + expectRead(middle).andReturn(ImmutableList.of()); + expectRead(end).andReturn(ImmutableList.of()); control.replay(); http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/src/test/java/org/apache/aurora/scheduler/mesos/MesosSchedulerImplTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/mesos/MesosSchedulerImplTest.java b/src/test/java/org/apache/aurora/scheduler/mesos/MesosSchedulerImplTest.java index ea96f46..49af15b 100644 --- a/src/test/java/org/apache/aurora/scheduler/mesos/MesosSchedulerImplTest.java +++ b/src/test/java/org/apache/aurora/scheduler/mesos/MesosSchedulerImplTest.java @@ -28,7 +28,6 @@ import com.twitter.common.application.Lifecycle; import com.twitter.common.base.Command; import com.twitter.common.testing.easymock.EasyMockTest; -import org.apache.aurora.gen.Attribute; import org.apache.aurora.gen.HostAttributes; import org.apache.aurora.gen.MaintenanceMode; import org.apache.aurora.scheduler.HostOffer; @@ -94,7 +93,7 @@ public class MesosSchedulerImplTest extends EasyMockTest { .setHost(SLAVE_HOST) .setSlaveId(SLAVE_ID.getValue()) .setMode(NONE) - .setAttributes(ImmutableSet.<Attribute>of()))); + .setAttributes(ImmutableSet.of()))); private static final OfferID OFFER_ID_2 = OfferID.newBuilder().setValue("offer-id-2").build(); private static final HostOffer OFFER_2 = new HostOffer( Offer.newBuilder(OFFER.getOffer()) @@ -107,7 +106,7 @@ public class MesosSchedulerImplTest extends EasyMockTest { .setHost(SLAVE_HOST_2) .setSlaveId(SLAVE_ID_2.getValue()) .setMode(NONE) - .setAttributes(ImmutableSet.<Attribute>of()))); + .setAttributes(ImmutableSet.of()))); private static final TaskStatus STATUS_NO_REASON = TaskStatus.newBuilder() .setState(TaskState.TASK_RUNNING) @@ -178,7 +177,7 @@ public class MesosSchedulerImplTest extends EasyMockTest { control.replay(); // Should fail since the scheduler is not yet registered. - scheduler.resourceOffers(driver, ImmutableList.<Offer>of()); + scheduler.resourceOffers(driver, ImmutableList.of()); } @Test @@ -186,7 +185,7 @@ public class MesosSchedulerImplTest extends EasyMockTest { new RegisteredFixture() { @Override void test() { - scheduler.resourceOffers(driver, ImmutableList.<Offer>of()); + scheduler.resourceOffers(driver, ImmutableList.of()); } }.run(); } @@ -388,7 +387,7 @@ public class MesosSchedulerImplTest extends EasyMockTest { private void expectOfferAttributesSaved(HostOffer offer) { expect(storageUtil.attributeStore.getHostAttributes(offer.getOffer().getHostname())) - .andReturn(Optional.<IHostAttributes>absent()); + .andReturn(Optional.absent()); IHostAttributes defaultMode = IHostAttributes.build( Conversions.getAttributes(offer.getOffer()).newBuilder().setMode(MaintenanceMode.NONE)); expect(storageUtil.attributeStore.saveHostAttributes(defaultMode)).andReturn(true); http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/src/test/java/org/apache/aurora/scheduler/mesos/MesosTaskFactoryImplTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/mesos/MesosTaskFactoryImplTest.java b/src/test/java/org/apache/aurora/scheduler/mesos/MesosTaskFactoryImplTest.java index 1b2a794..c0cadfb 100644 --- a/src/test/java/org/apache/aurora/scheduler/mesos/MesosTaskFactoryImplTest.java +++ b/src/test/java/org/apache/aurora/scheduler/mesos/MesosTaskFactoryImplTest.java @@ -145,9 +145,9 @@ public class MesosTaskFactoryImplTest { .setNumCpus(0.001) .setRamMb(1) .setDiskMb(0) - .setRequestedPorts(ImmutableSet.<String>of()); + .setRequestedPorts(ImmutableSet.of()); IAssignedTask assignedTask = - IAssignedTask.build(builder.setAssignedPorts(ImmutableMap.<String, Integer>of())); + IAssignedTask.build(builder.setAssignedPorts(ImmutableMap.of())); assertEquals( MIN_THERMOS_RESOURCES, http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/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 09593b1..f9acba7 100644 --- a/src/test/java/org/apache/aurora/scheduler/mesos/SchedulerDriverServiceTest.java +++ b/src/test/java/org/apache/aurora/scheduler/mesos/SchedulerDriverServiceTest.java @@ -35,7 +35,7 @@ public class SchedulerDriverServiceTest extends EasyMockTest { private static final DriverSettings SETTINGS = new DriverSettings( "fakemaster", - Optional.<Protos.Credential>absent(), + Optional.absent(), 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/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 0724278..bfb8ea5 100644 --- a/src/test/java/org/apache/aurora/scheduler/mesos/TaskStatusStatsTest.java +++ b/src/test/java/org/apache/aurora/scheduler/mesos/TaskStatusStatsTest.java @@ -84,7 +84,7 @@ public class TaskStatusStatsTest extends EasyMockTest { eventBus.post(new TaskStatusReceived( TaskState.TASK_RUNNING, Optional.of(Source.SOURCE_MASTER), - Optional.<Reason>absent(), + Optional.absent(), Optional.of(agoMicros(ONE_SECOND)))); clock.advance(ONE_SECOND); @@ -102,19 +102,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.<Source>absent(), - Optional.<Reason>absent(), - Optional.<Long>absent())); + Optional.absent(), + Optional.absent(), + Optional.absent())); eventBus.post(new TaskStatusReceived( TaskState.TASK_LOST, - Optional.<Source>absent(), - Optional.<Reason>absent(), + Optional.absent(), + Optional.absent(), Optional.of(agoMicros(ONE_SECOND)))); eventBus.post(new TaskStatusReceived( TaskState.TASK_LOST, Optional.of(Source.SOURCE_MASTER), Optional.of(Reason.REASON_SLAVE_DISCONNECTED), - Optional.<Long>absent())); + Optional.absent())); // 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/013ba6ff/src/test/java/org/apache/aurora/scheduler/metadata/NearestFitTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/metadata/NearestFitTest.java b/src/test/java/org/apache/aurora/scheduler/metadata/NearestFitTest.java index 210bafd..8f6f5df 100644 --- a/src/test/java/org/apache/aurora/scheduler/metadata/NearestFitTest.java +++ b/src/test/java/org/apache/aurora/scheduler/metadata/NearestFitTest.java @@ -16,7 +16,6 @@ package org.apache.aurora.scheduler.metadata; import java.util.Set; import com.google.common.collect.ImmutableSet; - import com.twitter.common.quantity.Amount; import com.twitter.common.quantity.Time; import com.twitter.common.util.testing.FakeTicker; @@ -113,11 +112,11 @@ public class NearestFitTest { } private Set<Veto> vetoes(Veto... vetoes) { - return ImmutableSet.<Veto>builder().add(vetoes).build(); + return ImmutableSet.copyOf(vetoes); } private void vetoed(Veto... vetoes) { - nearest.vetoed(new Vetoed(GROUP_KEY, ImmutableSet.<Veto>builder().add(vetoes).build())); + nearest.vetoed(new Vetoed(GROUP_KEY, ImmutableSet.copyOf(vetoes))); } private void assertNearest(Veto... vetoes) { http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/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 4cc0ee5..2d90536 100644 --- a/src/test/java/org/apache/aurora/scheduler/quota/QuotaManagerImplTest.java +++ b/src/test/java/org/apache/aurora/scheduler/quota/QuotaManagerImplTest.java @@ -263,7 +263,7 @@ public class QuotaManagerImplTest extends EasyMockTest { @Test public void testCheckQuotaNoQuotaSet() { expect(storageUtil.quotaStore.fetchQuota(ROLE)) - .andReturn(Optional.<IResourceAggregate>absent()); + .andReturn(Optional.absent()); expectNoTasks(); expectNoJobUpdates(); @@ -502,7 +502,7 @@ public class QuotaManagerImplTest extends EasyMockTest { List<IJobUpdateSummary> summaries = buildJobUpdateSummaries(UPDATE_KEY); IJobUpdate update = buildJobUpdate(summaries.get(0), config, 1, config, 1); JobUpdate builder = update.newBuilder(); - builder.getInstructions().setInitialState(ImmutableSet.<InstanceTaskConfig>of()); + builder.getInstructions().setInitialState(ImmutableSet.of()); expect(jobUpdateStore.fetchJobUpdateSummaries(updateQuery(config.getJob().getRole()))) .andReturn(summaries).times(2); @@ -863,7 +863,7 @@ public class QuotaManagerImplTest extends EasyMockTest { private IExpectationSetters<?> expectNoJobUpdates() { return expect(jobUpdateStore.fetchJobUpdateSummaries( - QuotaManagerImpl.updateQuery(ROLE))).andReturn(ImmutableList.<IJobUpdateSummary>of()); + QuotaManagerImpl.updateQuery(ROLE))).andReturn(ImmutableList.of()); } private IExpectationSetters<?> expectNoTasks() { @@ -871,7 +871,7 @@ public class QuotaManagerImplTest extends EasyMockTest { } private IExpectationSetters<?> expectNoCronJobs() { - return expect(storageUtil.jobStore.fetchJobs()).andReturn(ImmutableSet.<IJobConfiguration>of()); + return expect(storageUtil.jobStore.fetchJobs()).andReturn(ImmutableSet.of()); } private IExpectationSetters<?> expectCronJobs(IJobConfiguration... jobs) { @@ -889,7 +889,7 @@ public class QuotaManagerImplTest extends EasyMockTest { private IExpectationSetters<?> expectNoCronJob() { return expect(storageUtil.jobStore.fetchJob(anyObject(IJobKey.class))) - .andReturn(Optional.<IJobConfiguration>absent()); + .andReturn(Optional.absent()); } private IExpectationSetters<Optional<IResourceAggregate>> expectQuota(IResourceAggregate quota) { http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/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 cb98834..d9c7b07 100644 --- a/src/test/java/org/apache/aurora/scheduler/sla/MetricCalculatorTest.java +++ b/src/test/java/org/apache/aurora/scheduler/sla/MetricCalculatorTest.java @@ -19,10 +19,8 @@ import java.util.Set; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Multimap; -import com.twitter.common.base.Supplier; import com.twitter.common.quantity.Amount; import com.twitter.common.quantity.Time; -import com.twitter.common.stats.Stat; import com.twitter.common.stats.StatsProvider; import com.twitter.common.testing.easymock.EasyMockTest; import com.twitter.common.util.testing.FakeClock; @@ -62,8 +60,8 @@ public class MetricCalculatorTest extends EasyMockTest { expect(statsProvider.untracked()).andReturn(untracked).anyTimes(); Capture<String> names = new Capture<>(CaptureType.ALL); - expect(untracked.makeGauge(EasyMock.capture(names), EasyMock.<Supplier<Number>>anyObject())) - .andReturn(EasyMock.<Stat<Number>>anyObject()) + expect(untracked.makeGauge(EasyMock.capture(names), EasyMock.anyObject())) + .andReturn(EasyMock.anyObject()) .anyTimes(); IScheduledTask task1 = makeTask(ImmutableMap.of(clock.nowMillis() - 1000, PENDING), 0); http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/src/test/java/org/apache/aurora/scheduler/sla/SlaModuleTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/sla/SlaModuleTest.java b/src/test/java/org/apache/aurora/scheduler/sla/SlaModuleTest.java index 5ee123a..763a6c4 100644 --- a/src/test/java/org/apache/aurora/scheduler/sla/SlaModuleTest.java +++ b/src/test/java/org/apache/aurora/scheduler/sla/SlaModuleTest.java @@ -26,7 +26,6 @@ import com.google.inject.Key; import com.google.inject.Module; import com.twitter.common.application.modules.AppLauncherModule; import com.twitter.common.application.modules.LifecycleModule; -import com.twitter.common.base.Supplier; import com.twitter.common.quantity.Amount; import com.twitter.common.quantity.Time; import com.twitter.common.stats.Stat; @@ -99,8 +98,8 @@ public class SlaModuleTest extends EasyMockTest { final CountDownLatch latch = new CountDownLatch(1); StatsProvider untracked = createMock(StatsProvider.class); expect(statsProvider.untracked()).andReturn(untracked).anyTimes(); - expect(untracked.makeGauge(EasyMock.anyString(), EasyMock.<Supplier<Number>>anyObject())) - .andReturn(EasyMock.<Stat<Number>>anyObject()) + expect(untracked.makeGauge(EasyMock.anyString(), EasyMock.anyObject())) + .andReturn(EasyMock.anyObject()) .andAnswer(new IAnswer<Stat<Number>>() { @Override public Stat<Number> answer() throws Throwable { http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/src/test/java/org/apache/aurora/scheduler/state/LockManagerImplTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/state/LockManagerImplTest.java b/src/test/java/org/apache/aurora/scheduler/state/LockManagerImplTest.java index 1b5a5a8..180ed74 100644 --- a/src/test/java/org/apache/aurora/scheduler/state/LockManagerImplTest.java +++ b/src/test/java/org/apache/aurora/scheduler/state/LockManagerImplTest.java @@ -120,7 +120,7 @@ public class LockManagerImplTest extends EasyMockTest { public void testValidateLockNotStoredNotHeld() throws Exception { control.replay(); - lockManager.validateIfLocked(LOCK_KEY, Optional.<ILock>empty()); + lockManager.validateIfLocked(LOCK_KEY, Optional.empty()); } @Test @@ -139,7 +139,7 @@ public class LockManagerImplTest extends EasyMockTest { expectLockException(JOB_KEY); lockManager.acquireLock(LOCK_KEY, USER); - lockManager.validateIfLocked(LOCK_KEY, Optional.<ILock>empty()); + lockManager.validateIfLocked(LOCK_KEY, Optional.empty()); } @Test @@ -168,12 +168,12 @@ public class LockManagerImplTest extends EasyMockTest { expect(storageUtil.storeProvider.getLockStore()).andReturn(storageUtil.lockStore).atLeastOnce(); expect(storageUtil.lockStore.fetchLock(LOCK_KEY)) - .andReturn(Optional.<ILock>empty()) + .andReturn(Optional.empty()) .atLeastOnce(); final CountDownLatch reads = new CountDownLatch(2); EasyMock.makeThreadSafe(storageUtil.storage, false); - expect(storageUtil.storage.read(EasyMock.<Work<Object, ?>>anyObject())) + expect(storageUtil.storage.read(EasyMock.anyObject())) .andAnswer(new IAnswer<Object>() { @Override public Object answer() throws Throwable { @@ -198,7 +198,7 @@ public class LockManagerImplTest extends EasyMockTest { @Override public void run() { try { - lockManager.validateIfLocked(LOCK_KEY, Optional.<ILock>empty()); + lockManager.validateIfLocked(LOCK_KEY, Optional.empty()); } catch (LockException e) { throw Throwables.propagate(e); } @@ -206,7 +206,7 @@ public class LockManagerImplTest extends EasyMockTest { }) .start(); - lockManager.validateIfLocked(LOCK_KEY, Optional.<ILock>empty()); + lockManager.validateIfLocked(LOCK_KEY, Optional.empty()); } private void expectLockException(IJobKey key) { http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/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 0d54049..cd85b80 100644 --- a/src/test/java/org/apache/aurora/scheduler/state/MaintenanceControllerImplTest.java +++ b/src/test/java/org/apache/aurora/scheduler/state/MaintenanceControllerImplTest.java @@ -114,7 +114,7 @@ public class MaintenanceControllerImplTest extends EasyMockTest { expect(storageUtil.attributeStore.getHostAttributes()).andReturn(ImmutableSet.of(attributes)); expectFetchTasksByHost(HOST_A, ImmutableSet.of(task2)); // TaskA is KILLED and therefore no longer active - expectFetchTasksByHost(HOST_A, ImmutableSet.<ScheduledTask>of()); + expectFetchTasksByHost(HOST_A, ImmutableSet.of()); expectMaintenanceModeChange(HOST_A, DRAINED); expectMaintenanceModeChange(HOST_A, NONE); @@ -133,18 +133,18 @@ public class MaintenanceControllerImplTest extends EasyMockTest { @Test public void testUnknownHost() { expect(storageUtil.attributeStore.getHostAttributes("b")) - .andReturn(Optional.<IHostAttributes>absent()); + .andReturn(Optional.absent()); control.replay(); - assertEquals(ImmutableSet.<HostStatus>of(), + assertEquals(ImmutableSet.of(), maintenance.startMaintenance(ImmutableSet.of("b"))); } @Test public void testDrainEmptyHost() { expectMaintenanceModeChange(HOST_A, SCHEDULED); - expectFetchTasksByHost(HOST_A, ImmutableSet.<ScheduledTask>of()); + expectFetchTasksByHost(HOST_A, ImmutableSet.of()); expectMaintenanceModeChange(HOST_A, DRAINED); control.replay(); @@ -177,8 +177,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.<IHostAttributes>absent()); + expect(storageUtil.attributeStore.getHostAttributes("unknown")).andReturn(Optional.absent()); control.replay(); @@ -190,7 +189,7 @@ public class MaintenanceControllerImplTest extends EasyMockTest { expect(stateManager.changeState( storageUtil.mutableStoreProvider, Tasks.id(task), - Optional.<ScheduleStatus>absent(), + Optional.absent(), ScheduleStatus.DRAINING, MaintenanceControllerImpl.DRAINING_MESSAGE)) .andReturn(StateChangeResult.SUCCESS); http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/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 ff0ef02..dba1945 100644 --- a/src/test/java/org/apache/aurora/scheduler/state/StateManagerImplTest.java +++ b/src/test/java/org/apache/aurora/scheduler/state/StateManagerImplTest.java @@ -199,7 +199,7 @@ public class StateManagerImplTest extends EasyMockTest { .setScheduler(StateManagerImpl.LOCAL_HOST_SUPPLIER.get()) .setStatus(PENDING))) .setAssignedTask(new AssignedTask() - .setAssignedPorts(ImmutableMap.<String, Integer>of()) + .setAssignedPorts(ImmutableMap.of()) .setInstanceId(3) .setTaskId(taskId) .setTask(NON_SERVICE_CONFIG.newBuilder())); @@ -227,7 +227,7 @@ public class StateManagerImplTest extends EasyMockTest { String taskId = "a"; expect(taskIdGenerator.generate(NON_SERVICE_CONFIG, 0)).andReturn(taskId); expectStateTransitions(taskId, INIT, PENDING, ASSIGNED, RUNNING, KILLING, KILLED); - driver.killTask(EasyMock.<String>anyObject()); + driver.killTask(EasyMock.anyObject()); control.replay(); @@ -245,7 +245,7 @@ public class StateManagerImplTest extends EasyMockTest { expect(taskIdGenerator.generate(NON_SERVICE_CONFIG, 0)).andReturn(taskId); expectStateTransitions(taskId, INIT, PENDING, ASSIGNED, RUNNING, KILLING, LOST); - driver.killTask(EasyMock.<String>anyObject()); + driver.killTask(EasyMock.anyObject()); control.replay(); @@ -305,8 +305,7 @@ public class StateManagerImplTest extends EasyMockTest { expectStateTransitions(taskId, INIT, PENDING, ASSIGNED, RUNNING, FAILED); String newTaskId = "b"; expect(taskIdGenerator.generate(task, 0)).andReturn(newTaskId); - expect(rescheduleCalculator.getFlappingPenaltyMs(EasyMock.<IScheduledTask>anyObject())) - .andReturn(100L); + expect(rescheduleCalculator.getFlappingPenaltyMs(EasyMock.anyObject())).andReturn(100L); expectStateTransitions(newTaskId, INIT, THROTTLED); control.replay(); @@ -329,8 +328,7 @@ public class StateManagerImplTest extends EasyMockTest { } private void noFlappingPenalty() { - expect(rescheduleCalculator.getFlappingPenaltyMs(EasyMock.<IScheduledTask>anyObject())) - .andReturn(0L); + expect(rescheduleCalculator.getFlappingPenaltyMs(EasyMock.anyObject())).andReturn(0L); } @Test @@ -376,12 +374,12 @@ public class StateManagerImplTest extends EasyMockTest { taskId, Optional.of(PENDING), RUNNING, - Optional.<String>absent())); + Optional.absent())); assertEquals(SUCCESS, changeState( taskId, Optional.of(ASSIGNED), FAILED, - Optional.<String>absent())); + Optional.absent())); } @Test @@ -392,7 +390,7 @@ public class StateManagerImplTest extends EasyMockTest { "a", Optional.of(PENDING), ASSIGNED, - Optional.<String>absent())); + Optional.absent())); } @Test @@ -480,7 +478,7 @@ public class StateManagerImplTest extends EasyMockTest { stateManager.insertPendingTasks( storeProvider, NON_SERVICE_CONFIG, - ImmutableSet.<Integer>of()); + ImmutableSet.of()); } }); } @@ -575,13 +573,13 @@ public class StateManagerImplTest extends EasyMockTest { private StateChangeResult changeState(final String taskId, final ScheduleStatus status) { return changeState( taskId, - Optional.<ScheduleStatus>absent(), + Optional.absent(), status, - Optional.<String>absent()); + Optional.absent()); } private void assignTask(String taskId, IHostAttributes host) { - assignTask(taskId, host, ImmutableMap.<String, Integer>of()); + assignTask(taskId, host, ImmutableMap.of()); } private void assignTask( http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/src/test/java/org/apache/aurora/scheduler/state/TaskAssignerImplTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/state/TaskAssignerImplTest.java b/src/test/java/org/apache/aurora/scheduler/state/TaskAssignerImplTest.java index 702a01a..f98818f 100644 --- a/src/test/java/org/apache/aurora/scheduler/state/TaskAssignerImplTest.java +++ b/src/test/java/org/apache/aurora/scheduler/state/TaskAssignerImplTest.java @@ -102,7 +102,7 @@ public class TaskAssignerImplTest extends EasyMockTest { expect(filter.filter( new UnusedResource(ResourceSlot.from(MESOS_OFFER), OFFER.getAttributes()), new ResourceRequest(TASK.getAssignedTask().getTask(), EMPTY))) - .andReturn(ImmutableSet.<Veto>of()); + .andReturn(ImmutableSet.of()); expect(stateManager.assignTask( storeProvider, Tasks.id(TASK), http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/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 b7326a6..e2c82b7 100644 --- a/src/test/java/org/apache/aurora/scheduler/state/TaskStateMachineTest.java +++ b/src/test/java/org/apache/aurora/scheduler/state/TaskStateMachineTest.java @@ -279,7 +279,7 @@ public class TaskStateMachineTest { new Function<Action, SideEffect>() { @Override public SideEffect apply(Action action) { - return new SideEffect(action, Optional.<ScheduleStatus>absent()); + return new SideEffect(action, Optional.absent()); } }; @@ -332,34 +332,34 @@ public class TaskStateMachineTest { private static final TransitionResult SAVE = new TransitionResult( SUCCESS, - ImmutableSet.of(new SideEffect(Action.SAVE_STATE, Optional.<ScheduleStatus>absent()))); + ImmutableSet.of(new SideEffect(Action.SAVE_STATE, Optional.absent()))); private static final TransitionResult SAVE_AND_KILL = new TransitionResult( SUCCESS, ImmutableSet.of( - new SideEffect(Action.SAVE_STATE, Optional.<ScheduleStatus>absent()), - new SideEffect(Action.KILL, Optional.<ScheduleStatus>absent()))); + new SideEffect(Action.SAVE_STATE, Optional.absent()), + new SideEffect(Action.KILL, Optional.absent()))); private static final TransitionResult SAVE_AND_RESCHEDULE = new TransitionResult( SUCCESS, ImmutableSet.of( - new SideEffect(Action.SAVE_STATE, Optional.<ScheduleStatus>absent()), - new SideEffect(Action.RESCHEDULE, Optional.<ScheduleStatus>absent()))); + new SideEffect(Action.SAVE_STATE, Optional.absent()), + new SideEffect(Action.RESCHEDULE, Optional.absent()))); private static final TransitionResult SAVE_KILL_AND_RESCHEDULE = new TransitionResult( SUCCESS, ImmutableSet.of( - new SideEffect(Action.SAVE_STATE, Optional.<ScheduleStatus>absent()), - new SideEffect(Action.KILL, Optional.<ScheduleStatus>absent()), - new SideEffect(Action.RESCHEDULE, Optional.<ScheduleStatus>absent()))); + new SideEffect(Action.SAVE_STATE, Optional.absent()), + new SideEffect(Action.KILL, Optional.absent()), + new SideEffect(Action.RESCHEDULE, Optional.absent()))); private static final TransitionResult ILLEGAL_KILL = new TransitionResult( ILLEGAL_WITH_SIDE_EFFECTS, - ImmutableSet.of(new SideEffect(Action.KILL, Optional.<ScheduleStatus>absent()))); + ImmutableSet.of(new SideEffect(Action.KILL, Optional.absent()))); private static final TransitionResult RECORD_FAILURE = new TransitionResult( SUCCESS, ImmutableSet.of( - new SideEffect(Action.SAVE_STATE, Optional.<ScheduleStatus>absent()), - new SideEffect(Action.INCREMENT_FAILURES, Optional.<ScheduleStatus>absent()))); + new SideEffect(Action.SAVE_STATE, Optional.absent()), + new SideEffect(Action.INCREMENT_FAILURES, Optional.absent()))); private static final TransitionResult DELETE_TASK = new TransitionResult( SUCCESS, - ImmutableSet.of(new SideEffect(Action.DELETE, Optional.<ScheduleStatus>absent()))); + ImmutableSet.of(new SideEffect(Action.DELETE, Optional.absent()))); private static final class TestCase { private final boolean taskPresent; @@ -539,9 +539,9 @@ public class TaskStateMachineTest { TransitionResult expectation = EXPECTATIONS.get(testCase); if (expectation == null) { if (taskPresent && from == to || !taskPresent && to == DELETED) { - expectation = new TransitionResult(NOOP, ImmutableSet.<SideEffect>of()); + expectation = new TransitionResult(NOOP, ImmutableSet.of()); } else { - expectation = new TransitionResult(ILLEGAL, ImmutableSet.<SideEffect>of()); + expectation = new TransitionResult(ILLEGAL, ImmutableSet.of()); } } http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/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 7b12d64..ed834bc 100644 --- a/src/test/java/org/apache/aurora/scheduler/stats/ResourceCounterTest.java +++ b/src/test/java/org/apache/aurora/scheduler/stats/ResourceCounterTest.java @@ -37,7 +37,6 @@ import org.apache.aurora.scheduler.storage.db.DbUtil; import org.apache.aurora.scheduler.storage.entities.IJobKey; import org.apache.aurora.scheduler.storage.entities.IResourceAggregate; import org.apache.aurora.scheduler.storage.entities.IScheduledTask; -import org.apache.aurora.scheduler.storage.entities.ITaskConfig; import org.junit.Before; import org.junit.Test; @@ -84,9 +83,9 @@ public class ResourceCounterTest { Map<IJobKey, Metric> aggregates = resourceCounter.computeAggregates( Query.unscoped(), - Predicates.<ITaskConfig>alwaysTrue(), + Predicates.alwaysTrue(), INFO_TO_JOB_KEY); - assertEquals(ImmutableMap.<IJobKey, Metric>of(), aggregates); + assertEquals(ImmutableMap.of(), aggregates); for (Metric metric : resourceCounter.computeConsumptionTotals()) { assertEquals(ZERO, metric); @@ -186,8 +185,7 @@ public class ResourceCounterTest { storage.write(new Storage.MutateWork.NoResult.Quiet() { @Override protected void execute(Storage.MutableStoreProvider storeProvider) { - storeProvider.getUnsafeTaskStore() - .saveTasks(ImmutableSet.<IScheduledTask>builder().add(tasks).build()); + storeProvider.getUnsafeTaskStore().saveTasks(ImmutableSet.copyOf(tasks)); } }); } http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/src/test/java/org/apache/aurora/scheduler/storage/AbstractCronJobStoreTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/storage/AbstractCronJobStoreTest.java b/src/test/java/org/apache/aurora/scheduler/storage/AbstractCronJobStoreTest.java index e20f66c..6b9eb34 100644 --- a/src/test/java/org/apache/aurora/scheduler/storage/AbstractCronJobStoreTest.java +++ b/src/test/java/org/apache/aurora/scheduler/storage/AbstractCronJobStoreTest.java @@ -62,7 +62,7 @@ public abstract class AbstractCronJobStoreTest { @Test public void testJobStore() { assertNull(fetchJob(JobKeys.from("nobody", "nowhere", "noname")).orNull()); - assertEquals(ImmutableSet.<IJobConfiguration>of(), fetchJobs()); + assertEquals(ImmutableSet.of(), fetchJobs()); saveAcceptedJob(JOB_A); assertEquals(JOB_A, fetchJob(KEY_A).orNull()); @@ -76,7 +76,7 @@ public abstract class AbstractCronJobStoreTest { assertEquals(ImmutableSet.of(JOB_A), fetchJobs()); deleteJobs(); - assertEquals(ImmutableSet.<IJobConfiguration>of(), fetchJobs()); + assertEquals(ImmutableSet.of(), fetchJobs()); } @Test http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/src/test/java/org/apache/aurora/scheduler/storage/AbstractTaskStoreTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/storage/AbstractTaskStoreTest.java b/src/test/java/org/apache/aurora/scheduler/storage/AbstractTaskStoreTest.java index 3a8e0d9..edfeb09 100644 --- a/src/test/java/org/apache/aurora/scheduler/storage/AbstractTaskStoreTest.java +++ b/src/test/java/org/apache/aurora/scheduler/storage/AbstractTaskStoreTest.java @@ -200,12 +200,12 @@ public abstract class AbstractTaskStoreTest { // Explicitly call out the current differing behaviors for types of empty query conditions. // Specifically - null task IDs and empty task IDs are different than other 'IN' conditions.. assertQueryResults(new TaskQuery().setTaskIds(null), TASK_A, TASK_B, TASK_C, TASK_D); - assertQueryResults(new TaskQuery().setTaskIds(ImmutableSet.<String>of())); + assertQueryResults(new TaskQuery().setTaskIds(ImmutableSet.of())); assertQueryResults( - new TaskQuery().setInstanceIds(ImmutableSet.<Integer>of()), + new TaskQuery().setInstanceIds(ImmutableSet.of()), TASK_A, TASK_B, TASK_C, TASK_D); assertQueryResults( - new TaskQuery().setStatuses(ImmutableSet.<ScheduleStatus>of()), + new TaskQuery().setStatuses(ImmutableSet.of()), TASK_A, TASK_B, TASK_C, TASK_D); } @@ -526,7 +526,7 @@ public abstract class AbstractTaskStoreTest { @Test public void testGetsJobKeys() { - assertEquals(ImmutableSet.<IJobKey>of(), getJobKeys()); + assertEquals(ImmutableSet.of(), getJobKeys()); saveTasks(TASK_A); assertEquals(toJobKeys(TASK_A), getJobKeys()); saveTasks(TASK_B, TASK_C); http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/src/test/java/org/apache/aurora/scheduler/storage/backup/RecoveryTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/storage/backup/RecoveryTest.java b/src/test/java/org/apache/aurora/scheduler/storage/backup/RecoveryTest.java index 09e4208..e699ecf 100644 --- a/src/test/java/org/apache/aurora/scheduler/storage/backup/RecoveryTest.java +++ b/src/test/java/org/apache/aurora/scheduler/storage/backup/RecoveryTest.java @@ -25,13 +25,8 @@ import com.twitter.common.quantity.Time; import com.twitter.common.testing.easymock.EasyMockTest; import com.twitter.common.util.testing.FakeClock; -import org.apache.aurora.gen.HostAttributes; -import org.apache.aurora.gen.Lock; -import org.apache.aurora.gen.storage.QuotaConfiguration; import org.apache.aurora.gen.storage.SchedulerMetadata; import org.apache.aurora.gen.storage.Snapshot; -import org.apache.aurora.gen.storage.StoredCronJob; -import org.apache.aurora.gen.storage.StoredJobUpdateDetails; import org.apache.aurora.scheduler.base.Query; import org.apache.aurora.scheduler.base.TaskTestUtil; import org.apache.aurora.scheduler.base.Tasks; @@ -108,7 +103,7 @@ public class RecoveryTest extends EasyMockTest { control.replay(); - assertEquals(ImmutableSet.<String>of(), recovery.listBackups()); + assertEquals(ImmutableSet.of(), recovery.listBackups()); clock.advance(INTERVAL); storageBackup.createSnapshot(); @@ -163,12 +158,12 @@ public class RecoveryTest extends EasyMockTest { private static Snapshot makeSnapshot(IScheduledTask... tasks) { return new Snapshot() - .setHostAttributes(ImmutableSet.<HostAttributes>of()) - .setCronJobs(ImmutableSet.<StoredCronJob>of()) + .setHostAttributes(ImmutableSet.of()) + .setCronJobs(ImmutableSet.of()) .setSchedulerMetadata(new SchedulerMetadata().setVersion(CURRENT_API_VERSION)) - .setQuotaConfigurations(ImmutableSet.<QuotaConfiguration>of()) + .setQuotaConfigurations(ImmutableSet.of()) .setTasks(IScheduledTask.toBuildersSet(ImmutableSet.copyOf(tasks))) - .setLocks(ImmutableSet.<Lock>of()) - .setJobUpdateDetails(ImmutableSet.<StoredJobUpdateDetails>of()); + .setLocks(ImmutableSet.of()) + .setJobUpdateDetails(ImmutableSet.of()); } } http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/src/test/java/org/apache/aurora/scheduler/storage/db/DbAttributeStoreTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/storage/db/DbAttributeStoreTest.java b/src/test/java/org/apache/aurora/scheduler/storage/db/DbAttributeStoreTest.java index db508ca..e19d15d 100644 --- a/src/test/java/org/apache/aurora/scheduler/storage/db/DbAttributeStoreTest.java +++ b/src/test/java/org/apache/aurora/scheduler/storage/db/DbAttributeStoreTest.java @@ -46,12 +46,12 @@ public class DbAttributeStoreTest { private static final IHostAttributes HOST_A_ATTRS = IHostAttributes.build(new HostAttributes(HOST_A, ImmutableSet.of(ATTR1, ATTR2)) .setSlaveId(SLAVE_A) - .setAttributes(ImmutableSet.<Attribute>of()) + .setAttributes(ImmutableSet.of()) .setMode(MaintenanceMode.NONE)); private static final IHostAttributes HOST_B_ATTRS = IHostAttributes.build(new HostAttributes(HOST_B, ImmutableSet.of(ATTR2, ATTR3)) .setSlaveId(SLAVE_B) - .setAttributes(ImmutableSet.<Attribute>of()) + .setAttributes(ImmutableSet.of()) .setMode(MaintenanceMode.DRAINING)); private Storage storage; @@ -63,8 +63,8 @@ public class DbAttributeStoreTest { @Test public void testCrud() { - assertEquals(Optional.<IHostAttributes>absent(), read(HOST_A)); - assertEquals(ImmutableSet.<IHostAttributes>of(), readAll()); + assertEquals(Optional.absent(), read(HOST_A)); + assertEquals(ImmutableSet.of(), readAll()); insert(HOST_A_ATTRS); assertEquals(Optional.of(HOST_A_ATTRS), read(HOST_A)); @@ -87,21 +87,21 @@ public class DbAttributeStoreTest { assertEquals(ImmutableSet.of(updatedMode, HOST_B_ATTRS), readAll()); truncate(); - assertEquals(Optional.<IHostAttributes>absent(), read(HOST_A)); - assertEquals(ImmutableSet.<IHostAttributes>of(), readAll()); + assertEquals(Optional.absent(), read(HOST_A)); + assertEquals(ImmutableSet.of(), readAll()); } @Test(expected = IllegalArgumentException.class) public void testEmptyAttributeValues() { IHostAttributes attributes = IHostAttributes.build(HOST_A_ATTRS.newBuilder() - .setAttributes(ImmutableSet.of(new Attribute("attr1", ImmutableSet.<String>of())))); + .setAttributes(ImmutableSet.of(new Attribute("attr1", ImmutableSet.of())))); insert(attributes); } @Test public void testNoAttributes() { IHostAttributes attributes = IHostAttributes.build( - HOST_A_ATTRS.newBuilder().setAttributes(ImmutableSet.<Attribute>of())); + HOST_A_ATTRS.newBuilder().setAttributes(ImmutableSet.of())); insert(attributes); assertEquals(Optional.of(attributes), read(HOST_A)); } http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/src/test/java/org/apache/aurora/scheduler/storage/db/DbJobUpdateStoreTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/storage/db/DbJobUpdateStoreTest.java b/src/test/java/org/apache/aurora/scheduler/storage/db/DbJobUpdateStoreTest.java index 550deae..3e78c09 100644 --- a/src/test/java/org/apache/aurora/scheduler/storage/db/DbJobUpdateStoreTest.java +++ b/src/test/java/org/apache/aurora/scheduler/storage/db/DbJobUpdateStoreTest.java @@ -116,8 +116,8 @@ public class DbJobUpdateStoreTest { IJobUpdate update1 = makeJobUpdate(updateId1); IJobUpdate update2 = makeJobUpdate(updateId2); - assertEquals(Optional.<IJobUpdate>absent(), getUpdate(updateId1)); - assertEquals(Optional.<IJobUpdate>absent(), getUpdate(updateId2)); + assertEquals(Optional.absent(), getUpdate(updateId1)); + assertEquals(Optional.absent(), getUpdate(updateId2)); StorageEntityUtil.assertFullyPopulated( update1, @@ -128,13 +128,13 @@ public class DbJobUpdateStoreTest { saveUpdate(update1, Optional.of("lock1")); assertUpdate(update1); - saveUpdate(update2, Optional.<String>absent()); + saveUpdate(update2, Optional.absent()); assertUpdate(update2); // Colliding update keys should be forbidden. IJobUpdate update3 = makeJobUpdate(updateId2); try { - saveUpdate(update3, Optional.<String>absent()); + saveUpdate(update3, Optional.absent()); fail("Update ID collision should not be allowed"); } catch (StorageException e) { // Expected. @@ -149,7 +149,7 @@ public class DbJobUpdateStoreTest { // Save with null initial state instances. saveUpdate(IJobUpdate.build(builder), Optional.of("lock")); - builder.getInstructions().setInitialState(ImmutableSet.<InstanceTaskConfig>of()); + builder.getInstructions().setInitialState(ImmutableSet.of()); assertUpdate(IJobUpdate.build(builder)); } @@ -177,7 +177,7 @@ public class DbJobUpdateStoreTest { public void testSaveNullInitialStateTaskThrows() { JobUpdate builder = makeJobUpdate(makeKey("u1")).newBuilder(); builder.getInstructions().getInitialState().add( - new InstanceTaskConfig(null, ImmutableSet.<Range>of())); + new InstanceTaskConfig(null, ImmutableSet.of())); saveUpdate(IJobUpdate.build(builder), Optional.of("lock")); } @@ -186,7 +186,7 @@ public class DbJobUpdateStoreTest { public void testSaveEmptyInitialStateRangesThrows() { JobUpdate builder = makeJobUpdate(makeKey("u1")).newBuilder(); builder.getInstructions().getInitialState().add( - new InstanceTaskConfig(new TaskConfig(), ImmutableSet.<Range>of())); + new InstanceTaskConfig(new TaskConfig(), ImmutableSet.of())); saveUpdate(IJobUpdate.build(builder), Optional.of("lock")); } @@ -202,7 +202,7 @@ public class DbJobUpdateStoreTest { @Test(expected = IllegalArgumentException.class) public void testSaveEmptyDesiredStateRangesThrows() { JobUpdate builder = makeJobUpdate(makeKey("u1")).newBuilder(); - builder.getInstructions().getDesiredState().setInstances(ImmutableSet.<Range>of()); + builder.getInstructions().getDesiredState().setInstances(ImmutableSet.of()); saveUpdate(IJobUpdate.build(builder), Optional.of("lock")); } @@ -213,7 +213,7 @@ public class DbJobUpdateStoreTest { IJobUpdate update = makeJobUpdate(updateId); JobUpdate builder = update.newBuilder(); - builder.getInstructions().getSettings().setUpdateOnlyTheseInstances(ImmutableSet.<Range>of()); + builder.getInstructions().getSettings().setUpdateOnlyTheseInstances(ImmutableSet.of()); IJobUpdate expected = IJobUpdate.build(builder); @@ -228,7 +228,7 @@ public class DbJobUpdateStoreTest { IJobUpdate update = makeJobUpdate(updateId); JobUpdate builder = update.newBuilder(); - builder.getInstructions().getSettings().setUpdateOnlyTheseInstances(ImmutableSet.<Range>of()); + builder.getInstructions().getSettings().setUpdateOnlyTheseInstances(ImmutableSet.of()); IJobUpdate expected = IJobUpdate.build(builder); @@ -339,7 +339,7 @@ public class DbJobUpdateStoreTest { storeProvider.getJobUpdateStore().saveJobUpdate(update, Optional.of("lock1")); } }); - assertEquals(Optional.<IJobUpdateDetails>absent(), getUpdateDetails(updateId)); + assertEquals(Optional.absent(), getUpdateDetails(updateId)); } @Test @@ -349,7 +349,7 @@ public class DbJobUpdateStoreTest { IJobUpdateDetails details1 = makeJobDetails(makeJobUpdate(updateId1)); IJobUpdateDetails details2 = makeJobDetails(makeJobUpdate(updateId2)); - assertEquals(ImmutableList.<IJobInstanceUpdateEvent>of(), getInstanceEvents(updateId2, 3)); + assertEquals(ImmutableList.of(), getInstanceEvents(updateId2, 3)); saveUpdate(details1.getUpdate(), Optional.of("lock1")); saveUpdate(details2.getUpdate(), Optional.of("lock2")); @@ -376,7 +376,7 @@ public class DbJobUpdateStoreTest { saveJobEvent(jEvent21, updateId2); saveJobEvent(jEvent22, updateId2); - assertEquals(ImmutableList.<IJobInstanceUpdateEvent>of(), getInstanceEvents(updateId2, 3)); + assertEquals(ImmutableList.of(), getInstanceEvents(updateId2, 3)); saveJobInstanceEvent(iEvent21, updateId2); assertEquals(ImmutableList.of(iEvent21), getInstanceEvents(updateId2, 3)); @@ -422,7 +422,7 @@ public class DbJobUpdateStoreTest { assertEquals(1, getUpdateDetails(updateId).get().getInstanceEvents().size()); truncateUpdates(); - assertEquals(Optional.<IJobUpdateDetails>absent(), getUpdateDetails(updateId)); + assertEquals(Optional.absent(), getUpdateDetails(updateId)); } @Test @@ -455,15 +455,15 @@ public class DbJobUpdateStoreTest { update1 = populateExpected( saveUpdateNoEvent(update1, Optional.of("lock1")), ROLLING_BACK, 123L, 123L); update2 = populateExpected( - saveUpdateNoEvent(update2, Optional.<String>absent()), ABORTED, 124L, 124L); + saveUpdateNoEvent(update2, Optional.absent()), ABORTED, 124L, 124L); update3 = populateExpected( - saveUpdateNoEvent(update3, Optional.<String>absent()), ROLLED_BACK, 125L, 125L); + saveUpdateNoEvent(update3, Optional.absent()), ROLLED_BACK, 125L, 125L); update4 = populateExpected( - saveUpdateNoEvent(update4, Optional.<String>absent()), FAILED, 126L, 126L); + saveUpdateNoEvent(update4, Optional.absent()), FAILED, 126L, 126L); update5 = populateExpected( - saveUpdateNoEvent(update5, Optional.<String>absent()), ERROR, 123L, 123L); + saveUpdateNoEvent(update5, Optional.absent()), ERROR, 123L, 123L); update6 = populateExpected( - saveUpdateNoEvent(update6, Optional.<String>absent()), FAILED, 125L, 125L); + saveUpdateNoEvent(update6, Optional.absent()), FAILED, 125L, 125L); update7 = populateExpected( saveUpdateNoEvent(update7, Optional.of("lock2")), ROLLING_FORWARD, 126L, 126L); @@ -486,7 +486,7 @@ public class DbJobUpdateStoreTest { long pruningThreshold = 120L; // No updates pruned. - assertEquals(ImmutableSet.<IJobUpdateKey>of(), pruneHistory(3, pruningThreshold)); + assertEquals(ImmutableSet.of(), pruneHistory(3, pruningThreshold)); assertEquals(Optional.of(update7), getUpdate(updateId7)); // active update assertEquals(Optional.of(update6), getUpdate(updateId6)); assertEquals(Optional.of(update5), getUpdate(updateId5)); @@ -505,24 +505,24 @@ public class DbJobUpdateStoreTest { // 1 update pruned. assertEquals(Optional.of(update4), getUpdate(updateId4)); assertEquals(Optional.of(update3), getUpdate(updateId3)); - assertEquals(Optional.<IJobUpdate>absent(), getUpdate(updateId2)); + assertEquals(Optional.absent(), getUpdate(updateId2)); assertEquals(Optional.of(update1), getUpdate(updateId1)); // active update assertEquals(ImmutableSet.of(updateId5, updateId3), pruneHistory(1, pruningThreshold)); // 1 update pruned. assertEquals(Optional.of(update7), getUpdate(updateId7)); // active update assertEquals(Optional.of(update6), getUpdate(updateId6)); - assertEquals(Optional.<IJobUpdate>absent(), getUpdate(updateId5)); + assertEquals(Optional.absent(), getUpdate(updateId5)); // 2 updates pruned. assertEquals(Optional.of(update4), getUpdate(updateId4)); - assertEquals(Optional.<IJobUpdate>absent(), getUpdate(updateId3)); + assertEquals(Optional.absent(), getUpdate(updateId3)); assertEquals(Optional.of(update1), getUpdate(updateId1)); // active update // The oldest update is pruned. assertEquals(ImmutableSet.of(updateId6), pruneHistory(1, 126L)); assertEquals(Optional.of(update7), getUpdate(updateId7)); // active update - assertEquals(Optional.<IJobUpdate>absent(), getUpdate(updateId6)); + assertEquals(Optional.absent(), getUpdate(updateId6)); assertEquals(Optional.of(update4), getUpdate(updateId4)); assertEquals(Optional.of(update1), getUpdate(updateId1)); // active update @@ -531,7 +531,7 @@ public class DbJobUpdateStoreTest { assertEquals(ImmutableSet.of(updateId4), pruneHistory(0, pruningThreshold)); assertEquals(Optional.of(update7), getUpdate(updateId7)); // active update - assertEquals(Optional.<IJobUpdate>absent(), getUpdate(updateId4)); + assertEquals(Optional.absent(), getUpdate(updateId4)); assertEquals(Optional.of(update1), getUpdate(updateId1)); // active update } @@ -667,11 +667,11 @@ public class DbJobUpdateStoreTest { // Test querying by incorrect update keys. assertEquals( - ImmutableList.<IJobUpdateSummary>of(), + ImmutableList.of(), getSummaries( new JobUpdateQuery().setKey(new JobUpdateKey(job5.newBuilder(), s4.getKey().getId())))); assertEquals( - ImmutableList.<IJobUpdateSummary>of(), + ImmutableList.of(), getSummaries( new JobUpdateQuery().setKey(new JobUpdateKey(job4.newBuilder(), s5.getKey().getId())))); @@ -689,7 +689,7 @@ public class DbJobUpdateStoreTest { // Test query by empty statuses. assertEquals( ImmutableList.of(s3, s5, s4, s2, s1), - getSummaries(new JobUpdateQuery().setUpdateStatuses(ImmutableSet.<JobUpdateStatus>of()))); + getSummaries(new JobUpdateQuery().setUpdateStatuses(ImmutableSet.of()))); // Test paging. assertEquals( @@ -704,7 +704,7 @@ public class DbJobUpdateStoreTest { // Test no match. assertEquals( - ImmutableList.<IJobUpdateSummary>of(), + ImmutableList.of(), getSummaries(new JobUpdateQuery().setRole("no_match"))); } @@ -718,7 +718,7 @@ public class DbJobUpdateStoreTest { IJobUpdate update1 = makeJobUpdate(updateId1); IJobUpdate update2 = makeJobUpdate(updateId2); - assertEquals(ImmutableList.<IJobInstanceUpdateEvent>of(), getInstanceEvents(updateId2, 3)); + assertEquals(ImmutableList.of(), getInstanceEvents(updateId2, 3)); saveUpdate(update1, Optional.of("lock1")); saveUpdate(update2, Optional.of("lock2")); @@ -775,7 +775,7 @@ public class DbJobUpdateStoreTest { // Test no match. assertEquals( - ImmutableList.<IJobUpdateDetails>of(), + ImmutableList.of(), queryDetails(new JobUpdateQuery().setRole("no match"))); } @@ -982,14 +982,14 @@ public class DbJobUpdateStoreTest { return updateJobDetails( update, ImmutableList.of(FIRST_EVENT), - ImmutableList.<IJobInstanceUpdateEvent>of()); + ImmutableList.of()); } private IJobUpdateDetails updateJobDetails(IJobUpdate update, IJobUpdateEvent event) { return updateJobDetails( update, ImmutableList.of(event), - ImmutableList.<IJobInstanceUpdateEvent>of()); + ImmutableList.of()); } private IJobUpdateDetails updateJobDetails( http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/src/test/java/org/apache/aurora/scheduler/storage/db/DbLockStoreTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/storage/db/DbLockStoreTest.java b/src/test/java/org/apache/aurora/scheduler/storage/db/DbLockStoreTest.java index 5152448..400e99f 100644 --- a/src/test/java/org/apache/aurora/scheduler/storage/db/DbLockStoreTest.java +++ b/src/test/java/org/apache/aurora/scheduler/storage/db/DbLockStoreTest.java @@ -167,17 +167,17 @@ public class DbLockStoreTest { ILock lock1 = makeLock(JobKeys.from(role1, env, job).newBuilder(), "token1"); ILock lock2 = makeLock(JobKeys.from(role2, env, job).newBuilder(), "token2"); - assertEquals(Optional.<ILock>empty(), getLock(lock1.getKey())); - assertEquals(Optional.<ILock>empty(), getLock(lock2.getKey())); + assertEquals(Optional.empty(), getLock(lock1.getKey())); + assertEquals(Optional.empty(), getLock(lock2.getKey())); saveLocks(StorageEntityUtil.assertFullyPopulated(lock1)); assertEquals(Optional.of(lock1), getLock(lock1.getKey())); - assertEquals(Optional.<ILock>empty(), getLock(lock2.getKey())); + assertEquals(Optional.empty(), getLock(lock2.getKey())); saveLocks(lock2); assertEquals(Optional.of(lock1), getLock(lock1.getKey())); assertEquals(Optional.of(lock2), getLock(lock2.getKey())); removeLocks(lock1); - assertEquals(Optional.<ILock>empty(), getLock(lock1.getKey())); + assertEquals(Optional.empty(), getLock(lock1.getKey())); assertEquals(Optional.of(lock2), getLock(lock2.getKey())); } http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/src/test/java/org/apache/aurora/scheduler/storage/db/DbQuotaStoreTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/storage/db/DbQuotaStoreTest.java b/src/test/java/org/apache/aurora/scheduler/storage/db/DbQuotaStoreTest.java index a0bd6e1..ff7afcf 100644 --- a/src/test/java/org/apache/aurora/scheduler/storage/db/DbQuotaStoreTest.java +++ b/src/test/java/org/apache/aurora/scheduler/storage/db/DbQuotaStoreTest.java @@ -50,8 +50,8 @@ public class DbQuotaStoreTest { @Test public void testCrud() { - assertEquals(Optional.<IResourceAggregate>absent(), select(ROLE_A)); - assertQuotas(ImmutableMap.<String, IResourceAggregate>of()); + assertEquals(Optional.absent(), select(ROLE_A)); + assertQuotas(ImmutableMap.of()); save(ROLE_A, StorageEntityUtil.assertFullyPopulated(QUOTA_A)); save(ROLE_B, QUOTA_B); @@ -62,22 +62,22 @@ public class DbQuotaStoreTest { delete(ROLE_B); assertEquals(Optional.of(QUOTA_A), select(ROLE_A)); - assertEquals(Optional.<IResourceAggregate>absent(), select(ROLE_B)); + assertEquals(Optional.absent(), select(ROLE_B)); assertQuotas(ImmutableMap.of(ROLE_A, QUOTA_A)); deleteAll(); - assertEquals(Optional.<IResourceAggregate>absent(), select(ROLE_A)); - assertEquals(Optional.<IResourceAggregate>absent(), select(ROLE_B)); - assertQuotas(ImmutableMap.<String, IResourceAggregate>of()); + assertEquals(Optional.absent(), select(ROLE_A)); + assertEquals(Optional.absent(), select(ROLE_B)); + assertQuotas(ImmutableMap.of()); } @Test public void testDeleteNonExistent() { - assertEquals(Optional.<IResourceAggregate>absent(), select(ROLE_A)); - assertQuotas(ImmutableMap.<String, IResourceAggregate>of()); + assertEquals(Optional.absent(), select(ROLE_A)); + assertQuotas(ImmutableMap.of()); delete(ROLE_A); - assertEquals(Optional.<IResourceAggregate>absent(), select(ROLE_A)); - assertQuotas(ImmutableMap.<String, IResourceAggregate>of()); + assertEquals(Optional.absent(), select(ROLE_A)); + assertQuotas(ImmutableMap.of()); } @Test http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/src/test/java/org/apache/aurora/scheduler/storage/db/DbSchedulerStoreTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/storage/db/DbSchedulerStoreTest.java b/src/test/java/org/apache/aurora/scheduler/storage/db/DbSchedulerStoreTest.java index 0bfb4d4..36ff3a5 100644 --- a/src/test/java/org/apache/aurora/scheduler/storage/db/DbSchedulerStoreTest.java +++ b/src/test/java/org/apache/aurora/scheduler/storage/db/DbSchedulerStoreTest.java @@ -38,7 +38,7 @@ public class DbSchedulerStoreTest { @Test public void testSchedulerStore() { - assertEquals(Optional.<String>absent(), select()); + assertEquals(Optional.absent(), select()); save("a"); assertEquals(Optional.of("a"), select()); save("b"); http://git-wip-us.apache.org/repos/asf/aurora/blob/013ba6ff/src/test/java/org/apache/aurora/scheduler/storage/db/DbStorageTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/storage/db/DbStorageTest.java b/src/test/java/org/apache/aurora/scheduler/storage/db/DbStorageTest.java index b24fef9..15a9589 100644 --- a/src/test/java/org/apache/aurora/scheduler/storage/db/DbStorageTest.java +++ b/src/test/java/org/apache/aurora/scheduler/storage/db/DbStorageTest.java @@ -21,10 +21,8 @@ import org.apache.aurora.scheduler.storage.JobUpdateStore; import org.apache.aurora.scheduler.storage.LockStore; import org.apache.aurora.scheduler.storage.QuotaStore; import org.apache.aurora.scheduler.storage.SchedulerStore; -import org.apache.aurora.scheduler.storage.Storage.MutableStoreProvider; import org.apache.aurora.scheduler.storage.Storage.MutateWork; import org.apache.aurora.scheduler.storage.Storage.StorageException; -import org.apache.aurora.scheduler.storage.Storage.StoreProvider; import org.apache.aurora.scheduler.storage.Storage.Work; import org.apache.aurora.scheduler.storage.TaskStore; import org.apache.ibatis.exceptions.PersistenceException; @@ -69,7 +67,7 @@ public class DbStorageTest extends EasyMockTest { @Test(expected = StorageException.class) public void testReadFails() { - expect(readWork.apply(EasyMock.<StoreProvider>anyObject())) + expect(readWork.apply(EasyMock.anyObject())) .andThrow(new PersistenceException()); control.replay(); @@ -79,7 +77,7 @@ public class DbStorageTest extends EasyMockTest { @Test public void testRead() { - expect(readWork.apply(EasyMock.<StoreProvider>anyObject())).andReturn("hi"); + expect(readWork.apply(EasyMock.anyObject())).andReturn("hi"); control.replay(); @@ -101,7 +99,7 @@ public class DbStorageTest extends EasyMockTest { public void testBulkLoad() { expect(sessionFactory.openSession(false)).andReturn(session); expect(session.update(DbStorage.DISABLE_UNDO_LOG)).andReturn(0); - writeWork.apply(EasyMock.<MutableStoreProvider>anyObject()); + writeWork.apply(EasyMock.anyObject()); session.close(); expect(session.update(DbStorage.ENABLE_UNDO_LOG)).andReturn(0);
