Reorder imports

bootstrap/src/main/java/com/facebook/airlift/bootstrap/Bootstrap.java

@@ -15,6 +15,16 @@
  */
 package com.facebook.airlift.bootstrap;
 
+import com.facebook.airlift.configuration.ConfigurationFactory;
+import com.facebook.airlift.configuration.ConfigurationInspector;
+import com.facebook.airlift.configuration.ConfigurationInspector.ConfigAttribute;
+import com.facebook.airlift.configuration.ConfigurationInspector.ConfigRecord;
+import com.facebook.airlift.configuration.ConfigurationModule;
+import com.facebook.airlift.configuration.ValidationErrorModule;
+import com.facebook.airlift.configuration.WarningsMonitor;
+import com.facebook.airlift.log.Logger;
+import com.facebook.airlift.log.Logging;
+import com.facebook.airlift.log.LoggingConfiguration;
 import com.google.common.annotations.Beta;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
@@ -26,16 +36,6 @@
 import com.google.inject.Module;
 import com.google.inject.Stage;
 import com.google.inject.spi.Message;
-import com.facebook.airlift.configuration.ConfigurationFactory;
-import com.facebook.airlift.configuration.ConfigurationInspector;
-import com.facebook.airlift.configuration.ConfigurationInspector.ConfigAttribute;
-import com.facebook.airlift.configuration.ConfigurationInspector.ConfigRecord;
-import com.facebook.airlift.configuration.ConfigurationModule;
-import com.facebook.airlift.configuration.ValidationErrorModule;
-import com.facebook.airlift.configuration.WarningsMonitor;
-import com.facebook.airlift.log.Logger;
-import com.facebook.airlift.log.Logging;
-import com.facebook.airlift.log.LoggingConfiguration;
 
 import java.io.IOException;
 import java.io.PrintWriter;

concurrent/src/main/java/com/facebook/airlift/concurrent/BoundedExecutor.java

@@ -1,7 +1,7 @@
 package com.facebook.airlift.concurrent;
 
-import com.google.common.base.Preconditions;
 import com.facebook.airlift.log.Logger;
+import com.google.common.base.Preconditions;
 
 import javax.annotation.concurrent.ThreadSafe;
 

concurrent/src/test/java/com/facebook/airlift/concurrent/BenchmarkWhenAnyCompleteCancelOthers.java

@@ -35,8 +35,8 @@
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
 
-import static com.google.common.util.concurrent.MoreExecutors.directExecutor;
 import static com.facebook.airlift.concurrent.MoreFutures.whenAnyCompleteCancelOthers;
+import static com.google.common.util.concurrent.MoreExecutors.directExecutor;
 
 @State(Scope.Thread)
 @OutputTimeUnit(TimeUnit.NANOSECONDS)

concurrent/src/test/java/com/facebook/airlift/concurrent/TestAsyncSemaphore.java

@@ -30,12 +30,12 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import static com.facebook.airlift.concurrent.Threads.daemonThreadsNamed;
+import static com.facebook.airlift.testing.Assertions.assertLessThanOrEqual;
 import static com.google.common.util.concurrent.Futures.addCallback;
 import static com.google.common.util.concurrent.MoreExecutors.directExecutor;
 import static com.google.common.util.concurrent.MoreExecutors.listeningDecorator;
 import static com.google.common.util.concurrent.MoreExecutors.newDirectExecutorService;
-import static com.facebook.airlift.concurrent.Threads.daemonThreadsNamed;
-import static com.facebook.airlift.testing.Assertions.assertLessThanOrEqual;
 import static java.util.concurrent.Executors.newCachedThreadPool;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.fail;

concurrent/src/test/java/com/facebook/airlift/concurrent/TestMoreFutures.java

@@ -19,9 +19,6 @@
 import java.util.function.Consumer;
 import java.util.function.Function;
 
-import static com.google.common.base.Strings.nullToEmpty;
-import static com.google.common.util.concurrent.Futures.immediateFailedFuture;
-import static com.google.common.util.concurrent.Futures.immediateFuture;
 import static com.facebook.airlift.concurrent.MoreFutures.addTimeout;
 import static com.facebook.airlift.concurrent.MoreFutures.allAsList;
 import static com.facebook.airlift.concurrent.MoreFutures.checkSuccess;
@@ -40,6 +37,9 @@
 import static com.facebook.airlift.concurrent.MoreFutures.whenAnyCompleteCancelOthers;
 import static com.facebook.airlift.concurrent.Threads.daemonThreadsNamed;
 import static com.facebook.airlift.testing.Assertions.assertInstanceOf;
+import static com.google.common.base.Strings.nullToEmpty;
+import static com.google.common.util.concurrent.Futures.immediateFailedFuture;
+import static com.google.common.util.concurrent.Futures.immediateFuture;
 import static java.lang.String.format;
 import static java.util.concurrent.CompletableFuture.completedFuture;
 import static java.util.concurrent.Executors.newSingleThreadScheduledExecutor;

configuration/src/main/java/com/facebook/airlift/configuration/AbstractConfigurationAwareModule.java

@@ -17,8 +17,8 @@
 import com.google.inject.Binder;
 import com.google.inject.Module;
 
-import static com.google.common.base.Preconditions.checkState;
 import static com.facebook.airlift.configuration.ConfigBinder.configBinder;
+import static com.google.common.base.Preconditions.checkState;
 import static java.util.Objects.requireNonNull;
 
 @Beta

configuration/src/main/java/com/facebook/airlift/configuration/ConfigurationFactory.java

@@ -15,6 +15,7 @@
  */
 package com.facebook.airlift.configuration;
 
+import com.facebook.airlift.configuration.ConfigurationMetadata.AttributeMetadata;
 import com.google.common.annotations.Beta;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.cache.CacheBuilder;
@@ -37,7 +38,6 @@
 import com.google.inject.spi.InstanceBinding;
 import com.google.inject.spi.Message;
 import com.google.inject.spi.ProviderInstanceBinding;
-import com.facebook.airlift.configuration.ConfigurationMetadata.AttributeMetadata;
 import org.apache.bval.jsr.ApacheValidationProvider;
 
 import javax.annotation.Nullable;
@@ -61,11 +61,11 @@
 import java.util.function.Consumer;
 import java.util.function.Function;
 
+import static com.facebook.airlift.configuration.ConfigurationMetadata.getConfigurationMetadata;
+import static com.facebook.airlift.configuration.Problems.exceptionFor;
 import static com.google.common.base.CaseFormat.LOWER_CAMEL;
 import static com.google.common.base.CaseFormat.UPPER_CAMEL;
 import static com.google.common.collect.Sets.newConcurrentHashSet;
-import static com.facebook.airlift.configuration.ConfigurationMetadata.getConfigurationMetadata;
-import static com.facebook.airlift.configuration.Problems.exceptionFor;
 import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
 

configuration/src/main/java/com/facebook/airlift/configuration/ConfigurationInspector.java

@@ -15,18 +15,18 @@
  */
 package com.facebook.airlift.configuration;
 
+import com.facebook.airlift.configuration.ConfigurationMetadata.AttributeMetadata;
 import com.google.common.collect.ComparisonChain;
 import com.google.common.collect.ImmutableSortedSet;
 import com.google.common.collect.Ordering;
 import com.google.inject.Key;
-import com.facebook.airlift.configuration.ConfigurationMetadata.AttributeMetadata;
 
 import java.lang.reflect.Method;
 import java.util.Optional;
 import java.util.SortedSet;
 
-import static com.google.common.base.MoreObjects.toStringHelper;
 import static com.facebook.airlift.configuration.ConfigurationMetadata.getConfigurationMetadata;
+import static com.google.common.base.MoreObjects.toStringHelper;
 import static java.util.Objects.requireNonNull;
 
 public class ConfigurationInspector

configuration/src/main/java/com/facebook/airlift/configuration/ConfigurationMetadata.java

@@ -15,11 +15,11 @@
  */
 package com.facebook.airlift.configuration;
 
+import com.facebook.airlift.configuration.Problems.Monitor;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ImmutableSortedMap;
 import com.google.inject.ConfigurationException;
-import com.facebook.airlift.configuration.Problems.Monitor;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;

configuration/src/main/java/com/facebook/airlift/configuration/testing/ConfigAssertions.java

@@ -15,11 +15,11 @@
  */
 package com.facebook.airlift.configuration.testing;
 
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.MapMaker;
 import com.facebook.airlift.configuration.ConfigurationFactory;
 import com.facebook.airlift.configuration.ConfigurationMetadata;
 import com.facebook.airlift.configuration.ConfigurationMetadata.AttributeMetadata;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.MapMaker;
 import net.sf.cglib.proxy.Enhancer;
 import net.sf.cglib.proxy.MethodInterceptor;
 import net.sf.cglib.proxy.MethodProxy;

configuration/src/test/java/com/facebook/airlift/configuration/ConfigurationMetadataTest.java

@@ -15,9 +15,9 @@
  */
 package com.facebook.airlift.configuration;
 
+import com.facebook.airlift.configuration.ConfigurationMetadata.AttributeMetadata;
 import com.google.common.collect.ImmutableSet;
 import com.google.inject.ConfigurationException;
-import com.facebook.airlift.configuration.ConfigurationMetadata.AttributeMetadata;
 import org.testng.annotations.Test;
 
 import java.util.HashMap;

configuration/src/test/java/com/facebook/airlift/configuration/TestConfig.java

@@ -39,8 +39,8 @@
 import java.util.Map.Entry;
 import java.util.Optional;
 
-import static com.google.inject.name.Names.named;
 import static com.facebook.airlift.configuration.ConfigBinder.configBinder;
+import static com.google.inject.name.Names.named;
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.ElementType.PARAMETER;

configuration/src/test/java/com/facebook/airlift/configuration/TestConfigurationInspector.java

@@ -1,18 +1,18 @@
 package com.facebook.airlift.configuration;
 
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
 import com.facebook.airlift.configuration.ConfigurationInspector.ConfigAttribute;
 import com.facebook.airlift.configuration.ConfigurationInspector.ConfigRecord;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
 import org.testng.annotations.Test;
 
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
+import static com.facebook.airlift.configuration.ConfigBinder.configBinder;
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.Iterables.getOnlyElement;
-import static com.facebook.airlift.configuration.ConfigBinder.configBinder;
 import static org.testng.Assert.assertEquals;
 
 public class TestConfigurationInspector

configuration/src/test/java/com/facebook/airlift/configuration/TestConfigurationLoader.java

@@ -26,9 +26,9 @@
 import java.io.PrintStream;
 import java.util.Map;
 
+import static com.facebook.airlift.configuration.ConfigurationLoader.loadProperties;
 import static com.google.common.io.MoreFiles.deleteRecursively;
 import static com.google.common.io.RecursiveDeleteOption.ALLOW_INSECURE;
-import static com.facebook.airlift.configuration.ConfigurationLoader.loadProperties;
 import static org.testng.Assert.assertEquals;
 
 public class TestConfigurationLoader

configuration/src/test/java/com/facebook/airlift/configuration/testing/TestConfigAssertions.java

@@ -15,12 +15,12 @@
  */
 package com.facebook.airlift.configuration.testing;
 
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
 import com.facebook.airlift.configuration.Config;
 import com.facebook.airlift.configuration.Config1;
 import com.facebook.airlift.configuration.LegacyConfig;
 import com.facebook.airlift.configuration.testing.ConfigAssertions.$$RecordedConfigData;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
 import org.testng.annotations.Test;
 
 import java.net.MalformedURLException;

dbpool/src/main/java/com/facebook/airlift/dbpool/H2EmbeddedDataSource.java

@@ -15,9 +15,9 @@
  */
 package com.facebook.airlift.dbpool;
 
+import com.facebook.airlift.dbpool.H2EmbeddedDataSourceConfig.Cipher;
 import com.google.common.io.Resources;
 import com.google.common.primitives.Ints;
-import com.facebook.airlift.dbpool.H2EmbeddedDataSourceConfig.Cipher;
 import org.h2.jdbcx.JdbcDataSource;
 import org.h2.util.ScriptReader;
 

dbpool/src/main/java/com/facebook/airlift/dbpool/MySqlDataSource.java

@@ -15,9 +15,9 @@
  */
 package com.facebook.airlift.dbpool;
 
-import com.mysql.jdbc.jdbc2.optional.MysqlConnectionPoolDataSource;
 import com.facebook.airlift.discovery.client.ServiceDescriptor;
 import com.facebook.airlift.discovery.client.ServiceSelector;
+import com.mysql.jdbc.jdbc2.optional.MysqlConnectionPoolDataSource;
 
 import javax.sql.PooledConnection;
 

dbpool/src/main/java/com/facebook/airlift/dbpool/MySqlDataSourceModule.java

@@ -15,13 +15,13 @@
  */
 package com.facebook.airlift.dbpool;
 
+import com.facebook.airlift.discovery.client.ServiceSelector;
 import com.google.common.collect.ImmutableList;
 import com.google.inject.Binder;
 import com.google.inject.Injector;
 import com.google.inject.Key;
 import com.google.inject.Module;
 import com.google.inject.Scopes;
-import com.facebook.airlift.discovery.client.ServiceSelector;
 import org.weakref.jmx.guice.MBeanModule;
 
 import javax.inject.Inject;

dbpool/src/main/java/com/facebook/airlift/dbpool/PostgreSqlDataSource.java

@@ -15,9 +15,9 @@
  */
 package com.facebook.airlift.dbpool;
 
-import com.google.common.primitives.Ints;
 import com.facebook.airlift.discovery.client.ServiceDescriptor;
 import com.facebook.airlift.discovery.client.ServiceSelector;
+import com.google.common.primitives.Ints;
 import org.postgresql.ds.PGConnectionPoolDataSource;
 
 import javax.sql.PooledConnection;

dbpool/src/main/java/com/facebook/airlift/dbpool/PostgreSqlDataSourceModule.java

@@ -15,13 +15,13 @@
  */
 package com.facebook.airlift.dbpool;
 
+import com.facebook.airlift.discovery.client.ServiceSelector;
 import com.google.common.collect.ImmutableList;
 import com.google.inject.Binder;
 import com.google.inject.Injector;
 import com.google.inject.Key;
 import com.google.inject.Module;
 import com.google.inject.Scopes;
-import com.facebook.airlift.discovery.client.ServiceSelector;
 import org.weakref.jmx.guice.MBeanModule;
 
 import javax.inject.Inject;

dbpool/src/test/java/com/facebook/airlift/dbpool/H2EmbeddedDataSourceTest.java

@@ -15,9 +15,9 @@
  */
 package com.facebook.airlift.dbpool;
 
+import com.facebook.airlift.dbpool.H2EmbeddedDataSourceConfig.Cipher;
 import com.google.common.io.Files;
 import com.google.common.io.Resources;
-import com.facebook.airlift.dbpool.H2EmbeddedDataSourceConfig.Cipher;
 import org.h2.jdbc.JdbcSQLException;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;

dbpool/src/test/java/com/facebook/airlift/dbpool/TestH2EmbeddedDataSourceConfig.java

@@ -1,7 +1,7 @@
 package com.facebook.airlift.dbpool;
 
-import com.google.common.collect.ImmutableMap;
 import com.facebook.airlift.configuration.testing.ConfigAssertions;
+import com.google.common.collect.ImmutableMap;
 import io.airlift.units.Duration;
 import org.testng.annotations.Test;
 

dbpool/src/test/java/com/facebook/airlift/dbpool/TestH2EmbeddedDataSourceModule.java

@@ -15,15 +15,15 @@
  */
 package com.facebook.airlift.dbpool;
 
+import com.facebook.airlift.configuration.ConfigurationFactory;
+import com.facebook.airlift.configuration.ConfigurationModule;
 import com.google.common.collect.ImmutableList;
 import com.google.inject.BindingAnnotation;
 import com.google.inject.CreationException;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 import com.google.inject.Module;
 import com.google.inject.Scopes;
-import com.facebook.airlift.configuration.ConfigurationFactory;
-import com.facebook.airlift.configuration.ConfigurationModule;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;

dbpool/src/test/java/com/facebook/airlift/dbpool/TestMySqlDataSourceConfig.java

@@ -1,7 +1,7 @@
 package com.facebook.airlift.dbpool;
 
-import com.google.common.collect.ImmutableMap;
 import com.facebook.airlift.configuration.testing.ConfigAssertions;
+import com.google.common.collect.ImmutableMap;
 import io.airlift.units.Duration;
 import org.testng.annotations.Test;
 

dbpool/src/test/java/com/facebook/airlift/dbpool/TestPostgreSqlDataSourceConfig.java

@@ -1,7 +1,7 @@
 package com.facebook.airlift.dbpool;
 
-import com.google.common.collect.ImmutableMap;
 import com.facebook.airlift.configuration.testing.ConfigAssertions;
+import com.google.common.collect.ImmutableMap;
 import io.airlift.units.Duration;
 import org.testng.annotations.Test;
 

discovery/src/main/java/com/facebook/airlift/discovery/client/Announcer.java

@@ -15,14 +15,14 @@
  */
 package com.facebook.airlift.discovery.client;
 
+import com.facebook.airlift.concurrent.ThreadPoolExecutorMBean;
+import com.facebook.airlift.log.Logger;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.MapMaker;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
-import com.facebook.airlift.concurrent.ThreadPoolExecutorMBean;
-import com.facebook.airlift.log.Logger;
 import io.airlift.units.Duration;
 import org.weakref.jmx.Managed;
 import org.weakref.jmx.Nested;