move package io.airlift.units to com.facebook.airlift.units

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

@@ -1,12 +1,12 @@
 package com.facebook.airlift.concurrent;
 
+import com.facebook.airlift.units.Duration;
 import com.google.common.util.concurrent.AsyncFunction;
 import com.google.common.util.concurrent.FluentFuture;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
-import io.airlift.units.Duration;
 
 import javax.annotation.Nullable;
 

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

@@ -1,7 +1,7 @@
 package com.facebook.airlift.concurrent;
 
+import com.facebook.airlift.units.Duration;
 import com.google.common.annotations.Beta;
-import io.airlift.units.Duration;
 import org.weakref.jmx.Managed;
 
 import java.util.concurrent.ThreadPoolExecutor;

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

@@ -1,9 +1,9 @@
 package com.facebook.airlift.concurrent;
 
+import com.facebook.airlift.units.Duration;
 import com.google.common.collect.ImmutableList;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
-import io.airlift.units.Duration;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.Test;
 

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

@@ -15,8 +15,8 @@
  */
 package com.facebook.airlift.dbpool;
 
+import com.facebook.airlift.units.Duration;
 import com.google.common.primitives.Ints;
-import io.airlift.units.Duration;
 import org.weakref.jmx.Flatten;
 import org.weakref.jmx.Managed;
 
@@ -34,7 +34,7 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.logging.Logger;
 
-import static io.airlift.units.Duration.nanosSince;
+import static com.facebook.airlift.units.Duration.nanosSince;
 import static java.lang.Math.ceil;
 
 public abstract class ManagedDataSource

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

@@ -17,7 +17,7 @@
 
 import com.facebook.airlift.configuration.Config;
 import com.facebook.airlift.configuration.DefunctConfig;
-import io.airlift.units.Duration;
+import com.facebook.airlift.units.Duration;
 
 import java.util.concurrent.TimeUnit;
 

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

@@ -16,7 +16,7 @@
 package com.facebook.airlift.dbpool;
 
 import com.facebook.airlift.stats.TimeStat;
-import io.airlift.units.Duration;
+import com.facebook.airlift.units.Duration;
 import org.weakref.jmx.Managed;
 import org.weakref.jmx.Nested;
 

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

@@ -15,7 +15,7 @@
  */
 package com.facebook.airlift.dbpool;
 
-import io.airlift.units.Duration;
+import com.facebook.airlift.units.Duration;
 
 import javax.sql.ConnectionPoolDataSource;
 import javax.sql.PooledConnection;

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

@@ -16,7 +16,7 @@
 package com.facebook.airlift.dbpool;
 
 import com.facebook.airlift.dbpool.MockConnectionPoolDataSource.MockConnection;
-import io.airlift.units.Duration;
+import com.facebook.airlift.units.Duration;
 import org.testng.annotations.Test;
 
 import javax.sql.ConnectionPoolDataSource;
@@ -37,7 +37,7 @@
 
 import static com.facebook.airlift.testing.Assertions.assertGreaterThan;
 import static com.facebook.airlift.testing.Assertions.assertInstanceOf;
-import static io.airlift.units.Duration.nanosSince;
+import static com.facebook.airlift.units.Duration.nanosSince;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.testng.Assert.assertEquals;

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

@@ -15,7 +15,7 @@
  */
 package com.facebook.airlift.dbpool;
 
-import io.airlift.units.Duration;
+import com.facebook.airlift.units.Duration;
 
 import javax.sql.PooledConnection;
 

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

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

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

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

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

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

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

@@ -17,13 +17,13 @@
 
 import com.facebook.airlift.concurrent.ThreadPoolExecutorMBean;
 import com.facebook.airlift.log.Logger;
+import com.facebook.airlift.units.Duration;
 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 io.airlift.units.Duration;
 import org.weakref.jmx.Managed;
 import org.weakref.jmx.Nested;
 

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

@@ -16,13 +16,13 @@
 package com.facebook.airlift.discovery.client;
 
 import com.facebook.airlift.log.Logger;
+import com.facebook.airlift.units.Duration;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
-import io.airlift.units.Duration;
 
 import javax.annotation.PostConstruct;
 

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

@@ -15,8 +15,8 @@
  */
 package com.facebook.airlift.discovery.client;
 
+import com.facebook.airlift.units.Duration;
 import com.google.common.util.concurrent.ListenableFuture;
-import io.airlift.units.Duration;
 
 import java.util.Set;
 import java.util.concurrent.TimeUnit;

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

@@ -1,7 +1,7 @@
 package com.facebook.airlift.discovery.client;
 
 import com.facebook.airlift.log.Logger;
-import io.airlift.units.Duration;
+import com.facebook.airlift.units.Duration;
 
 import javax.annotation.concurrent.GuardedBy;
 

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

@@ -22,11 +22,11 @@
 import com.facebook.airlift.http.client.ResponseHandler;
 import com.facebook.airlift.json.JsonCodec;
 import com.facebook.airlift.node.NodeInfo;
+import com.facebook.airlift.units.Duration;
 import com.google.common.io.CharStreams;
 import com.google.common.net.HttpHeaders;
 import com.google.common.net.MediaType;
 import com.google.common.util.concurrent.ListenableFuture;
-import io.airlift.units.Duration;
 
 import javax.inject.Inject;
 

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

@@ -24,10 +24,10 @@
 import com.facebook.airlift.http.client.ResponseHandler;
 import com.facebook.airlift.json.JsonCodec;
 import com.facebook.airlift.node.NodeInfo;
+import com.facebook.airlift.units.Duration;
 import com.google.common.io.ByteStreams;
 import com.google.common.net.HttpHeaders;
 import com.google.common.util.concurrent.ListenableFuture;
-import io.airlift.units.Duration;
 import org.weakref.jmx.Flatten;
 import org.weakref.jmx.Managed;
 

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

@@ -15,8 +15,8 @@
  */
 package com.facebook.airlift.discovery.client;
 
+import com.facebook.airlift.units.Duration;
 import com.google.common.collect.ImmutableList;
-import io.airlift.units.Duration;
 
 import java.util.List;
 

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

@@ -20,9 +20,9 @@
 import com.facebook.airlift.json.JsonCodec;
 import com.facebook.airlift.log.Logger;
 import com.facebook.airlift.node.NodeInfo;
+import com.facebook.airlift.units.Duration;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
-import io.airlift.units.Duration;
 import org.weakref.jmx.Managed;
 
 import javax.annotation.PostConstruct;

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

@@ -17,7 +17,7 @@
 
 import com.facebook.airlift.configuration.Config;
 import com.facebook.airlift.configuration.ConfigDescription;
-import io.airlift.units.Duration;
+import com.facebook.airlift.units.Duration;
 
 import javax.validation.constraints.NotNull;
 

discovery/src/main/java/com/facebook/airlift/discovery/client/testing/InMemoryDiscoveryClient.java

@@ -21,11 +21,11 @@
 import com.facebook.airlift.discovery.client.ServiceDescriptor;
 import com.facebook.airlift.discovery.client.ServiceDescriptors;
 import com.facebook.airlift.node.NodeInfo;
+import com.facebook.airlift.units.Duration;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.MapMaker;
 import com.google.common.util.concurrent.ListenableFuture;
-import io.airlift.units.Duration;
 
 import javax.inject.Inject;
 

discovery/src/test/java/com/facebook/airlift/discovery/client/TestAnnouncer.java

@@ -18,9 +18,9 @@
 import com.facebook.airlift.discovery.client.testing.InMemoryDiscoveryClient;
 import com.facebook.airlift.node.NodeConfig;
 import com.facebook.airlift.node.NodeInfo;
+import com.facebook.airlift.units.Duration;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
-import io.airlift.units.Duration;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;

discovery/src/test/java/com/facebook/airlift/discovery/client/TestServiceInventoryConfig.java

@@ -16,8 +16,8 @@
 package com.facebook.airlift.discovery.client;
 
 import com.facebook.airlift.configuration.testing.ConfigAssertions;
+import com.facebook.airlift.units.Duration;
 import com.google.common.collect.ImmutableMap;
-import io.airlift.units.Duration;
 import org.testng.annotations.Test;
 
 import java.net.URI;

event/src/test/java/com/facebook/airlift/event/client/TestHttpEventClient.java

@@ -21,8 +21,8 @@
 import com.facebook.airlift.http.client.HttpClientConfig;
 import com.facebook.airlift.http.client.jetty.JettyHttpClient;
 import com.facebook.airlift.node.NodeInfo;
+import com.facebook.airlift.units.Duration;
 import com.google.common.io.CharStreams;
-import io.airlift.units.Duration;
 import org.eclipse.jetty.server.HttpConfiguration;
 import org.eclipse.jetty.server.HttpConnectionFactory;
 import org.eclipse.jetty.server.Server;

http-client/src/main/java/com/facebook/airlift/http/client/HttpClientConfig.java

@@ -19,25 +19,25 @@
 import com.facebook.airlift.configuration.ConfigDescription;
 import com.facebook.airlift.configuration.ConfigSecuritySensitive;
 import com.facebook.airlift.configuration.LegacyConfig;
+import com.facebook.airlift.units.DataSize;
+import com.facebook.airlift.units.Duration;
+import com.facebook.airlift.units.MaxDataSize;
+import com.facebook.airlift.units.MinDataSize;
+import com.facebook.airlift.units.MinDuration;
 import com.google.common.annotations.Beta;
 import com.google.common.base.Splitter;
 import com.google.common.collect.ImmutableList;
 import com.google.common.net.HostAndPort;
-import io.airlift.units.DataSize;
-import io.airlift.units.Duration;
-import io.airlift.units.MaxDataSize;
-import io.airlift.units.MinDataSize;
-import io.airlift.units.MinDuration;
 
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
 
 import java.util.List;
 
 import static com.facebook.airlift.http.client.KerberosNameType.HOSTBASED_SERVICE;
-import static io.airlift.units.DataSize.Unit.GIGABYTE;
-import static io.airlift.units.DataSize.Unit.KILOBYTE;
-import static io.airlift.units.DataSize.Unit.MEGABYTE;
+import static com.facebook.airlift.units.DataSize.Unit.GIGABYTE;
+import static com.facebook.airlift.units.DataSize.Unit.KILOBYTE;
+import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE;
 import static java.util.Objects.requireNonNull;
 import static java.util.concurrent.TimeUnit.MINUTES;
 import static java.util.concurrent.TimeUnit.SECONDS;

http-client/src/main/java/com/facebook/airlift/http/client/RequestStats.java

@@ -18,8 +18,8 @@
 import com.facebook.airlift.stats.CounterStat;
 import com.facebook.airlift.stats.DistributionStat;
 import com.facebook.airlift.stats.TimeStat;
+import com.facebook.airlift.units.Duration;
 import com.google.common.annotations.Beta;
-import io.airlift.units.Duration;
 import org.weakref.jmx.Managed;
 import org.weakref.jmx.Nested;
 

http-client/src/main/java/com/facebook/airlift/http/client/jetty/BufferingResponseListener.java

@@ -2,7 +2,7 @@
 
 import com.facebook.airlift.http.client.GatheringByteArrayInputStream;
 import com.facebook.airlift.http.client.ResponseTooLargeException;
-import io.airlift.units.DataSize;
+import com.facebook.airlift.units.DataSize;
 import org.eclipse.jetty.client.api.Response;
 import org.eclipse.jetty.client.api.Result;
 import org.eclipse.jetty.http.HttpHeader;
@@ -14,10 +14,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import static com.facebook.airlift.units.DataSize.Unit.KILOBYTE;
+import static com.facebook.airlift.units.DataSize.Unit.MEGABYTE;
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkState;
-import static io.airlift.units.DataSize.Unit.KILOBYTE;
-import static io.airlift.units.DataSize.Unit.MEGABYTE;
 import static java.lang.Math.max;
 import static java.lang.Math.min;
 import static java.util.Objects.requireNonNull;

http-client/src/main/java/com/facebook/airlift/http/client/jetty/DefaultHttpClientLogger.java

@@ -21,8 +21,8 @@
 import ch.qos.logback.core.status.ErrorStatus;
 import ch.qos.logback.core.util.FileSize;
 import com.facebook.airlift.log.Logger;
-import io.airlift.units.DataSize;
-import io.airlift.units.Duration;
+import com.facebook.airlift.units.DataSize;
+import com.facebook.airlift.units.Duration;
 
 import java.io.File;
 import java.io.IOException;

http-client/src/main/java/com/facebook/airlift/http/client/jetty/JettyHttpClient.java

@@ -15,10 +15,10 @@
 import com.facebook.airlift.http.client.spnego.SpnegoAuthenticationProtocolHandler;
 import com.facebook.airlift.http.client.spnego.SpnegoAuthenticationStore;
 import com.facebook.airlift.security.pem.PemReader;
+import com.facebook.airlift.units.Duration;
 import com.google.common.collect.ImmutableList;
 import com.google.common.net.HostAndPort;
 import com.google.common.primitives.Ints;
-import io.airlift.units.Duration;
 import org.eclipse.jetty.client.DuplexConnectionPool;
 import org.eclipse.jetty.client.HttpClient;
 import org.eclipse.jetty.client.HttpClientTransport;

http-client/src/main/java/com/facebook/airlift/http/client/spnego/SpnegoAuthentication.java

@@ -2,10 +2,10 @@
 
 import com.facebook.airlift.http.client.KerberosNameType;
 import com.facebook.airlift.log.Logger;
+import com.facebook.airlift.units.Duration;
 import com.google.common.base.Throwables;
 import com.google.common.collect.ImmutableMap;
 import com.sun.security.auth.module.Krb5LoginModule;
-import io.airlift.units.Duration;
 import net.jodah.failsafe.Failsafe;
 import net.jodah.failsafe.RetryPolicy;
 import org.eclipse.jetty.client.api.Authentication;

http-client/src/main/java/com/facebook/airlift/http/client/spnego/SpnegoAuthenticationStore.java

@@ -1,8 +1,8 @@
 package com.facebook.airlift.http.client.spnego;
 
+import com.facebook.airlift.units.Duration;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
-import io.airlift.units.Duration;
 import org.eclipse.jetty.client.api.Authentication;
 import org.eclipse.jetty.client.api.AuthenticationStore;