You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aurora.apache.org by wf...@apache.org on 2014/07/01 22:36:44 UTC
[1/3] Use java.util.Objects replacements for guava helpers.
Repository: incubator-aurora
Updated Branches:
refs/heads/master d7b8f76b4 -> 5bd683594
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/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 3d3dcb1..f2656de 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
@@ -54,7 +54,7 @@ import org.apache.aurora.scheduler.storage.entities.IScheduledTask;
import org.apache.aurora.scheduler.storage.entities.ITaskConfig;
import org.apache.commons.lang.StringUtils;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
/**
* An in-memory task store.
@@ -116,7 +116,7 @@ class MemTaskStore implements TaskStore.Mutable {
@Timed("mem_storage_fetch_tasks")
@Override
public ImmutableSet<IScheduledTask> fetchTasks(Query.Builder query) {
- checkNotNull(query);
+ requireNonNull(query);
long start = System.nanoTime();
ImmutableSet<IScheduledTask> result = matches(query).transform(TO_SCHEDULED).toSet();
@@ -141,7 +141,7 @@ class MemTaskStore implements TaskStore.Mutable {
@Timed("mem_storage_save_tasks")
@Override
public void saveTasks(Set<IScheduledTask> newTasks) {
- checkNotNull(newTasks);
+ requireNonNull(newTasks);
Preconditions.checkState(Tasks.ids(newTasks).size() == newTasks.size(),
"Proposed new tasks would create task ID collision.");
@@ -165,7 +165,7 @@ class MemTaskStore implements TaskStore.Mutable {
@Timed("mem_storage_delete_tasks")
@Override
public void deleteTasks(Set<String> taskIds) {
- checkNotNull(taskIds);
+ requireNonNull(taskIds);
for (String id : taskIds) {
Task removed = tasks.remove(id);
@@ -186,8 +186,8 @@ class MemTaskStore implements TaskStore.Mutable {
Query.Builder query,
Function<IScheduledTask, IScheduledTask> mutator) {
- checkNotNull(query);
- checkNotNull(mutator);
+ requireNonNull(query);
+ requireNonNull(mutator);
ImmutableSet.Builder<IScheduledTask> mutated = ImmutableSet.builder();
for (Task original : matches(query).toList()) {
@@ -212,7 +212,7 @@ class MemTaskStore implements TaskStore.Mutable {
@Override
public boolean unsafeModifyInPlace(String taskId, ITaskConfig taskConfiguration) {
MorePreconditions.checkNotBlank(taskId);
- checkNotNull(taskConfiguration);
+ requireNonNull(taskConfiguration);
Task stored = tasks.get(taskId);
if (stored == null) {
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/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 5751a86..2549dd3 100644
--- a/src/main/java/org/apache/aurora/scheduler/thrift/SchedulerThriftInterface.java
+++ b/src/main/java/org/apache/aurora/scheduler/thrift/SchedulerThriftInterface.java
@@ -129,7 +129,8 @@ import org.apache.aurora.scheduler.thrift.auth.Requires;
import org.apache.commons.lang.StringUtils;
import org.apache.thrift.TException;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
+
import static com.twitter.common.base.MorePreconditions.checkNotBlank;
import static org.apache.aurora.auth.SessionValidator.SessionContext;
@@ -211,16 +212,16 @@ class SchedulerThriftInterface implements AuroraAdmin.Iface {
CronPredictor cronPredictor,
QuotaManager quotaManager) {
- this.storage = checkNotNull(storage);
- this.schedulerCore = checkNotNull(schedulerCore);
- this.lockManager = checkNotNull(lockManager);
- this.sessionValidator = checkNotNull(sessionValidator);
- this.backup = checkNotNull(backup);
- this.recovery = checkNotNull(recovery);
- this.maintenance = checkNotNull(maintenance);
- this.cronJobManager = checkNotNull(cronJobManager);
- this.cronPredictor = checkNotNull(cronPredictor);
- this.quotaManager = checkNotNull(quotaManager);
+ this.storage = requireNonNull(storage);
+ this.schedulerCore = requireNonNull(schedulerCore);
+ this.lockManager = requireNonNull(lockManager);
+ this.sessionValidator = requireNonNull(sessionValidator);
+ this.backup = requireNonNull(backup);
+ this.recovery = requireNonNull(recovery);
+ this.maintenance = requireNonNull(maintenance);
+ this.cronJobManager = requireNonNull(cronJobManager);
+ this.cronPredictor = requireNonNull(cronPredictor);
+ this.quotaManager = requireNonNull(quotaManager);
}
@Override
@@ -231,7 +232,7 @@ class SchedulerThriftInterface implements AuroraAdmin.Iface {
IJobConfiguration job = IJobConfiguration.build(mutableJob);
IJobKey jobKey = JobKeys.assertValid(job.getKey());
- checkNotNull(session);
+ requireNonNull(session);
Response response = Util.emptyResponse();
@@ -266,7 +267,7 @@ class SchedulerThriftInterface implements AuroraAdmin.Iface {
IJobConfiguration job = IJobConfiguration.build(mutableJob);
IJobKey jobKey = JobKeys.assertValid(job.getKey());
- checkNotNull(session);
+ requireNonNull(session);
Response response = Util.emptyResponse();
@@ -346,10 +347,10 @@ class SchedulerThriftInterface implements AuroraAdmin.Iface {
@Nullable Lock mutableLock,
SessionKey session) {
- checkNotNull(mutableConfig);
+ requireNonNull(mutableConfig);
IJobConfiguration job = IJobConfiguration.build(mutableConfig);
IJobKey jobKey = JobKeys.assertValid(job.getKey());
- checkNotNull(session);
+ requireNonNull(session);
Response response = Util.emptyResponse();
try {
@@ -374,7 +375,7 @@ class SchedulerThriftInterface implements AuroraAdmin.Iface {
@Override
public Response populateJobConfig(JobConfiguration description) {
- checkNotNull(description);
+ requireNonNull(description);
Response response = Util.emptyResponse();
try {
@@ -394,7 +395,7 @@ class SchedulerThriftInterface implements AuroraAdmin.Iface {
@Override
public Response startCronJob(JobKey mutableJobKey, SessionKey session) {
- checkNotNull(session);
+ requireNonNull(session);
IJobKey jobKey = JobKeys.assertValid(IJobKey.build(mutableJobKey));
Response response = Util.emptyResponse();
@@ -435,7 +436,7 @@ class SchedulerThriftInterface implements AuroraAdmin.Iface {
}
private List<ScheduledTask> getTasks(TaskQuery query) {
- checkNotNull(query);
+ requireNonNull(query);
Iterable<IScheduledTask> tasks =
Storage.Util.weaklyConsistentFetchTasks(storage, Query.arbitrary(query));
@@ -641,8 +642,8 @@ class SchedulerThriftInterface implements AuroraAdmin.Iface {
@Override
public Response killTasks(final TaskQuery query, Lock mutablelock, SessionKey session) {
- checkNotNull(query);
- checkNotNull(session);
+ requireNonNull(query);
+ requireNonNull(session);
Response response = Util.emptyResponse();
@@ -685,7 +686,7 @@ class SchedulerThriftInterface implements AuroraAdmin.Iface {
IJobKey jobKey = JobKeys.assertValid(IJobKey.build(mutableJobKey));
checkNotBlank(shardIds);
- checkNotNull(session);
+ requireNonNull(session);
Response response = Util.emptyResponse();
SessionContext context;
@@ -730,8 +731,8 @@ class SchedulerThriftInterface implements AuroraAdmin.Iface {
SessionKey session) {
checkNotBlank(ownerRole);
- checkNotNull(resourceAggregate);
- checkNotNull(session);
+ requireNonNull(resourceAggregate);
+ requireNonNull(session);
Response response = Util.emptyResponse();
try {
@@ -775,8 +776,8 @@ class SchedulerThriftInterface implements AuroraAdmin.Iface {
@Override
public Response forceTaskState(String taskId, ScheduleStatus status, SessionKey session) {
checkNotBlank(taskId);
- checkNotNull(status);
- checkNotNull(session);
+ requireNonNull(status);
+ requireNonNull(session);
Response response = Util.emptyResponse();
SessionContext context;
@@ -1034,8 +1035,8 @@ class SchedulerThriftInterface implements AuroraAdmin.Iface {
@Nullable Lock mutableLock,
SessionKey session) {
- checkNotNull(config);
- checkNotNull(session);
+ requireNonNull(config);
+ requireNonNull(session);
checkNotBlank(config.getInstanceIds());
IJobKey jobKey = JobKeys.assertValid(IJobKey.build(config.getKey()));
@@ -1075,8 +1076,8 @@ class SchedulerThriftInterface implements AuroraAdmin.Iface {
@Override
public Response acquireLock(LockKey mutableLockKey, SessionKey session) {
- checkNotNull(mutableLockKey);
- checkNotNull(session);
+ requireNonNull(mutableLockKey);
+ requireNonNull(session);
ILockKey lockKey = ILockKey.build(mutableLockKey);
Response response = Util.emptyResponse();
@@ -1100,9 +1101,9 @@ class SchedulerThriftInterface implements AuroraAdmin.Iface {
@Override
public Response releaseLock(Lock mutableLock, LockValidation validation, SessionKey session) {
- checkNotNull(mutableLock);
- checkNotNull(validation);
- checkNotNull(session);
+ requireNonNull(mutableLock);
+ requireNonNull(validation);
+ requireNonNull(session);
Response response = Util.emptyResponse();
ILock lock = ILock.build(mutableLock);
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/main/java/org/apache/aurora/scheduler/thrift/aop/UserCapabilityInterceptor.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/thrift/aop/UserCapabilityInterceptor.java b/src/main/java/org/apache/aurora/scheduler/thrift/aop/UserCapabilityInterceptor.java
index 411efea..5e6577d 100644
--- a/src/main/java/org/apache/aurora/scheduler/thrift/aop/UserCapabilityInterceptor.java
+++ b/src/main/java/org/apache/aurora/scheduler/thrift/aop/UserCapabilityInterceptor.java
@@ -16,13 +16,13 @@ package org.apache.aurora.scheduler.thrift.aop;
import java.lang.reflect.Method;
import java.util.Arrays;
import java.util.List;
+import java.util.Objects;
import java.util.logging.Logger;
import javax.inject.Inject;
import com.google.common.base.Function;
import com.google.common.base.Optional;
-import com.google.common.base.Preconditions;
import com.google.common.base.Predicates;
import com.google.common.collect.FluentIterable;
import com.google.common.collect.ImmutableList;
@@ -59,7 +59,7 @@ class UserCapabilityInterceptor implements MethodInterceptor {
@Override
public Object invoke(MethodInvocation invocation) throws Throwable {
- Preconditions.checkNotNull(capabilityValidator, "Session validator has not yet been set.");
+ Objects.requireNonNull(capabilityValidator, "Session validator has not yet been set.");
// Ensure ROOT is always permitted.
ImmutableList.Builder<Capability> whitelistBuilder =
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/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 a78e666..e390af1 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
@@ -14,6 +14,7 @@
package org.apache.aurora.scheduler.thrift.auth;
import java.util.Map;
+import java.util.Objects;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
@@ -50,7 +51,7 @@ public class ThriftAuthModule extends AbstractModule {
@VisibleForTesting
public ThriftAuthModule(Map<Capability, String> capabilities) {
- this.capabilities = Preconditions.checkNotNull(capabilities);
+ this.capabilities = Objects.requireNonNull(capabilities);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/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 13e3461..9d500ba 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
@@ -153,7 +153,7 @@ public final class %(name)s {
private int cachedHashCode = 0;
%(fields)s
private %(name)s(%(wrapped)s wrapped) {
- this.wrapped = Preconditions.checkNotNull(wrapped);%(assignments)s
+ this.wrapped = Objects.requireNonNull(wrapped);%(assignments)s
}
static %(name)s buildNoCopy(%(wrapped)s wrapped) {
@@ -355,7 +355,7 @@ def parse_structs(thrift_defs):
def generate_java(struct):
code = GeneratedCode(struct.codegen_name, struct.name)
- code.add_import('com.google.common.base.Preconditions')
+ code.add_import('java.util.Objects')
code.add_import('com.google.common.base.Function')
code.add_import('com.google.common.collect.ImmutableList')
code.add_import('com.google.common.collect.ImmutableSet')
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/test/java/org/apache/aurora/scheduler/cron/quartz/CronIT.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/cron/quartz/CronIT.java b/src/test/java/org/apache/aurora/scheduler/cron/quartz/CronIT.java
index 6dcf695..f3c7c5b 100644
--- a/src/test/java/org/apache/aurora/scheduler/cron/quartz/CronIT.java
+++ b/src/test/java/org/apache/aurora/scheduler/cron/quartz/CronIT.java
@@ -19,7 +19,6 @@ import com.google.common.util.concurrent.Service;
import com.google.inject.AbstractModule;
import com.google.inject.Guice;
import com.google.inject.Injector;
-
import com.google.inject.util.Modules;
import com.twitter.common.application.ShutdownRegistry;
import com.twitter.common.base.ExceptionalCommand;
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/test/java/org/apache/aurora/scheduler/cron/quartz/CronPredictorImplTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/cron/quartz/CronPredictorImplTest.java b/src/test/java/org/apache/aurora/scheduler/cron/quartz/CronPredictorImplTest.java
index 4376983..c68adc4 100644
--- a/src/test/java/org/apache/aurora/scheduler/cron/quartz/CronPredictorImplTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/cron/quartz/CronPredictorImplTest.java
@@ -25,7 +25,6 @@ import com.twitter.common.util.testing.FakeClock;
import org.apache.aurora.scheduler.cron.CronPredictor;
import org.apache.aurora.scheduler.cron.CrontabEntry;
-
import org.apache.aurora.scheduler.cron.ExpectedPrediction;
import org.junit.Before;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/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 6038514..55fbc55 100644
--- a/src/test/java/org/apache/aurora/scheduler/http/LocksTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/http/LocksTest.java
@@ -17,7 +17,6 @@ import javax.servlet.http.HttpServletResponse;
import javax.ws.rs.core.Response;
import com.google.common.collect.ImmutableSet;
-
import com.twitter.common.testing.easymock.EasyMockTest;
import org.apache.aurora.gen.Lock;
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/test/java/org/apache/aurora/scheduler/sla/SlaAlgorithmTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/sla/SlaAlgorithmTest.java b/src/test/java/org/apache/aurora/scheduler/sla/SlaAlgorithmTest.java
index 7bbc99b..e775527 100644
--- a/src/test/java/org/apache/aurora/scheduler/sla/SlaAlgorithmTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/sla/SlaAlgorithmTest.java
@@ -23,7 +23,6 @@ import com.google.common.collect.Range;
import com.google.common.collect.Sets;
import org.apache.aurora.gen.ScheduleStatus;
-
import org.apache.aurora.scheduler.storage.entities.IScheduledTask;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/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 e8b6241..850c9a9 100644
--- a/src/test/java/org/apache/aurora/scheduler/sla/SlaModuleTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/sla/SlaModuleTest.java
@@ -48,7 +48,6 @@ import org.junit.Test;
import static org.apache.aurora.gen.ScheduleStatus.PENDING;
import static org.easymock.EasyMock.expect;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/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 f1892bd..791aa6f 100644
--- a/src/test/java/org/apache/aurora/scheduler/state/LockManagerImplTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/state/LockManagerImplTest.java
@@ -17,7 +17,6 @@ import java.util.UUID;
import com.google.common.base.Optional;
import com.google.common.collect.Iterables;
-
import com.twitter.common.quantity.Amount;
import com.twitter.common.quantity.Time;
import com.twitter.common.testing.easymock.EasyMockTest;
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/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 de394eb..cb32547 100644
--- a/src/test/java/org/apache/aurora/scheduler/state/TaskStateMachineTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/state/TaskStateMachineTest.java
@@ -14,10 +14,10 @@
package org.apache.aurora.scheduler.state;
import java.util.Map;
+import java.util.Objects;
import java.util.Set;
import com.google.common.base.Function;
-import com.google.common.base.Objects;
import com.google.common.base.Optional;
import com.google.common.collect.FluentIterable;
import com.google.common.collect.ImmutableList;
@@ -444,7 +444,7 @@ public class TaskStateMachineTest {
@Override
public int hashCode() {
- return Objects.hashCode(taskPresent, from, to);
+ return Objects.hash(taskPresent, from, to);
}
@Override
@@ -461,7 +461,7 @@ public class TaskStateMachineTest {
@Override
public String toString() {
- return Objects.toStringHelper(this)
+ return com.google.common.base.Objects.toStringHelper(this)
.add("taskPresent", taskPresent)
.add("from", from)
.add("to", to)
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/test/java/org/apache/aurora/scheduler/thrift/aop/ForwardingThrift.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/thrift/aop/ForwardingThrift.java b/src/test/java/org/apache/aurora/scheduler/thrift/aop/ForwardingThrift.java
index a746c48..ed24ca0 100644
--- a/src/test/java/org/apache/aurora/scheduler/thrift/aop/ForwardingThrift.java
+++ b/src/test/java/org/apache/aurora/scheduler/thrift/aop/ForwardingThrift.java
@@ -31,7 +31,7 @@ import org.apache.aurora.gen.SessionKey;
import org.apache.aurora.gen.TaskQuery;
import org.apache.thrift.TException;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
/**
* A forwarding scheduler controller to make it easy to override specific behavior in an
@@ -42,7 +42,7 @@ abstract class ForwardingThrift implements AuroraAdmin.Iface {
private final AuroraAdmin.Iface delegate;
ForwardingThrift(AuroraAdmin.Iface delegate) {
- this.delegate = checkNotNull(delegate);
+ this.delegate = requireNonNull(delegate);
}
@Override
[3/3] git commit: Use java.util.Objects replacements for guava
helpers.
Posted by wf...@apache.org.
Use java.util.Objects replacements for guava helpers.
Reviewed at https://reviews.apache.org/r/22982/
Project: http://git-wip-us.apache.org/repos/asf/incubator-aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-aurora/commit/5bd68359
Tree: http://git-wip-us.apache.org/repos/asf/incubator-aurora/tree/5bd68359
Diff: http://git-wip-us.apache.org/repos/asf/incubator-aurora/diff/5bd68359
Branch: refs/heads/master
Commit: 5bd68359402a2588ac89d023971f78c7198be0c2
Parents: d7b8f76
Author: Bill Farner <wf...@apache.org>
Authored: Tue Jul 1 13:34:02 2014 -0700
Committer: Bill Farner <wf...@apache.org>
Committed: Tue Jul 1 13:34:02 2014 -0700
----------------------------------------------------------------------
.../apache/aurora/codec/ThriftBinaryCodec.java | 10 +--
.../org/apache/aurora/scheduler/Driver.java | 5 +-
.../apache/aurora/scheduler/DriverFactory.java | 3 +-
.../aurora/scheduler/MesosSchedulerImpl.java | 12 ++--
.../aurora/scheduler/MesosTaskFactory.java | 5 +-
.../aurora/scheduler/SchedulerLifecycle.java | 27 ++++----
.../aurora/scheduler/TaskIdGenerator.java | 4 +-
.../org/apache/aurora/scheduler/TaskVars.java | 6 +-
.../aurora/scheduler/UserTaskLauncher.java | 8 +--
.../apache/aurora/scheduler/app/AppModule.java | 5 +-
.../aurora/scheduler/app/Log4jConfigurator.java | 5 +-
.../scheduler/async/GcExecutorLauncher.java | 18 +++---
.../aurora/scheduler/async/HistoryPruner.java | 12 ++--
.../aurora/scheduler/async/OfferQueue.java | 9 ++-
.../aurora/scheduler/async/Preemptor.java | 15 +++--
.../scheduler/async/RescheduleCalculator.java | 12 ++--
.../aurora/scheduler/async/TaskGroups.java | 23 ++++---
.../aurora/scheduler/async/TaskScheduler.java | 17 +++--
.../aurora/scheduler/async/TaskThrottler.java | 10 +--
.../aurora/scheduler/async/TaskTimeout.java | 6 +-
.../apache/aurora/scheduler/base/AsyncUtil.java | 4 +-
.../org/apache/aurora/scheduler/base/Query.java | 34 +++++-----
.../configuration/ConfigurationManager.java | 12 ++--
.../scheduler/configuration/Resources.java | 29 ++++-----
.../aurora/scheduler/cron/CrontabEntry.java | 27 ++++----
.../aurora/scheduler/cron/SanitizedCronJob.java | 4 +-
.../scheduler/cron/quartz/AuroraCronJob.java | 16 ++---
.../cron/quartz/AuroraCronJobFactory.java | 5 +-
.../cron/quartz/CronJobManagerImpl.java | 18 +++---
.../scheduler/cron/quartz/CronLifecycle.java | 8 +--
.../cron/quartz/CronPredictorImpl.java | 6 +-
.../cron/quartz/CronSchedulerImpl.java | 6 +-
.../aurora/scheduler/cron/quartz/Quartz.java | 6 +-
.../events/NotifyingSchedulingFilter.java | 7 +--
.../aurora/scheduler/events/PubsubEvent.java | 40 ++++++------
.../scheduler/events/PubsubEventModule.java | 6 +-
.../scheduler/filter/AttributeAggregate.java | 8 +--
.../scheduler/filter/ConstraintFilter.java | 6 +-
.../scheduler/filter/SchedulingFilter.java | 12 ++--
.../scheduler/filter/SchedulingFilterImpl.java | 6 +-
.../aurora/scheduler/http/LeaderRedirect.java | 6 +-
.../scheduler/http/LeaderRedirectFilter.java | 4 +-
.../org/apache/aurora/scheduler/http/Locks.java | 5 +-
.../aurora/scheduler/http/Maintenance.java | 4 +-
.../org/apache/aurora/scheduler/http/Mname.java | 6 +-
.../apache/aurora/scheduler/http/Offers.java | 4 +-
.../aurora/scheduler/http/PendingTasks.java | 6 +-
.../apache/aurora/scheduler/http/Quotas.java | 4 +-
.../aurora/scheduler/http/ServletModule.java | 4 +-
.../apache/aurora/scheduler/http/Slaves.java | 5 +-
.../aurora/scheduler/http/StructDump.java | 6 +-
.../aurora/scheduler/http/Utilization.java | 3 +-
.../scheduler/local/FakeDriverFactory.java | 6 +-
.../aurora/scheduler/log/mesos/MesosLog.java | 21 +++----
.../log/mesos/MesosLogStreamModule.java | 4 +-
.../aurora/scheduler/log/testing/FileLog.java | 4 +-
.../log/testing/FileLogStreamModule.java | 4 +-
.../aurora/scheduler/metadata/NearestFit.java | 4 +-
.../scheduler/quota/QuotaCheckResult.java | 6 +-
.../aurora/scheduler/quota/QuotaInfo.java | 8 +--
.../aurora/scheduler/quota/QuotaManager.java | 4 +-
.../aurora/scheduler/sla/MetricCalculator.java | 11 ++--
.../aurora/scheduler/sla/SlaAlgorithm.java | 11 ++--
.../apache/aurora/scheduler/sla/SlaModule.java | 10 ++-
.../aurora/scheduler/state/LockManagerImpl.java | 9 ++-
.../scheduler/state/MaintenanceController.java | 8 +--
.../scheduler/state/SchedulerCoreImpl.java | 16 ++---
.../aurora/scheduler/state/SideEffect.java | 9 +--
.../scheduler/state/StateManagerImpl.java | 23 +++----
.../aurora/scheduler/state/TaskAssigner.java | 8 +--
.../scheduler/state/TaskStateMachine.java | 6 +-
.../scheduler/state/TransitionResult.java | 14 ++---
.../scheduler/stats/AsyncStatsModule.java | 11 ++--
.../aurora/scheduler/stats/ResourceCounter.java | 3 +-
.../aurora/scheduler/stats/SlotSizeCounter.java | 10 +--
.../scheduler/stats/TaskStatCalculator.java | 6 +-
.../storage/CallOrderEnforcingStorage.java | 6 +-
.../scheduler/storage/ForwardingStore.java | 14 ++---
.../scheduler/storage/ReadWriteLockManager.java | 6 +-
.../scheduler/storage/backup/BackupModule.java | 8 +--
.../scheduler/storage/backup/Recovery.java | 12 ++--
.../scheduler/storage/backup/StorageBackup.java | 13 ++--
.../scheduler/storage/db/DbLockStore.java | 6 +-
.../aurora/scheduler/storage/db/DbModule.java | 5 +-
.../scheduler/storage/db/DbQuotaStore.java | 4 +-
.../aurora/scheduler/storage/db/DbStorage.java | 4 +-
.../scheduler/storage/db/LockKeyMapper.java | 6 +-
.../scheduler/storage/db/MigrationModule.java | 6 +-
.../scheduler/storage/log/LogManager.java | 10 +--
.../scheduler/storage/log/LogStorage.java | 28 ++++-----
.../storage/log/SnapshotStoreImpl.java | 8 +--
.../storage/log/WriteAheadStorage.java | 52 ++++++++--------
.../storage/log/testing/LogOpMatcher.java | 5 +-
.../scheduler/storage/mem/MemJobStore.java | 14 ++---
.../scheduler/storage/mem/MemStorage.java | 4 +-
.../scheduler/storage/mem/MemStorageModule.java | 4 +-
.../scheduler/storage/mem/MemTaskStore.java | 14 ++---
.../thrift/SchedulerThriftInterface.java | 65 ++++++++++----------
.../thrift/aop/UserCapabilityInterceptor.java | 4 +-
.../scheduler/thrift/auth/ThriftAuthModule.java | 3 +-
.../aurora/tools/java/thrift_wrapper_codegen.py | 4 +-
.../aurora/scheduler/cron/quartz/CronIT.java | 1 -
.../cron/quartz/CronPredictorImplTest.java | 1 -
.../apache/aurora/scheduler/http/LocksTest.java | 1 -
.../aurora/scheduler/sla/SlaAlgorithmTest.java | 1 -
.../aurora/scheduler/sla/SlaModuleTest.java | 1 -
.../scheduler/state/LockManagerImplTest.java | 1 -
.../scheduler/state/TaskStateMachineTest.java | 6 +-
.../scheduler/thrift/aop/ForwardingThrift.java | 4 +-
109 files changed, 530 insertions(+), 536 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/main/java/org/apache/aurora/codec/ThriftBinaryCodec.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/codec/ThriftBinaryCodec.java b/src/main/java/org/apache/aurora/codec/ThriftBinaryCodec.java
index 2c827fe..da4f0e5 100644
--- a/src/main/java/org/apache/aurora/codec/ThriftBinaryCodec.java
+++ b/src/main/java/org/apache/aurora/codec/ThriftBinaryCodec.java
@@ -13,9 +13,9 @@
*/
package org.apache.aurora.codec;
-import javax.annotation.Nullable;
+import java.util.Objects;
-import com.google.common.base.Preconditions;
+import javax.annotation.Nullable;
import org.apache.thrift.TBase;
import org.apache.thrift.TDeserializer;
@@ -69,8 +69,8 @@ public final class ThriftBinaryCodec {
public static <T extends TBase<T, ?>> T decodeNonNull(Class<T> clazz, byte[] buffer)
throws CodingException {
- Preconditions.checkNotNull(clazz);
- Preconditions.checkNotNull(buffer);
+ Objects.requireNonNull(clazz);
+ Objects.requireNonNull(buffer);
try {
T t = clazz.newInstance();
@@ -108,7 +108,7 @@ public final class ThriftBinaryCodec {
* @throws CodingException If the object could not be encoded.
*/
public static byte[] encodeNonNull(TBase<?, ?> tBase) throws CodingException {
- Preconditions.checkNotNull(tBase);
+ Objects.requireNonNull(tBase);
try {
return new TSerializer(PROTOCOL_FACTORY).serialize(tBase);
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/main/java/org/apache/aurora/scheduler/Driver.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/Driver.java b/src/main/java/org/apache/aurora/scheduler/Driver.java
index ffedfc3..b07378f 100644
--- a/src/main/java/org/apache/aurora/scheduler/Driver.java
+++ b/src/main/java/org/apache/aurora/scheduler/Driver.java
@@ -13,6 +13,7 @@
*/
package org.apache.aurora.scheduler;
+import java.util.Objects;
import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.atomic.AtomicReference;
import java.util.logging.Logger;
@@ -111,7 +112,7 @@ public interface Driver {
private synchronized SchedulerDriver get(State expected) {
// TODO(William Farner): Formalize the failure case here by throwing a checked exception.
stateMachine.checkState(expected);
- return Preconditions.checkNotNull(driverRef.get());
+ return Objects.requireNonNull(driverRef.get());
}
@Override
@@ -126,7 +127,7 @@ public interface Driver {
@Override
public void initialize(SchedulerDriver driver) {
- Preconditions.checkNotNull(driver);
+ Objects.requireNonNull(driver);
stateMachine.checkState(State.INIT);
Preconditions.checkState(driverRef.compareAndSet(null, driver));
stateMachine.transition(State.RUNNING);
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/main/java/org/apache/aurora/scheduler/DriverFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/DriverFactory.java b/src/main/java/org/apache/aurora/scheduler/DriverFactory.java
index 0f40112..a65e1bb 100644
--- a/src/main/java/org/apache/aurora/scheduler/DriverFactory.java
+++ b/src/main/java/org/apache/aurora/scheduler/DriverFactory.java
@@ -18,6 +18,7 @@ import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
+import java.util.Objects;
import java.util.Properties;
import java.util.logging.Logger;
@@ -107,7 +108,7 @@ public interface DriverFactory extends Function<String, SchedulerDriver> {
@Inject
DriverFactoryImpl(Provider<Scheduler> scheduler) {
- this.scheduler = Preconditions.checkNotNull(scheduler);
+ this.scheduler = Objects.requireNonNull(scheduler);
}
@VisibleForTesting
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/main/java/org/apache/aurora/scheduler/MesosSchedulerImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/MesosSchedulerImpl.java b/src/main/java/org/apache/aurora/scheduler/MesosSchedulerImpl.java
index 0dce5c4..e4439f6 100644
--- a/src/main/java/org/apache/aurora/scheduler/MesosSchedulerImpl.java
+++ b/src/main/java/org/apache/aurora/scheduler/MesosSchedulerImpl.java
@@ -50,7 +50,7 @@ import org.apache.mesos.Protos.TaskStatus;
import org.apache.mesos.Scheduler;
import org.apache.mesos.SchedulerDriver;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
/**
* Location for communication with mesos.
@@ -93,11 +93,11 @@ class MesosSchedulerImpl implements Scheduler {
List<TaskLauncher> taskLaunchers,
EventSink eventSink) {
- this.storage = checkNotNull(storage);
- this.stateManager = checkNotNull(stateManager);
- this.lifecycle = checkNotNull(lifecycle);
- this.taskLaunchers = checkNotNull(taskLaunchers);
- this.eventSink = checkNotNull(eventSink);
+ this.storage = requireNonNull(storage);
+ this.stateManager = requireNonNull(stateManager);
+ this.lifecycle = requireNonNull(lifecycle);
+ this.taskLaunchers = requireNonNull(taskLaunchers);
+ this.eventSink = requireNonNull(eventSink);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/main/java/org/apache/aurora/scheduler/MesosTaskFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/MesosTaskFactory.java b/src/main/java/org/apache/aurora/scheduler/MesosTaskFactory.java
index 979b4bb..83d0406 100644
--- a/src/main/java/org/apache/aurora/scheduler/MesosTaskFactory.java
+++ b/src/main/java/org/apache/aurora/scheduler/MesosTaskFactory.java
@@ -42,7 +42,8 @@ import org.apache.mesos.Protos.SlaveID;
import org.apache.mesos.Protos.TaskID;
import org.apache.mesos.Protos.TaskInfo;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
+
import static com.twitter.common.base.MorePreconditions.checkNotBlank;
/**
@@ -108,7 +109,7 @@ public interface MesosTaskFactory {
@Override
public TaskInfo createFrom(IAssignedTask task, SlaveID slaveId) throws SchedulerException {
- checkNotNull(task);
+ requireNonNull(task);
byte[] taskInBytes;
try {
taskInBytes = ThriftBinaryCodec.encode(task.newBuilder());
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/main/java/org/apache/aurora/scheduler/SchedulerLifecycle.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/SchedulerLifecycle.java b/src/main/java/org/apache/aurora/scheduler/SchedulerLifecycle.java
index 48b4404..b4139eb 100644
--- a/src/main/java/org/apache/aurora/scheduler/SchedulerLifecycle.java
+++ b/src/main/java/org/apache/aurora/scheduler/SchedulerLifecycle.java
@@ -59,7 +59,8 @@ import org.apache.aurora.scheduler.storage.StorageBackfill;
import org.apache.mesos.Protos;
import org.apache.mesos.SchedulerDriver;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
+
import static com.twitter.common.zookeeper.SingletonService.LeadershipListener;
/**
@@ -148,8 +149,8 @@ public class SchedulerLifecycle implements EventSubscriber {
private final ScheduledExecutorService executorService;
DefaultDelayedActions(LeadingOptions leadingOptions, ScheduledExecutorService executorService) {
- this.leadingOptions = checkNotNull(leadingOptions);
- this.executorService = checkNotNull(executorService);
+ this.leadingOptions = requireNonNull(leadingOptions);
+ this.executorService = requireNonNull(executorService);
}
@Override
@@ -200,14 +201,14 @@ public class SchedulerLifecycle implements EventSubscriber {
final EventSink eventSink,
final ShutdownRegistry shutdownRegistry) {
- checkNotNull(driverFactory);
- checkNotNull(storage);
- checkNotNull(lifecycle);
- checkNotNull(driver);
- checkNotNull(delayedActions);
- checkNotNull(clock);
- checkNotNull(eventSink);
- checkNotNull(shutdownRegistry);
+ requireNonNull(driverFactory);
+ requireNonNull(storage);
+ requireNonNull(lifecycle);
+ requireNonNull(driver);
+ requireNonNull(delayedActions);
+ requireNonNull(clock);
+ requireNonNull(eventSink);
+ requireNonNull(shutdownRegistry);
Stats.export(new StatImpl<Integer>("framework_registered") {
@Override
@@ -490,8 +491,8 @@ public class SchedulerLifecycle implements EventSubscriber {
leadingTimeLimit.getValue() >= 0,
"Leading time limit must be positive.");
- this.registrationDelayLimit = checkNotNull(registrationDelayLimit);
- this.leadingTimeLimit = checkNotNull(leadingTimeLimit);
+ this.registrationDelayLimit = requireNonNull(registrationDelayLimit);
+ this.leadingTimeLimit = requireNonNull(leadingTimeLimit);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/main/java/org/apache/aurora/scheduler/TaskIdGenerator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/TaskIdGenerator.java b/src/main/java/org/apache/aurora/scheduler/TaskIdGenerator.java
index d96e34a..5c75cc8 100644
--- a/src/main/java/org/apache/aurora/scheduler/TaskIdGenerator.java
+++ b/src/main/java/org/apache/aurora/scheduler/TaskIdGenerator.java
@@ -13,11 +13,11 @@
*/
package org.apache.aurora.scheduler;
+import java.util.Objects;
import java.util.UUID;
import javax.inject.Inject;
-import com.google.common.base.Preconditions;
import com.twitter.common.util.Clock;
import org.apache.aurora.scheduler.storage.entities.ITaskConfig;
@@ -42,7 +42,7 @@ public interface TaskIdGenerator {
@Inject
TaskIdGeneratorImpl(Clock clock) {
- this.clock = Preconditions.checkNotNull(clock);
+ this.clock = Objects.requireNonNull(clock);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/main/java/org/apache/aurora/scheduler/TaskVars.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/TaskVars.java b/src/main/java/org/apache/aurora/scheduler/TaskVars.java
index a58696b..ed63d5a 100644
--- a/src/main/java/org/apache/aurora/scheduler/TaskVars.java
+++ b/src/main/java/org/apache/aurora/scheduler/TaskVars.java
@@ -44,7 +44,7 @@ import org.apache.aurora.scheduler.storage.Storage.Work;
import org.apache.aurora.scheduler.storage.entities.IAttribute;
import org.apache.aurora.scheduler.storage.entities.IScheduledTask;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
/**
* A container that tracks and exports stat counters for tasks.
@@ -58,8 +58,8 @@ class TaskVars implements EventSubscriber {
@Inject
TaskVars(Storage storage, final StatsProvider statProvider) {
- this.storage = checkNotNull(storage);
- checkNotNull(statProvider);
+ this.storage = requireNonNull(storage);
+ requireNonNull(statProvider);
counters = CacheBuilder.newBuilder().build(new CacheLoader<String, Counter>() {
@Override
public Counter load(String statName) {
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/main/java/org/apache/aurora/scheduler/UserTaskLauncher.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/UserTaskLauncher.java b/src/main/java/org/apache/aurora/scheduler/UserTaskLauncher.java
index f79b0fa..250c2df 100644
--- a/src/main/java/org/apache/aurora/scheduler/UserTaskLauncher.java
+++ b/src/main/java/org/apache/aurora/scheduler/UserTaskLauncher.java
@@ -31,7 +31,7 @@ import org.apache.mesos.Protos.Offer;
import org.apache.mesos.Protos.OfferID;
import org.apache.mesos.Protos.TaskStatus;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
/**
* A task launcher that matches resource offers against user tasks.
@@ -51,13 +51,13 @@ class UserTaskLauncher implements TaskLauncher {
@Inject
UserTaskLauncher(OfferQueue offerQueue, StateManager stateManager) {
- this.offerQueue = checkNotNull(offerQueue);
- this.stateManager = checkNotNull(stateManager);
+ this.offerQueue = requireNonNull(offerQueue);
+ this.stateManager = requireNonNull(stateManager);
}
@Override
public boolean willUse(Offer offer) {
- checkNotNull(offer);
+ requireNonNull(offer);
offerQueue.addOffer(offer);
return true;
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/main/java/org/apache/aurora/scheduler/app/AppModule.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/app/AppModule.java b/src/main/java/org/apache/aurora/scheduler/app/AppModule.java
index a0b3744..30b1ba6 100644
--- a/src/main/java/org/apache/aurora/scheduler/app/AppModule.java
+++ b/src/main/java/org/apache/aurora/scheduler/app/AppModule.java
@@ -58,7 +58,8 @@ import org.apache.aurora.scheduler.storage.entities.IServerInfo;
import org.apache.mesos.Scheduler;
import org.apache.zookeeper.data.ACL;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
+
import static com.twitter.common.base.MorePreconditions.checkNotBlank;
import static org.apache.aurora.gen.apiConstants.THRIFT_API_VERSION;
@@ -83,7 +84,7 @@ class AppModule extends AbstractModule {
this.clusterName = checkNotBlank(clusterName);
this.serverSetPath = checkNotBlank(serverSetPath);
this.statsUrlPrefix = statsUrlPrefix;
- this.zkClientConfig = checkNotNull(zkClientConfig);
+ this.zkClientConfig = requireNonNull(zkClientConfig);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/main/java/org/apache/aurora/scheduler/app/Log4jConfigurator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/app/Log4jConfigurator.java b/src/main/java/org/apache/aurora/scheduler/app/Log4jConfigurator.java
index dc99ddc..6df497e 100644
--- a/src/main/java/org/apache/aurora/scheduler/app/Log4jConfigurator.java
+++ b/src/main/java/org/apache/aurora/scheduler/app/Log4jConfigurator.java
@@ -13,7 +13,8 @@
*/
package org.apache.aurora.scheduler.app;
-import com.google.common.base.Preconditions;
+import java.util.Objects;
+
import com.twitter.common.logging.RootLogConfig;
import com.twitter.common.logging.RootLogConfig.Configuration;
import com.twitter.common.logging.log4j.GlogLayout;
@@ -36,7 +37,7 @@ final class Log4jConfigurator {
* @param glogConfig The glog configuration in effect.
*/
static void configureConsole(Configuration glogConfig) {
- Preconditions.checkNotNull(glogConfig);
+ Objects.requireNonNull(glogConfig);
BasicConfigurator.configure(
new ConsoleAppender(new GlogLayout(), ConsoleAppender.SYSTEM_ERR));
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/main/java/org/apache/aurora/scheduler/async/GcExecutorLauncher.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/async/GcExecutorLauncher.java b/src/main/java/org/apache/aurora/scheduler/async/GcExecutorLauncher.java
index a70f817..e1f6977 100644
--- a/src/main/java/org/apache/aurora/scheduler/async/GcExecutorLauncher.java
+++ b/src/main/java/org/apache/aurora/scheduler/async/GcExecutorLauncher.java
@@ -61,7 +61,7 @@ import org.apache.mesos.Protos.TaskID;
import org.apache.mesos.Protos.TaskInfo;
import org.apache.mesos.Protos.TaskStatus;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
/**
* A task launcher that periodically initiates garbage collection on a host, re-using a single
@@ -128,12 +128,12 @@ public class GcExecutorLauncher implements TaskLauncher {
Driver driver,
Supplier<String> uuidGenerator) {
- this.settings = checkNotNull(settings);
- this.storage = checkNotNull(storage);
- this.clock = checkNotNull(clock);
- this.executor = checkNotNull(executor);
- this.driver = checkNotNull(driver);
- this.uuidGenerator = checkNotNull(uuidGenerator);
+ this.settings = requireNonNull(settings);
+ this.storage = requireNonNull(storage);
+ this.clock = requireNonNull(clock);
+ this.executor = requireNonNull(executor);
+ this.driver = requireNonNull(driver);
+ this.uuidGenerator = requireNonNull(uuidGenerator);
this.pulses = CacheBuilder.newBuilder()
.expireAfterWrite(settings.getMaxGcInterval(), TimeUnit.MILLISECONDS)
.build();
@@ -234,8 +234,8 @@ public class GcExecutorLauncher implements TaskLauncher {
@VisibleForTesting
GcExecutorSettings(Amount<Long, Time> gcInterval, Optional<String> gcExecutorPath) {
- this.gcInterval = checkNotNull(gcInterval);
- this.gcExecutorPath = checkNotNull(gcExecutorPath);
+ this.gcInterval = requireNonNull(gcInterval);
+ this.gcExecutorPath = requireNonNull(gcExecutorPath);
}
@VisibleForTesting
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/main/java/org/apache/aurora/scheduler/async/HistoryPruner.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/async/HistoryPruner.java b/src/main/java/org/apache/aurora/scheduler/async/HistoryPruner.java
index 1fff2b3..ebae58a 100644
--- a/src/main/java/org/apache/aurora/scheduler/async/HistoryPruner.java
+++ b/src/main/java/org/apache/aurora/scheduler/async/HistoryPruner.java
@@ -39,7 +39,7 @@ import org.apache.aurora.scheduler.storage.Storage;
import org.apache.aurora.scheduler.storage.entities.IJobKey;
import org.apache.aurora.scheduler.storage.entities.IScheduledTask;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.aurora.scheduler.events.PubsubEvent.EventSubscriber;
import static org.apache.aurora.scheduler.events.PubsubEvent.TaskStateChange;
@@ -89,11 +89,11 @@ public class HistoryPruner implements EventSubscriber {
final HistoryPrunnerSettings settings,
final Storage storage) {
- this.executor = checkNotNull(executor);
- this.stateManager = checkNotNull(stateManager);
- this.clock = checkNotNull(clock);
- this.settings = checkNotNull(settings);
- this.storage = checkNotNull(storage);
+ this.executor = requireNonNull(executor);
+ this.stateManager = requireNonNull(stateManager);
+ this.clock = requireNonNull(clock);
+ this.settings = requireNonNull(settings);
+ this.storage = requireNonNull(storage);
}
@VisibleForTesting
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/main/java/org/apache/aurora/scheduler/async/OfferQueue.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/async/OfferQueue.java b/src/main/java/org/apache/aurora/scheduler/async/OfferQueue.java
index cf22e9c..92c8438 100644
--- a/src/main/java/org/apache/aurora/scheduler/async/OfferQueue.java
+++ b/src/main/java/org/apache/aurora/scheduler/async/OfferQueue.java
@@ -15,6 +15,7 @@ package org.apache.aurora.scheduler.async;
import java.util.Comparator;
import java.util.Map;
+import java.util.Objects;
import java.util.Set;
import java.util.concurrent.ConcurrentSkipListSet;
import java.util.concurrent.ScheduledExecutorService;
@@ -25,9 +26,7 @@ import java.util.logging.Logger;
import javax.inject.Inject;
import com.google.common.base.Function;
-import com.google.common.base.Objects;
import com.google.common.base.Optional;
-import com.google.common.base.Preconditions;
import com.google.common.base.Supplier;
import com.google.common.collect.FluentIterable;
import com.google.common.collect.Iterables;
@@ -188,7 +187,7 @@ public interface OfferQueue extends EventSubscriber {
}
private boolean removeFromHostOffers(final OfferID offerId) {
- Preconditions.checkNotNull(offerId);
+ Objects.requireNonNull(offerId);
// The small risk of inconsistency is acceptable here - if we have an accept/remove race
// on an offer, the master will mark the task as LOST and it will be retried.
@@ -248,12 +247,12 @@ public interface OfferQueue extends EventSubscriber {
return false;
}
HostOffer other = (HostOffer) o;
- return Objects.equal(offer, other.offer) && mode == other.mode;
+ return Objects.equals(offer, other.offer) && mode == other.mode;
}
@Override
public int hashCode() {
- return Objects.hashCode(offer, mode);
+ return Objects.hash(offer, mode);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/main/java/org/apache/aurora/scheduler/async/Preemptor.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/async/Preemptor.java b/src/main/java/org/apache/aurora/scheduler/async/Preemptor.java
index f29ad7f..4088559 100644
--- a/src/main/java/org/apache/aurora/scheduler/async/Preemptor.java
+++ b/src/main/java/org/apache/aurora/scheduler/async/Preemptor.java
@@ -58,8 +58,7 @@ import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
import static java.lang.annotation.ElementType.PARAMETER;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.aurora.gen.ScheduleStatus.PENDING;
import static org.apache.aurora.gen.ScheduleStatus.PREEMPTING;
@@ -150,12 +149,12 @@ public interface Preemptor {
@PreemptionDelay Amount<Long, Time> preemptionCandidacyDelay,
Clock clock) {
- this.storage = checkNotNull(storage);
- this.stateManager = checkNotNull(stateManager);
- this.offerQueue = checkNotNull(offerQueue);
- this.schedulingFilter = checkNotNull(schedulingFilter);
- this.preemptionCandidacyDelay = checkNotNull(preemptionCandidacyDelay);
- this.clock = checkNotNull(clock);
+ this.storage = requireNonNull(storage);
+ this.stateManager = requireNonNull(stateManager);
+ this.offerQueue = requireNonNull(offerQueue);
+ this.schedulingFilter = requireNonNull(schedulingFilter);
+ this.preemptionCandidacyDelay = requireNonNull(preemptionCandidacyDelay);
+ this.clock = requireNonNull(clock);
}
private List<IAssignedTask> fetch(Query.Builder query, Predicate<IScheduledTask> filter) {
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/main/java/org/apache/aurora/scheduler/async/RescheduleCalculator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/async/RescheduleCalculator.java b/src/main/java/org/apache/aurora/scheduler/async/RescheduleCalculator.java
index 6ad733c..aaa3513 100644
--- a/src/main/java/org/apache/aurora/scheduler/async/RescheduleCalculator.java
+++ b/src/main/java/org/apache/aurora/scheduler/async/RescheduleCalculator.java
@@ -39,7 +39,7 @@ import org.apache.aurora.scheduler.storage.Storage;
import org.apache.aurora.scheduler.storage.entities.IScheduledTask;
import org.apache.aurora.scheduler.storage.entities.ITaskEvent;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.aurora.gen.ScheduleStatus.DRAINING;
import static org.apache.aurora.gen.ScheduleStatus.KILLING;
@@ -122,16 +122,16 @@ public interface RescheduleCalculator {
Amount<Long, Time> flappingTaskThreashold,
Amount<Integer, Time> maxStartupRescheduleDelay) {
- this.flappingTaskBackoff = checkNotNull(flappingTaskBackoff);
- this.flappingTaskThreashold = checkNotNull(flappingTaskThreashold);
- this.maxStartupRescheduleDelay = checkNotNull(maxStartupRescheduleDelay);
+ this.flappingTaskBackoff = requireNonNull(flappingTaskBackoff);
+ this.flappingTaskThreashold = requireNonNull(flappingTaskThreashold);
+ this.maxStartupRescheduleDelay = requireNonNull(maxStartupRescheduleDelay);
}
}
@Inject
RescheduleCalculatorImpl(Storage storage, RescheduleCalculatorSettings settings) {
- this.storage = checkNotNull(storage);
- this.settings = checkNotNull(settings);
+ this.storage = requireNonNull(storage);
+ this.settings = requireNonNull(settings);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/main/java/org/apache/aurora/scheduler/async/TaskGroups.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/async/TaskGroups.java b/src/main/java/org/apache/aurora/scheduler/async/TaskGroups.java
index 8a8e6e2..0656b9b 100644
--- a/src/main/java/org/apache/aurora/scheduler/async/TaskGroups.java
+++ b/src/main/java/org/apache/aurora/scheduler/async/TaskGroups.java
@@ -13,6 +13,7 @@
*/
package org.apache.aurora.scheduler.async;
+import java.util.Objects;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledThreadPoolExecutor;
@@ -21,7 +22,6 @@ import java.util.logging.Logger;
import javax.inject.Inject;
import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Objects;
import com.google.common.base.Optional;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
@@ -46,10 +46,9 @@ import org.apache.aurora.scheduler.storage.entities.IAssignedTask;
import org.apache.aurora.scheduler.storage.entities.IScheduledTask;
import org.apache.aurora.scheduler.storage.entities.ITaskConfig;
+import static java.util.Objects.requireNonNull;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
-import static com.google.common.base.Preconditions.checkNotNull;
-
import static org.apache.aurora.gen.ScheduleStatus.PENDING;
/**
@@ -76,8 +75,8 @@ public class TaskGroups implements EventSubscriber {
private final RateLimiter rateLimiter;
TaskGroupsSettings(BackoffStrategy taskGroupBackoff, RateLimiter rateLimiter) {
- this.taskGroupBackoff = checkNotNull(taskGroupBackoff);
- this.rateLimiter = checkNotNull(rateLimiter);
+ this.taskGroupBackoff = requireNonNull(taskGroupBackoff);
+ this.rateLimiter = requireNonNull(rateLimiter);
}
}
@@ -104,11 +103,11 @@ public class TaskGroups implements EventSubscriber {
final TaskScheduler taskScheduler,
final RescheduleCalculator rescheduleCalculator) {
- this.executor = checkNotNull(executor);
- checkNotNull(rateLimiter);
- checkNotNull(taskScheduler);
- this.backoff = checkNotNull(backoff);
- this.rescheduleCalculator = checkNotNull(rescheduleCalculator);
+ this.executor = requireNonNull(executor);
+ requireNonNull(rateLimiter);
+ requireNonNull(taskScheduler);
+ this.backoff = requireNonNull(backoff);
+ this.rescheduleCalculator = requireNonNull(rescheduleCalculator);
this.taskScheduler = new TaskScheduler() {
@Override
@@ -226,7 +225,7 @@ public class TaskGroups implements EventSubscriber {
@Override
public int hashCode() {
- return Objects.hashCode(canonicalTask);
+ return Objects.hash(canonicalTask);
}
@Override
@@ -235,7 +234,7 @@ public class TaskGroups implements EventSubscriber {
return false;
}
GroupKey other = (GroupKey) o;
- return Objects.equal(canonicalTask, other.canonicalTask);
+ return Objects.equals(canonicalTask, other.canonicalTask);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/main/java/org/apache/aurora/scheduler/async/TaskScheduler.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/async/TaskScheduler.java b/src/main/java/org/apache/aurora/scheduler/async/TaskScheduler.java
index 57ed758..a37232a 100644
--- a/src/main/java/org/apache/aurora/scheduler/async/TaskScheduler.java
+++ b/src/main/java/org/apache/aurora/scheduler/async/TaskScheduler.java
@@ -62,8 +62,7 @@ import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
import static java.lang.annotation.ElementType.PARAMETER;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.aurora.gen.ScheduleStatus.LOST;
import static org.apache.aurora.gen.ScheduleStatus.PENDING;
@@ -118,11 +117,11 @@ interface TaskScheduler extends EventSubscriber {
@ReservationDuration Amount<Long, Time> reservationDuration,
final Clock clock) {
- this.storage = checkNotNull(storage);
- this.stateManager = checkNotNull(stateManager);
- this.assigner = checkNotNull(assigner);
- this.offerQueue = checkNotNull(offerQueue);
- this.preemptor = checkNotNull(preemptor);
+ this.storage = requireNonNull(storage);
+ this.stateManager = requireNonNull(stateManager);
+ this.assigner = requireNonNull(assigner);
+ this.offerQueue = requireNonNull(offerQueue);
+ this.preemptor = requireNonNull(preemptor);
this.reservations = new Reservations(reservationDuration, clock);
}
@@ -243,8 +242,8 @@ interface TaskScheduler extends EventSubscriber {
private final Cache<SlaveID, String> reservations;
Reservations(final Amount<Long, Time> duration, final Clock clock) {
- checkNotNull(duration);
- checkNotNull(clock);
+ requireNonNull(duration);
+ requireNonNull(clock);
this.reservations = CacheBuilder.newBuilder()
.expireAfterWrite(duration.as(Time.MINUTES), TimeUnit.MINUTES)
.ticker(new Ticker() {
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/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 d21856f..ca6129c 100644
--- a/src/main/java/org/apache/aurora/scheduler/async/TaskThrottler.java
+++ b/src/main/java/org/apache/aurora/scheduler/async/TaskThrottler.java
@@ -28,7 +28,7 @@ import org.apache.aurora.scheduler.events.PubsubEvent.EventSubscriber;
import org.apache.aurora.scheduler.events.PubsubEvent.TaskStateChange;
import org.apache.aurora.scheduler.state.StateManager;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.aurora.gen.ScheduleStatus.PENDING;
import static org.apache.aurora.gen.ScheduleStatus.THROTTLED;
@@ -55,10 +55,10 @@ class TaskThrottler implements EventSubscriber {
ScheduledExecutorService executor,
StateManager stateManager) {
- this.rescheduleCalculator = checkNotNull(rescheduleCalculator);
- this.clock = checkNotNull(clock);
- this.executor = checkNotNull(executor);
- this.stateManager = checkNotNull(stateManager);
+ this.rescheduleCalculator = requireNonNull(rescheduleCalculator);
+ this.clock = requireNonNull(clock);
+ this.executor = requireNonNull(executor);
+ this.stateManager = requireNonNull(stateManager);
}
@Subscribe
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/main/java/org/apache/aurora/scheduler/async/TaskTimeout.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/async/TaskTimeout.java b/src/main/java/org/apache/aurora/scheduler/async/TaskTimeout.java
index 0b63721..8914022 100644
--- a/src/main/java/org/apache/aurora/scheduler/async/TaskTimeout.java
+++ b/src/main/java/org/apache/aurora/scheduler/async/TaskTimeout.java
@@ -34,7 +34,7 @@ import org.apache.aurora.scheduler.events.PubsubEvent.EventSubscriber;
import org.apache.aurora.scheduler.events.PubsubEvent.TaskStateChange;
import org.apache.aurora.scheduler.state.StateManager;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
/**
* Observes task transitions and identifies tasks that are 'stuck' in a transient state. Stuck
@@ -69,8 +69,8 @@ class TaskTimeout implements EventSubscriber {
Amount<Long, Time> timeout,
StatsProvider statsProvider) {
- this.executor = checkNotNull(executor);
- this.stateManager = checkNotNull(stateManager);
+ this.executor = requireNonNull(executor);
+ this.stateManager = requireNonNull(stateManager);
this.timeoutMillis = timeout.as(Time.MILLISECONDS);
this.timedOutTasks = statsProvider.makeCounter(TIMED_OUT_TASKS_COUNTER);
}
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/main/java/org/apache/aurora/scheduler/base/AsyncUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/base/AsyncUtil.java b/src/main/java/org/apache/aurora/scheduler/base/AsyncUtil.java
index 48b36c2..212ba12 100644
--- a/src/main/java/org/apache/aurora/scheduler/base/AsyncUtil.java
+++ b/src/main/java/org/apache/aurora/scheduler/base/AsyncUtil.java
@@ -23,7 +23,7 @@ import javax.annotation.Nullable;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
/**
* Utility class for facilitating async scheduling.
@@ -47,7 +47,7 @@ public final class AsyncUtil {
String nameFormat,
final Logger logger) {
- checkNotNull(nameFormat);
+ requireNonNull(nameFormat);
return new ScheduledThreadPoolExecutor(
poolSize,
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/main/java/org/apache/aurora/scheduler/base/Query.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/base/Query.java b/src/main/java/org/apache/aurora/scheduler/base/Query.java
index cfb1d16..d8572bb 100644
--- a/src/main/java/org/apache/aurora/scheduler/base/Query.java
+++ b/src/main/java/org/apache/aurora/scheduler/base/Query.java
@@ -14,9 +14,9 @@
package org.apache.aurora.scheduler.base;
import java.util.EnumSet;
+import java.util.Objects;
import java.util.Set;
-import com.google.common.base.Objects;
import com.google.common.base.Optional;
import com.google.common.base.Supplier;
import com.google.common.collect.ImmutableSet;
@@ -29,7 +29,7 @@ import org.apache.aurora.gen.ScheduleStatus;
import org.apache.aurora.gen.TaskQuery;
import org.apache.aurora.scheduler.storage.entities.IJobKey;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
/**
* A utility class to construct storage queries.
@@ -153,7 +153,7 @@ public final class Query {
}
Builder(final TaskQuery query) {
- this.query = checkNotNull(query); // It is expected that the caller calls deepCopy.
+ this.query = requireNonNull(query); // It is expected that the caller calls deepCopy.
}
/**
@@ -172,17 +172,17 @@ public final class Query {
public boolean equals(Object that) {
return that != null
&& that instanceof Builder
- && Objects.equal(query, ((Builder) that).query);
+ && Objects.equals(query, ((Builder) that).query);
}
@Override
public int hashCode() {
- return Objects.hashCode(query);
+ return Objects.hash(query);
}
@Override
public String toString() {
- return Objects.toStringHelper(this)
+ return com.google.common.base.Objects.toStringHelper(this)
.add("query", query)
.toString();
}
@@ -195,7 +195,7 @@ public final class Query {
* @return A new Builder scoped to the given tasks.
*/
public Builder byId(String taskId, String... taskIds) {
- checkNotNull(taskId);
+ requireNonNull(taskId);
return new Builder(
query.deepCopy()
@@ -211,7 +211,7 @@ public final class Query {
* @return A new Builder scoped to the given tasks.
*/
public Builder byId(Iterable<String> taskIds) {
- checkNotNull(taskIds);
+ requireNonNull(taskIds);
return new Builder(
query.deepCopy().setTaskIds(ImmutableSet.copyOf(taskIds)));
@@ -224,7 +224,7 @@ public final class Query {
* @return A new Builder scoped to the given role.
*/
public Builder byRole(String role) {
- checkNotNull(role);
+ requireNonNull(role);
return new Builder(
query.deepCopy().setOwner(new Identity().setRole(role)));
@@ -239,8 +239,8 @@ public final class Query {
* @return A new Builder scoped to the given environment.
*/
public Builder byEnv(String role, String environment) {
- checkNotNull(role);
- checkNotNull(environment);
+ requireNonNull(role);
+ requireNonNull(environment);
return new Builder(
query.deepCopy()
@@ -274,7 +274,7 @@ public final class Query {
* @return A new Builder scoped to the given slaves.
*/
public Builder bySlave(String slaveHost, String... slaveHosts) {
- checkNotNull(slaveHost);
+ requireNonNull(slaveHost);
return bySlave(ImmutableSet.<String>builder().add(slaveHost).add(slaveHosts).build());
}
@@ -288,7 +288,7 @@ public final class Query {
* @return A new Builder scoped to the slaveHosts.
*/
public Builder bySlave(Iterable<String> slaveHosts) {
- checkNotNull(slaveHosts);
+ requireNonNull(slaveHosts);
return new Builder(query.deepCopy().setSlaveHosts(ImmutableSet.copyOf(slaveHosts)));
}
@@ -302,7 +302,7 @@ public final class Query {
* @return A new Builder scoped to the given statuses.
*/
public Builder byStatus(ScheduleStatus status, ScheduleStatus... statuses) {
- checkNotNull(status);
+ requireNonNull(status);
return new Builder(
query.deepCopy().setStatuses(EnumSet.of(status, statuses)));
@@ -317,7 +317,7 @@ public final class Query {
* @return A new Builder scoped to the given statuses.
*/
public Builder byStatus(Iterable<ScheduleStatus> statuses) {
- checkNotNull(statuses);
+ requireNonNull(statuses);
return new Builder(
query.deepCopy().setStatuses(EnumSet.copyOf(ImmutableSet.copyOf(statuses))));
@@ -357,7 +357,7 @@ public final class Query {
*/
public Builder byInstances(IJobKey jobKey, Iterable<Integer> instanceIds) {
JobKeys.assertValid(jobKey);
- checkNotNull(instanceIds);
+ requireNonNull(instanceIds);
return new Builder(
query.deepCopy()
@@ -375,7 +375,7 @@ public final class Query {
* @return A new Builder scoped to the job keys.
*/
public Builder byJobKeys(Iterable<IJobKey> jobKeys) {
- checkNotNull(jobKeys);
+ requireNonNull(jobKeys);
return new Builder(query.deepCopy().setJobKeys(IJobKey.toBuildersSet(jobKeys)));
}
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/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 47cb70b..3661f84 100644
--- a/src/main/java/org/apache/aurora/scheduler/configuration/ConfigurationManager.java
+++ b/src/main/java/org/apache/aurora/scheduler/configuration/ConfigurationManager.java
@@ -13,12 +13,12 @@
*/
package org.apache.aurora.scheduler.configuration;
+import java.util.Objects;
import java.util.regex.Pattern;
import javax.annotation.Nullable;
import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
import com.google.common.base.Predicate;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
@@ -174,16 +174,16 @@ public final class ConfigurationManager {
&& identifier.length() <= MAX_IDENTIFIER_LENGTH;
}
- private static void checkNotNull(Object value, String error) throws TaskDescriptionException {
+ private static void requireNonNull(Object value, String error) throws TaskDescriptionException {
if (value == null) {
throw new TaskDescriptionException(error);
}
}
private static void assertOwnerValidity(IIdentity jobOwner) throws TaskDescriptionException {
- checkNotNull(jobOwner, "No job owner specified!");
- checkNotNull(jobOwner.getRole(), "No job role specified!");
- checkNotNull(jobOwner.getUser(), "No job user specified!");
+ requireNonNull(jobOwner, "No job owner specified!");
+ requireNonNull(jobOwner.getRole(), "No job role specified!");
+ requireNonNull(jobOwner.getUser(), "No job user specified!");
if (!isGoodIdentifier(jobOwner.getRole())) {
throw new TaskDescriptionException(
@@ -225,7 +225,7 @@ public final class ConfigurationManager {
public static IJobConfiguration validateAndPopulate(IJobConfiguration job)
throws TaskDescriptionException {
- Preconditions.checkNotNull(job);
+ Objects.requireNonNull(job);
if (!job.isSetTaskConfig()) {
throw new TaskDescriptionException("Job configuration must have taskConfig set.");
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/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 1d557c7..65c4b52 100644
--- a/src/main/java/org/apache/aurora/scheduler/configuration/Resources.java
+++ b/src/main/java/org/apache/aurora/scheduler/configuration/Resources.java
@@ -15,11 +15,11 @@ package org.apache.aurora.scheduler.configuration;
import java.util.Collections;
import java.util.List;
+import java.util.Objects;
import java.util.Set;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Function;
-import com.google.common.base.Objects;
import com.google.common.base.Predicate;
import com.google.common.base.Predicates;
import com.google.common.collect.ContiguousSet;
@@ -36,7 +36,6 @@ import com.twitter.common.quantity.Data;
import org.apache.aurora.scheduler.base.Numbers;
import org.apache.aurora.scheduler.storage.entities.ITaskConfig;
-import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.mesos.Protos.Offer;
import org.apache.mesos.Protos.Resource;
import org.apache.mesos.Protos.Value.Range;
@@ -44,7 +43,7 @@ import org.apache.mesos.Protos.Value.Ranges;
import org.apache.mesos.Protos.Value.Scalar;
import org.apache.mesos.Protos.Value.Type;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
/**
* A container for multiple resource vectors.
@@ -82,8 +81,8 @@ public class Resources {
*/
public Resources(double numCpus, Amount<Long, Data> ram, Amount<Long, Data> disk, int numPorts) {
this.numCpus = numCpus;
- this.ram = checkNotNull(ram);
- this.disk = checkNotNull(disk);
+ this.ram = requireNonNull(ram);
+ this.disk = requireNonNull(disk);
this.numPorts = numPorts;
}
@@ -137,17 +136,15 @@ public class Resources {
}
Resources other = (Resources) o;
- return new EqualsBuilder()
- .append(numCpus, other.numCpus)
- .append(ram, other.ram)
- .append(disk, other.disk)
- .append(numPorts, other.numPorts)
- .isEquals();
+ return Objects.equals(numCpus, other.numCpus)
+ && Objects.equals(ram, other.ram)
+ && Objects.equals(disk, other.disk)
+ && Objects.equals(numPorts, other.numPorts);
}
@Override
public int hashCode() {
- return Objects.hashCode(numCpus, ram, disk, numPorts);
+ return Objects.hash(numCpus, ram, disk, numPorts);
}
/**
@@ -157,7 +154,7 @@ public class Resources {
* @return The resources required by the task.
*/
public static Resources from(ITaskConfig task) {
- checkNotNull(task);
+ requireNonNull(task);
return new Resources(
task.getNumCpus(),
Amount.of(task.getRamMb(), Data.MB),
@@ -172,7 +169,7 @@ public class Resources {
* @return The canonical resources.
*/
public static Resources from(List<Resource> resources) {
- checkNotNull(resources);
+ requireNonNull(resources);
return new Resources(
getScalarValue(resources, CPUS),
Amount.of((long) getScalarValue(resources, RAM_MB), Data.MB),
@@ -188,7 +185,7 @@ public class Resources {
* @return The resources available in the offer.
*/
public static Resources from(Offer offer) {
- checkNotNull(offer);
+ requireNonNull(offer);
return new Resources(
getScalarValue(offer, CPUS),
Amount.of((long) getScalarValue(offer, RAM_MB), Data.MB),
@@ -379,7 +376,7 @@ public class Resources {
public static Set<Integer> getPorts(Offer offer, int numPorts)
throws InsufficientResourcesException {
- checkNotNull(offer);
+ requireNonNull(offer);
if (numPorts == 0) {
return ImmutableSet.of();
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/main/java/org/apache/aurora/scheduler/cron/CrontabEntry.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/cron/CrontabEntry.java b/src/main/java/org/apache/aurora/scheduler/cron/CrontabEntry.java
index 6f01a69..904dd72 100644
--- a/src/main/java/org/apache/aurora/scheduler/cron/CrontabEntry.java
+++ b/src/main/java/org/apache/aurora/scheduler/cron/CrontabEntry.java
@@ -16,12 +16,12 @@ package org.apache.aurora.scheduler.cron;
import java.util.List;
import java.util.Locale;
import java.util.Map;
+import java.util.Objects;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Joiner;
-import com.google.common.base.Objects;
import com.google.common.base.Optional;
import com.google.common.base.Splitter;
import com.google.common.collect.BiMap;
@@ -34,8 +34,9 @@ import com.google.common.collect.Range;
import com.google.common.collect.RangeSet;
import com.google.common.collect.TreeRangeSet;
+import static java.util.Objects.requireNonNull;
+
import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
/**
* A pattern that describes one or more cron 5-tuples (minute, hour, dayOfMonth, month, dayOfWeek).
@@ -278,16 +279,16 @@ public final class CrontabEntry {
return false;
}
CrontabEntry that = (CrontabEntry) o;
- return Objects.equal(getMinute(), that.getMinute())
- && Objects.equal(getHour(), that.getHour())
- && Objects.equal(getDayOfMonth(), that.getDayOfMonth())
- && Objects.equal(getMonth(), that.getMonth())
- && Objects.equal(getDayOfWeek(), that.getDayOfWeek());
+ return Objects.equals(getMinute(), that.getMinute())
+ && Objects.equals(getHour(), that.getHour())
+ && Objects.equals(getDayOfMonth(), that.getDayOfMonth())
+ && Objects.equals(getMonth(), that.getMonth())
+ && Objects.equals(getDayOfWeek(), that.getDayOfWeek());
}
@Override
public int hashCode() {
- return Objects.hashCode(getMinute(), getHour(), getDayOfWeek(), getMonth(), getDayOfMonth());
+ return Objects.hash(getMinute(), getHour(), getDayOfWeek(), getMonth(), getDayOfMonth());
}
private static class Parser {
@@ -349,11 +350,11 @@ public final class CrontabEntry {
Matcher matcher = CRONTAB_ENTRY.matcher(schedule);
checkArgument(matcher.matches(), "Invalid cron schedule " + schedule);
- rawMinute = checkNotNull(matcher.group("minute"));
- rawHour = checkNotNull(matcher.group("hour"));
- rawDayOfMonth = checkNotNull(matcher.group("dayOfMonth"));
- rawMonth = checkNotNull(matcher.group("month"));
- rawDayOfWeek = checkNotNull(matcher.group("dayOfWeek"));
+ rawMinute = requireNonNull(matcher.group("minute"));
+ rawHour = requireNonNull(matcher.group("hour"));
+ rawDayOfMonth = requireNonNull(matcher.group("dayOfMonth"));
+ rawMonth = requireNonNull(matcher.group("month"));
+ rawDayOfWeek = requireNonNull(matcher.group("dayOfWeek"));
}
CrontabEntry get() throws IllegalArgumentException {
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/main/java/org/apache/aurora/scheduler/cron/SanitizedCronJob.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/cron/SanitizedCronJob.java b/src/main/java/org/apache/aurora/scheduler/cron/SanitizedCronJob.java
index 17ac286..48b403e 100644
--- a/src/main/java/org/apache/aurora/scheduler/cron/SanitizedCronJob.java
+++ b/src/main/java/org/apache/aurora/scheduler/cron/SanitizedCronJob.java
@@ -24,7 +24,7 @@ import org.apache.aurora.scheduler.configuration.SanitizedConfiguration;
import org.apache.aurora.scheduler.storage.entities.IJobConfiguration;
import org.apache.commons.lang.StringUtils;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
/**
* Used by functions that expect field validation before being called.
@@ -105,7 +105,7 @@ public final class SanitizedCronJob {
}
private static boolean hasCronSchedule(IJobConfiguration job) {
- checkNotNull(job);
+ requireNonNull(job);
return !StringUtils.isEmpty(job.getCronSchedule());
}
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/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 57d874b..6220281 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
@@ -19,12 +19,12 @@ import java.util.Set;
import java.util.concurrent.atomic.AtomicLong;
import java.util.logging.Level;
import java.util.logging.Logger;
+
import javax.inject.Inject;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Optional;
import com.google.common.collect.ImmutableMap;
-
import com.twitter.common.base.Supplier;
import com.twitter.common.stats.Stats;
import com.twitter.common.util.BackoffHelper;
@@ -43,13 +43,13 @@ import org.apache.aurora.scheduler.storage.Storage;
import org.apache.aurora.scheduler.storage.entities.IJobConfiguration;
import org.apache.aurora.scheduler.storage.entities.IJobKey;
import org.apache.aurora.scheduler.storage.entities.ITaskConfig;
-
import org.quartz.DisallowConcurrentExecution;
import org.quartz.Job;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
+
import static com.google.common.base.Preconditions.checkState;
import static org.apache.aurora.gen.ScheduleStatus.KILLING;
@@ -87,10 +87,10 @@ class AuroraCronJob implements Job {
StateManager stateManager,
CronJobManager cronJobManager) {
- this.storage = checkNotNull(storage);
- this.stateManager = checkNotNull(stateManager);
- this.cronJobManager = checkNotNull(cronJobManager);
- this.delayedStartBackoff = checkNotNull(config.getDelayedStartBackoff());
+ this.storage = requireNonNull(storage);
+ this.stateManager = requireNonNull(stateManager);
+ this.cronJobManager = requireNonNull(cronJobManager);
+ this.delayedStartBackoff = requireNonNull(config.getDelayedStartBackoff());
}
private static final class DeferredLaunch {
@@ -219,7 +219,7 @@ class AuroraCronJob implements Job {
private final BackoffHelper delayedStartBackoff;
Config(BackoffHelper delayedStartBackoff) {
- this.delayedStartBackoff = checkNotNull(delayedStartBackoff);
+ this.delayedStartBackoff = requireNonNull(delayedStartBackoff);
}
public BackoffHelper getDelayedStartBackoff() {
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/main/java/org/apache/aurora/scheduler/cron/quartz/AuroraCronJobFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/cron/quartz/AuroraCronJobFactory.java b/src/main/java/org/apache/aurora/scheduler/cron/quartz/AuroraCronJobFactory.java
index 311bcb3..bb3bbbd 100644
--- a/src/main/java/org/apache/aurora/scheduler/cron/quartz/AuroraCronJobFactory.java
+++ b/src/main/java/org/apache/aurora/scheduler/cron/quartz/AuroraCronJobFactory.java
@@ -22,7 +22,8 @@ import org.quartz.SchedulerException;
import org.quartz.spi.JobFactory;
import org.quartz.spi.TriggerFiredBundle;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
+
import static com.google.common.base.Preconditions.checkState;
/**
@@ -33,7 +34,7 @@ class AuroraCronJobFactory implements JobFactory {
@Inject
AuroraCronJobFactory(Provider<AuroraCronJob> auroraCronJobProvider) {
- this.auroraCronJobProvider = checkNotNull(auroraCronJobProvider);
+ this.auroraCronJobProvider = requireNonNull(auroraCronJobProvider);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/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 9eda3b7..8e2d3d9 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
@@ -43,7 +43,7 @@ import org.quartz.Scheduler;
import org.quartz.SchedulerException;
import org.quartz.impl.matchers.GroupMatcher;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
/**
* NOTE: The source of truth for whether a cron job exists or not is always the JobStore. If state
@@ -60,9 +60,9 @@ class CronJobManagerImpl implements CronJobManager {
@Inject
CronJobManagerImpl(Storage storage, Scheduler scheduler, TimeZone timeZone) {
- this.storage = checkNotNull(storage);
- this.scheduler = checkNotNull(scheduler);
- this.timeZone = checkNotNull(timeZone);
+ this.storage = requireNonNull(storage);
+ this.scheduler = requireNonNull(scheduler);
+ this.timeZone = requireNonNull(timeZone);
}
@Override
@@ -72,7 +72,7 @@ class CronJobManagerImpl implements CronJobManager {
@Override
public void startJobNow(final IJobKey jobKey) throws CronException {
- checkNotNull(jobKey);
+ requireNonNull(jobKey);
storage.weaklyConsistentRead(new Work<Void, CronException>() {
@Override
@@ -104,7 +104,7 @@ class CronJobManagerImpl implements CronJobManager {
@Override
public void updateJob(final SanitizedCronJob config) throws CronException {
- checkNotNull(config);
+ requireNonNull(config);
checkNoRunOverlap(config);
final IJobKey jobKey = config.getSanitizedConfig().getJobConfig().getKey();
@@ -123,7 +123,7 @@ class CronJobManagerImpl implements CronJobManager {
@Override
public void createJob(final SanitizedCronJob cronJob) throws CronException {
- checkNotNull(cronJob);
+ requireNonNull(cronJob);
checkNoRunOverlap(cronJob);
final IJobKey jobKey = cronJob.getSanitizedConfig().getJobConfig().getKey();
@@ -192,7 +192,7 @@ class CronJobManagerImpl implements CronJobManager {
@Override
public boolean hasJob(final IJobKey jobKey) {
- checkNotNull(jobKey);
+ requireNonNull(jobKey);
return storage.consistentRead(new Work.Quiet<Boolean>() {
@Override
@@ -204,7 +204,7 @@ class CronJobManagerImpl implements CronJobManager {
@Override
public boolean deleteJob(final IJobKey jobKey) {
- checkNotNull(jobKey);
+ requireNonNull(jobKey);
return storage.write(new MutateWork.Quiet<Boolean>() {
@Override
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/main/java/org/apache/aurora/scheduler/cron/quartz/CronLifecycle.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/cron/quartz/CronLifecycle.java b/src/main/java/org/apache/aurora/scheduler/cron/quartz/CronLifecycle.java
index 02ba94a..1d39783 100644
--- a/src/main/java/org/apache/aurora/scheduler/cron/quartz/CronLifecycle.java
+++ b/src/main/java/org/apache/aurora/scheduler/cron/quartz/CronLifecycle.java
@@ -34,7 +34,7 @@ import org.apache.aurora.scheduler.storage.entities.IJobConfiguration;
import org.quartz.Scheduler;
import org.quartz.SchedulerException;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
/**
* Manager for startup and teardown of Quartz scheduler.
@@ -56,9 +56,9 @@ class CronLifecycle extends AbstractIdleService implements PubsubEvent.EventSubs
ShutdownRegistry shutdownRegistry,
CronJobManagerImpl cronJobManager) {
- this.scheduler = checkNotNull(scheduler);
- this.shutdownRegistry = checkNotNull(shutdownRegistry);
- this.cronJobManager = checkNotNull(cronJobManager);
+ this.scheduler = requireNonNull(scheduler);
+ this.shutdownRegistry = requireNonNull(shutdownRegistry);
+ this.cronJobManager = requireNonNull(cronJobManager);
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/main/java/org/apache/aurora/scheduler/cron/quartz/CronPredictorImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/cron/quartz/CronPredictorImpl.java b/src/main/java/org/apache/aurora/scheduler/cron/quartz/CronPredictorImpl.java
index a2f099a..d362a1e 100644
--- a/src/main/java/org/apache/aurora/scheduler/cron/quartz/CronPredictorImpl.java
+++ b/src/main/java/org/apache/aurora/scheduler/cron/quartz/CronPredictorImpl.java
@@ -24,7 +24,7 @@ import org.apache.aurora.scheduler.cron.CronPredictor;
import org.apache.aurora.scheduler.cron.CrontabEntry;
import org.quartz.CronExpression;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
class CronPredictorImpl implements CronPredictor {
private final Clock clock;
@@ -32,8 +32,8 @@ class CronPredictorImpl implements CronPredictor {
@Inject
CronPredictorImpl(Clock clock, TimeZone timeZone) {
- this.clock = checkNotNull(clock);
- this.timeZone = checkNotNull(timeZone);
+ this.clock = requireNonNull(clock);
+ this.timeZone = requireNonNull(timeZone);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/main/java/org/apache/aurora/scheduler/cron/quartz/CronSchedulerImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/cron/quartz/CronSchedulerImpl.java b/src/main/java/org/apache/aurora/scheduler/cron/quartz/CronSchedulerImpl.java
index 5b24b31..1ec8ddf 100644
--- a/src/main/java/org/apache/aurora/scheduler/cron/quartz/CronSchedulerImpl.java
+++ b/src/main/java/org/apache/aurora/scheduler/cron/quartz/CronSchedulerImpl.java
@@ -31,7 +31,7 @@ import org.quartz.CronTrigger;
import org.quartz.Scheduler;
import org.quartz.SchedulerException;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.aurora.scheduler.cron.quartz.Quartz.jobKey;
@@ -42,12 +42,12 @@ class CronSchedulerImpl implements CronScheduler {
@Inject
CronSchedulerImpl(Scheduler scheduler) {
- this.scheduler = checkNotNull(scheduler);
+ this.scheduler = requireNonNull(scheduler);
}
@Override
public Optional<CrontabEntry> getSchedule(IJobKey jobKey) throws IllegalStateException {
- checkNotNull(jobKey);
+ requireNonNull(jobKey);
try {
return Optional.of(Iterables.getOnlyElement(
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/main/java/org/apache/aurora/scheduler/cron/quartz/Quartz.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/cron/quartz/Quartz.java b/src/main/java/org/apache/aurora/scheduler/cron/quartz/Quartz.java
index 25c81b9..45e062d 100644
--- a/src/main/java/org/apache/aurora/scheduler/cron/quartz/Quartz.java
+++ b/src/main/java/org/apache/aurora/scheduler/cron/quartz/Quartz.java
@@ -36,7 +36,7 @@ import org.quartz.JobDetail;
import org.quartz.JobKey;
import org.quartz.TriggerBuilder;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
/**
* Utilities for converting Aurora datatypes to Quartz datatypes.
@@ -108,8 +108,8 @@ final class Quartz {
}
static JobDetail jobDetail(IJobKey jobKey, Class<? extends Job> jobClass) {
- checkNotNull(jobKey);
- checkNotNull(jobClass);
+ requireNonNull(jobKey);
+ requireNonNull(jobClass);
return JobBuilder.newJob(jobClass)
.withIdentity(jobKey(jobKey))
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/main/java/org/apache/aurora/scheduler/events/NotifyingSchedulingFilter.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/events/NotifyingSchedulingFilter.java b/src/main/java/org/apache/aurora/scheduler/events/NotifyingSchedulingFilter.java
index 29fe32b..5cb0b2d 100644
--- a/src/main/java/org/apache/aurora/scheduler/events/NotifyingSchedulingFilter.java
+++ b/src/main/java/org/apache/aurora/scheduler/events/NotifyingSchedulingFilter.java
@@ -31,8 +31,7 @@ import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
import static java.lang.annotation.ElementType.PARAMETER;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
/**
* A decorating scheduling filter that sends an event when a scheduling assignment is vetoed.
@@ -54,8 +53,8 @@ class NotifyingSchedulingFilter implements SchedulingFilter {
@NotifyDelegate SchedulingFilter delegate,
EventSink eventSink) {
- this.delegate = checkNotNull(delegate);
- this.eventSink = checkNotNull(eventSink);
+ this.delegate = requireNonNull(delegate);
+ this.eventSink = requireNonNull(eventSink);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/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 2afbef8..e7fafec 100644
--- a/src/main/java/org/apache/aurora/scheduler/events/PubsubEvent.java
+++ b/src/main/java/org/apache/aurora/scheduler/events/PubsubEvent.java
@@ -13,9 +13,9 @@
*/
package org.apache.aurora.scheduler.events;
+import java.util.Objects;
import java.util.Set;
-import com.google.common.base.Objects;
import com.google.common.base.Optional;
import org.apache.aurora.gen.HostStatus;
@@ -24,7 +24,7 @@ import org.apache.aurora.scheduler.base.Tasks;
import org.apache.aurora.scheduler.filter.SchedulingFilter.Veto;
import org.apache.aurora.scheduler.storage.entities.IScheduledTask;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
/**
* Event notifications related to tasks.
@@ -44,7 +44,7 @@ public interface PubsubEvent {
private final Set<IScheduledTask> tasks;
public TasksDeleted(Set<IScheduledTask> tasks) {
- this.tasks = checkNotNull(tasks);
+ this.tasks = requireNonNull(tasks);
}
public Set<IScheduledTask> getTasks() {
@@ -58,17 +58,17 @@ public interface PubsubEvent {
}
TasksDeleted other = (TasksDeleted) o;
- return Objects.equal(tasks, other.tasks);
+ return Objects.equals(tasks, other.tasks);
}
@Override
public int hashCode() {
- return Objects.hashCode(tasks);
+ return Objects.hash(tasks);
}
@Override
public String toString() {
- return Objects.toStringHelper(this)
+ return com.google.common.base.Objects.toStringHelper(this)
.add("tasks", Tasks.ids(tasks))
.toString();
}
@@ -84,8 +84,8 @@ public interface PubsubEvent {
private final Optional<ScheduleStatus> oldState;
private TaskStateChange(IScheduledTask task, Optional<ScheduleStatus> oldState) {
- this.task = checkNotNull(task);
- this.oldState = checkNotNull(oldState);
+ this.task = requireNonNull(task);
+ this.oldState = requireNonNull(oldState);
}
/**
@@ -136,18 +136,18 @@ public interface PubsubEvent {
}
TaskStateChange other = (TaskStateChange) o;
- return Objects.equal(task, other.task)
- && Objects.equal(oldState, other.oldState);
+ return Objects.equals(task, other.task)
+ && Objects.equals(oldState, other.oldState);
}
@Override
public int hashCode() {
- return Objects.hashCode(task, oldState);
+ return Objects.hash(task, oldState);
}
@Override
public String toString() {
- return Objects.toStringHelper(this)
+ return com.google.common.base.Objects.toStringHelper(this)
.add("task", Tasks.id(task))
.add("oldState", getOldState())
.add("newState", getNewState())
@@ -162,7 +162,7 @@ public interface PubsubEvent {
private final HostStatus status;
public HostMaintenanceStateChange(HostStatus status) {
- this.status = checkNotNull(status);
+ this.status = requireNonNull(status);
}
public HostStatus getStatus() {
@@ -176,12 +176,12 @@ public interface PubsubEvent {
}
HostMaintenanceStateChange other = (HostMaintenanceStateChange) o;
- return Objects.equal(status, other.status);
+ return Objects.equals(status, other.status);
}
@Override
public int hashCode() {
- return Objects.hashCode(status);
+ return Objects.hash(status);
}
}
@@ -193,8 +193,8 @@ public interface PubsubEvent {
private final Set<Veto> vetoes;
public Vetoed(String taskId, Set<Veto> vetoes) {
- this.taskId = checkNotNull(taskId);
- this.vetoes = checkNotNull(vetoes);
+ this.taskId = requireNonNull(taskId);
+ this.vetoes = requireNonNull(vetoes);
}
public String getTaskId() {
@@ -212,13 +212,13 @@ public interface PubsubEvent {
}
Vetoed other = (Vetoed) o;
- return Objects.equal(taskId, other.taskId)
- && Objects.equal(vetoes, other.vetoes);
+ return Objects.equals(taskId, other.taskId)
+ && Objects.equals(vetoes, other.vetoes);
}
@Override
public int hashCode() {
- return Objects.hashCode(taskId, vetoes);
+ return Objects.hash(taskId, vetoes);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/main/java/org/apache/aurora/scheduler/events/PubsubEventModule.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/events/PubsubEventModule.java b/src/main/java/org/apache/aurora/scheduler/events/PubsubEventModule.java
index d29fbd4..cd5aa17 100644
--- a/src/main/java/org/apache/aurora/scheduler/events/PubsubEventModule.java
+++ b/src/main/java/org/apache/aurora/scheduler/events/PubsubEventModule.java
@@ -33,7 +33,7 @@ import org.apache.aurora.scheduler.events.NotifyingSchedulingFilter.NotifyDelega
import org.apache.aurora.scheduler.events.PubsubEvent.EventSubscriber;
import org.apache.aurora.scheduler.filter.SchedulingFilter;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
/**
* Binding module for plumbing event notifications.
@@ -81,8 +81,8 @@ public final class PubsubEventModule extends AbstractModule {
@Inject
RegisterSubscribers(EventBus eventBus, Set<EventSubscriber> subscribers) {
- this.eventBus = checkNotNull(eventBus);
- this.subscribers = checkNotNull(subscribers);
+ this.eventBus = requireNonNull(eventBus);
+ this.subscribers = requireNonNull(subscribers);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/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 71620d7..da7b662 100644
--- a/src/main/java/org/apache/aurora/scheduler/filter/AttributeAggregate.java
+++ b/src/main/java/org/apache/aurora/scheduler/filter/AttributeAggregate.java
@@ -30,7 +30,7 @@ import org.apache.aurora.scheduler.storage.AttributeStore;
import org.apache.aurora.scheduler.storage.entities.IAttribute;
import org.apache.aurora.scheduler.storage.entities.IScheduledTask;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
/**
* A temporary view of a job's state. Once constructed, instances of this class should be discarded
@@ -60,8 +60,8 @@ public class AttributeAggregate {
final Supplier<ImmutableSet<IScheduledTask>> activeTaskSupplier,
final AttributeStore attributeStore) {
- checkNotNull(activeTaskSupplier);
- checkNotNull(attributeStore);
+ requireNonNull(activeTaskSupplier);
+ requireNonNull(attributeStore);
final Function<IScheduledTask, Iterable<IAttribute>> getHostAttributes =
new Function<IScheduledTask, Iterable<IAttribute>>() {
@@ -69,7 +69,7 @@ public class AttributeAggregate {
public Iterable<IAttribute> apply(IScheduledTask task) {
// Note: this assumes we have access to attributes for hosts where all active tasks
// reside.
- String host = checkNotNull(task.getAssignedTask().getSlaveHost());
+ String host = requireNonNull(task.getAssignedTask().getSlaveHost());
return attributeStore.getHostAttributes(host).get().getAttributes();
}
};
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/main/java/org/apache/aurora/scheduler/filter/ConstraintFilter.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/filter/ConstraintFilter.java b/src/main/java/org/apache/aurora/scheduler/filter/ConstraintFilter.java
index 860a240..3839083 100644
--- a/src/main/java/org/apache/aurora/scheduler/filter/ConstraintFilter.java
+++ b/src/main/java/org/apache/aurora/scheduler/filter/ConstraintFilter.java
@@ -29,7 +29,7 @@ import org.apache.aurora.scheduler.storage.entities.IAttribute;
import org.apache.aurora.scheduler.storage.entities.IConstraint;
import org.apache.aurora.scheduler.storage.entities.ITaskConstraint;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
/**
* Filter that determines whether a task's constraints are satisfied.
@@ -45,8 +45,8 @@ class ConstraintFilter {
* @param hostAttributes The attributes of the host to test against.
*/
ConstraintFilter(AttributeAggregate cachedjobState, Iterable<IAttribute> hostAttributes) {
- this.cachedjobState = checkNotNull(cachedjobState);
- this.hostAttributes = checkNotNull(hostAttributes);
+ this.cachedjobState = requireNonNull(cachedjobState);
+ this.hostAttributes = requireNonNull(hostAttributes);
}
@VisibleForTesting
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/main/java/org/apache/aurora/scheduler/filter/SchedulingFilter.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/filter/SchedulingFilter.java b/src/main/java/org/apache/aurora/scheduler/filter/SchedulingFilter.java
index b206830..1e3018e 100644
--- a/src/main/java/org/apache/aurora/scheduler/filter/SchedulingFilter.java
+++ b/src/main/java/org/apache/aurora/scheduler/filter/SchedulingFilter.java
@@ -13,10 +13,10 @@
*/
package org.apache.aurora.scheduler.filter;
+import java.util.Objects;
import java.util.Set;
import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Objects;
import org.apache.aurora.scheduler.ResourceSlot;
import org.apache.aurora.scheduler.storage.entities.ITaskConfig;
@@ -80,19 +80,19 @@ public interface SchedulingFilter {
}
Veto other = (Veto) o;
- return Objects.equal(reason, other.reason)
- && score == other.score
- && valueMismatch == other.valueMismatch;
+ return Objects.equals(reason, other.reason)
+ && Objects.equals(score, other.score)
+ && Objects.equals(valueMismatch, other.valueMismatch);
}
@Override
public int hashCode() {
- return Objects.hashCode(reason, score, valueMismatch);
+ return Objects.hash(reason, score, valueMismatch);
}
@Override
public String toString() {
- return Objects.toStringHelper(this)
+ return com.google.common.base.Objects.toStringHelper(this)
.add("reason", reason)
.add("score", score)
.add("valueMismatch", valueMismatch)
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/main/java/org/apache/aurora/scheduler/filter/SchedulingFilterImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/filter/SchedulingFilterImpl.java b/src/main/java/org/apache/aurora/scheduler/filter/SchedulingFilterImpl.java
index a336b47..da29428 100644
--- a/src/main/java/org/apache/aurora/scheduler/filter/SchedulingFilterImpl.java
+++ b/src/main/java/org/apache/aurora/scheduler/filter/SchedulingFilterImpl.java
@@ -42,7 +42,7 @@ import org.apache.aurora.scheduler.storage.entities.IAttribute;
import org.apache.aurora.scheduler.storage.entities.IConstraint;
import org.apache.aurora.scheduler.storage.entities.ITaskConfig;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.aurora.gen.MaintenanceMode.DRAINED;
import static org.apache.aurora.gen.MaintenanceMode.DRAINING;
@@ -77,8 +77,8 @@ public class SchedulingFilterImpl implements SchedulingFilter {
*/
@Inject
public SchedulingFilterImpl(Storage storage, MaintenanceController maintenance) {
- this.storage = checkNotNull(storage);
- this.maintenance = checkNotNull(maintenance);
+ this.storage = requireNonNull(storage);
+ this.maintenance = requireNonNull(maintenance);
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/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 070c7da..e50de1e 100644
--- a/src/main/java/org/apache/aurora/scheduler/http/LeaderRedirect.java
+++ b/src/main/java/org/apache/aurora/scheduler/http/LeaderRedirect.java
@@ -14,6 +14,7 @@
package org.apache.aurora.scheduler.http;
import java.net.InetSocketAddress;
+import java.util.Objects;
import java.util.concurrent.atomic.AtomicReference;
import java.util.logging.Logger;
@@ -22,7 +23,6 @@ import javax.servlet.http.HttpServletRequest;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Optional;
-import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
import com.google.common.net.HostAndPort;
@@ -54,8 +54,8 @@ public class LeaderRedirect {
@Inject
LeaderRedirect(LocalServiceRegistry serviceRegistry, DynamicHostSet<ServiceInstance> schedulers) {
- this.serviceRegistry = Preconditions.checkNotNull(serviceRegistry);
- this.schedulers = Preconditions.checkNotNull(schedulers);
+ this.serviceRegistry = Objects.requireNonNull(serviceRegistry);
+ this.schedulers = Objects.requireNonNull(schedulers);
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/main/java/org/apache/aurora/scheduler/http/LeaderRedirectFilter.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/http/LeaderRedirectFilter.java b/src/main/java/org/apache/aurora/scheduler/http/LeaderRedirectFilter.java
index 051166c..86939aa 100644
--- a/src/main/java/org/apache/aurora/scheduler/http/LeaderRedirectFilter.java
+++ b/src/main/java/org/apache/aurora/scheduler/http/LeaderRedirectFilter.java
@@ -14,6 +14,7 @@
package org.apache.aurora.scheduler.http;
import java.io.IOException;
+import java.util.Objects;
import javax.inject.Inject;
import javax.servlet.FilterChain;
@@ -22,7 +23,6 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.google.common.base.Optional;
-import com.google.common.base.Preconditions;
import com.twitter.common.net.http.filters.AbstractHttpFilter;
/**
@@ -34,7 +34,7 @@ public class LeaderRedirectFilter extends AbstractHttpFilter {
@Inject
LeaderRedirectFilter(LeaderRedirect redirector) {
- this.redirector = Preconditions.checkNotNull(redirector);
+ this.redirector = Objects.requireNonNull(redirector);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/main/java/org/apache/aurora/scheduler/http/Locks.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/http/Locks.java b/src/main/java/org/apache/aurora/scheduler/http/Locks.java
index dce1891..e275dd7 100644
--- a/src/main/java/org/apache/aurora/scheduler/http/Locks.java
+++ b/src/main/java/org/apache/aurora/scheduler/http/Locks.java
@@ -13,6 +13,8 @@
*/
package org.apache.aurora.scheduler.http;
+import java.util.Objects;
+
import javax.inject.Inject;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
@@ -21,7 +23,6 @@ import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import com.google.common.base.Function;
-import com.google.common.base.Preconditions;
import com.google.common.collect.Maps;
import org.apache.aurora.gen.LockKey;
@@ -40,7 +41,7 @@ public class Locks {
@Inject
Locks(LockManager lockManager) {
- this.lockManager = Preconditions.checkNotNull(lockManager);
+ this.lockManager = Objects.requireNonNull(lockManager);
}
/**
[2/3] Use java.util.Objects replacements for guava helpers.
Posted by wf...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/main/java/org/apache/aurora/scheduler/http/Maintenance.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/http/Maintenance.java b/src/main/java/org/apache/aurora/scheduler/http/Maintenance.java
index 5470e6f..a7a807d 100644
--- a/src/main/java/org/apache/aurora/scheduler/http/Maintenance.java
+++ b/src/main/java/org/apache/aurora/scheduler/http/Maintenance.java
@@ -14,6 +14,7 @@
package org.apache.aurora.scheduler.http;
import java.util.Map;
+import java.util.Objects;
import javax.inject.Inject;
import javax.ws.rs.GET;
@@ -23,7 +24,6 @@ import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import com.google.common.base.Function;
-import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Maps;
import com.google.common.collect.Multimap;
@@ -51,7 +51,7 @@ public class Maintenance {
@Inject
Maintenance(Storage storage) {
- this.storage = Preconditions.checkNotNull(storage);
+ this.storage = Objects.requireNonNull(storage);
}
@GET
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/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 88dd23c..dc8967f 100644
--- a/src/main/java/org/apache/aurora/scheduler/http/Mname.java
+++ b/src/main/java/org/apache/aurora/scheduler/http/Mname.java
@@ -45,9 +45,9 @@ import org.apache.aurora.scheduler.storage.Storage;
import org.apache.aurora.scheduler.storage.entities.IAssignedTask;
import org.apache.aurora.scheduler.storage.entities.IScheduledTask;
-import static javax.ws.rs.core.Response.Status.NOT_FOUND;
+import static java.util.Objects.requireNonNull;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static javax.ws.rs.core.Response.Status.NOT_FOUND;
import static org.apache.aurora.gen.ScheduleStatus.RUNNING;
@@ -67,7 +67,7 @@ public class Mname {
@Inject
public Mname(Storage storage) {
- this.storage = checkNotNull(storage);
+ this.storage = requireNonNull(storage);
}
@GET
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/main/java/org/apache/aurora/scheduler/http/Offers.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/http/Offers.java b/src/main/java/org/apache/aurora/scheduler/http/Offers.java
index 19add35..b7dfeda 100644
--- a/src/main/java/org/apache/aurora/scheduler/http/Offers.java
+++ b/src/main/java/org/apache/aurora/scheduler/http/Offers.java
@@ -14,6 +14,7 @@
package org.apache.aurora.scheduler.http;
import java.util.Map;
+import java.util.Objects;
import javax.inject.Inject;
import javax.ws.rs.GET;
@@ -23,7 +24,6 @@ import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import com.google.common.base.Function;
-import com.google.common.base.Preconditions;
import com.google.common.collect.FluentIterable;
import com.google.common.collect.ImmutableMap;
@@ -44,7 +44,7 @@ public class Offers {
@Inject
Offers(OfferQueue offerQueue) {
- this.offerQueue = Preconditions.checkNotNull(offerQueue);
+ this.offerQueue = Objects.requireNonNull(offerQueue);
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/main/java/org/apache/aurora/scheduler/http/PendingTasks.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/http/PendingTasks.java b/src/main/java/org/apache/aurora/scheduler/http/PendingTasks.java
index fea52f7..82b6f50 100644
--- a/src/main/java/org/apache/aurora/scheduler/http/PendingTasks.java
+++ b/src/main/java/org/apache/aurora/scheduler/http/PendingTasks.java
@@ -13,6 +13,8 @@
*/
package org.apache.aurora.scheduler.http;
+import java.util.Objects;
+
import javax.inject.Inject;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
@@ -20,8 +22,6 @@ import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
-import com.google.common.base.Preconditions;
-
import org.apache.aurora.scheduler.async.TaskGroups;
/**
@@ -34,7 +34,7 @@ public class PendingTasks {
@Inject
PendingTasks(TaskGroups taskGroups) {
- this.taskGroups = Preconditions.checkNotNull(taskGroups);
+ this.taskGroups = Objects.requireNonNull(taskGroups);
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/main/java/org/apache/aurora/scheduler/http/Quotas.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/http/Quotas.java b/src/main/java/org/apache/aurora/scheduler/http/Quotas.java
index f23739a..5f3cce3 100644
--- a/src/main/java/org/apache/aurora/scheduler/http/Quotas.java
+++ b/src/main/java/org/apache/aurora/scheduler/http/Quotas.java
@@ -14,6 +14,7 @@
package org.apache.aurora.scheduler.http;
import java.util.Map;
+import java.util.Objects;
import javax.inject.Inject;
import javax.ws.rs.GET;
@@ -25,7 +26,6 @@ import javax.ws.rs.core.Response;
import com.google.common.base.Function;
import com.google.common.base.Optional;
-import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps;
@@ -45,7 +45,7 @@ public class Quotas {
@Inject
Quotas(Storage storage) {
- this.storage = Preconditions.checkNotNull(storage);
+ this.storage = Objects.requireNonNull(storage);
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/main/java/org/apache/aurora/scheduler/http/ServletModule.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/http/ServletModule.java b/src/main/java/org/apache/aurora/scheduler/http/ServletModule.java
index fb225f1..27599f7 100644
--- a/src/main/java/org/apache/aurora/scheduler/http/ServletModule.java
+++ b/src/main/java/org/apache/aurora/scheduler/http/ServletModule.java
@@ -14,11 +14,11 @@
package org.apache.aurora.scheduler.http;
import java.util.Map;
+import java.util.Objects;
import javax.inject.Inject;
import javax.inject.Singleton;
-import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableMap;
import com.google.common.io.Resources;
import com.google.common.net.MediaType;
@@ -257,7 +257,7 @@ public class ServletModule extends AbstractModule {
@Inject
RedirectMonitor(LeaderRedirect redirector) {
- this.redirector = Preconditions.checkNotNull(redirector);
+ this.redirector = Objects.requireNonNull(redirector);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/main/java/org/apache/aurora/scheduler/http/Slaves.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/http/Slaves.java b/src/main/java/org/apache/aurora/scheduler/http/Slaves.java
index bbbdb92..0ea462f 100644
--- a/src/main/java/org/apache/aurora/scheduler/http/Slaves.java
+++ b/src/main/java/org/apache/aurora/scheduler/http/Slaves.java
@@ -34,7 +34,8 @@ import org.apache.aurora.scheduler.storage.entities.IAttribute;
import org.apache.aurora.scheduler.storage.entities.IHostAttributes;
import org.apache.aurora.scheduler.storage.entities.IServerInfo;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
+
import static com.twitter.common.base.MorePreconditions.checkNotBlank;
import static org.apache.aurora.scheduler.storage.Storage.StoreProvider;
@@ -58,7 +59,7 @@ public class Slaves extends JerseyTemplateServlet {
public Slaves(IServerInfo serverInfo, Storage storage) {
super("slaves");
this.clusterName = checkNotBlank(serverInfo.getClusterName());
- this.storage = checkNotNull(storage);
+ this.storage = requireNonNull(storage);
}
private Iterable<IHostAttributes> getHostAttributes() {
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/main/java/org/apache/aurora/scheduler/http/StructDump.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/http/StructDump.java b/src/main/java/org/apache/aurora/scheduler/http/StructDump.java
index a7fbcbf..8147d54 100644
--- a/src/main/java/org/apache/aurora/scheduler/http/StructDump.java
+++ b/src/main/java/org/apache/aurora/scheduler/http/StructDump.java
@@ -40,7 +40,7 @@ import org.apache.aurora.scheduler.storage.entities.IJobConfiguration;
import org.apache.aurora.scheduler.storage.entities.IJobKey;
import org.apache.thrift.TBase;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
/**
* Servlet that prints out the raw configuration for a specified struct.
@@ -54,8 +54,8 @@ public class StructDump extends JerseyTemplateServlet {
@Inject
public StructDump(Storage storage, CronJobManager cronJobManager) {
super("structdump");
- this.storage = checkNotNull(storage);
- this.cronJobManager = checkNotNull(cronJobManager);
+ this.storage = requireNonNull(storage);
+ this.cronJobManager = requireNonNull(cronJobManager);
}
private static final String USAGE =
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/main/java/org/apache/aurora/scheduler/http/Utilization.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/http/Utilization.java b/src/main/java/org/apache/aurora/scheduler/http/Utilization.java
index d6dfcf1..a0cb7bf 100644
--- a/src/main/java/org/apache/aurora/scheduler/http/Utilization.java
+++ b/src/main/java/org/apache/aurora/scheduler/http/Utilization.java
@@ -31,7 +31,6 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status;
import com.google.common.base.Function;
-import com.google.common.base.Preconditions;
import com.google.common.collect.FluentIterable;
import com.twitter.common.base.Closure;
import com.twitter.common.base.MorePreconditions;
@@ -60,7 +59,7 @@ public class Utilization {
@Inject
Utilization(ResourceCounter counter, IServerInfo serverInfo) {
templateHelper = new StringTemplateHelper(getClass(), "utilization", true);
- this.counter = Preconditions.checkNotNull(counter);
+ this.counter = Objects.requireNonNull(counter);
this.clusterName = MorePreconditions.checkNotBlank(serverInfo.getClusterName());
}
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/main/java/org/apache/aurora/scheduler/local/FakeDriverFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/local/FakeDriverFactory.java b/src/main/java/org/apache/aurora/scheduler/local/FakeDriverFactory.java
index 31cfc8c..92cf442 100644
--- a/src/main/java/org/apache/aurora/scheduler/local/FakeDriverFactory.java
+++ b/src/main/java/org/apache/aurora/scheduler/local/FakeDriverFactory.java
@@ -14,13 +14,13 @@
package org.apache.aurora.scheduler.local;
import java.util.Collection;
+import java.util.Objects;
import javax.annotation.Nullable;
import javax.inject.Inject;
import javax.inject.Provider;
import com.google.common.base.Optional;
-import com.google.common.base.Preconditions;
import com.twitter.common.application.Lifecycle;
import org.apache.aurora.scheduler.DriverFactory;
@@ -49,8 +49,8 @@ class FakeDriverFactory implements DriverFactory {
@Inject
FakeDriverFactory(Provider<Scheduler> scheduler, Lifecycle lifecycle) {
- this.scheduler = Preconditions.checkNotNull(scheduler);
- this.lifecycle = Preconditions.checkNotNull(lifecycle);
+ this.scheduler = Objects.requireNonNull(scheduler);
+ this.lifecycle = Objects.requireNonNull(lifecycle);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/main/java/org/apache/aurora/scheduler/log/mesos/MesosLog.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/log/mesos/MesosLog.java b/src/main/java/org/apache/aurora/scheduler/log/mesos/MesosLog.java
index ee6149c..fd08be1 100644
--- a/src/main/java/org/apache/aurora/scheduler/log/mesos/MesosLog.java
+++ b/src/main/java/org/apache/aurora/scheduler/log/mesos/MesosLog.java
@@ -51,8 +51,7 @@ import org.apache.mesos.Log;
import static java.lang.annotation.ElementType.METHOD;
import static java.lang.annotation.ElementType.PARAMETER;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
/**
* A {@code Log} implementation backed by a true distributed log in mesos core.
@@ -118,17 +117,17 @@ public class MesosLog implements org.apache.aurora.scheduler.log.Log {
@NoopEntry byte[] noopEntry,
Lifecycle lifecycle) {
- this.logFactory = checkNotNull(logFactory);
+ this.logFactory = requireNonNull(logFactory);
- this.readerFactory = checkNotNull(readerFactory);
- this.readTimeout = checkNotNull(readTimeout);
+ this.readerFactory = requireNonNull(readerFactory);
+ this.readTimeout = requireNonNull(readTimeout);
- this.writerFactory = checkNotNull(writerFactory);
- this.writeTimeout = checkNotNull(writeTimeout);
+ this.writerFactory = requireNonNull(writerFactory);
+ this.writeTimeout = requireNonNull(writeTimeout);
- this.noopEntry = checkNotNull(noopEntry);
+ this.noopEntry = requireNonNull(noopEntry);
- this.lifecycle = checkNotNull(lifecycle);
+ this.lifecycle = requireNonNull(lifecycle);
}
@Override
@@ -302,7 +301,7 @@ public class MesosLog implements org.apache.aurora.scheduler.log.Log {
throw new NoSuchElementException();
}
- Entry result = checkNotNull(entry);
+ Entry result = requireNonNull(entry);
entry = null;
return result;
}
@@ -311,7 +310,7 @@ public class MesosLog implements org.apache.aurora.scheduler.log.Log {
@Override
public LogPosition append(final byte[] contents) throws StreamAccessException {
- checkNotNull(contents);
+ requireNonNull(contents);
Log.Position position = mutate(appendStats, new Mutation<Log.Position>() {
@Override
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/main/java/org/apache/aurora/scheduler/log/mesos/MesosLogStreamModule.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/log/mesos/MesosLogStreamModule.java b/src/main/java/org/apache/aurora/scheduler/log/mesos/MesosLogStreamModule.java
index f73b5eb..7232f60 100644
--- a/src/main/java/org/apache/aurora/scheduler/log/mesos/MesosLogStreamModule.java
+++ b/src/main/java/org/apache/aurora/scheduler/log/mesos/MesosLogStreamModule.java
@@ -15,13 +15,13 @@ package org.apache.aurora.scheduler.log.mesos;
import java.io.File;
import java.util.List;
+import java.util.Objects;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import javax.inject.Singleton;
import com.google.common.base.Joiner;
-import com.google.common.base.Preconditions;
import com.google.common.collect.Iterables;
import com.google.inject.PrivateModule;
import com.google.inject.Provides;
@@ -96,7 +96,7 @@ public class MesosLogStreamModule extends PrivateModule {
private final ClientConfig zkClientConfig;
public MesosLogStreamModule(ClientConfig zkClientConfig) {
- this.zkClientConfig = Preconditions.checkNotNull(zkClientConfig);
+ this.zkClientConfig = Objects.requireNonNull(zkClientConfig);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/main/java/org/apache/aurora/scheduler/log/testing/FileLog.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/log/testing/FileLog.java b/src/main/java/org/apache/aurora/scheduler/log/testing/FileLog.java
index b2cfba6..c6672fb 100644
--- a/src/main/java/org/apache/aurora/scheduler/log/testing/FileLog.java
+++ b/src/main/java/org/apache/aurora/scheduler/log/testing/FileLog.java
@@ -18,12 +18,12 @@ import java.io.IOException;
import java.nio.ByteBuffer;
import java.nio.charset.Charset;
import java.util.Iterator;
+import java.util.Objects;
import javax.inject.Inject;
import com.google.common.base.Function;
import com.google.common.base.Functions;
-import com.google.common.base.Preconditions;
import com.google.common.base.Predicate;
import com.google.common.base.Throwables;
import com.google.common.collect.FluentIterable;
@@ -53,7 +53,7 @@ class FileLog implements Log {
@Inject
FileLog(File logFile) {
- this.logFile = Preconditions.checkNotNull(logFile);
+ this.logFile = Objects.requireNonNull(logFile);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/main/java/org/apache/aurora/scheduler/log/testing/FileLogStreamModule.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/log/testing/FileLogStreamModule.java b/src/main/java/org/apache/aurora/scheduler/log/testing/FileLogStreamModule.java
index 0580c40..781414c 100644
--- a/src/main/java/org/apache/aurora/scheduler/log/testing/FileLogStreamModule.java
+++ b/src/main/java/org/apache/aurora/scheduler/log/testing/FileLogStreamModule.java
@@ -14,10 +14,10 @@
package org.apache.aurora.scheduler.log.testing;
import java.io.File;
+import java.util.Objects;
import javax.inject.Singleton;
-import com.google.common.base.Preconditions;
import com.google.inject.PrivateModule;
import com.twitter.common.args.Arg;
import com.twitter.common.args.CmdLine;
@@ -37,7 +37,7 @@ public class FileLogStreamModule extends PrivateModule {
@Override
protected void configure() {
- Preconditions.checkNotNull(LOG_PATH.get());
+ Objects.requireNonNull(LOG_PATH.get());
bind(File.class).toInstance(LOG_PATH.get());
bind(Log.class).to(FileLog.class);
bind(FileLog.class).in(Singleton.class);
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/main/java/org/apache/aurora/scheduler/metadata/NearestFit.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/metadata/NearestFit.java b/src/main/java/org/apache/aurora/scheduler/metadata/NearestFit.java
index c86f598..8720369 100644
--- a/src/main/java/org/apache/aurora/scheduler/metadata/NearestFit.java
+++ b/src/main/java/org/apache/aurora/scheduler/metadata/NearestFit.java
@@ -13,12 +13,12 @@
*/
package org.apache.aurora.scheduler.metadata;
+import java.util.Objects;
import java.util.Set;
import javax.inject.Inject;
import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
import com.google.common.base.Predicate;
import com.google.common.base.Ticker;
import com.google.common.cache.CacheBuilder;
@@ -120,7 +120,7 @@ public class NearestFit implements EventSubscriber {
*/
@Subscribe
public synchronized void vetoed(Vetoed vetoEvent) {
- Preconditions.checkNotNull(vetoEvent);
+ Objects.requireNonNull(vetoEvent);
fitByTask.getUnchecked(vetoEvent.getTaskId()).maybeUpdate(vetoEvent.getVetoes());
}
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/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 1a7b421..5bf4d9a 100644
--- a/src/main/java/org/apache/aurora/scheduler/quota/QuotaCheckResult.java
+++ b/src/main/java/org/apache/aurora/scheduler/quota/QuotaCheckResult.java
@@ -18,7 +18,7 @@ import com.google.common.base.Optional;
import org.apache.aurora.scheduler.storage.entities.IResourceAggregate;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
/**
* Calculates and formats detailed quota comparison result.
@@ -64,8 +64,8 @@ public class QuotaCheckResult {
}
private QuotaCheckResult(Result result, Optional<String> details) {
- this.result = checkNotNull(result);
- this.details = checkNotNull(details);
+ this.result = requireNonNull(result);
+ this.details = requireNonNull(details);
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/main/java/org/apache/aurora/scheduler/quota/QuotaInfo.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/quota/QuotaInfo.java b/src/main/java/org/apache/aurora/scheduler/quota/QuotaInfo.java
index d349c5f..7a1a09b 100644
--- a/src/main/java/org/apache/aurora/scheduler/quota/QuotaInfo.java
+++ b/src/main/java/org/apache/aurora/scheduler/quota/QuotaInfo.java
@@ -15,7 +15,7 @@ package org.apache.aurora.scheduler.quota;
import org.apache.aurora.scheduler.storage.entities.IResourceAggregate;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
/**
* Wraps allocated quota and consumption details.
@@ -30,9 +30,9 @@ public class QuotaInfo {
IResourceAggregate prodConsumption,
IResourceAggregate nonProdConsumption) {
- this.quota = checkNotNull(quota);
- this.prodConsumption = checkNotNull(prodConsumption);
- this.nonProdConsumption = checkNotNull(nonProdConsumption);
+ this.quota = requireNonNull(quota);
+ this.prodConsumption = requireNonNull(prodConsumption);
+ this.nonProdConsumption = requireNonNull(nonProdConsumption);
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/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 7aedea5..24145f5 100644
--- a/src/main/java/org/apache/aurora/scheduler/quota/QuotaManager.java
+++ b/src/main/java/org/apache/aurora/scheduler/quota/QuotaManager.java
@@ -29,7 +29,7 @@ import org.apache.aurora.scheduler.storage.Storage.Work;
import org.apache.aurora.scheduler.storage.entities.IResourceAggregate;
import org.apache.aurora.scheduler.storage.entities.ITaskConfig;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.aurora.scheduler.quota.QuotaCheckResult.Result.SUFFICIENT_QUOTA;
@@ -81,7 +81,7 @@ public interface QuotaManager {
@Inject
QuotaManagerImpl(Storage storage) {
- this.storage = checkNotNull(storage);
+ this.storage = requireNonNull(storage);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/main/java/org/apache/aurora/scheduler/sla/MetricCalculator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/sla/MetricCalculator.java b/src/main/java/org/apache/aurora/scheduler/sla/MetricCalculator.java
index bce5f4e..dca6804 100644
--- a/src/main/java/org/apache/aurora/scheduler/sla/MetricCalculator.java
+++ b/src/main/java/org/apache/aurora/scheduler/sla/MetricCalculator.java
@@ -30,7 +30,6 @@ import com.google.common.collect.FluentIterable;
import com.google.common.collect.ImmutableMultimap;
import com.google.common.collect.Multimap;
import com.google.common.collect.Range;
-
import com.twitter.common.inject.TimedInterceptor.Timed;
import com.twitter.common.stats.StatsProvider;
import com.twitter.common.util.Clock;
@@ -43,7 +42,7 @@ import org.apache.aurora.scheduler.storage.Storage;
import org.apache.aurora.scheduler.storage.entities.IScheduledTask;
import org.apache.aurora.scheduler.storage.entities.ITaskConfig;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.aurora.scheduler.sla.SlaAlgorithm.AlgorithmType.AGGREGATE_PLATFORM_UPTIME;
import static org.apache.aurora.scheduler.sla.SlaAlgorithm.AlgorithmType.JOB_UPTIME_50;
@@ -131,11 +130,11 @@ class MetricCalculator implements Runnable {
MetricCalculatorSettings settings,
final StatsProvider statsProvider) {
- this.storage = checkNotNull(storage);
- this.clock = checkNotNull(clock);
- this.settings = checkNotNull(settings);
+ this.storage = requireNonNull(storage);
+ this.clock = requireNonNull(clock);
+ this.settings = requireNonNull(settings);
- checkNotNull(statsProvider);
+ requireNonNull(statsProvider);
this.metricCache = CacheBuilder.newBuilder().build(
new CacheLoader<String, Counter>() {
public Counter load(String key) {
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/main/java/org/apache/aurora/scheduler/sla/SlaAlgorithm.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/sla/SlaAlgorithm.java b/src/main/java/org/apache/aurora/scheduler/sla/SlaAlgorithm.java
index 4236859..82f1894 100644
--- a/src/main/java/org/apache/aurora/scheduler/sla/SlaAlgorithm.java
+++ b/src/main/java/org/apache/aurora/scheduler/sla/SlaAlgorithm.java
@@ -16,10 +16,10 @@ package org.apache.aurora.scheduler.sla;
import java.util.Collection;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import com.google.common.base.Function;
import com.google.common.base.Functions;
-import com.google.common.base.Objects;
import com.google.common.base.Predicate;
import com.google.common.base.Predicates;
import com.google.common.collect.FluentIterable;
@@ -39,7 +39,7 @@ import org.apache.aurora.scheduler.storage.entities.IJobKey;
import org.apache.aurora.scheduler.storage.entities.IScheduledTask;
import org.apache.aurora.scheduler.storage.entities.ITaskEvent;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
/**
* Defines an SLA algorithm to be applied to a {@link IScheduledTask}
@@ -250,7 +250,7 @@ interface SlaAlgorithm {
private final int id;
InstanceId(IJobKey jobKey, int instanceId) {
- this.jobKey = checkNotNull(jobKey);
+ this.jobKey = requireNonNull(jobKey);
this.id = instanceId;
}
@@ -261,12 +261,13 @@ interface SlaAlgorithm {
}
InstanceId other = (InstanceId) o;
- return Objects.equal(jobKey, other.jobKey) && Objects.equal(id, other.id);
+ return Objects.equals(jobKey, other.jobKey)
+ && Objects.equals(id, other.id);
}
@Override
public int hashCode() {
- return Objects.hashCode(jobKey, id);
+ return Objects.hash(jobKey, id);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/main/java/org/apache/aurora/scheduler/sla/SlaModule.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/sla/SlaModule.java b/src/main/java/org/apache/aurora/scheduler/sla/SlaModule.java
index ec953e1..05417ca 100644
--- a/src/main/java/org/apache/aurora/scheduler/sla/SlaModule.java
+++ b/src/main/java/org/apache/aurora/scheduler/sla/SlaModule.java
@@ -26,7 +26,6 @@ import com.google.common.eventbus.Subscribe;
import com.google.inject.AbstractModule;
import com.google.inject.BindingAnnotation;
import com.google.inject.Singleton;
-
import com.twitter.common.application.modules.LifecycleModule;
import com.twitter.common.args.Arg;
import com.twitter.common.args.CmdLine;
@@ -45,8 +44,7 @@ import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
import static java.lang.annotation.ElementType.PARAMETER;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
/**
* Binding module for the sla processor.
@@ -101,9 +99,9 @@ public class SlaModule extends AbstractModule {
MetricCalculator calculator,
MetricCalculatorSettings settings) {
- this.executor = checkNotNull(executor);
- this.calculator = checkNotNull(calculator);
- this.settings = checkNotNull(settings);
+ this.executor = requireNonNull(executor);
+ this.calculator = requireNonNull(calculator);
+ this.settings = requireNonNull(settings);
}
@Subscribe
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/main/java/org/apache/aurora/scheduler/state/LockManagerImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/state/LockManagerImpl.java b/src/main/java/org/apache/aurora/scheduler/state/LockManagerImpl.java
index df2bc5a..8befeca 100644
--- a/src/main/java/org/apache/aurora/scheduler/state/LockManagerImpl.java
+++ b/src/main/java/org/apache/aurora/scheduler/state/LockManagerImpl.java
@@ -18,7 +18,6 @@ import java.util.Date;
import javax.inject.Inject;
import com.google.common.base.Optional;
-
import com.twitter.common.util.Clock;
import org.apache.aurora.gen.Lock;
@@ -33,7 +32,7 @@ import org.apache.aurora.scheduler.storage.Storage.Work;
import org.apache.aurora.scheduler.storage.entities.ILock;
import org.apache.aurora.scheduler.storage.entities.ILockKey;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
/**
* Implements lock-related primitives required to provide mutual exclusion guarantees
@@ -46,9 +45,9 @@ class LockManagerImpl implements LockManager {
@Inject
LockManagerImpl(Storage storage, Clock clock, UUIDGenerator tokenGenerator) {
- this.storage = checkNotNull(storage);
- this.clock = checkNotNull(clock);
- this.tokenGenerator = checkNotNull(tokenGenerator);
+ this.storage = requireNonNull(storage);
+ this.clock = requireNonNull(clock);
+ this.tokenGenerator = requireNonNull(tokenGenerator);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/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 0c3e1fb..bf48db9 100644
--- a/src/main/java/org/apache/aurora/scheduler/state/MaintenanceController.java
+++ b/src/main/java/org/apache/aurora/scheduler/state/MaintenanceController.java
@@ -43,7 +43,7 @@ import org.apache.aurora.scheduler.storage.Storage.StoreProvider;
import org.apache.aurora.scheduler.storage.Storage.Work;
import org.apache.aurora.scheduler.storage.entities.IHostAttributes;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.aurora.gen.MaintenanceMode.DRAINED;
import static org.apache.aurora.gen.MaintenanceMode.DRAINING;
@@ -111,9 +111,9 @@ public interface MaintenanceController {
StateManager stateManager,
EventSink eventSink) {
- this.storage = checkNotNull(storage);
- this.stateManager = checkNotNull(stateManager);
- this.eventSink = checkNotNull(eventSink);
+ this.storage = requireNonNull(storage);
+ this.stateManager = requireNonNull(stateManager);
+ this.eventSink = requireNonNull(eventSink);
}
private Set<HostStatus> watchDrainingTasks(MutableStoreProvider store, Set<String> hosts) {
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/main/java/org/apache/aurora/scheduler/state/SchedulerCoreImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/state/SchedulerCoreImpl.java b/src/main/java/org/apache/aurora/scheduler/state/SchedulerCoreImpl.java
index 44ced61..b6d06f3 100644
--- a/src/main/java/org/apache/aurora/scheduler/state/SchedulerCoreImpl.java
+++ b/src/main/java/org/apache/aurora/scheduler/state/SchedulerCoreImpl.java
@@ -50,7 +50,7 @@ import org.apache.aurora.scheduler.storage.entities.IJobKey;
import org.apache.aurora.scheduler.storage.entities.IScheduledTask;
import org.apache.aurora.scheduler.storage.entities.ITaskConfig;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.aurora.gen.ScheduleStatus.KILLING;
import static org.apache.aurora.gen.ScheduleStatus.RESTARTING;
@@ -96,11 +96,11 @@ class SchedulerCoreImpl implements SchedulerCore {
TaskIdGenerator taskIdGenerator,
QuotaManager quotaManager) {
- this.storage = checkNotNull(storage);
+ this.storage = requireNonNull(storage);
this.cronJobManager = cronJobManager;
- this.stateManager = checkNotNull(stateManager);
- this.taskIdGenerator = checkNotNull(taskIdGenerator);
- this.quotaManager = checkNotNull(quotaManager);
+ this.stateManager = requireNonNull(stateManager);
+ this.taskIdGenerator = requireNonNull(taskIdGenerator);
+ this.quotaManager = requireNonNull(quotaManager);
}
private boolean hasActiveJob(IJobConfiguration job) {
@@ -208,8 +208,8 @@ class SchedulerCoreImpl implements SchedulerCore {
final ScheduleStatus status,
Optional<String> message) {
- checkNotNull(taskId);
- checkNotNull(status);
+ requireNonNull(taskId);
+ requireNonNull(status);
stateManager.changeState(taskId, Optional.<ScheduleStatus>absent(), status, message);
}
@@ -217,7 +217,7 @@ class SchedulerCoreImpl implements SchedulerCore {
@Override
public synchronized void killTasks(Query.Builder query, final String user) {
- checkNotNull(query);
+ requireNonNull(query);
LOG.info("Killing tasks matching " + query);
if (Query.isSingleJobScoped(query)) {
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/main/java/org/apache/aurora/scheduler/state/SideEffect.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/state/SideEffect.java b/src/main/java/org/apache/aurora/scheduler/state/SideEffect.java
index 87059cd..180852e 100644
--- a/src/main/java/org/apache/aurora/scheduler/state/SideEffect.java
+++ b/src/main/java/org/apache/aurora/scheduler/state/SideEffect.java
@@ -13,7 +13,8 @@
*/
package org.apache.aurora.scheduler.state;
-import com.google.common.base.Objects;
+import java.util.Objects;
+
import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
@@ -52,13 +53,13 @@ class SideEffect {
}
SideEffect other = (SideEffect) o;
- return Objects.equal(action, other.action)
- && Objects.equal(nextState, other.nextState);
+ return Objects.equals(action, other.action)
+ && Objects.equals(nextState, other.nextState);
}
@Override
public int hashCode() {
- return Objects.hashCode(action, nextState);
+ return Objects.hash(action, nextState);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/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 7f27a1f..6ad104b 100644
--- a/src/main/java/org/apache/aurora/scheduler/state/StateManagerImpl.java
+++ b/src/main/java/org/apache/aurora/scheduler/state/StateManagerImpl.java
@@ -64,7 +64,8 @@ import org.apache.aurora.scheduler.storage.entities.IScheduledTask;
import org.apache.aurora.scheduler.storage.entities.ITaskConfig;
import org.apache.mesos.Protos.SlaveID;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
+
import static com.twitter.common.base.MorePreconditions.checkNotBlank;
import static org.apache.aurora.gen.ScheduleStatus.ASSIGNED;
@@ -95,12 +96,12 @@ public class StateManagerImpl implements StateManager {
EventSink eventSink,
RescheduleCalculator rescheduleCalculator) {
- this.storage = checkNotNull(storage);
- this.clock = checkNotNull(clock);
- this.driver = checkNotNull(driver);
- this.taskIdGenerator = checkNotNull(taskIdGenerator);
- this.eventSink = checkNotNull(eventSink);
- this.rescheduleCalculator = checkNotNull(rescheduleCalculator);
+ this.storage = requireNonNull(storage);
+ this.clock = requireNonNull(clock);
+ this.driver = requireNonNull(driver);
+ this.taskIdGenerator = requireNonNull(taskIdGenerator);
+ this.eventSink = requireNonNull(eventSink);
+ this.rescheduleCalculator = requireNonNull(rescheduleCalculator);
}
private IScheduledTask createTask(int instanceId, ITaskConfig template) {
@@ -115,7 +116,7 @@ public class StateManagerImpl implements StateManager {
@Override
public void insertPendingTasks(final Map<Integer, ITaskConfig> tasks) {
- checkNotNull(tasks);
+ requireNonNull(tasks);
// Done outside the write transaction to minimize the work done inside a transaction.
final Set<IScheduledTask> scheduledTasks = FluentIterable.from(tasks.entrySet())
@@ -161,8 +162,8 @@ public class StateManagerImpl implements StateManager {
checkNotBlank(taskId);
checkNotBlank(slaveHost);
- checkNotNull(slaveId);
- checkNotNull(assignedPorts);
+ requireNonNull(slaveId);
+ requireNonNull(assignedPorts);
return storage.write(new MutateWork.Quiet<IAssignedTask>() {
@Override
@@ -203,7 +204,7 @@ public class StateManagerImpl implements StateManager {
Set<String> portNames,
Set<Integer> allocatedPorts) {
- checkNotNull(portNames);
+ requireNonNull(portNames);
// Expand ports.
Map<String, Integer> ports = Maps.newHashMap();
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/main/java/org/apache/aurora/scheduler/state/TaskAssigner.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/state/TaskAssigner.java b/src/main/java/org/apache/aurora/scheduler/state/TaskAssigner.java
index 2dc2d8c..4db9be8 100644
--- a/src/main/java/org/apache/aurora/scheduler/state/TaskAssigner.java
+++ b/src/main/java/org/apache/aurora/scheduler/state/TaskAssigner.java
@@ -32,7 +32,7 @@ import org.apache.aurora.scheduler.storage.entities.IScheduledTask;
import org.apache.mesos.Protos.Offer;
import org.apache.mesos.Protos.TaskInfo;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
/**
* Responsible for matching a task against an offer.
@@ -66,9 +66,9 @@ public interface TaskAssigner {
SchedulingFilter filter,
MesosTaskFactory taskFactory) {
- this.stateManager = checkNotNull(stateManager);
- this.filter = checkNotNull(filter);
- this.taskFactory = checkNotNull(taskFactory);
+ this.stateManager = requireNonNull(stateManager);
+ this.filter = requireNonNull(filter);
+ this.taskFactory = requireNonNull(taskFactory);
}
private TaskInfo assign(Offer offer, IScheduledTask task) {
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/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 6e0aa13..86a8eb5 100644
--- a/src/main/java/org/apache/aurora/scheduler/state/TaskStateMachine.java
+++ b/src/main/java/org/apache/aurora/scheduler/state/TaskStateMachine.java
@@ -40,7 +40,7 @@ import org.apache.aurora.gen.ScheduleStatus;
import org.apache.aurora.scheduler.base.Tasks;
import org.apache.aurora.scheduler.storage.entities.IScheduledTask;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.aurora.scheduler.state.SideEffect.Action;
import static org.apache.aurora.scheduler.state.SideEffect.Action.DELETE;
@@ -158,7 +158,7 @@ class TaskStateMachine {
private TaskStateMachine(final String name, final Optional<IScheduledTask> task) {
MorePreconditions.checkNotBlank(name);
- checkNotNull(task);
+ requireNonNull(task);
final TaskState initialState = task.transform(SCHEDULED_TO_TASK_STATE).or(DELETED);
if (task.isPresent()) {
@@ -538,7 +538,7 @@ class TaskStateMachine {
* @return {@code true} if the state change was allowed, {@code false} otherwise.
*/
public synchronized TransitionResult updateState(final Optional<ScheduleStatus> status) {
- checkNotNull(status);
+ requireNonNull(status);
Preconditions.checkState(sideEffects.isEmpty());
/**
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/main/java/org/apache/aurora/scheduler/state/TransitionResult.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/state/TransitionResult.java b/src/main/java/org/apache/aurora/scheduler/state/TransitionResult.java
index 148c611..874c554 100644
--- a/src/main/java/org/apache/aurora/scheduler/state/TransitionResult.java
+++ b/src/main/java/org/apache/aurora/scheduler/state/TransitionResult.java
@@ -13,8 +13,8 @@
*/
package org.apache.aurora.scheduler.state;
-import com.google.common.base.Objects;
-import com.google.common.base.Preconditions;
+import java.util.Objects;
+
import com.google.common.collect.ImmutableSet;
/**
@@ -34,7 +34,7 @@ public class TransitionResult {
*/
public TransitionResult(boolean success, ImmutableSet<SideEffect> sideEffects) {
this.success = success;
- this.sideEffects = Preconditions.checkNotNull(sideEffects);
+ this.sideEffects = Objects.requireNonNull(sideEffects);
}
public boolean isSuccess() {
@@ -52,18 +52,18 @@ public class TransitionResult {
}
TransitionResult other = (TransitionResult) o;
- return success == other.success
- && Objects.equal(sideEffects, other.sideEffects);
+ return Objects.equals(success, other.success)
+ && Objects.equals(sideEffects, other.sideEffects);
}
@Override
public int hashCode() {
- return Objects.hashCode(success, sideEffects);
+ return Objects.hash(success, sideEffects);
}
@Override
public String toString() {
- return Objects.toStringHelper(this)
+ return com.google.common.base.Objects.toStringHelper(this)
.add("success", success)
.add("sideEffects", sideEffects)
.toString();
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/main/java/org/apache/aurora/scheduler/stats/AsyncStatsModule.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/stats/AsyncStatsModule.java b/src/main/java/org/apache/aurora/scheduler/stats/AsyncStatsModule.java
index 3b5c617..c4435cb 100644
--- a/src/main/java/org/apache/aurora/scheduler/stats/AsyncStatsModule.java
+++ b/src/main/java/org/apache/aurora/scheduler/stats/AsyncStatsModule.java
@@ -48,8 +48,7 @@ import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
import static java.lang.annotation.ElementType.PARAMETER;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
/**
* Module to configure export of cluster-wide resource allocation and consumption statistics.
@@ -97,9 +96,9 @@ public class AsyncStatsModule extends AbstractModule {
TaskStatCalculator taskStats,
SlotSizeCounter slotCounter) {
- this.executor = checkNotNull(executor);
- this.taskStats = checkNotNull(taskStats);
- this.slotCounter = checkNotNull(slotCounter);
+ this.executor = requireNonNull(executor);
+ this.taskStats = requireNonNull(taskStats);
+ this.slotCounter = requireNonNull(slotCounter);
}
@Override
@@ -129,7 +128,7 @@ public class AsyncStatsModule extends AbstractModule {
@Inject
OfferAdapter(OfferQueue offerQueue) {
- this.offerQueue = checkNotNull(offerQueue);
+ this.offerQueue = requireNonNull(offerQueue);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/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 e72bc48..79d12b0 100644
--- a/src/main/java/org/apache/aurora/scheduler/stats/ResourceCounter.java
+++ b/src/main/java/org/apache/aurora/scheduler/stats/ResourceCounter.java
@@ -22,7 +22,6 @@ import javax.inject.Inject;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Function;
-import com.google.common.base.Preconditions;
import com.google.common.base.Predicate;
import com.google.common.base.Predicates;
import com.google.common.cache.CacheBuilder;
@@ -49,7 +48,7 @@ public class ResourceCounter {
@Inject
ResourceCounter(Storage storage) {
- this.storage = Preconditions.checkNotNull(storage);
+ this.storage = Objects.requireNonNull(storage);
}
private Iterable<ITaskConfig> getTasks(Query.Builder query) throws StorageException {
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/main/java/org/apache/aurora/scheduler/stats/SlotSizeCounter.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/stats/SlotSizeCounter.java b/src/main/java/org/apache/aurora/scheduler/stats/SlotSizeCounter.java
index af99957..5de34b2 100644
--- a/src/main/java/org/apache/aurora/scheduler/stats/SlotSizeCounter.java
+++ b/src/main/java/org/apache/aurora/scheduler/stats/SlotSizeCounter.java
@@ -26,7 +26,7 @@ import com.google.common.collect.ImmutableMap;
import org.apache.aurora.scheduler.base.ResourceAggregates;
import org.apache.aurora.scheduler.storage.entities.IResourceAggregate;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
/**
* A stat computer that aggregates the number of 'slots' available at different pre-determined
@@ -49,9 +49,9 @@ class SlotSizeCounter implements Runnable {
MachineResourceProvider machineResourceProvider,
CachedCounters cachedCounters) {
- this.slotSizes = checkNotNull(slotSizes);
- this.machineResourceProvider = checkNotNull(machineResourceProvider);
- this.cachedCounters = checkNotNull(cachedCounters);
+ this.slotSizes = requireNonNull(slotSizes);
+ this.machineResourceProvider = requireNonNull(machineResourceProvider);
+ this.cachedCounters = requireNonNull(cachedCounters);
}
static class MachineResource {
@@ -59,7 +59,7 @@ class SlotSizeCounter implements Runnable {
private final boolean dedicated;
public MachineResource(IResourceAggregate size, boolean dedicated) {
- this.size = checkNotNull(size);
+ this.size = requireNonNull(size);
this.dedicated = dedicated;
}
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/main/java/org/apache/aurora/scheduler/stats/TaskStatCalculator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/stats/TaskStatCalculator.java b/src/main/java/org/apache/aurora/scheduler/stats/TaskStatCalculator.java
index 557c213..a7f9401 100644
--- a/src/main/java/org/apache/aurora/scheduler/stats/TaskStatCalculator.java
+++ b/src/main/java/org/apache/aurora/scheduler/stats/TaskStatCalculator.java
@@ -22,7 +22,7 @@ import org.apache.aurora.scheduler.stats.ResourceCounter.GlobalMetric;
import org.apache.aurora.scheduler.stats.ResourceCounter.Metric;
import org.apache.aurora.scheduler.storage.Storage.StorageException;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
/**
* Calculates and exports aggregate stats about resources consumed by active tasks.
@@ -35,8 +35,8 @@ class TaskStatCalculator implements Runnable {
@Inject
TaskStatCalculator(ResourceCounter resourceCounter, CachedCounters counters) {
- this.resourceCounter = checkNotNull(resourceCounter);
- this.counters = checkNotNull(counters);
+ this.resourceCounter = requireNonNull(resourceCounter);
+ this.counters = requireNonNull(counters);
}
private void update(String prefix, Metric metric) {
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/main/java/org/apache/aurora/scheduler/storage/CallOrderEnforcingStorage.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/storage/CallOrderEnforcingStorage.java b/src/main/java/org/apache/aurora/scheduler/storage/CallOrderEnforcingStorage.java
index 0a0650e..fc3eaf6 100644
--- a/src/main/java/org/apache/aurora/scheduler/storage/CallOrderEnforcingStorage.java
+++ b/src/main/java/org/apache/aurora/scheduler/storage/CallOrderEnforcingStorage.java
@@ -34,7 +34,7 @@ import org.apache.aurora.scheduler.storage.Storage.MutateWork.NoResult.Quiet;
import org.apache.aurora.scheduler.storage.Storage.NonVolatileStorage;
import org.apache.aurora.scheduler.storage.entities.IScheduledTask;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
/**
* A non-volatile storage wrapper that enforces method call ordering.
@@ -69,8 +69,8 @@ public class CallOrderEnforcingStorage implements NonVolatileStorage {
@Inject
CallOrderEnforcingStorage(@EnforceOrderOn NonVolatileStorage wrapped, EventSink eventSink) {
- this.wrapped = checkNotNull(wrapped);
- this.eventSink = checkNotNull(eventSink);
+ this.wrapped = requireNonNull(wrapped);
+ this.eventSink = requireNonNull(eventSink);
}
private void checkInState(State state) throws StorageException {
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/main/java/org/apache/aurora/scheduler/storage/ForwardingStore.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/storage/ForwardingStore.java b/src/main/java/org/apache/aurora/scheduler/storage/ForwardingStore.java
index e23506b..94f03f0 100644
--- a/src/main/java/org/apache/aurora/scheduler/storage/ForwardingStore.java
+++ b/src/main/java/org/apache/aurora/scheduler/storage/ForwardingStore.java
@@ -30,7 +30,7 @@ import org.apache.aurora.scheduler.storage.entities.ILockKey;
import org.apache.aurora.scheduler.storage.entities.IResourceAggregate;
import org.apache.aurora.scheduler.storage.entities.IScheduledTask;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
/**
* A store that forwards all its operations to underlying storage systems. Useful for decorating
@@ -69,12 +69,12 @@ public class ForwardingStore implements
QuotaStore quotaStore,
AttributeStore attributeStore) {
- this.schedulerStore = checkNotNull(schedulerStore);
- this.jobStore = checkNotNull(jobStore);
- this.taskStore = checkNotNull(taskStore);
- this.lockStore = checkNotNull(lockStore);
- this.quotaStore = checkNotNull(quotaStore);
- this.attributeStore = checkNotNull(attributeStore);
+ this.schedulerStore = requireNonNull(schedulerStore);
+ this.jobStore = requireNonNull(jobStore);
+ this.taskStore = requireNonNull(taskStore);
+ this.lockStore = requireNonNull(lockStore);
+ this.quotaStore = requireNonNull(quotaStore);
+ this.attributeStore = requireNonNull(attributeStore);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/main/java/org/apache/aurora/scheduler/storage/ReadWriteLockManager.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/storage/ReadWriteLockManager.java b/src/main/java/org/apache/aurora/scheduler/storage/ReadWriteLockManager.java
index 3725590..4e6d68b 100644
--- a/src/main/java/org/apache/aurora/scheduler/storage/ReadWriteLockManager.java
+++ b/src/main/java/org/apache/aurora/scheduler/storage/ReadWriteLockManager.java
@@ -17,7 +17,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
import com.google.common.base.Preconditions;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
/**
* A lock manager that wraps a ReadWriteLock and detects ill-fated attempts to upgrade
@@ -88,7 +88,7 @@ public class ReadWriteLockManager {
* secured the lock and has yet to release it.
*/
public boolean lock(LockType type) {
- checkNotNull(type);
+ requireNonNull(type);
if (LockType.READ == type) {
managedLock.readLock().lock();
@@ -108,7 +108,7 @@ public class ReadWriteLockManager {
* @param type Type of lock to release.
*/
public void unlock(LockType type) {
- checkNotNull(type);
+ requireNonNull(type);
if (LockType.READ == type) {
managedLock.readLock().unlock();
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/main/java/org/apache/aurora/scheduler/storage/backup/BackupModule.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/storage/backup/BackupModule.java b/src/main/java/org/apache/aurora/scheduler/storage/backup/BackupModule.java
index 4e2fb8b..71feb57 100644
--- a/src/main/java/org/apache/aurora/scheduler/storage/backup/BackupModule.java
+++ b/src/main/java/org/apache/aurora/scheduler/storage/backup/BackupModule.java
@@ -39,7 +39,7 @@ import org.apache.aurora.scheduler.storage.backup.StorageBackup.StorageBackupImp
import org.apache.aurora.scheduler.storage.backup.StorageBackup.StorageBackupImpl.BackupConfig;
import org.apache.aurora.scheduler.storage.backup.TemporaryStorage.TemporaryStorageFactory;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
/**
* A module that will periodically save full storage backups to local disk and makes those backups
@@ -81,8 +81,8 @@ public class BackupModule extends PrivateModule {
*/
@VisibleForTesting
public BackupModule(File backupDir, Class<? extends SnapshotStore<Snapshot>> snapshotStore) {
- this.unvalidatedBackupDir = checkNotNull(backupDir);
- this.snapshotStore = checkNotNull(snapshotStore);
+ this.unvalidatedBackupDir = requireNonNull(backupDir);
+ this.snapshotStore = requireNonNull(snapshotStore);
}
@Override
@@ -109,7 +109,7 @@ public class BackupModule extends PrivateModule {
private final Lifecycle lifecycle;
@Inject LifecycleHook(Lifecycle lifecycle) {
- this.lifecycle = checkNotNull(lifecycle);
+ this.lifecycle = requireNonNull(lifecycle);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/main/java/org/apache/aurora/scheduler/storage/backup/Recovery.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/storage/backup/Recovery.java b/src/main/java/org/apache/aurora/scheduler/storage/backup/Recovery.java
index f1511b8..4744dc9 100644
--- a/src/main/java/org/apache/aurora/scheduler/storage/backup/Recovery.java
+++ b/src/main/java/org/apache/aurora/scheduler/storage/backup/Recovery.java
@@ -37,7 +37,7 @@ import org.apache.aurora.scheduler.storage.Storage.MutableStoreProvider;
import org.apache.aurora.scheduler.storage.Storage.MutateWork;
import org.apache.aurora.scheduler.storage.entities.IScheduledTask;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
/**
* A recovery mechanism that works with {@link StorageBackup} to provide a two-step storage
@@ -119,12 +119,12 @@ public interface Recovery {
DistributedSnapshotStore distributedStore,
Command shutDownNow) {
- this.backupDir = checkNotNull(backupDir);
- this.tempStorageFactory = checkNotNull(tempStorageFactory);
+ this.backupDir = requireNonNull(backupDir);
+ this.tempStorageFactory = requireNonNull(tempStorageFactory);
this.recovery = Atomics.newReference();
- this.primaryStorage = checkNotNull(primaryStorage);
- this.distributedStore = checkNotNull(distributedStore);
- this.shutDownNow = checkNotNull(shutDownNow);
+ this.primaryStorage = requireNonNull(primaryStorage);
+ this.distributedStore = requireNonNull(distributedStore);
+ this.shutDownNow = requireNonNull(shutDownNow);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/main/java/org/apache/aurora/scheduler/storage/backup/StorageBackup.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/storage/backup/StorageBackup.java b/src/main/java/org/apache/aurora/scheduler/storage/backup/StorageBackup.java
index 8bc0b8c..4bfb44d 100644
--- a/src/main/java/org/apache/aurora/scheduler/storage/backup/StorageBackup.java
+++ b/src/main/java/org/apache/aurora/scheduler/storage/backup/StorageBackup.java
@@ -49,8 +49,7 @@ import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
import static java.lang.annotation.ElementType.PARAMETER;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
/**
* A backup routine that layers over a snapshot store and periodically writes snapshots to
@@ -78,9 +77,9 @@ public interface StorageBackup {
private final Amount<Long, Time> interval;
BackupConfig(File dir, int maxBackups, Amount<Long, Time> interval) {
- this.dir = checkNotNull(dir);
+ this.dir = requireNonNull(dir);
this.maxBackups = maxBackups;
- this.interval = checkNotNull(interval);
+ this.interval = requireNonNull(interval);
}
@VisibleForTesting
@@ -120,9 +119,9 @@ public interface StorageBackup {
Clock clock,
BackupConfig config) {
- this.delegate = checkNotNull(delegate);
- this.clock = checkNotNull(clock);
- this.config = checkNotNull(config);
+ this.delegate = requireNonNull(delegate);
+ this.clock = requireNonNull(clock);
+ this.config = requireNonNull(config);
backupDateFormat = new SimpleDateFormat("yyyy-MM-dd-HH-mm", Locale.ENGLISH);
backupIntervalMs = config.interval.as(Time.MILLISECONDS);
lastBackupMs = clock.nowMillis();
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/main/java/org/apache/aurora/scheduler/storage/db/DbLockStore.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/storage/db/DbLockStore.java b/src/main/java/org/apache/aurora/scheduler/storage/db/DbLockStore.java
index 0e7f52c..f5ed139 100644
--- a/src/main/java/org/apache/aurora/scheduler/storage/db/DbLockStore.java
+++ b/src/main/java/org/apache/aurora/scheduler/storage/db/DbLockStore.java
@@ -27,7 +27,7 @@ import org.apache.aurora.scheduler.storage.entities.ILock;
import org.apache.aurora.scheduler.storage.entities.ILockKey;
import org.apache.ibatis.exceptions.PersistenceException;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
/**
* A relational database-backed lock store.
@@ -41,8 +41,8 @@ class DbLockStore implements LockStore.Mutable {
@Inject
DbLockStore(LockMapper mapper, LockKeyMapper lockKeyMapper) {
- this.mapper = checkNotNull(mapper);
- this.lockKeyMapper = checkNotNull(lockKeyMapper);
+ this.mapper = requireNonNull(mapper);
+ this.lockKeyMapper = requireNonNull(lockKeyMapper);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/main/java/org/apache/aurora/scheduler/storage/db/DbModule.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/storage/db/DbModule.java b/src/main/java/org/apache/aurora/scheduler/storage/db/DbModule.java
index 1738b95..3485279 100644
--- a/src/main/java/org/apache/aurora/scheduler/storage/db/DbModule.java
+++ b/src/main/java/org/apache/aurora/scheduler/storage/db/DbModule.java
@@ -32,7 +32,8 @@ import org.h2.Driver;
import org.mybatis.guice.MyBatisModule;
import org.mybatis.guice.datasource.builtin.PooledDataSourceProvider;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
+
import static com.google.inject.name.Names.named;
/**
@@ -56,7 +57,7 @@ public class DbModule extends PrivateModule {
private final Bindings.KeyFactory keyFactory;
public DbModule(Bindings.KeyFactory keyFactory) {
- this.keyFactory = checkNotNull(keyFactory);
+ this.keyFactory = requireNonNull(keyFactory);
}
private <T> void bindStore(Class<T> binding, Class<? extends T> impl) {
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/main/java/org/apache/aurora/scheduler/storage/db/DbQuotaStore.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/storage/db/DbQuotaStore.java b/src/main/java/org/apache/aurora/scheduler/storage/db/DbQuotaStore.java
index 0c327de..412b3e7 100644
--- a/src/main/java/org/apache/aurora/scheduler/storage/db/DbQuotaStore.java
+++ b/src/main/java/org/apache/aurora/scheduler/storage/db/DbQuotaStore.java
@@ -23,7 +23,7 @@ import org.apache.aurora.gen.storage.SaveQuota;
import org.apache.aurora.scheduler.storage.QuotaStore;
import org.apache.aurora.scheduler.storage.entities.IResourceAggregate;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
/**
* Quota store backed by a relational database.
@@ -34,7 +34,7 @@ class DbQuotaStore implements QuotaStore.Mutable {
@Inject
DbQuotaStore(QuotaMapper mapper) {
- this.mapper = checkNotNull(mapper);
+ this.mapper = requireNonNull(mapper);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/main/java/org/apache/aurora/scheduler/storage/db/DbStorage.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/storage/db/DbStorage.java b/src/main/java/org/apache/aurora/scheduler/storage/db/DbStorage.java
index c683e39..0d8ad61 100644
--- a/src/main/java/org/apache/aurora/scheduler/storage/db/DbStorage.java
+++ b/src/main/java/org/apache/aurora/scheduler/storage/db/DbStorage.java
@@ -15,9 +15,9 @@ package org.apache.aurora.scheduler.storage.db;
import java.io.IOException;
import java.io.InputStreamReader;
+import java.util.Objects;
import com.google.common.base.Charsets;
-import com.google.common.base.Preconditions;
import com.google.common.io.CharStreams;
import com.google.common.util.concurrent.AbstractIdleService;
import com.google.inject.Inject;
@@ -60,7 +60,7 @@ class DbStorage extends AbstractIdleService implements Storage {
final LockStore.Mutable lockStore,
final QuotaStore.Mutable quotaStore) {
- this.sessionFactory = Preconditions.checkNotNull(sessionFactory);
+ this.sessionFactory = Objects.requireNonNull(sessionFactory);
storeProvider = new MutableStoreProvider() {
@Override
public SchedulerStore.Mutable getSchedulerStore() {
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/main/java/org/apache/aurora/scheduler/storage/db/LockKeyMapper.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/storage/db/LockKeyMapper.java b/src/main/java/org/apache/aurora/scheduler/storage/db/LockKeyMapper.java
index 72543bf..618d5b7 100644
--- a/src/main/java/org/apache/aurora/scheduler/storage/db/LockKeyMapper.java
+++ b/src/main/java/org/apache/aurora/scheduler/storage/db/LockKeyMapper.java
@@ -17,7 +17,7 @@ import com.google.inject.Inject;
import org.apache.aurora.gen.LockKey;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
/**
* Mapper for LockKeys. Not a MyBatis mapper, this just encapsulates the logic for writing
@@ -36,12 +36,12 @@ public class LockKeyMapper {
@Inject
public LockKeyMapper(JobKeyMapper jobKeyMapper) {
- this.jobKeyMapper = checkNotNull(jobKeyMapper);
+ this.jobKeyMapper = requireNonNull(jobKeyMapper);
}
public void insert(LockKey key) {
if (key.isSetJob()) {
- jobKeyMapper.insert(checkNotNull(key.getJob()));
+ jobKeyMapper.insert(requireNonNull(key.getJob()));
} else {
throw new IllegalArgumentException("Unsupported lock type on LockKey.");
}
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/main/java/org/apache/aurora/scheduler/storage/db/MigrationModule.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/storage/db/MigrationModule.java b/src/main/java/org/apache/aurora/scheduler/storage/db/MigrationModule.java
index 505c94d..77cd8ab 100644
--- a/src/main/java/org/apache/aurora/scheduler/storage/db/MigrationModule.java
+++ b/src/main/java/org/apache/aurora/scheduler/storage/db/MigrationModule.java
@@ -19,7 +19,7 @@ import com.twitter.common.inject.Bindings.KeyFactory;
import org.apache.aurora.scheduler.storage.LockStore;
import org.apache.aurora.scheduler.storage.QuotaStore;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
/**
* Temporary module to wire the two partial storage implementations together as we
@@ -38,8 +38,8 @@ public class MigrationModule extends AbstractModule {
private final KeyFactory fromFactory;
public MigrationModule(KeyFactory from, KeyFactory to) {
- this.fromFactory = checkNotNull(from);
- this.toFactory = checkNotNull(to);
+ this.fromFactory = requireNonNull(from);
+ this.toFactory = requireNonNull(to);
}
private <T> void link(Class<T> clazz) {
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/main/java/org/apache/aurora/scheduler/storage/log/LogManager.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/storage/log/LogManager.java b/src/main/java/org/apache/aurora/scheduler/storage/log/LogManager.java
index 496f13e..bfca1d9 100644
--- a/src/main/java/org/apache/aurora/scheduler/storage/log/LogManager.java
+++ b/src/main/java/org/apache/aurora/scheduler/storage/log/LogManager.java
@@ -66,7 +66,7 @@ import org.apache.aurora.scheduler.log.Log.Stream;
import org.apache.aurora.scheduler.log.Log.Stream.InvalidPositionException;
import org.apache.aurora.scheduler.log.Log.Stream.StreamAccessException;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
/**
* Manages opening, reading from and writing to a {@link Log}.
@@ -101,8 +101,8 @@ public final class LogManager {
@MaxEntrySize Amount<Integer, Data> maxEntrySize,
@SnapshotSetting boolean deflateSnapshots) {
- this.log = checkNotNull(log);
- this.maxEntrySize = checkNotNull(maxEntrySize);
+ this.log = requireNonNull(log);
+ this.maxEntrySize = requireNonNull(maxEntrySize);
this.deflateSnapshots = deflateSnapshots;
}
@@ -154,7 +154,7 @@ public final class LogManager {
private final EntrySerializer entrySerializer;
StreamManager(Stream stream, boolean deflateSnapshots, Amount<Integer, Data> maxEntrySize) {
- this.stream = checkNotNull(stream);
+ this.stream = requireNonNull(stream);
this.deflateSnapshots = deflateSnapshots;
digest = createDigest();
entrySerializer = new EntrySerializer(digest, maxEntrySize);
@@ -320,7 +320,7 @@ public final class LogManager {
private final int maxEntrySizeBytes;
EntrySerializer(MessageDigest digest, Amount<Integer, Data> maxEntrySize) {
- this.digest = checkNotNull(digest);
+ this.digest = requireNonNull(digest);
maxEntrySizeBytes = maxEntrySize.as(Data.BYTES);
}
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/main/java/org/apache/aurora/scheduler/storage/log/LogStorage.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/storage/log/LogStorage.java b/src/main/java/org/apache/aurora/scheduler/storage/log/LogStorage.java
index 2d7e81c..67191e7 100644
--- a/src/main/java/org/apache/aurora/scheduler/storage/log/LogStorage.java
+++ b/src/main/java/org/apache/aurora/scheduler/storage/log/LogStorage.java
@@ -67,7 +67,7 @@ import org.apache.aurora.scheduler.storage.entities.ITaskConfig;
import org.apache.aurora.scheduler.storage.log.LogManager.StreamManager;
import org.apache.aurora.scheduler.storage.log.LogManager.StreamManager.StreamTransaction;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
/**
* A storage implementation that ensures committed transactions are written to a log.
@@ -155,8 +155,8 @@ public class LogStorage implements NonVolatileStorage, DistributedSnapshotStore
@Override
public void doEvery(Amount<Long, Time> interval, Runnable action) {
- checkNotNull(interval);
- checkNotNull(action);
+ requireNonNull(interval);
+ requireNonNull(action);
long delay = interval.getValue();
TimeUnit timeUnit = interval.getUnit().getTimeUnit();
@@ -254,22 +254,22 @@ public class LogStorage implements NonVolatileStorage, DistributedSnapshotStore
QuotaStore.Mutable quotaStore,
AttributeStore.Mutable attributeStore) {
- this.logManager = checkNotNull(logManager);
- this.schedulingService = checkNotNull(schedulingService);
- this.snapshotStore = checkNotNull(snapshotStore);
- this.snapshotInterval = checkNotNull(snapshotInterval);
+ this.logManager = requireNonNull(logManager);
+ this.schedulingService = requireNonNull(schedulingService);
+ this.snapshotStore = requireNonNull(snapshotStore);
+ this.snapshotInterval = requireNonNull(snapshotInterval);
// Log storage has two distinct operating modes: pre- and post-recovery. When recovering,
// we write directly to the writeBehind stores since we are replaying what's already persisted.
// After that, all writes must succeed in the distributed log before they may be considered
// successful.
- this.writeBehindStorage = checkNotNull(delegateStorage);
- this.writeBehindSchedulerStore = checkNotNull(schedulerStore);
- this.writeBehindJobStore = checkNotNull(jobStore);
- this.writeBehindTaskStore = checkNotNull(taskStore);
- this.writeBehindLockStore = checkNotNull(lockStore);
- this.writeBehindQuotaStore = checkNotNull(quotaStore);
- this.writeBehindAttributeStore = checkNotNull(attributeStore);
+ this.writeBehindStorage = requireNonNull(delegateStorage);
+ this.writeBehindSchedulerStore = requireNonNull(schedulerStore);
+ this.writeBehindJobStore = requireNonNull(jobStore);
+ this.writeBehindTaskStore = requireNonNull(taskStore);
+ this.writeBehindLockStore = requireNonNull(lockStore);
+ this.writeBehindQuotaStore = requireNonNull(quotaStore);
+ this.writeBehindAttributeStore = requireNonNull(attributeStore);
TransactionManager transactionManager = new TransactionManager() {
@Override
public boolean hasActiveTransaction() {
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/main/java/org/apache/aurora/scheduler/storage/log/SnapshotStoreImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/storage/log/SnapshotStoreImpl.java b/src/main/java/org/apache/aurora/scheduler/storage/log/SnapshotStoreImpl.java
index 083e3ff..1757ee3 100644
--- a/src/main/java/org/apache/aurora/scheduler/storage/log/SnapshotStoreImpl.java
+++ b/src/main/java/org/apache/aurora/scheduler/storage/log/SnapshotStoreImpl.java
@@ -45,7 +45,7 @@ import org.apache.aurora.scheduler.storage.entities.ILock;
import org.apache.aurora.scheduler.storage.entities.IResourceAggregate;
import org.apache.aurora.scheduler.storage.entities.IScheduledTask;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.aurora.gen.apiConstants.CURRENT_API_VERSION;
@@ -195,8 +195,8 @@ public class SnapshotStoreImpl implements SnapshotStore<Snapshot> {
@Inject
public SnapshotStoreImpl(Clock clock, @Volatile Storage storage) {
- this.clock = checkNotNull(clock);
- this.storage = checkNotNull(storage);
+ this.clock = requireNonNull(clock);
+ this.storage = requireNonNull(storage);
}
@Timed("snapshot_create")
@@ -222,7 +222,7 @@ public class SnapshotStoreImpl implements SnapshotStore<Snapshot> {
@Timed("snapshot_apply")
@Override
public void applySnapshot(final Snapshot snapshot) {
- checkNotNull(snapshot);
+ requireNonNull(snapshot);
storage.write(new MutateWork.NoResult.Quiet() {
@Override
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/main/java/org/apache/aurora/scheduler/storage/log/WriteAheadStorage.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/storage/log/WriteAheadStorage.java b/src/main/java/org/apache/aurora/scheduler/storage/log/WriteAheadStorage.java
index 4257cb9..414492f 100644
--- a/src/main/java/org/apache/aurora/scheduler/storage/log/WriteAheadStorage.java
+++ b/src/main/java/org/apache/aurora/scheduler/storage/log/WriteAheadStorage.java
@@ -57,7 +57,7 @@ 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 static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.aurora.scheduler.storage.log.LogStorage.TransactionManager;
@@ -107,13 +107,13 @@ class WriteAheadStorage extends ForwardingStore implements
super(schedulerStore, jobStore, taskStore, lockStore, quotaStore, attributeStore);
- this.transactionManager = checkNotNull(transactionManager);
- this.schedulerStore = checkNotNull(schedulerStore);
- this.jobStore = checkNotNull(jobStore);
- this.taskStore = checkNotNull(taskStore);
- this.lockStore = checkNotNull(lockStore);
- this.quotaStore = checkNotNull(quotaStore);
- this.attributeStore = checkNotNull(attributeStore);
+ this.transactionManager = requireNonNull(transactionManager);
+ this.schedulerStore = requireNonNull(schedulerStore);
+ this.jobStore = requireNonNull(jobStore);
+ this.taskStore = requireNonNull(taskStore);
+ this.lockStore = requireNonNull(lockStore);
+ this.quotaStore = requireNonNull(quotaStore);
+ this.attributeStore = requireNonNull(attributeStore);
}
private void write(Op op) {
@@ -126,7 +126,7 @@ class WriteAheadStorage extends ForwardingStore implements
@Timed("scheduler_log_save_framework_id")
@Override
public void saveFrameworkId(final String frameworkId) {
- checkNotNull(frameworkId);
+ requireNonNull(frameworkId);
write(Op.saveFrameworkId(new SaveFrameworkId(frameworkId)));
schedulerStore.saveFrameworkId(frameworkId);
@@ -135,8 +135,8 @@ class WriteAheadStorage extends ForwardingStore implements
@Timed("scheduler_log_unsafe_modify_in_place")
@Override
public boolean unsafeModifyInPlace(final String taskId, final ITaskConfig taskConfiguration) {
- checkNotNull(taskId);
- checkNotNull(taskConfiguration);
+ requireNonNull(taskId);
+ requireNonNull(taskConfiguration);
boolean mutated = taskStore.unsafeModifyInPlace(taskId, taskConfiguration);
if (mutated) {
@@ -148,7 +148,7 @@ class WriteAheadStorage extends ForwardingStore implements
@Timed("scheduler_log_tasks_remove")
@Override
public void deleteTasks(final Set<String> taskIds) {
- checkNotNull(taskIds);
+ requireNonNull(taskIds);
write(Op.removeTasks(new RemoveTasks(taskIds)));
taskStore.deleteTasks(taskIds);
@@ -157,7 +157,7 @@ class WriteAheadStorage extends ForwardingStore implements
@Timed("scheduler_log_tasks_save")
@Override
public void saveTasks(final Set<IScheduledTask> newTasks) {
- checkNotNull(newTasks);
+ requireNonNull(newTasks);
write(Op.saveTasks(new SaveTasks(IScheduledTask.toBuildersSet(newTasks))));
taskStore.saveTasks(newTasks);
@@ -169,8 +169,8 @@ class WriteAheadStorage extends ForwardingStore implements
final Query.Builder query,
final Function<IScheduledTask, IScheduledTask> mutator) {
- checkNotNull(query);
- checkNotNull(mutator);
+ requireNonNull(query);
+ requireNonNull(mutator);
ImmutableSet<IScheduledTask> mutated = taskStore.mutateTasks(query, mutator);
@@ -188,8 +188,8 @@ class WriteAheadStorage extends ForwardingStore implements
@Timed("scheduler_log_quota_save")
@Override
public void saveQuota(final String role, final IResourceAggregate quota) {
- checkNotNull(role);
- checkNotNull(quota);
+ requireNonNull(role);
+ requireNonNull(quota);
write(Op.saveQuota(new SaveQuota(role, quota.newBuilder())));
quotaStore.saveQuota(role, quota);
@@ -198,7 +198,7 @@ class WriteAheadStorage extends ForwardingStore implements
@Timed("scheduler_save_host_attribute")
@Override
public void saveHostAttributes(final IHostAttributes attrs) {
- checkNotNull(attrs);
+ requireNonNull(attrs);
// Pass the updated attributes upstream, and then check if the stored value changes.
// We do this since different parts of the system write partial HostAttributes objects
@@ -216,7 +216,7 @@ class WriteAheadStorage extends ForwardingStore implements
@Timed("scheduler_log_job_remove")
@Override
public void removeJob(final IJobKey jobKey) {
- checkNotNull(jobKey);
+ requireNonNull(jobKey);
write(Op.removeJob(new RemoveJob().setJobKey(jobKey.newBuilder())));
jobStore.removeJob(jobKey);
@@ -225,8 +225,8 @@ class WriteAheadStorage extends ForwardingStore implements
@Timed("scheduler_log_job_save")
@Override
public void saveAcceptedJob(final String managerId, final IJobConfiguration jobConfig) {
- checkNotNull(managerId);
- checkNotNull(jobConfig);
+ requireNonNull(managerId);
+ requireNonNull(jobConfig);
write(Op.saveAcceptedJob(new SaveAcceptedJob(managerId, jobConfig.newBuilder())));
jobStore.saveAcceptedJob(managerId, jobConfig);
@@ -235,7 +235,7 @@ class WriteAheadStorage extends ForwardingStore implements
@Timed("scheduler_log_quota_remove")
@Override
public void removeQuota(final String role) {
- checkNotNull(role);
+ requireNonNull(role);
write(Op.removeQuota(new RemoveQuota(role)));
quotaStore.removeQuota(role);
@@ -244,7 +244,7 @@ class WriteAheadStorage extends ForwardingStore implements
@Timed("scheduler_lock_save")
@Override
public void saveLock(final ILock lock) {
- checkNotNull(lock);
+ requireNonNull(lock);
write(Op.saveLock(new SaveLock(lock.newBuilder())));
lockStore.saveLock(lock);
@@ -253,7 +253,7 @@ class WriteAheadStorage extends ForwardingStore implements
@Timed("scheduler_lock_remove")
@Override
public void removeLock(final ILockKey lockKey) {
- checkNotNull(lockKey);
+ requireNonNull(lockKey);
write(Op.removeLock(new RemoveLock(lockKey.newBuilder())));
lockStore.removeLock(lockKey);
@@ -291,8 +291,8 @@ class WriteAheadStorage extends ForwardingStore implements
@Override
public boolean setMaintenanceMode(final String host, final MaintenanceMode mode) {
- checkNotNull(host);
- checkNotNull(mode);
+ requireNonNull(host);
+ requireNonNull(mode);
boolean saved = attributeStore.setMaintenanceMode(host, mode);
if (saved) {
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/main/java/org/apache/aurora/scheduler/storage/log/testing/LogOpMatcher.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/storage/log/testing/LogOpMatcher.java b/src/main/java/org/apache/aurora/scheduler/storage/log/testing/LogOpMatcher.java
index 35e2e5a..9abdbbb 100644
--- a/src/main/java/org/apache/aurora/scheduler/storage/log/testing/LogOpMatcher.java
+++ b/src/main/java/org/apache/aurora/scheduler/storage/log/testing/LogOpMatcher.java
@@ -13,7 +13,8 @@
*/
package org.apache.aurora.scheduler.storage.log.testing;
-import com.google.common.base.Preconditions;
+import java.util.Objects;
+
import com.google.common.collect.ImmutableList;
import org.apache.aurora.codec.ThriftBinaryCodec;
@@ -70,7 +71,7 @@ public class LogOpMatcher implements IArgumentMatcher {
private final Stream stream;
StreamMatcher(Stream stream) {
- this.stream = Preconditions.checkNotNull(stream);
+ this.stream = Objects.requireNonNull(stream);
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/main/java/org/apache/aurora/scheduler/storage/mem/MemJobStore.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/storage/mem/MemJobStore.java b/src/main/java/org/apache/aurora/scheduler/storage/mem/MemJobStore.java
index 571636d..c8f73bb 100644
--- a/src/main/java/org/apache/aurora/scheduler/storage/mem/MemJobStore.java
+++ b/src/main/java/org/apache/aurora/scheduler/storage/mem/MemJobStore.java
@@ -30,7 +30,7 @@ import org.apache.aurora.scheduler.storage.JobStore;
import org.apache.aurora.scheduler.storage.entities.IJobConfiguration;
import org.apache.aurora.scheduler.storage.entities.IJobKey;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
/**
* An in-memory job store.
@@ -47,8 +47,8 @@ class MemJobStore implements JobStore.Mutable {
@Override
public void saveAcceptedJob(String managerId, IJobConfiguration jobConfig) {
- checkNotNull(managerId);
- checkNotNull(jobConfig);
+ requireNonNull(managerId);
+ requireNonNull(jobConfig);
IJobKey key = JobKeys.assertValid(jobConfig.getKey());
managers.getUnchecked(managerId).jobs.put(key, jobConfig);
@@ -56,7 +56,7 @@ class MemJobStore implements JobStore.Mutable {
@Override
public void removeJob(IJobKey jobKey) {
- checkNotNull(jobKey);
+ requireNonNull(jobKey);
for (Manager manager : managers.asMap().values()) {
manager.jobs.remove(jobKey);
@@ -70,7 +70,7 @@ class MemJobStore implements JobStore.Mutable {
@Override
public Iterable<IJobConfiguration> fetchJobs(String managerId) {
- checkNotNull(managerId);
+ requireNonNull(managerId);
@Nullable Manager manager = managers.getIfPresent(managerId);
if (manager == null) {
@@ -84,8 +84,8 @@ class MemJobStore implements JobStore.Mutable {
@Override
public Optional<IJobConfiguration> fetchJob(String managerId, IJobKey jobKey) {
- checkNotNull(managerId);
- checkNotNull(jobKey);
+ requireNonNull(managerId);
+ requireNonNull(jobKey);
Optional<Manager> manager = Optional.fromNullable(managers.getIfPresent(managerId));
if (manager.isPresent()) {
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/main/java/org/apache/aurora/scheduler/storage/mem/MemStorage.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/storage/mem/MemStorage.java b/src/main/java/org/apache/aurora/scheduler/storage/mem/MemStorage.java
index 65750b6..cc20631 100644
--- a/src/main/java/org/apache/aurora/scheduler/storage/mem/MemStorage.java
+++ b/src/main/java/org/apache/aurora/scheduler/storage/mem/MemStorage.java
@@ -43,7 +43,7 @@ import org.apache.aurora.scheduler.storage.Storage;
import org.apache.aurora.scheduler.storage.TaskStore;
import org.apache.aurora.scheduler.storage.db.DbModule;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
/**
* A storage implementation comprised of individual in-memory store implementations.
@@ -154,7 +154,7 @@ public class MemStorage implements Storage {
SlidingStats stats,
AtomicLong lockWaitStat) throws StorageException, E {
- checkNotNull(work);
+ requireNonNull(work);
// Perform the work, and only record stats for top-level transactions. This prevents
// over-counting when nested transactions are performed.
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5bd68359/src/main/java/org/apache/aurora/scheduler/storage/mem/MemStorageModule.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/storage/mem/MemStorageModule.java b/src/main/java/org/apache/aurora/scheduler/storage/mem/MemStorageModule.java
index 23555c2..65565f1 100644
--- a/src/main/java/org/apache/aurora/scheduler/storage/mem/MemStorageModule.java
+++ b/src/main/java/org/apache/aurora/scheduler/storage/mem/MemStorageModule.java
@@ -26,7 +26,7 @@ import org.apache.aurora.scheduler.storage.Storage;
import org.apache.aurora.scheduler.storage.Storage.Volatile;
import org.apache.aurora.scheduler.storage.TaskStore;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
/**
* Binding module for an in-memory storage system.
@@ -50,7 +50,7 @@ public final class MemStorageModule extends PrivateModule {
private final KeyFactory keyFactory;
public MemStorageModule(KeyFactory keyFactory) {
- this.keyFactory = checkNotNull(keyFactory);
+ this.keyFactory = requireNonNull(keyFactory);
}
private <T> void bindStore(Class<T> binding, Class<? extends T> impl) {