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 2016/01/04 05:50:23 UTC
[4/4] aurora git commit: Use slf4j throughout the scheduler.
Use slf4j throughout the scheduler.
Reviewed at https://reviews.apache.org/r/41777/
Project: http://git-wip-us.apache.org/repos/asf/aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/aurora/commit/9ed81a7d
Tree: http://git-wip-us.apache.org/repos/asf/aurora/tree/9ed81a7d
Diff: http://git-wip-us.apache.org/repos/asf/aurora/diff/9ed81a7d
Branch: refs/heads/master
Commit: 9ed81a7db58f6a7cb308c8ac6a545705351c8c0e
Parents: 5b46fd1
Author: Bill Farner <wf...@apache.org>
Authored: Sun Jan 3 20:44:03 2016 -0800
Committer: Bill Farner <wf...@apache.org>
Committed: Sun Jan 3 20:44:03 2016 -0800
----------------------------------------------------------------------
.../aurora/common/args/apt/Configuration.java | 5 --
.../aurora/common/application/Lifecycle.java | 6 +--
.../common/application/ShutdownRegistry.java | 10 ++--
.../apache/aurora/common/args/ArgScanner.java | 7 +--
.../org/apache/aurora/common/args/Args.java | 7 +--
.../aurora/common/args/PositionalInfo.java | 1 -
.../aurora/common/args/parsers/ListParser.java | 1 -
.../aurora/common/args/parsers/SetParser.java | 1 -
.../aurora/common/collections/Iterables2.java | 1 -
.../aurora/common/inject/TimedInterceptor.java | 3 +-
.../common/net/InetSocketAddressHelper.java | 12 ++---
.../common/net/http/handlers/AbortHandler.java | 10 ++--
.../http/handlers/HttpServletRequestParams.java | 10 ++--
.../common/net/http/handlers/LogConfig.java | 2 -
.../common/net/http/handlers/QuitHandler.java | 10 ++--
.../apache/aurora/common/stats/JvmStats.java | 3 +-
.../apache/aurora/common/stats/Percentile.java | 16 +++---
.../org/apache/aurora/common/stats/Rate.java | 8 +--
.../aurora/common/stats/RequestStats.java | 3 +-
.../aurora/common/stats/SlidingStats.java | 4 +-
.../org/apache/aurora/common/stats/Stats.java | 11 ++--
.../apache/aurora/common/stats/TimeSeries.java | 2 -
.../common/stats/TimeSeriesRepositoryImpl.java | 7 ++-
.../aurora/common/util/BackoffHelper.java | 8 +--
.../apache/aurora/common/util/BuildInfo.java | 10 ++--
.../apache/aurora/common/util/StateMachine.java | 5 +-
.../common/util/TruncatedBinaryBackoff.java | 1 +
.../util/templating/StringTemplateHelper.java | 1 -
.../aurora/common/util/testing/FakeClock.java | 5 +-
.../aurora/common/zookeeper/Candidate.java | 3 +-
.../aurora/common/zookeeper/CandidateImpl.java | 32 ++++++------
.../apache/aurora/common/zookeeper/Group.java | 44 ++++++++--------
.../aurora/common/zookeeper/ServerSet.java | 9 ++--
.../aurora/common/zookeeper/ServerSetImpl.java | 34 ++++++-------
.../common/zookeeper/SingletonService.java | 3 --
.../common/zookeeper/ZooKeeperClient.java | 18 +++----
.../aurora/common/zookeeper/ZooKeeperUtils.java | 12 ++---
.../aurora/common/args/ArgScannerTest.java | 11 ++--
.../org/apache/aurora/common/args/ArgsTest.java | 3 +-
.../aurora/common/args/OptionInfoTest.java | 1 -
.../apache/aurora/common/args/ParsersTest.java | 5 +-
.../common/collections/Iterables2Test.java | 1 -
.../common/net/InetSocketAddressHelperTest.java | 4 +-
.../handlers/HttpServletRequestParamsTest.java | 3 +-
.../net/http/handlers/StatSupplierTestBase.java | 3 +-
.../http/handlers/TimeSeriesDataSourceTest.java | 7 +--
.../aurora/common/stats/PercentileTest.java | 12 +++--
.../apache/aurora/common/stats/RateTest.java | 18 ++++---
.../stats/TimeSeriesRepositoryImplTest.java | 1 +
.../testing/easymock/EasyMockTestTest.java | 1 -
.../aurora/common/util/BackoffHelperTest.java | 10 ++--
.../apache/aurora/common/util/SamplerTest.java | 7 +--
.../templating/StringTemplateHelperTest.java | 3 --
.../common/util/testing/FakeClockTest.java | 3 +-
.../aurora/common/zookeeper/GroupTest.java | 7 ++-
.../common/zookeeper/ServerSetImplTest.java | 5 +-
.../aurora/common/zookeeper/ServerSetsTest.java | 7 ++-
.../common/zookeeper/ZooKeeperClientTest.java | 11 ++--
.../common/zookeeper/ZooKeeperUtilsTest.java | 1 +
.../aurora/benchmark/StatusUpdateBenchmark.java | 4 +-
src/main/java/org/apache/aurora/GuavaUtils.java | 7 +--
src/main/java/org/apache/aurora/GuiceUtils.java | 8 +--
.../apache/aurora/codec/ThriftBinaryCodec.java | 1 -
.../aurora/scheduler/SchedulerLifecycle.java | 18 +++----
.../aurora/scheduler/SchedulerModule.java | 9 ++--
.../aurora/scheduler/TaskIdGenerator.java | 1 -
.../aurora/scheduler/TaskStatusHandlerImpl.java | 10 ++--
.../org/apache/aurora/scheduler/TaskVars.java | 7 +--
.../aurora/scheduler/app/Log4jConfigurator.java | 7 ++-
.../aurora/scheduler/app/SchedulerMain.java | 10 ++--
.../scheduler/app/ServiceDiscoveryModule.java | 7 +--
.../aurora/scheduler/async/AsyncModule.java | 5 +-
.../apache/aurora/scheduler/base/AsyncUtil.java | 8 +--
.../aurora/scheduler/base/Conversions.java | 7 +--
.../scheduler/cron/quartz/AuroraCronJob.java | 30 +++++------
.../cron/quartz/CronJobManagerImpl.java | 8 +--
.../scheduler/cron/quartz/CronLifecycle.java | 8 +--
.../scheduler/cron/quartz/CronModule.java | 7 +--
.../cron/quartz/CronSchedulerImpl.java | 9 ++--
.../scheduler/events/PubsubEventModule.java | 11 ++--
.../scheduler/filter/SchedulingFilterImpl.java | 1 -
.../aurora/scheduler/http/AbortCallback.java | 5 +-
.../scheduler/http/JettyServerModule.java | 10 ++--
.../aurora/scheduler/http/LeaderRedirect.java | 13 ++---
.../scheduler/http/LeaderRedirectFilter.java | 8 +--
.../aurora/scheduler/http/QuitCallback.java | 6 +--
.../aurora/scheduler/http/api/ApiBeta.java | 10 ++--
.../api/security/Kerberos5ShiroRealmModule.java | 7 +--
.../security/ShiroAuthorizingInterceptor.java | 7 +--
.../ShiroKerberosAuthenticationFilter.java | 9 ++--
.../aurora/scheduler/log/mesos/MesosLog.java | 10 ++--
.../mesos/CommandLineDriverSettingsModule.java | 14 +++---
.../scheduler/mesos/MesosSchedulerImpl.java | 53 ++++++++++++++------
.../scheduler/mesos/MesosTaskFactory.java | 15 +++---
.../scheduler/mesos/SchedulerDriverModule.java | 5 +-
.../scheduler/mesos/SchedulerDriverService.java | 12 ++---
.../aurora/scheduler/mesos/TaskStatusStats.java | 7 +--
.../aurora/scheduler/offers/OfferManager.java | 7 +--
.../aurora/scheduler/offers/OffersModule.java | 1 -
.../offers/RandomJitterReturnDelay.java | 1 -
.../scheduler/preemptor/PreemptorModule.java | 8 +--
.../pruning/JobUpdateHistoryPruner.java | 5 +-
.../aurora/scheduler/pruning/PruningModule.java | 5 +-
.../scheduler/pruning/TaskHistoryPruner.java | 7 +--
.../scheduler/reconciliation/KillRetry.java | 5 +-
.../reconciliation/ReconciliationModule.java | 5 +-
.../scheduler/reconciliation/TaskTimeout.java | 7 +--
.../scheduling/RescheduleCalculator.java | 5 +-
.../scheduler/scheduling/TaskScheduler.java | 12 ++---
.../apache/aurora/scheduler/sla/SlaModule.java | 7 +--
.../scheduler/state/MaintenanceController.java | 15 +++---
.../scheduler/state/StateManagerImpl.java | 8 +--
.../aurora/scheduler/state/TaskAssigner.java | 15 +++---
.../scheduler/state/TaskStateMachine.java | 7 +--
.../scheduler/stats/TaskStatCalculator.java | 8 +--
.../scheduler/storage/StorageBackfill.java | 5 +-
.../scheduler/storage/backup/BackupModule.java | 5 +-
.../scheduler/storage/backup/StorageBackup.java | 14 +++---
.../scheduler/storage/db/DbTaskStore.java | 19 ++++---
.../aurora/scheduler/storage/db/DbUtil.java | 1 -
.../storage/db/RowGarbageCollector.java | 5 +-
.../scheduler/storage/db/TaskConfigMapper.java | 1 -
.../aurora/scheduler/storage/db/TaskMapper.java | 1 -
.../storage/db/views/DbAssignedTask.java | 1 -
.../aurora/scheduler/storage/log/Entries.java | 6 +--
.../scheduler/storage/log/LogStorage.java | 12 ++---
.../storage/log/SnapshotDeduplicator.java | 11 ++--
.../storage/log/SnapshotStoreImpl.java | 5 +-
.../scheduler/storage/log/StreamManager.java | 1 -
.../storage/log/StreamManagerImpl.java | 7 +--
.../storage/log/WriteAheadStorage.java | 10 ++--
.../scheduler/storage/mem/MemTaskStore.java | 17 ++++---
.../thrift/SchedulerThriftInterface.java | 5 +-
.../thrift/aop/LoggingInterceptor.java | 10 ++--
.../updater/InstanceActionHandler.java | 6 +--
.../scheduler/updater/InstanceUpdater.java | 6 +--
.../updater/JobUpdateControllerImpl.java | 26 +++++-----
.../updater/JobUpdateEventSubscriber.java | 12 ++---
.../scheduler/updater/OneWayJobUpdater.java | 5 +-
.../aurora/scheduler/app/SchedulerIT.java | 8 +--
.../aurora/scheduler/app/local/FakeMaster.java | 5 +-
.../aurora/scheduler/base/AsyncUtilTest.java | 9 +---
.../scheduler/events/PubsubEventModuleTest.java | 8 ++-
.../scheduler/http/ServletFilterTest.java | 1 +
.../scheduler/mesos/MesosSchedulerImplTest.java | 22 ++++----
.../scheduler/offers/OfferManagerImplTest.java | 4 --
.../storage/log/WriteAheadStorageTest.java | 8 ++-
147 files changed, 597 insertions(+), 610 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aurora/blob/9ed81a7d/commons-args/src/main/java/org/apache/aurora/common/args/apt/Configuration.java
----------------------------------------------------------------------
diff --git a/commons-args/src/main/java/org/apache/aurora/common/args/apt/Configuration.java b/commons-args/src/main/java/org/apache/aurora/common/args/apt/Configuration.java
index 3ff3474..b526dd0 100644
--- a/commons-args/src/main/java/org/apache/aurora/common/args/apt/Configuration.java
+++ b/commons-args/src/main/java/org/apache/aurora/common/args/apt/Configuration.java
@@ -25,11 +25,8 @@ import java.util.List;
import java.util.Set;
import java.util.logging.Logger;
-import javax.annotation.Nullable;
-
import com.google.common.base.CharMatcher;
import com.google.common.base.Function;
-import com.google.common.base.Functions;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
@@ -37,10 +34,8 @@ import com.google.common.collect.Iterables;
import com.google.common.collect.Iterators;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
-import com.google.common.io.ByteSource;
import com.google.common.io.CharSource;
import com.google.common.io.CharStreams;
-import com.google.common.io.InputSupplier;
import com.google.common.io.LineProcessor;
import com.google.common.io.Resources;
http://git-wip-us.apache.org/repos/asf/aurora/blob/9ed81a7d/commons/src/main/java/org/apache/aurora/common/application/Lifecycle.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/aurora/common/application/Lifecycle.java b/commons/src/main/java/org/apache/aurora/common/application/Lifecycle.java
index a71a51d..d2b71a4 100644
--- a/commons/src/main/java/org/apache/aurora/common/application/Lifecycle.java
+++ b/commons/src/main/java/org/apache/aurora/common/application/Lifecycle.java
@@ -13,11 +13,11 @@
*/
package org.apache.aurora.common.application;
-import java.util.logging.Logger;
-
import com.google.inject.Inject;
import org.apache.aurora.common.base.Command;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Application lifecycle manager, which coordinates orderly shutdown of an application. This class
@@ -28,7 +28,7 @@ import org.apache.aurora.common.base.Command;
*/
public class Lifecycle {
- private static final Logger LOG = Logger.getLogger(Lifecycle.class.getName());
+ private static final Logger LOG = LoggerFactory.getLogger(Lifecycle.class);
// Monitor and state for suspending and terminating execution.
private final Object waitMonitor = new Object();
http://git-wip-us.apache.org/repos/asf/aurora/blob/9ed81a7d/commons/src/main/java/org/apache/aurora/common/application/ShutdownRegistry.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/aurora/common/application/ShutdownRegistry.java b/commons/src/main/java/org/apache/aurora/common/application/ShutdownRegistry.java
index b440e7e..5ee740f 100644
--- a/commons/src/main/java/org/apache/aurora/common/application/ShutdownRegistry.java
+++ b/commons/src/main/java/org/apache/aurora/common/application/ShutdownRegistry.java
@@ -14,14 +14,14 @@
package org.apache.aurora.common.application;
import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
import org.apache.aurora.common.base.Command;
import org.apache.aurora.common.base.ExceptionalCommand;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A shutdown action controller. It executes actions in the reverse order they were registered, and
@@ -45,7 +45,7 @@ public interface ShutdownRegistry {
* Implementation of a shutdown registry.
*/
public static class ShutdownRegistryImpl implements ShutdownRegistry, Command {
- private static final Logger LOG = Logger.getLogger(ShutdownRegistry.class.getName());
+ private static final Logger LOG = LoggerFactory.getLogger(ShutdownRegistry.class);
private final List<ExceptionalCommand<? extends Exception>> actions = Lists.newLinkedList();
@@ -74,7 +74,7 @@ public interface ShutdownRegistry {
@Override
public synchronized void execute() {
if (!completed) {
- LOG.info(String.format("Executing %d shutdown commands.", actions.size()));
+ LOG.info("Executing {} shutdown commands.", actions.size());
completed = true;
try {
for (ExceptionalCommand<? extends Exception> action : Lists.reverse(actions)) {
@@ -84,7 +84,7 @@ public interface ShutdownRegistry {
try {
action.execute();
} catch (Exception e) {
- LOG.log(Level.WARNING, "Shutdown action failed.", e);
+ LOG.warn("Shutdown action failed.", e);
}
// SUPPRESS CHECKSTYLE:ON IllegalCatch
}
http://git-wip-us.apache.org/repos/asf/aurora/blob/9ed81a7d/commons/src/main/java/org/apache/aurora/common/args/ArgScanner.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/aurora/common/args/ArgScanner.java b/commons/src/main/java/org/apache/aurora/common/args/ArgScanner.java
index c98ed87..908553c 100644
--- a/commons/src/main/java/org/apache/aurora/common/args/ArgScanner.java
+++ b/commons/src/main/java/org/apache/aurora/common/args/ArgScanner.java
@@ -20,7 +20,6 @@ import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.logging.Logger;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -46,6 +45,8 @@ import com.google.common.collect.Sets;
import org.apache.aurora.common.args.Args.ArgsInfo;
import org.apache.aurora.common.args.apt.Configuration;
import org.apache.aurora.common.collections.Pair;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import static com.google.common.base.Preconditions.checkArgument;
@@ -122,7 +123,7 @@ public final class ArgScanner {
private static final Function<OptionInfo<?>, String> GET_CANONICAL_NEGATED_ARG_NAME =
OptionInfo::getCanonicalNegatedName;
- private static final Logger LOG = Logger.getLogger(ArgScanner.class.getName());
+ private static final Logger LOG = LoggerFactory.getLogger(ArgScanner.class);
// Pattern for the required argument format.
private static final Pattern ARG_PATTERN =
@@ -314,7 +315,7 @@ public final class ArgScanner {
Set<String> collisionsDropped = Sets.difference(ImmutableSet.copyOf(argAllShortNames),
argAllShortNamesNoCollisions);
if (!collisionsDropped.isEmpty()) {
- LOG.warning("Found argument name collisions, args must be referenced by canonical names: "
+ LOG.warn("Found argument name collisions, args must be referenced by canonical names: "
+ collisionsDropped);
}
return argAllShortNamesNoCollisions;
http://git-wip-us.apache.org/repos/asf/aurora/blob/9ed81a7d/commons/src/main/java/org/apache/aurora/common/args/Args.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/aurora/common/args/Args.java b/commons/src/main/java/org/apache/aurora/common/args/Args.java
index db8e169..1983fd9 100644
--- a/commons/src/main/java/org/apache/aurora/common/args/Args.java
+++ b/commons/src/main/java/org/apache/aurora/common/args/Args.java
@@ -15,7 +15,6 @@ package org.apache.aurora.common.args;
import java.io.IOException;
import java.lang.reflect.Field;
-import java.util.logging.Logger;
import javax.annotation.Nullable;
@@ -32,6 +31,8 @@ import com.google.common.collect.Iterables;
import org.apache.aurora.common.args.apt.Configuration;
import org.apache.aurora.common.args.apt.Configuration.ArgInfo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import static org.apache.aurora.common.args.apt.Configuration.ConfigurationException;
@@ -40,7 +41,7 @@ import static org.apache.aurora.common.args.apt.Configuration.ConfigurationExcep
* a configuration database or from explicitly listed containing classes or objects.
*/
public final class Args {
- private static final Logger LOG = Logger.getLogger(Args.class.getName());
+ private static final Logger LOG = LoggerFactory.getLogger(Args.class);
@VisibleForTesting
static final Function<ArgInfo, Optional<Field>> TO_FIELD =
@@ -56,7 +57,7 @@ public final class Args {
// the classes have been re-bundled with some subset including the class this ArgInfo
// points to no longer available. If the re-bundling is correct, then the arg truly is
// not needed.
- LOG.fine(String.format("Not on current classpath, skipping %s", info));
+ LOG.debug("Not on current classpath, skipping {}", info);
return Optional.absent();
}
};
http://git-wip-us.apache.org/repos/asf/aurora/blob/9ed81a7d/commons/src/main/java/org/apache/aurora/common/args/PositionalInfo.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/aurora/common/args/PositionalInfo.java b/commons/src/main/java/org/apache/aurora/common/args/PositionalInfo.java
index ddffdf9..48737d4 100644
--- a/commons/src/main/java/org/apache/aurora/common/args/PositionalInfo.java
+++ b/commons/src/main/java/org/apache/aurora/common/args/PositionalInfo.java
@@ -21,7 +21,6 @@ import java.util.List;
import javax.annotation.Nullable;
-import com.google.common.base.Function;
import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
import com.google.common.collect.Iterables;
http://git-wip-us.apache.org/repos/asf/aurora/blob/9ed81a7d/commons/src/main/java/org/apache/aurora/common/args/parsers/ListParser.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/aurora/common/args/parsers/ListParser.java b/commons/src/main/java/org/apache/aurora/common/args/parsers/ListParser.java
index 676f88b..c224434 100644
--- a/commons/src/main/java/org/apache/aurora/common/args/parsers/ListParser.java
+++ b/commons/src/main/java/org/apache/aurora/common/args/parsers/ListParser.java
@@ -16,7 +16,6 @@ package org.apache.aurora.common.args.parsers;
import java.lang.reflect.Type;
import java.util.List;
-import com.google.common.base.Function;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;
import com.google.common.reflect.TypeToken;
http://git-wip-us.apache.org/repos/asf/aurora/blob/9ed81a7d/commons/src/main/java/org/apache/aurora/common/args/parsers/SetParser.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/aurora/common/args/parsers/SetParser.java b/commons/src/main/java/org/apache/aurora/common/args/parsers/SetParser.java
index 75031f4..15b6c74 100644
--- a/commons/src/main/java/org/apache/aurora/common/args/parsers/SetParser.java
+++ b/commons/src/main/java/org/apache/aurora/common/args/parsers/SetParser.java
@@ -17,7 +17,6 @@ import java.lang.reflect.Type;
import java.util.List;
import java.util.Set;
-import com.google.common.base.Function;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
import com.google.common.reflect.TypeToken;
http://git-wip-us.apache.org/repos/asf/aurora/blob/9ed81a7d/commons/src/main/java/org/apache/aurora/common/collections/Iterables2.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/aurora/common/collections/Iterables2.java b/commons/src/main/java/org/apache/aurora/common/collections/Iterables2.java
index 7ae80ce..339b15b 100644
--- a/commons/src/main/java/org/apache/aurora/common/collections/Iterables2.java
+++ b/commons/src/main/java/org/apache/aurora/common/collections/Iterables2.java
@@ -18,7 +18,6 @@ import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
-import com.google.common.base.Function;
import com.google.common.cache.CacheBuilder;
import com.google.common.cache.CacheLoader;
import com.google.common.cache.LoadingCache;
http://git-wip-us.apache.org/repos/asf/aurora/blob/9ed81a7d/commons/src/main/java/org/apache/aurora/common/inject/TimedInterceptor.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/aurora/common/inject/TimedInterceptor.java b/commons/src/main/java/org/apache/aurora/common/inject/TimedInterceptor.java
index 684e7bb..a4c4240 100644
--- a/commons/src/main/java/org/apache/aurora/common/inject/TimedInterceptor.java
+++ b/commons/src/main/java/org/apache/aurora/common/inject/TimedInterceptor.java
@@ -28,10 +28,9 @@ import com.google.inject.matcher.Matchers;
import org.aopalliance.intercept.MethodInterceptor;
import org.aopalliance.intercept.MethodInvocation;
-import org.apache.commons.lang.StringUtils;
-
import org.apache.aurora.common.stats.SlidingStats;
import org.apache.aurora.common.stats.TimeSeriesRepository;
+import org.apache.commons.lang.StringUtils;
/**
* A method interceptor that exports timing information for methods annotated with
http://git-wip-us.apache.org/repos/asf/aurora/blob/9ed81a7d/commons/src/main/java/org/apache/aurora/common/net/InetSocketAddressHelper.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/aurora/common/net/InetSocketAddressHelper.java b/commons/src/main/java/org/apache/aurora/common/net/InetSocketAddressHelper.java
index b3719d8..5b55ffd 100644
--- a/commons/src/main/java/org/apache/aurora/common/net/InetSocketAddressHelper.java
+++ b/commons/src/main/java/org/apache/aurora/common/net/InetSocketAddressHelper.java
@@ -13,17 +13,11 @@
*/
package org.apache.aurora.common.net;
-import com.google.common.base.Function;
+import java.net.InetSocketAddress;
+
import com.google.common.base.Preconditions;
-import com.google.common.base.Throwables;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Sets;
-import org.apache.commons.lang.StringUtils;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.UnknownHostException;
-import java.util.Set;
+import org.apache.commons.lang.StringUtils;
/**
* A utility that can parse [host]:[port] pairs or :[port] designators into instances of
http://git-wip-us.apache.org/repos/asf/aurora/blob/9ed81a7d/commons/src/main/java/org/apache/aurora/common/net/http/handlers/AbortHandler.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/aurora/common/net/http/handlers/AbortHandler.java b/commons/src/main/java/org/apache/aurora/common/net/http/handlers/AbortHandler.java
index 42e668d..42995c0 100644
--- a/commons/src/main/java/org/apache/aurora/common/net/http/handlers/AbortHandler.java
+++ b/commons/src/main/java/org/apache/aurora/common/net/http/handlers/AbortHandler.java
@@ -14,7 +14,6 @@
package org.apache.aurora.common.net.http.handlers;
import java.io.IOException;
-import java.util.logging.Logger;
import javax.servlet.http.HttpServletRequest;
import javax.ws.rs.POST;
@@ -27,6 +26,9 @@ import com.google.common.base.Preconditions;
import com.google.inject.Inject;
import com.google.inject.name.Named;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* A servlet that provides a way to remotely terminate the running process immediately.
*/
@@ -39,7 +41,7 @@ public class AbortHandler {
public static final String ABORT_HANDLER_KEY =
"com.twitter.common.net.http.handlers.AbortHandler.listener";
- private static final Logger LOG = Logger.getLogger(AbortHandler.class.getName());
+ private static final Logger LOG = LoggerFactory.getLogger(AbortHandler.class);
private final Runnable abortListener;
@@ -58,9 +60,7 @@ public class AbortHandler {
@POST
@Produces(MediaType.TEXT_PLAIN)
public void abort(@Context HttpServletRequest req) throws IOException {
- LOG.info(String.format("Received abort HTTP signal from %s (%s)",
- req.getRemoteAddr(), req.getRemoteHost()));
-
+ LOG.info("Received abort HTTP signal from {} ({})", req.getRemoteAddr(), req.getRemoteHost());
abortListener.run();
}
}
http://git-wip-us.apache.org/repos/asf/aurora/blob/9ed81a7d/commons/src/main/java/org/apache/aurora/common/net/http/handlers/HttpServletRequestParams.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/aurora/common/net/http/handlers/HttpServletRequestParams.java b/commons/src/main/java/org/apache/aurora/common/net/http/handlers/HttpServletRequestParams.java
index c09be67..e906f94 100644
--- a/commons/src/main/java/org/apache/aurora/common/net/http/handlers/HttpServletRequestParams.java
+++ b/commons/src/main/java/org/apache/aurora/common/net/http/handlers/HttpServletRequestParams.java
@@ -13,15 +13,17 @@
*/
package org.apache.aurora.common.net.http.handlers;
-import java.util.logging.Logger;
import javax.annotation.Nullable;
import javax.servlet.http.HttpServletRequest;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* Simple utility for parsing HttpServletRequest parameters by type.
*/
public class HttpServletRequestParams {
- private static final Logger LOG = Logger.getLogger(HttpServletRequestParams.class.getName());
+ private static final Logger LOG = LoggerFactory.getLogger(HttpServletRequestParams.class);
/**
* Parses an int param from an HttpServletRequest, returns a default value
@@ -34,7 +36,7 @@ public class HttpServletRequestParams {
try {
result = Integer.parseInt(value);
} catch (NumberFormatException e) {
- LOG.warning("Invalid int for " + param + ": " + value);
+ LOG.warn("Invalid int for " + param + ": " + value);
}
}
return result;
@@ -51,7 +53,7 @@ public class HttpServletRequestParams {
try {
result = Long.parseLong(value);
} catch (NumberFormatException e) {
- LOG.warning("Invalid long for " + param + ": " + value);
+ LOG.warn("Invalid long for " + param + ": " + value);
}
}
return result;
http://git-wip-us.apache.org/repos/asf/aurora/blob/9ed81a7d/commons/src/main/java/org/apache/aurora/common/net/http/handlers/LogConfig.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/aurora/common/net/http/handlers/LogConfig.java b/commons/src/main/java/org/apache/aurora/common/net/http/handlers/LogConfig.java
index c3fd808..d3c6ddd 100644
--- a/commons/src/main/java/org/apache/aurora/common/net/http/handlers/LogConfig.java
+++ b/commons/src/main/java/org/apache/aurora/common/net/http/handlers/LogConfig.java
@@ -32,8 +32,6 @@ import javax.ws.rs.core.MediaType;
import com.google.common.collect.Lists;
import com.google.common.collect.Ordering;
-import org.antlr.stringtemplate.StringTemplate;
-import org.apache.aurora.common.base.Closure;
import org.apache.aurora.common.util.templating.StringTemplateHelper;
import org.apache.aurora.common.util.templating.StringTemplateHelper.TemplateException;
import org.apache.commons.lang.StringUtils;
http://git-wip-us.apache.org/repos/asf/aurora/blob/9ed81a7d/commons/src/main/java/org/apache/aurora/common/net/http/handlers/QuitHandler.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/aurora/common/net/http/handlers/QuitHandler.java b/commons/src/main/java/org/apache/aurora/common/net/http/handlers/QuitHandler.java
index 40872e2..a2344eb 100644
--- a/commons/src/main/java/org/apache/aurora/common/net/http/handlers/QuitHandler.java
+++ b/commons/src/main/java/org/apache/aurora/common/net/http/handlers/QuitHandler.java
@@ -13,8 +13,6 @@
*/
package org.apache.aurora.common.net.http.handlers;
-import java.util.logging.Logger;
-
import javax.servlet.http.HttpServletRequest;
import javax.ws.rs.POST;
import javax.ws.rs.Path;
@@ -26,13 +24,16 @@ import com.google.common.base.Preconditions;
import com.google.inject.Inject;
import com.google.inject.name.Named;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* A servlet that provides a way to remotely signal the process to initiate a clean shutdown
* sequence.
*/
@Path("/quitquitquit")
public class QuitHandler {
- private static final Logger LOG = Logger.getLogger(QuitHandler.class.getName());
+ private static final Logger LOG = LoggerFactory.getLogger(QuitHandler.class);
/**
* A {@literal @Named} binding key for the QuitHandler listener.
@@ -57,8 +58,7 @@ public class QuitHandler {
@POST
@Produces(MediaType.TEXT_PLAIN)
public String quit(@Context HttpServletRequest req) {
- LOG.info(String.format("Received quit HTTP signal from %s (%s)",
- req.getRemoteAddr(), req.getRemoteHost()));
+ LOG.info("Received quit HTTP signal from {} ({})", req.getRemoteAddr(), req.getRemoteHost());
new Thread(quitListener).start();
return "Notifying quit listener.";
http://git-wip-us.apache.org/repos/asf/aurora/blob/9ed81a7d/commons/src/main/java/org/apache/aurora/common/stats/JvmStats.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/aurora/common/stats/JvmStats.java b/commons/src/main/java/org/apache/aurora/common/stats/JvmStats.java
index d1b072d..cc1af53 100644
--- a/commons/src/main/java/org/apache/aurora/common/stats/JvmStats.java
+++ b/commons/src/main/java/org/apache/aurora/common/stats/JvmStats.java
@@ -22,10 +22,9 @@ import java.lang.management.RuntimeMXBean;
import java.lang.management.ThreadMXBean;
import java.util.Map;
-import com.google.common.base.Function;
import com.google.common.collect.ImmutableList;
-
import com.google.common.collect.Iterables;
+
import org.apache.aurora.common.quantity.Amount;
import org.apache.aurora.common.quantity.Data;
import org.apache.aurora.common.quantity.Time;
http://git-wip-us.apache.org/repos/asf/aurora/blob/9ed81a7d/commons/src/main/java/org/apache/aurora/common/stats/Percentile.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/aurora/common/stats/Percentile.java b/commons/src/main/java/org/apache/aurora/common/stats/Percentile.java
index d8046b6..aa343a0 100644
--- a/commons/src/main/java/org/apache/aurora/common/stats/Percentile.java
+++ b/commons/src/main/java/org/apache/aurora/common/stats/Percentile.java
@@ -13,6 +13,14 @@
*/
package org.apache.aurora.common.stats;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.Map;
+import java.util.concurrent.LinkedBlockingDeque;
+
+import javax.annotation.Nullable;
+
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableMap;
@@ -22,14 +30,6 @@ import com.google.common.collect.Ordering;
import org.apache.aurora.common.base.MorePreconditions;
import org.apache.aurora.common.util.Sampler;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.Map;
-import java.util.concurrent.LinkedBlockingDeque;
-
-import javax.annotation.Nullable;
-
/**
* A stats tracker to export percentiles of inputs based on a sampling rate.
*
http://git-wip-us.apache.org/repos/asf/aurora/blob/9ed81a7d/commons/src/main/java/org/apache/aurora/common/stats/Rate.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/aurora/common/stats/Rate.java b/commons/src/main/java/org/apache/aurora/common/stats/Rate.java
index dbb90c4..55a8f1a 100644
--- a/commons/src/main/java/org/apache/aurora/common/stats/Rate.java
+++ b/commons/src/main/java/org/apache/aurora/common/stats/Rate.java
@@ -13,6 +13,10 @@
*/
package org.apache.aurora.common.stats;
+import java.util.concurrent.LinkedBlockingDeque;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
+
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import com.google.common.base.Supplier;
@@ -23,10 +27,6 @@ import org.apache.aurora.common.collections.Pair;
import org.apache.aurora.common.quantity.Amount;
import org.apache.aurora.common.quantity.Time;
-import java.util.concurrent.LinkedBlockingDeque;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicLong;
-
/**
* Function to compute a windowed per-second rate of a value.
*
http://git-wip-us.apache.org/repos/asf/aurora/blob/9ed81a7d/commons/src/main/java/org/apache/aurora/common/stats/RequestStats.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/aurora/common/stats/RequestStats.java b/commons/src/main/java/org/apache/aurora/common/stats/RequestStats.java
index 5467810..81b262c 100644
--- a/commons/src/main/java/org/apache/aurora/common/stats/RequestStats.java
+++ b/commons/src/main/java/org/apache/aurora/common/stats/RequestStats.java
@@ -13,9 +13,10 @@
*/
package org.apache.aurora.common.stats;
-import javax.annotation.Nullable;
import java.util.concurrent.atomic.AtomicLong;
+import javax.annotation.Nullable;
+
/**
* A class to represent the statistics associated with a client connection to an external service.
* Tracks request latency/rate, and error rate.
http://git-wip-us.apache.org/repos/asf/aurora/blob/9ed81a7d/commons/src/main/java/org/apache/aurora/common/stats/SlidingStats.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/aurora/common/stats/SlidingStats.java b/commons/src/main/java/org/apache/aurora/common/stats/SlidingStats.java
index 3341672..f7a5ae4 100644
--- a/commons/src/main/java/org/apache/aurora/common/stats/SlidingStats.java
+++ b/commons/src/main/java/org/apache/aurora/common/stats/SlidingStats.java
@@ -13,10 +13,10 @@
*/
package org.apache.aurora.common.stats;
-import org.apache.aurora.common.base.MorePreconditions;
-
import java.util.concurrent.atomic.AtomicLong;
+import org.apache.aurora.common.base.MorePreconditions;
+
/**
* Tracks event statistics over a sliding window of time. An event is something that has a
* frequency and associated total.
http://git-wip-us.apache.org/repos/asf/aurora/blob/9ed81a7d/commons/src/main/java/org/apache/aurora/common/stats/Stats.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/aurora/common/stats/Stats.java b/commons/src/main/java/org/apache/aurora/common/stats/Stats.java
index d4b6a31..613bdb9 100644
--- a/commons/src/main/java/org/apache/aurora/common/stats/Stats.java
+++ b/commons/src/main/java/org/apache/aurora/common/stats/Stats.java
@@ -21,7 +21,6 @@ import java.util.concurrent.ExecutionException;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
-import java.util.logging.Logger;
import java.util.regex.Pattern;
import com.google.common.annotations.VisibleForTesting;
@@ -33,6 +32,8 @@ import com.google.common.collect.MapMaker;
import com.google.common.util.concurrent.AtomicDouble;
import org.apache.aurora.common.base.MorePreconditions;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Manages {@link Stat}s that should be exported for monitoring.
@@ -44,7 +45,7 @@ import org.apache.aurora.common.base.MorePreconditions;
*/
public class Stats {
- private static final Logger LOG = Logger.getLogger(Stats.class.getName());
+ private static final Logger LOG = LoggerFactory.getLogger(Stats.class);
private static final Pattern NOT_NAME_CHAR = Pattern.compile("[^A-Za-z0-9_/]");
private static final ConcurrentMap<String, Stat<?>> VAR_MAP = new MapMaker().makeMap();
@@ -64,7 +65,7 @@ public class Stats {
static String validateName(String name) {
String normalized = normalizeName(name);
if (!name.equals(normalized)) {
- LOG.warning("Invalid stat name " + name + " exported as " + normalized);
+ LOG.warn("Invalid stat name " + name + " exported as " + normalized);
}
return normalized;
}
@@ -178,7 +179,7 @@ public class Stats {
"Unexpected error exporting stat " + validatedName, e.getCause());
} finally {
if (!exportStat.called.get()) {
- LOG.warning("Re-using already registered variable for key " + validatedName);
+ LOG.warn("Re-using already registered variable for key " + validatedName);
}
}
}
@@ -321,7 +322,7 @@ public class Stats {
private static void exportStaticInternal(String name, Stat<?> stat) {
if (VAR_MAP.put(name, stat) != null) {
- LOG.warning("Warning - exported variable collision on " + name);
+ LOG.warn("Warning - exported variable collision on " + name);
}
}
http://git-wip-us.apache.org/repos/asf/aurora/blob/9ed81a7d/commons/src/main/java/org/apache/aurora/common/stats/TimeSeries.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/aurora/common/stats/TimeSeries.java b/commons/src/main/java/org/apache/aurora/common/stats/TimeSeries.java
index 45f604c..13b990c 100644
--- a/commons/src/main/java/org/apache/aurora/common/stats/TimeSeries.java
+++ b/commons/src/main/java/org/apache/aurora/common/stats/TimeSeries.java
@@ -13,8 +13,6 @@
*/
package org.apache.aurora.common.stats;
-import java.util.Calendar;
-
/**
* A time series of values.
*
http://git-wip-us.apache.org/repos/asf/aurora/blob/9ed81a7d/commons/src/main/java/org/apache/aurora/common/stats/TimeSeriesRepositoryImpl.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/aurora/common/stats/TimeSeriesRepositoryImpl.java b/commons/src/main/java/org/apache/aurora/common/stats/TimeSeriesRepositoryImpl.java
index 6b237fb..d971f74 100644
--- a/commons/src/main/java/org/apache/aurora/common/stats/TimeSeriesRepositoryImpl.java
+++ b/commons/src/main/java/org/apache/aurora/common/stats/TimeSeriesRepositoryImpl.java
@@ -13,14 +13,11 @@
*/
package org.apache.aurora.common.stats;
-import java.util.Properties;
import java.util.Set;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledThreadPoolExecutor;
-import java.util.logging.Logger;
import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
import com.google.common.cache.CacheBuilder;
import com.google.common.cache.CacheLoader;
@@ -38,6 +35,8 @@ import org.apache.aurora.common.quantity.Amount;
import org.apache.aurora.common.quantity.Time;
import org.apache.aurora.common.util.BuildInfo;
import org.apache.aurora.common.util.Clock;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import static com.google.common.base.Preconditions.checkNotNull;
@@ -49,7 +48,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
public class TimeSeriesRepositoryImpl
extends AbstractScheduledService implements TimeSeriesRepository {
- private static final Logger LOG = Logger.getLogger(TimeSeriesRepositoryImpl.class.getName());
+ private static final Logger LOG = LoggerFactory.getLogger(TimeSeriesRepositoryImpl.class);
/**
* {@literal @Named} binding key for the sampling period.
http://git-wip-us.apache.org/repos/asf/aurora/blob/9ed81a7d/commons/src/main/java/org/apache/aurora/common/util/BackoffHelper.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/aurora/common/util/BackoffHelper.java b/commons/src/main/java/org/apache/aurora/common/util/BackoffHelper.java
index b251e9b..8e73dd9 100644
--- a/commons/src/main/java/org/apache/aurora/common/util/BackoffHelper.java
+++ b/commons/src/main/java/org/apache/aurora/common/util/BackoffHelper.java
@@ -13,14 +13,14 @@
*/
package org.apache.aurora.common.util;
-import java.util.logging.Logger;
-
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import org.apache.aurora.common.base.ExceptionalSupplier;
import org.apache.aurora.common.quantity.Amount;
import org.apache.aurora.common.quantity.Time;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A utility for dealing with backoffs of retryable actions.
@@ -30,7 +30,7 @@ import org.apache.aurora.common.quantity.Time;
* @author John Sirois
*/
public class BackoffHelper {
- private static final Logger LOG = Logger.getLogger(BackoffHelper.class.getName());
+ private static final Logger LOG = LoggerFactory.getLogger(BackoffHelper.class);
private static final Amount<Long,Time> DEFAULT_INITIAL_BACKOFF = Amount.of(1L, Time.SECONDS);
private static final Amount<Long,Time> DEFAULT_MAX_BACKOFF = Amount.of(1L, Time.MINUTES);
@@ -110,7 +110,7 @@ public class BackoffHelper {
long currentBackoffMs = 0;
while (backoffStrategy.shouldContinue(currentBackoffMs)) {
currentBackoffMs = backoffStrategy.calculateBackoffMs(currentBackoffMs);
- LOG.fine("Operation failed, backing off for " + currentBackoffMs + "ms");
+ LOG.debug("Operation failed, backing off for " + currentBackoffMs + "ms");
clock.waitFor(currentBackoffMs);
T result = work.get();
http://git-wip-us.apache.org/repos/asf/aurora/blob/9ed81a7d/commons/src/main/java/org/apache/aurora/common/util/BuildInfo.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/aurora/common/util/BuildInfo.java b/commons/src/main/java/org/apache/aurora/common/util/BuildInfo.java
index 4f9c384..bbb964d 100644
--- a/commons/src/main/java/org/apache/aurora/common/util/BuildInfo.java
+++ b/commons/src/main/java/org/apache/aurora/common/util/BuildInfo.java
@@ -16,14 +16,14 @@ package org.apache.aurora.common.util;
import java.io.InputStream;
import java.util.Map;
import java.util.Properties;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps;
import org.apache.aurora.common.base.MorePreconditions;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import static java.util.Objects.requireNonNull;
@@ -33,7 +33,7 @@ import static java.util.Objects.requireNonNull;
*/
public class BuildInfo {
- private static final Logger LOG = Logger.getLogger(BuildInfo.class.getName());
+ private static final Logger LOG = LoggerFactory.getLogger(BuildInfo.class);
private static final String DEFAULT_BUILD_PROPERTIES_PATH = "build.properties";
@@ -68,7 +68,7 @@ public class BuildInfo {
LOG.info("Fetching build properties from " + resourcePath);
InputStream in = ClassLoader.getSystemResourceAsStream(resourcePath);
if (in == null) {
- LOG.warning("Failed to fetch build properties from " + resourcePath);
+ LOG.warn("Failed to fetch build properties from " + resourcePath);
return;
}
@@ -77,7 +77,7 @@ public class BuildInfo {
buildProperties.load(in);
properties = Maps.fromProperties(buildProperties);
} catch (Exception e) {
- LOG.log(Level.WARNING, "Failed to load properties file " + resourcePath, e);
+ LOG.warn("Failed to load properties file " + resourcePath, e);
}
}
http://git-wip-us.apache.org/repos/asf/aurora/blob/9ed81a7d/commons/src/main/java/org/apache/aurora/common/util/StateMachine.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/aurora/common/util/StateMachine.java b/commons/src/main/java/org/apache/aurora/common/util/StateMachine.java
index dbaaadd..e8aa000 100644
--- a/commons/src/main/java/org/apache/aurora/common/util/StateMachine.java
+++ b/commons/src/main/java/org/apache/aurora/common/util/StateMachine.java
@@ -19,7 +19,6 @@ import java.util.Set;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
-import java.util.logging.Logger;
import com.google.common.base.Function;
import com.google.common.base.Preconditions;
@@ -34,6 +33,8 @@ import com.google.common.collect.Multimap;
import org.apache.aurora.common.base.Closure;
import org.apache.aurora.common.base.Closures;
import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
@@ -50,7 +51,7 @@ import static org.apache.aurora.common.base.MorePreconditions.checkNotBlank;
* TODO(William Farner): Consider merging the stats-tracking ala PipelineStats into this.
*/
public class StateMachine<T> {
- private static final Logger LOG = Logger.getLogger(StateMachine.class.getName());
+ private static final Logger LOG = LoggerFactory.getLogger(StateMachine.class);
private final String name;
http://git-wip-us.apache.org/repos/asf/aurora/blob/9ed81a7d/commons/src/main/java/org/apache/aurora/common/util/TruncatedBinaryBackoff.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/aurora/common/util/TruncatedBinaryBackoff.java b/commons/src/main/java/org/apache/aurora/common/util/TruncatedBinaryBackoff.java
index e580a19..f554cfd 100644
--- a/commons/src/main/java/org/apache/aurora/common/util/TruncatedBinaryBackoff.java
+++ b/commons/src/main/java/org/apache/aurora/common/util/TruncatedBinaryBackoff.java
@@ -14,6 +14,7 @@
package org.apache.aurora.common.util;
import com.google.common.base.Preconditions;
+
import org.apache.aurora.common.quantity.Amount;
import org.apache.aurora.common.quantity.Time;
http://git-wip-us.apache.org/repos/asf/aurora/blob/9ed81a7d/commons/src/main/java/org/apache/aurora/common/util/templating/StringTemplateHelper.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/aurora/common/util/templating/StringTemplateHelper.java b/commons/src/main/java/org/apache/aurora/common/util/templating/StringTemplateHelper.java
index 2756af4..bcfa003 100644
--- a/commons/src/main/java/org/apache/aurora/common/util/templating/StringTemplateHelper.java
+++ b/commons/src/main/java/org/apache/aurora/common/util/templating/StringTemplateHelper.java
@@ -21,7 +21,6 @@ import com.google.common.base.Preconditions;
import org.antlr.stringtemplate.AutoIndentWriter;
import org.antlr.stringtemplate.StringTemplate;
import org.antlr.stringtemplate.StringTemplateGroup;
-
import org.apache.aurora.common.base.Closure;
import org.apache.aurora.common.base.MorePreconditions;
http://git-wip-us.apache.org/repos/asf/aurora/blob/9ed81a7d/commons/src/main/java/org/apache/aurora/common/util/testing/FakeClock.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/aurora/common/util/testing/FakeClock.java b/commons/src/main/java/org/apache/aurora/common/util/testing/FakeClock.java
index 2ed8b15..104f2c6 100644
--- a/commons/src/main/java/org/apache/aurora/common/util/testing/FakeClock.java
+++ b/commons/src/main/java/org/apache/aurora/common/util/testing/FakeClock.java
@@ -13,13 +13,14 @@
*/
package org.apache.aurora.common.util.testing;
+import java.util.concurrent.TimeUnit;
+
import com.google.common.base.Preconditions;
+
import org.apache.aurora.common.quantity.Amount;
import org.apache.aurora.common.quantity.Time;
import org.apache.aurora.common.util.Clock;
-import java.util.concurrent.TimeUnit;
-
/**
* A clock for use in testing with a configurable value for {@link #nowMillis()}.
*
http://git-wip-us.apache.org/repos/asf/aurora/blob/9ed81a7d/commons/src/main/java/org/apache/aurora/common/zookeeper/Candidate.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/aurora/common/zookeeper/Candidate.java b/commons/src/main/java/org/apache/aurora/common/zookeeper/Candidate.java
index f679d92..75c1b14 100644
--- a/commons/src/main/java/org/apache/aurora/common/zookeeper/Candidate.java
+++ b/commons/src/main/java/org/apache/aurora/common/zookeeper/Candidate.java
@@ -16,12 +16,11 @@ package org.apache.aurora.common.zookeeper;
import com.google.common.base.Optional;
import com.google.common.base.Supplier;
-import org.apache.zookeeper.KeeperException;
-
import org.apache.aurora.common.base.ExceptionalCommand;
import org.apache.aurora.common.zookeeper.Group.JoinException;
import org.apache.aurora.common.zookeeper.Group.WatchException;
import org.apache.aurora.common.zookeeper.ZooKeeperClient.ZooKeeperConnectionException;
+import org.apache.zookeeper.KeeperException;
/**
* Interface definition for becoming or querying for a ZooKeeper-based group leader.
http://git-wip-us.apache.org/repos/asf/aurora/blob/9ed81a7d/commons/src/main/java/org/apache/aurora/common/zookeeper/CandidateImpl.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/aurora/common/zookeeper/CandidateImpl.java b/commons/src/main/java/org/apache/aurora/common/zookeeper/CandidateImpl.java
index bb0a48d..98b5ee4 100644
--- a/commons/src/main/java/org/apache/aurora/common/zookeeper/CandidateImpl.java
+++ b/commons/src/main/java/org/apache/aurora/common/zookeeper/CandidateImpl.java
@@ -16,8 +16,6 @@ package org.apache.aurora.common.zookeeper;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import javax.annotation.Nullable;
@@ -29,15 +27,13 @@ import com.google.common.base.Supplier;
import com.google.common.collect.Iterables;
import com.google.common.collect.Ordering;
-import org.apache.zookeeper.KeeperException;
-
-import org.apache.aurora.common.base.Command;
-import org.apache.aurora.common.base.ExceptionalCommand;
-import org.apache.aurora.common.zookeeper.Group.GroupChangeListener;
import org.apache.aurora.common.zookeeper.Group.JoinException;
import org.apache.aurora.common.zookeeper.Group.Membership;
import org.apache.aurora.common.zookeeper.Group.WatchException;
import org.apache.aurora.common.zookeeper.ZooKeeperClient.ZooKeeperConnectionException;
+import org.apache.zookeeper.KeeperException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Implements leader election for small groups of candidates. This implementation is subject to the
@@ -45,7 +41,7 @@ import org.apache.aurora.common.zookeeper.ZooKeeperClient.ZooKeeperConnectionExc
* herd effect</a> for a given group and should only be used for small (~10 member) candidate pools.
*/
public class CandidateImpl implements Candidate {
- private static final Logger LOG = Logger.getLogger(CandidateImpl.class.getName());
+ private static final Logger LOG = LoggerFactory.getLogger(CandidateImpl.class);
private static final byte[] UNKNOWN_CANDIDATE_DATA = "<unknown>".getBytes(Charsets.UTF_8);
@@ -53,7 +49,7 @@ public class CandidateImpl implements Candidate {
try {
return InetAddress.getLocalHost().getHostAddress().getBytes();
} catch (UnknownHostException e) {
- LOG.log(Level.WARNING, "Failed to determine local address!", e);
+ LOG.warn("Failed to determine local address!", e);
return UNKNOWN_CANDIDATE_DATA;
}
};
@@ -93,18 +89,18 @@ public class CandidateImpl implements Candidate {
String memberId = membership.getMemberId();
if (noCandidates) {
- LOG.warning("All candidates have temporarily left the group: " + group);
+ LOG.warn("All candidates have temporarily left the group: " + group);
} else if (!Iterables.contains(memberIds, memberId)) {
- LOG.severe(String.format(
- "Current member ID %s is not a candidate for leader, current voting: %s",
- memberId, memberIds));
+ LOG.error(
+ "Current member ID {} is not a candidate for leader, current voting: {}",
+ memberId, memberIds);
} else {
boolean electedLeader = memberId.equals(getLeader(memberIds));
boolean previouslyElected = elected.getAndSet(electedLeader);
if (!previouslyElected && electedLeader) {
- LOG.info(String.format("Candidate %s is now leader of group: %s",
- membership.getMemberPath(), memberIds));
+ LOG.info("Candidate {} is now leader of group: {}",
+ membership.getMemberPath(), memberIds);
leader.onElected(() -> {
membership.cancel();
@@ -114,9 +110,9 @@ public class CandidateImpl implements Candidate {
if (previouslyElected) {
leader.onDefeated();
}
- LOG.info(String.format(
- "Candidate %s waiting for the next leader election, current voting: %s",
- membership.getMemberPath(), memberIds));
+ LOG.info(
+ "Candidate {} waiting for the next leader election, current voting: {}",
+ membership.getMemberPath(), memberIds);
}
}
});
http://git-wip-us.apache.org/repos/asf/aurora/blob/9ed81a7d/commons/src/main/java/org/apache/aurora/common/zookeeper/Group.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/aurora/common/zookeeper/Group.java b/commons/src/main/java/org/apache/aurora/common/zookeeper/Group.java
index d368170..2720dd1 100644
--- a/commons/src/main/java/org/apache/aurora/common/zookeeper/Group.java
+++ b/commons/src/main/java/org/apache/aurora/common/zookeeper/Group.java
@@ -15,8 +15,6 @@ package org.apache.aurora.common.zookeeper;
import java.util.List;
import java.util.Set;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import java.util.regex.Pattern;
import javax.annotation.Nullable;
@@ -29,22 +27,22 @@ import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
+import org.apache.aurora.common.base.Command;
+import org.apache.aurora.common.base.Commands;
+import org.apache.aurora.common.base.ExceptionalSupplier;
+import org.apache.aurora.common.base.MorePreconditions;
+import org.apache.aurora.common.util.BackoffHelper;
+import org.apache.aurora.common.zookeeper.ZooKeeperClient.ZooKeeperConnectionException;
import org.apache.commons.lang.ArrayUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.zookeeper.CreateMode;
import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.KeeperException.NoNodeException;
-import org.apache.zookeeper.WatchedEvent;
import org.apache.zookeeper.Watcher;
import org.apache.zookeeper.Watcher.Event.EventType;
import org.apache.zookeeper.data.ACL;
-
-import org.apache.aurora.common.base.Command;
-import org.apache.aurora.common.base.Commands;
-import org.apache.aurora.common.base.ExceptionalSupplier;
-import org.apache.aurora.common.base.MorePreconditions;
-import org.apache.aurora.common.util.BackoffHelper;
-import org.apache.aurora.common.zookeeper.ZooKeeperClient.ZooKeeperConnectionException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This class exposes methods for joining and monitoring distributed groups. The groups this class
@@ -52,7 +50,7 @@ import org.apache.aurora.common.zookeeper.ZooKeeperClient.ZooKeeperConnectionExc
* each member of a group.
*/
public class Group {
- private static final Logger LOG = Logger.getLogger(Group.class.getName());
+ private static final Logger LOG = LoggerFactory.getLogger(Group.class);
private static final Supplier<byte[]> NO_MEMBER_DATA = Suppliers.ofInstance(null);
private static final String DEFAULT_NODE_NAME_PREFIX = "member_";
@@ -267,11 +265,11 @@ public class Group {
Thread.currentThread().interrupt();
throw new JoinException("Interrupted trying to join group at path: " + path, e);
} catch (ZooKeeperConnectionException e) {
- LOG.log(Level.WARNING, "Temporary error trying to join group at path: " + path, e);
+ LOG.warn("Temporary error trying to join group at path: " + path, e);
return null;
} catch (KeeperException e) {
if (zkClient.shouldRetry(e)) {
- LOG.log(Level.WARNING, "Temporary error trying to join group at path: " + path, e);
+ LOG.warn("Temporary error trying to join group at path: " + path, e);
return null;
} else {
throw new JoinException("Problem joining partition group at path: " + path, e);
@@ -289,11 +287,11 @@ public class Group {
Thread.currentThread().interrupt();
throw new JoinException("Interrupted trying to ensure group at path: " + path, e);
} catch (ZooKeeperConnectionException e) {
- LOG.log(Level.WARNING, "Problem connecting to ZooKeeper, retrying", e);
+ LOG.warn("Problem connecting to ZooKeeper, retrying", e);
return false;
} catch (KeeperException e) {
if (zkClient.shouldRetry(e)) {
- LOG.log(Level.WARNING, "Temporary error ensuring path: " + path, e);
+ LOG.warn("Temporary error ensuring path: " + path, e);
return false;
} else {
throw new JoinException("Problem ensuring group at path: " + path, e);
@@ -361,7 +359,7 @@ public class Group {
Thread.currentThread().interrupt();
throw new JoinException("Interrupted trying to cancel membership: " + nodePath, e);
} catch (ZooKeeperConnectionException e) {
- LOG.log(Level.WARNING, "Problem connecting to ZooKeeper, retrying", e);
+ LOG.warn("Problem connecting to ZooKeeper, retrying", e);
return false;
} catch (NoNodeException e) {
LOG.info("Membership already cancelled, node at path: " + nodePath +
@@ -369,7 +367,7 @@ public class Group {
return true;
} catch (KeeperException e) {
if (zkClient.shouldRetry(e)) {
- LOG.log(Level.WARNING, "Temporary error cancelling membership: " + nodePath, e);
+ LOG.warn("Temporary error cancelling membership: " + nodePath, e);
return false;
} else {
throw new JoinException("Problem cancelling membership: " + nodePath, e);
@@ -428,11 +426,11 @@ public class Group {
// Lost a cancel race - that's ok.
return true;
} catch (ZooKeeperConnectionException e) {
- LOG.log(Level.WARNING, "Problem connecting to ZooKeeper, retrying", e);
+ LOG.warn("Problem connecting to ZooKeeper, retrying", e);
return false;
} catch (KeeperException e) {
if (zkClient.shouldRetry(e)) {
- LOG.log(Level.WARNING, "Temporary error re-joining group: " + path, e);
+ LOG.warn("Temporary error re-joining group: " + path, e);
return false;
} else {
throw new IllegalStateException("Permanent problem re-joining group: " + path, e);
@@ -532,11 +530,11 @@ public class Group {
Thread.currentThread().interrupt();
throw new WatchException("Interrupted trying to watch group at path: " + path, e);
} catch (ZooKeeperConnectionException e) {
- LOG.log(Level.WARNING, "Temporary error trying to watch group at path: " + path, e);
+ LOG.warn("Temporary error trying to watch group at path: " + path, e);
return null;
} catch (KeeperException e) {
if (zkClient.shouldRetry(e)) {
- LOG.log(Level.WARNING, "Temporary error trying to watch group at path: " + path, e);
+ LOG.warn("Temporary error trying to watch group at path: " + path, e);
return null;
} else {
throw new WatchException("Problem trying to watch group at path: " + path, e);
@@ -570,11 +568,11 @@ public class Group {
watchGroup();
return true;
} catch (ZooKeeperConnectionException e) {
- LOG.log(Level.WARNING, "Problem connecting to ZooKeeper, retrying", e);
+ LOG.warn("Problem connecting to ZooKeeper, retrying", e);
return false;
} catch (KeeperException e) {
if (zkClient.shouldRetry(e)) {
- LOG.log(Level.WARNING, "Temporary error re-watching group: " + path, e);
+ LOG.warn("Temporary error re-watching group: " + path, e);
return false;
} else {
throw new IllegalStateException("Permanent problem re-watching group: " + path, e);
http://git-wip-us.apache.org/repos/asf/aurora/blob/9ed81a7d/commons/src/main/java/org/apache/aurora/common/zookeeper/ServerSet.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/aurora/common/zookeeper/ServerSet.java b/commons/src/main/java/org/apache/aurora/common/zookeeper/ServerSet.java
index cfeac92..fe6229e 100644
--- a/commons/src/main/java/org/apache/aurora/common/zookeeper/ServerSet.java
+++ b/commons/src/main/java/org/apache/aurora/common/zookeeper/ServerSet.java
@@ -13,14 +13,13 @@
*/
package org.apache.aurora.common.zookeeper;
-import org.apache.aurora.common.net.pool.DynamicHostSet;
-import org.apache.aurora.common.zookeeper.Group.JoinException;
-import org.apache.aurora.common.thrift.ServiceInstance;
-import org.apache.aurora.common.thrift.Status;
-
import java.net.InetSocketAddress;
import java.util.Map;
+import org.apache.aurora.common.net.pool.DynamicHostSet;
+import org.apache.aurora.common.thrift.ServiceInstance;
+import org.apache.aurora.common.zookeeper.Group.JoinException;
+
/**
* A logical set of servers registered in ZooKeeper. Intended to be used by both servers in a
* common service and their clients.
http://git-wip-us.apache.org/repos/asf/aurora/blob/9ed81a7d/commons/src/main/java/org/apache/aurora/common/zookeeper/ServerSetImpl.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/aurora/common/zookeeper/ServerSetImpl.java b/commons/src/main/java/org/apache/aurora/common/zookeeper/ServerSetImpl.java
index 6a0a314..eca1351 100644
--- a/commons/src/main/java/org/apache/aurora/common/zookeeper/ServerSetImpl.java
+++ b/commons/src/main/java/org/apache/aurora/common/zookeeper/ServerSetImpl.java
@@ -23,8 +23,6 @@ import java.net.InetSocketAddress;
import java.nio.charset.Charset;
import java.util.Map;
import java.util.Set;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import javax.annotation.Nullable;
@@ -51,7 +49,6 @@ import com.google.common.util.concurrent.UncheckedExecutionException;
import com.google.gson.Gson;
import org.apache.aurora.common.base.Command;
-import org.apache.aurora.common.base.ExceptionalSupplier;
import org.apache.aurora.common.io.Codec;
import org.apache.aurora.common.thrift.Endpoint;
import org.apache.aurora.common.thrift.ServiceInstance;
@@ -62,6 +59,8 @@ import org.apache.zookeeper.KeeperException.NoNodeException;
import org.apache.zookeeper.Watcher;
import org.apache.zookeeper.ZooDefs;
import org.apache.zookeeper.data.ACL;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import static com.google.common.base.Preconditions.checkNotNull;
@@ -69,7 +68,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
* ZooKeeper-backed implementation of {@link ServerSet}.
*/
public class ServerSetImpl implements ServerSet {
- private static final Logger LOG = Logger.getLogger(ServerSetImpl.class.getName());
+ private static final Logger LOG = LoggerFactory.getLogger(ServerSetImpl.class);
private final ZooKeeperClient zkClient;
private final Group group;
@@ -135,8 +134,7 @@ public class ServerSetImpl implements ServerSet {
Map<String, InetSocketAddress> additionalEndpoints)
throws Group.JoinException, InterruptedException {
- LOG.log(Level.WARNING,
- "Joining a ServerSet without a shard ID is deprecated and will soon break.");
+ LOG.warn("Joining a ServerSet without a shard ID is deprecated and will soon break.");
return join(endpoint, additionalEndpoints, Optional.<Integer>absent());
}
@@ -211,7 +209,7 @@ public class ServerSetImpl implements ServerSet {
serviceInstance.setShard(shardId.get());
}
- LOG.fine("updating endpoint data to:\n\t" + serviceInstance);
+ LOG.debug("updating endpoint data to:\n\t" + serviceInstance);
try {
return ServerSets.serializeServiceInstance(serviceInstance, codec);
} catch (IOException e) {
@@ -268,16 +266,14 @@ public class ServerSetImpl implements ServerSet {
throw new ServiceInstanceFetchException(
"Interrupted updating service data for: " + nodePath, e);
} catch (ZooKeeperClient.ZooKeeperConnectionException e) {
- LOG.log(Level.WARNING,
- "Temporary error trying to updating service data for: " + nodePath, e);
+ LOG.warn("Temporary error trying to updating service data for: " + nodePath, e);
return null;
} catch (NoNodeException e) {
invalidateNodePath(nodePath);
throw new ServiceInstanceDeletedException(nodePath);
} catch (KeeperException e) {
if (zkClient.shouldRetry(e)) {
- LOG.log(Level.WARNING,
- "Temporary error trying to update service data for: " + nodePath, e);
+ LOG.warn("Temporary error trying to update service data for: " + nodePath, e);
return null;
} else {
throw new ServiceInstanceFetchException(
@@ -352,14 +348,12 @@ public class ServerSetImpl implements ServerSet {
// if the server's status has not changed, we can skip any onChange updates.
if (!currentServerSet.equals(serverSet)) {
if (currentServerSet.isEmpty()) {
- LOG.warning("server set empty for path " + group.getPath());
+ LOG.warn("server set empty for path " + group.getPath());
} else {
- if (LOG.isLoggable(Level.INFO)) {
- if (serverSet == null) {
- LOG.info("received initial membership " + currentServerSet);
- } else {
- logChange(Level.INFO, currentServerSet);
- }
+ if (serverSet == null) {
+ LOG.info("received initial membership {}", currentServerSet);
+ } else {
+ logChange(currentServerSet);
}
}
serverSet = currentServerSet;
@@ -367,7 +361,7 @@ public class ServerSetImpl implements ServerSet {
}
}
- private void logChange(Level level, ImmutableSet<ServiceInstance> newServerSet) {
+ private void logChange(ImmutableSet<ServiceInstance> newServerSet) {
StringBuilder message = new StringBuilder("server set " + group.getPath() + " change: ");
if (serverSet.size() != newServerSet.size()) {
message.append("from ").append(serverSet.size())
@@ -386,7 +380,7 @@ public class ServerSetImpl implements ServerSet {
message.append("\n\tjoined:\n\t\t").append(joiner.join(joined));
}
- LOG.log(level, message.toString());
+ LOG.info(message.toString());
}
}
http://git-wip-us.apache.org/repos/asf/aurora/blob/9ed81a7d/commons/src/main/java/org/apache/aurora/common/zookeeper/SingletonService.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/aurora/common/zookeeper/SingletonService.java b/commons/src/main/java/org/apache/aurora/common/zookeeper/SingletonService.java
index 231aa91..20accd2 100644
--- a/commons/src/main/java/org/apache/aurora/common/zookeeper/SingletonService.java
+++ b/commons/src/main/java/org/apache/aurora/common/zookeeper/SingletonService.java
@@ -16,7 +16,6 @@ package org.apache.aurora.common.zookeeper;
import java.net.InetSocketAddress;
import java.util.Map;
import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.logging.Logger;
import javax.annotation.Nullable;
@@ -24,10 +23,8 @@ import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import org.apache.aurora.common.base.ExceptionalCommand;
-import org.apache.aurora.common.thrift.Status;
import org.apache.aurora.common.zookeeper.Candidate.Leader;
import org.apache.aurora.common.zookeeper.Group.JoinException;
-import org.apache.zookeeper.ZooDefs;
import org.apache.zookeeper.data.ACL;
/**
http://git-wip-us.apache.org/repos/asf/aurora/blob/9ed81a7d/commons/src/main/java/org/apache/aurora/common/zookeeper/ZooKeeperClient.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/aurora/common/zookeeper/ZooKeeperClient.java b/commons/src/main/java/org/apache/aurora/common/zookeeper/ZooKeeperClient.java
index e399d38..41ae035 100644
--- a/commons/src/main/java/org/apache/aurora/common/zookeeper/ZooKeeperClient.java
+++ b/commons/src/main/java/org/apache/aurora/common/zookeeper/ZooKeeperClient.java
@@ -22,7 +22,6 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
-import java.util.logging.Logger;
import javax.annotation.Nullable;
@@ -35,6 +34,11 @@ import com.google.common.base.Strings;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
+import org.apache.aurora.common.base.Command;
+import org.apache.aurora.common.base.MorePreconditions;
+import org.apache.aurora.common.net.InetSocketAddressHelper;
+import org.apache.aurora.common.quantity.Amount;
+import org.apache.aurora.common.quantity.Time;
import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.KeeperException.SessionExpiredException;
@@ -44,12 +48,8 @@ import org.apache.zookeeper.Watcher.Event.EventType;
import org.apache.zookeeper.Watcher.Event.KeeperState;
import org.apache.zookeeper.ZooKeeper;
import org.apache.zookeeper.common.PathUtils;
-
-import org.apache.aurora.common.base.Command;
-import org.apache.aurora.common.base.MorePreconditions;
-import org.apache.aurora.common.net.InetSocketAddressHelper;
-import org.apache.aurora.common.quantity.Amount;
-import org.apache.aurora.common.quantity.Time;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Manages a connection to a ZooKeeper cluster.
@@ -183,7 +183,7 @@ public class ZooKeeperClient {
}
}
- private static final Logger LOG = Logger.getLogger(ZooKeeperClient.class.getName());
+ private static final Logger LOG = LoggerFactory.getLogger(ZooKeeperClient.class);
private static final Amount<Long,Time> WAIT_FOREVER = Amount.of(0L, Time.MILLISECONDS);
@@ -467,7 +467,7 @@ public class ZooKeeperClient {
zooKeeper.close();
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
- LOG.warning("Interrupted trying to close zooKeeper");
+ LOG.warn("Interrupted trying to close zooKeeper");
} finally {
zooKeeper = null;
sessionState = null;
http://git-wip-us.apache.org/repos/asf/aurora/blob/9ed81a7d/commons/src/main/java/org/apache/aurora/common/zookeeper/ZooKeeperUtils.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/aurora/common/zookeeper/ZooKeeperUtils.java b/commons/src/main/java/org/apache/aurora/common/zookeeper/ZooKeeperUtils.java
index a8dcfa1..2ada264 100644
--- a/commons/src/main/java/org/apache/aurora/common/zookeeper/ZooKeeperUtils.java
+++ b/commons/src/main/java/org/apache/aurora/common/zookeeper/ZooKeeperUtils.java
@@ -14,27 +14,27 @@
package org.apache.aurora.common.zookeeper;
import java.util.List;
-import java.util.logging.Logger;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
+import org.apache.aurora.common.quantity.Amount;
+import org.apache.aurora.common.quantity.Time;
+import org.apache.aurora.common.zookeeper.ZooKeeperClient.ZooKeeperConnectionException;
import org.apache.zookeeper.CreateMode;
import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.ZooDefs.Ids;
import org.apache.zookeeper.common.PathUtils;
import org.apache.zookeeper.data.ACL;
-
-import org.apache.aurora.common.quantity.Amount;
-import org.apache.aurora.common.quantity.Time;
-import org.apache.aurora.common.zookeeper.ZooKeeperClient.ZooKeeperConnectionException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Utilities for dealing with zoo keeper.
*/
public final class ZooKeeperUtils {
- private static final Logger LOG = Logger.getLogger(ZooKeeperUtils.class.getName());
+ private static final Logger LOG = LoggerFactory.getLogger(ZooKeeperUtils.class);
/**
* An appropriate default session timeout for Twitter ZooKeeper clusters.
http://git-wip-us.apache.org/repos/asf/aurora/blob/9ed81a7d/commons/src/test/java/org/apache/aurora/common/args/ArgScannerTest.java
----------------------------------------------------------------------
diff --git a/commons/src/test/java/org/apache/aurora/common/args/ArgScannerTest.java b/commons/src/test/java/org/apache/aurora/common/args/ArgScannerTest.java
index 48afb61..a4d74ed 100644
--- a/commons/src/test/java/org/apache/aurora/common/args/ArgScannerTest.java
+++ b/commons/src/test/java/org/apache/aurora/common/args/ArgScannerTest.java
@@ -37,23 +37,22 @@ import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
import com.google.common.io.ByteStreams;
+import org.apache.aurora.common.args.ArgScannerTest.StandardArgs.Optimizations;
+import org.apache.aurora.common.args.constraints.NotEmpty;
import org.apache.aurora.common.args.constraints.NotNegative;
import org.apache.aurora.common.args.constraints.NotNull;
import org.apache.aurora.common.args.constraints.Positive;
import org.apache.aurora.common.args.constraints.Range;
import org.apache.aurora.common.args.parsers.NonParameterizedTypeParser;
-import org.hamcrest.CoreMatchers;
-import org.junit.Before;
-import org.junit.Test;
-
-import org.apache.aurora.common.args.ArgScannerTest.StandardArgs.Optimizations;
-import org.apache.aurora.common.args.constraints.NotEmpty;
import org.apache.aurora.common.base.Command;
import org.apache.aurora.common.base.MorePreconditions;
import org.apache.aurora.common.collections.Pair;
import org.apache.aurora.common.quantity.Amount;
import org.apache.aurora.common.quantity.Data;
import org.apache.aurora.common.quantity.Time;
+import org.hamcrest.CoreMatchers;
+import org.junit.Before;
+import org.junit.Test;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
http://git-wip-us.apache.org/repos/asf/aurora/blob/9ed81a7d/commons/src/test/java/org/apache/aurora/common/args/ArgsTest.java
----------------------------------------------------------------------
diff --git a/commons/src/test/java/org/apache/aurora/common/args/ArgsTest.java b/commons/src/test/java/org/apache/aurora/common/args/ArgsTest.java
index b64dcab..4ffc794 100644
--- a/commons/src/test/java/org/apache/aurora/common/args/ArgsTest.java
+++ b/commons/src/test/java/org/apache/aurora/common/args/ArgsTest.java
@@ -19,11 +19,10 @@ import java.util.List;
import com.google.common.collect.ImmutableList;
+import org.apache.aurora.common.args.constraints.NotEmpty;
import org.apache.aurora.common.args.constraints.Range;
import org.junit.Test;
-import org.apache.aurora.common.args.constraints.NotEmpty;
-
import static junit.framework.Assert.assertEquals;
public class ArgsTest {
http://git-wip-us.apache.org/repos/asf/aurora/blob/9ed81a7d/commons/src/test/java/org/apache/aurora/common/args/OptionInfoTest.java
----------------------------------------------------------------------
diff --git a/commons/src/test/java/org/apache/aurora/common/args/OptionInfoTest.java b/commons/src/test/java/org/apache/aurora/common/args/OptionInfoTest.java
index 0fe0aeb..98d9519 100644
--- a/commons/src/test/java/org/apache/aurora/common/args/OptionInfoTest.java
+++ b/commons/src/test/java/org/apache/aurora/common/args/OptionInfoTest.java
@@ -23,7 +23,6 @@ import com.google.common.io.Files;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-
import org.junit.rules.TemporaryFolder;
import static junit.framework.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/aurora/blob/9ed81a7d/commons/src/test/java/org/apache/aurora/common/args/ParsersTest.java
----------------------------------------------------------------------
diff --git a/commons/src/test/java/org/apache/aurora/common/args/ParsersTest.java b/commons/src/test/java/org/apache/aurora/common/args/ParsersTest.java
index 75d3c44..991291d 100644
--- a/commons/src/test/java/org/apache/aurora/common/args/ParsersTest.java
+++ b/commons/src/test/java/org/apache/aurora/common/args/ParsersTest.java
@@ -16,13 +16,12 @@ package org.apache.aurora.common.args;
import com.google.common.collect.ImmutableMap;
import com.google.common.reflect.TypeToken;
-import org.junit.Before;
-import org.junit.Test;
-
import org.apache.aurora.common.args.apt.Configuration.ParserInfo;
import org.apache.aurora.common.args.parsers.NonParameterizedTypeParser;
import org.apache.aurora.common.args.parsers.PairParser;
import org.apache.aurora.common.collections.Pair;
+import org.junit.Before;
+import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
http://git-wip-us.apache.org/repos/asf/aurora/blob/9ed81a7d/commons/src/test/java/org/apache/aurora/common/collections/Iterables2Test.java
----------------------------------------------------------------------
diff --git a/commons/src/test/java/org/apache/aurora/common/collections/Iterables2Test.java b/commons/src/test/java/org/apache/aurora/common/collections/Iterables2Test.java
index 11ff376..5c39654 100644
--- a/commons/src/test/java/org/apache/aurora/common/collections/Iterables2Test.java
+++ b/commons/src/test/java/org/apache/aurora/common/collections/Iterables2Test.java
@@ -15,7 +15,6 @@ package org.apache.aurora.common.collections;
import java.util.List;
-import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
http://git-wip-us.apache.org/repos/asf/aurora/blob/9ed81a7d/commons/src/test/java/org/apache/aurora/common/net/InetSocketAddressHelperTest.java
----------------------------------------------------------------------
diff --git a/commons/src/test/java/org/apache/aurora/common/net/InetSocketAddressHelperTest.java b/commons/src/test/java/org/apache/aurora/common/net/InetSocketAddressHelperTest.java
index c2dfe16..006b8a0 100644
--- a/commons/src/test/java/org/apache/aurora/common/net/InetSocketAddressHelperTest.java
+++ b/commons/src/test/java/org/apache/aurora/common/net/InetSocketAddressHelperTest.java
@@ -13,10 +13,10 @@
*/
package org.apache.aurora.common.net;
-import org.junit.Test;
-
import java.net.InetSocketAddress;
+import org.junit.Test;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
http://git-wip-us.apache.org/repos/asf/aurora/blob/9ed81a7d/commons/src/test/java/org/apache/aurora/common/net/http/handlers/HttpServletRequestParamsTest.java
----------------------------------------------------------------------
diff --git a/commons/src/test/java/org/apache/aurora/common/net/http/handlers/HttpServletRequestParamsTest.java b/commons/src/test/java/org/apache/aurora/common/net/http/handlers/HttpServletRequestParamsTest.java
index b7812ac..f1479bf 100644
--- a/commons/src/test/java/org/apache/aurora/common/net/http/handlers/HttpServletRequestParamsTest.java
+++ b/commons/src/test/java/org/apache/aurora/common/net/http/handlers/HttpServletRequestParamsTest.java
@@ -15,12 +15,11 @@ package org.apache.aurora.common.net.http.handlers;
import javax.servlet.http.HttpServletRequest;
+import org.apache.aurora.common.testing.easymock.EasyMockTest;
import org.easymock.EasyMock;
import org.junit.Before;
import org.junit.Test;
-import org.apache.aurora.common.testing.easymock.EasyMockTest;
-
import static org.easymock.EasyMock.expect;
import static org.junit.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/aurora/blob/9ed81a7d/commons/src/test/java/org/apache/aurora/common/net/http/handlers/StatSupplierTestBase.java
----------------------------------------------------------------------
diff --git a/commons/src/test/java/org/apache/aurora/common/net/http/handlers/StatSupplierTestBase.java b/commons/src/test/java/org/apache/aurora/common/net/http/handlers/StatSupplierTestBase.java
index 3f9444d..d3aa957 100644
--- a/commons/src/test/java/org/apache/aurora/common/net/http/handlers/StatSupplierTestBase.java
+++ b/commons/src/test/java/org/apache/aurora/common/net/http/handlers/StatSupplierTestBase.java
@@ -19,10 +19,9 @@ import java.util.Map;
import com.google.common.base.Supplier;
import com.google.common.collect.Lists;
-import org.junit.Before;
-
import org.apache.aurora.common.stats.Stat;
import org.apache.aurora.common.testing.easymock.EasyMockTest;
+import org.junit.Before;
import static org.easymock.EasyMock.expect;
http://git-wip-us.apache.org/repos/asf/aurora/blob/9ed81a7d/commons/src/test/java/org/apache/aurora/common/net/http/handlers/TimeSeriesDataSourceTest.java
----------------------------------------------------------------------
diff --git a/commons/src/test/java/org/apache/aurora/common/net/http/handlers/TimeSeriesDataSourceTest.java b/commons/src/test/java/org/apache/aurora/common/net/http/handlers/TimeSeriesDataSourceTest.java
index 86de2cc..5643f0b 100644
--- a/commons/src/test/java/org/apache/aurora/common/net/http/handlers/TimeSeriesDataSourceTest.java
+++ b/commons/src/test/java/org/apache/aurora/common/net/http/handlers/TimeSeriesDataSourceTest.java
@@ -19,7 +19,6 @@ import java.util.List;
import java.util.Map;
import com.google.common.base.Joiner;
-import com.google.common.base.Predicate;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Iterables;
@@ -27,14 +26,12 @@ import com.google.common.collect.Lists;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
-import org.junit.Before;
-import org.junit.Test;
-
import org.apache.aurora.common.collections.Iterables2;
-
import org.apache.aurora.common.stats.TimeSeries;
import org.apache.aurora.common.stats.TimeSeriesRepository;
import org.apache.aurora.common.testing.easymock.EasyMockTest;
+import org.junit.Before;
+import org.junit.Test;
import static org.easymock.EasyMock.expect;
import static org.junit.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/aurora/blob/9ed81a7d/commons/src/test/java/org/apache/aurora/common/stats/PercentileTest.java
----------------------------------------------------------------------
diff --git a/commons/src/test/java/org/apache/aurora/common/stats/PercentileTest.java b/commons/src/test/java/org/apache/aurora/common/stats/PercentileTest.java
index 63c9f0f..7fcbc5a 100644
--- a/commons/src/test/java/org/apache/aurora/common/stats/PercentileTest.java
+++ b/commons/src/test/java/org/apache/aurora/common/stats/PercentileTest.java
@@ -13,15 +13,17 @@
*/
package org.apache.aurora.common.stats;
+import java.util.Collections;
+import java.util.List;
+
import com.google.common.collect.Lists;
+
import org.junit.Before;
import org.junit.Test;
-import java.util.Collections;
-import java.util.List;
-
-import static org.junit.Assert.*;
-import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
/**
* @author William Farner
http://git-wip-us.apache.org/repos/asf/aurora/blob/9ed81a7d/commons/src/test/java/org/apache/aurora/common/stats/RateTest.java
----------------------------------------------------------------------
diff --git a/commons/src/test/java/org/apache/aurora/common/stats/RateTest.java b/commons/src/test/java/org/apache/aurora/common/stats/RateTest.java
index 46081a0..776875d 100644
--- a/commons/src/test/java/org/apache/aurora/common/stats/RateTest.java
+++ b/commons/src/test/java/org/apache/aurora/common/stats/RateTest.java
@@ -13,19 +13,23 @@
*/
package org.apache.aurora.common.stats;
+import java.util.concurrent.atomic.AtomicLong;
+
+import com.google.common.base.Supplier;
+
import org.apache.aurora.common.util.testing.FakeTicker;
import org.easymock.IMocksControl;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import java.util.concurrent.atomic.AtomicLong;
-
-import com.google.common.base.Supplier;
-
-import static org.easymock.EasyMock.*;
-import static org.junit.Assert.*;
-import static org.hamcrest.CoreMatchers.*;
+import static org.easymock.EasyMock.createControl;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.expectLastCall;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertThat;
/**
* @author William Farner
http://git-wip-us.apache.org/repos/asf/aurora/blob/9ed81a7d/commons/src/test/java/org/apache/aurora/common/stats/TimeSeriesRepositoryImplTest.java
----------------------------------------------------------------------
diff --git a/commons/src/test/java/org/apache/aurora/common/stats/TimeSeriesRepositoryImplTest.java b/commons/src/test/java/org/apache/aurora/common/stats/TimeSeriesRepositoryImplTest.java
index 6112e7c..bf55a16 100644
--- a/commons/src/test/java/org/apache/aurora/common/stats/TimeSeriesRepositoryImplTest.java
+++ b/commons/src/test/java/org/apache/aurora/common/stats/TimeSeriesRepositoryImplTest.java
@@ -14,6 +14,7 @@
package org.apache.aurora.common.stats;
import com.google.common.collect.ImmutableList;
+
import org.apache.aurora.common.quantity.Amount;
import org.apache.aurora.common.quantity.Time;
import org.apache.aurora.common.testing.easymock.EasyMockTest;
http://git-wip-us.apache.org/repos/asf/aurora/blob/9ed81a7d/commons/src/test/java/org/apache/aurora/common/testing/easymock/EasyMockTestTest.java
----------------------------------------------------------------------
diff --git a/commons/src/test/java/org/apache/aurora/common/testing/easymock/EasyMockTestTest.java b/commons/src/test/java/org/apache/aurora/common/testing/easymock/EasyMockTestTest.java
index 35dde9e..968e8f7 100644
--- a/commons/src/test/java/org/apache/aurora/common/testing/easymock/EasyMockTestTest.java
+++ b/commons/src/test/java/org/apache/aurora/common/testing/easymock/EasyMockTestTest.java
@@ -19,7 +19,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
import com.google.common.collect.ImmutableList;
import org.easymock.EasyMock;
-import org.easymock.IAnswer;
import org.junit.Test;
import static org.easymock.EasyMock.expectLastCall;