Java 21 upgrade

bootstrap/pom.xml

@@ -50,6 +50,7 @@
         <dependency>
             <groupId>javax.inject</groupId>
             <artifactId>javax.inject</artifactId>
+            <scope>runtime</scope>
         </dependency>
 
         <!-- for testing -->

concurrent/pom.xml

@@ -17,7 +17,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>io.airlift</groupId>
+            <groupId>com.facebook.airlift</groupId>
             <artifactId>units</artifactId>
         </dependency>
 
@@ -67,6 +67,12 @@
             <artifactId>jmh-generator-annprocess</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <dependency>
+            <groupId>org.gaul</groupId>
+            <artifactId>modernizer-maven-annotations</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>
 

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

@@ -1,5 +1,6 @@
 package com.facebook.airlift.concurrent;
 
+import com.google.common.collect.Streams;
 import com.google.common.util.concurrent.AsyncFunction;
 import com.google.common.util.concurrent.FluentFuture;
 import com.google.common.util.concurrent.FutureCallback;
@@ -29,15 +30,14 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-import static com.google.common.base.MoreObjects.firstNonNull;
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Throwables.propagateIfPossible;
 import static com.google.common.base.Throwables.throwIfInstanceOf;
-import static com.google.common.collect.Iterables.isEmpty;
 import static com.google.common.util.concurrent.Futures.immediateFailedFuture;
 import static com.google.common.util.concurrent.Futures.immediateFuture;
 import static com.google.common.util.concurrent.MoreExecutors.directExecutor;
 import static java.util.Objects.requireNonNull;
+import static java.util.Objects.requireNonNullElse;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 
 public final class MoreFutures
@@ -87,7 +87,7 @@ public void onFailure(Throwable t)
     public static Throwable unwrapCompletionException(Throwable throwable)
     {
         if (throwable instanceof CompletionException) {
-            return firstNonNull(throwable.getCause(), throwable);
+            return requireNonNullElse(throwable.getCause(), throwable);
         }
         return throwable;
     }
@@ -277,7 +277,7 @@ public static void checkSuccess(Future<?> future, String errorMessage)
     public static <V> ListenableFuture<V> whenAnyComplete(Iterable<? extends ListenableFuture<? extends V>> futures)
     {
         requireNonNull(futures, "futures is null");
-        checkArgument(!isEmpty(futures), "futures is empty");
+        checkArgument(Streams.stream(futures).findAny().isPresent(), "futures is empty");
 
         ExtendedSettableFuture<V> firstCompletedFuture = ExtendedSettableFuture.create();
         for (ListenableFuture<? extends V> future : futures) {
@@ -298,7 +298,7 @@ public static <V> ListenableFuture<V> whenAnyComplete(Iterable<? extends Listena
     public static <V> ListenableFuture<V> whenAnyCompleteCancelOthers(Iterable<? extends ListenableFuture<? extends V>> futures)
     {
         requireNonNull(futures, "futures is null");
-        checkArgument(!isEmpty(futures), "futures is empty");
+        checkArgument(Streams.stream(futures).findAny().isPresent(), "futures is empty");
 
         // wait for the first task to unblock and then cancel all futures to free up resources
         ListenableFuture<V> anyComplete = whenAnyComplete(futures);
@@ -332,7 +332,7 @@ public static <V> CompletableFuture<V> firstCompletedFuture(Iterable<? extends C
     public static <V> CompletableFuture<V> firstCompletedFuture(Iterable<? extends CompletionStage<? extends V>> futures, boolean propagateCancel)
     {
         requireNonNull(futures, "futures is null");
-        checkArgument(!isEmpty(futures), "futures is empty");
+        checkArgument(Streams.stream(futures).findAny().isPresent(), "futures is empty");
 
         CompletableFuture<V> future = new CompletableFuture<>();
         for (CompletionStage<? extends V> stage : futures) {

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

@@ -26,7 +26,7 @@ public SetThreadName(String format, Object... args)
     {
         requireNonNull(format, "format is null");
         originalThreadName = Thread.currentThread().getName();
-        Thread.currentThread().setName(String.format(format, args) + "-" + Thread.currentThread().getId());
+        Thread.currentThread().setName(String.format(format, args) + "-" + Thread.currentThread().threadId());
     }
 
     @Override

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

@@ -4,6 +4,7 @@
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
 import io.airlift.units.Duration;
+import org.gaul.modernizer_maven_annotations.SuppressModernizer;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.Test;
 
@@ -55,6 +56,7 @@
 import static org.testng.Assert.fail;
 
 @SuppressWarnings("deprecation")
+@SuppressModernizer
 public class TestMoreFutures
 {
     private final ScheduledExecutorService executorService = newSingleThreadScheduledExecutor(daemonThreadsNamed("test-%s"));

configuration/pom.xml

@@ -13,6 +13,9 @@
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
+        <air.test.jvm.additional-arguments>
+            --add-opens java.base/java.lang=ALL-UNNAMED
+        </air.test.jvm.additional-arguments>
     </properties>
 
     <dependencies>

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

@@ -19,7 +19,7 @@ public ConfigurationBinding(Key<T> key, Class<T> configClass, Optional<String> p
         requireNonNull(key, "key");
         requireNonNull(configClass, "configClass");
         requireNonNull(prefix, "prefix is null");
-        checkArgument(!prefix.isPresent() || !prefix.get().isEmpty(), "prefix is empty");
+        prefix.ifPresent(str -> checkArgument(!str.isEmpty(), "prefix is empty"));
 
         this.key = key;
         this.configClass = configClass;

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

@@ -12,7 +12,7 @@
 
 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.google.common.collect.MoreCollectors.onlyElement;
 import static org.testng.Assert.assertEquals;
 
 public class TestConfigurationInspector
@@ -42,7 +42,7 @@ private ConfigRecord<?> getConfigRecord()
         Map<String, String> properties = ImmutableMap.of("stringValue", "string");
         ConfigurationFactory configurationFactory = new ConfigurationFactory(properties);
         configurationFactory.registerConfigurationClasses(binder -> configBinder(binder).bindConfig(ConfigWithOptionalValue.class));
-        return getOnlyElement(new ConfigurationInspector().inspect(configurationFactory));
+        return new ConfigurationInspector().inspect(configurationFactory).stream().collect(onlyElement());
     }
 
     public static class ConfigWithOptionalValue

dbpool/pom.xml

@@ -13,6 +13,9 @@
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
+        <air.test.jvm.additional-arguments>
+            --add-opens java.base/java.lang=ALL-UNNAMED
+        </air.test.jvm.additional-arguments>
     </properties>
 
     <dependencies>
@@ -32,7 +35,7 @@
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
+            <groupId>com.facebook.airlift</groupId>
             <artifactId>units</artifactId>
         </dependency>
 

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

@@ -17,7 +17,6 @@
 
 import com.facebook.airlift.dbpool.H2EmbeddedDataSourceConfig.Cipher;
 import com.google.common.io.Resources;
-import com.google.common.primitives.Ints;
 import org.h2.jdbcx.JdbcDataSource;
 import org.h2.util.ScriptReader;
 
@@ -32,6 +31,7 @@
 import java.sql.SQLException;
 import java.sql.Statement;
 
+import static java.lang.Math.toIntExact;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.Objects.requireNonNull;
 import static java.util.concurrent.TimeUnit.SECONDS;
@@ -73,7 +73,7 @@ public H2EmbeddedDataSource(H2EmbeddedDataSourceConfig config)
         else {
             dataSource.setPassword("");
         }
-        dataSource.setLoginTimeout(Ints.checkedCast(config.getMaxConnectionWait().roundTo(SECONDS)));
+        dataSource.setLoginTimeout(toIntExact(config.getMaxConnectionWait().roundTo(SECONDS)));
 
         // connect to database and initialize database
         Connection connection = getConnection();

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

@@ -15,7 +15,6 @@
  */
 package com.facebook.airlift.dbpool;
 
-import com.google.common.primitives.Ints;
 import io.airlift.units.Duration;
 import org.weakref.jmx.Flatten;
 import org.weakref.jmx.Managed;
@@ -36,6 +35,7 @@
 
 import static io.airlift.units.Duration.nanosSince;
 import static java.lang.Math.ceil;
+import static java.lang.Math.toIntExact;
 
 public abstract class ManagedDataSource
         implements DataSource
@@ -53,7 +53,7 @@ protected ManagedDataSource(int maxConnections, Duration maxConnectionWait)
             throw new NullPointerException("maxConnectionWait is null");
         }
         semaphore = new ManagedSemaphore(maxConnections);
-        maxConnectionWaitMillis.set(Ints.checkedCast(maxConnectionWait.toMillis()));
+        maxConnectionWaitMillis.set(toIntExact(maxConnectionWait.toMillis()));
     }
 
     @Override
@@ -143,7 +143,7 @@ public void setMaxConnectionWaitMillis(Duration maxConnectionWait)
             throw new NullPointerException("maxConnectionWait is null");
         }
 
-        int millis = Ints.checkedCast(maxConnectionWait.toMillis());
+        int millis = toIntExact(maxConnectionWait.toMillis());
         if (millis < 1) {
             throw new IllegalArgumentException("maxConnectionWait must be greater than 1 millisecond");
         }

discovery/pom.xml

@@ -12,6 +12,9 @@
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
+        <air.test.jvm.additional-arguments>
+            --add-opens java.base/java.lang=ALL-UNNAMED
+        </air.test.jvm.additional-arguments>
     </properties>
 
     <dependencies>
@@ -31,7 +34,7 @@
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
+            <groupId>com.facebook.airlift</groupId>
             <artifactId>units</artifactId>
         </dependency>
 

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

@@ -39,7 +39,7 @@ public String value()
 
     public String toString()
     {
-        return String.format("@%s(value=%s)", ServiceType.class.getName(), Annotations.memberValueString(value));
+        return String.format("@%s(%s)", ServiceType.class.getName(), Annotations.memberValueString(value));
     }
 
     @Override

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

@@ -19,7 +19,7 @@
 import com.facebook.airlift.discovery.client.ServiceSelector;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Iterables;
+import com.google.common.collect.Streams;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 
@@ -44,7 +44,7 @@ public StaticServiceSelector(Iterable<ServiceDescriptor> serviceDescriptors)
     {
         requireNonNull(serviceDescriptors, "serviceDescriptors is null");
 
-        ServiceDescriptor serviceDescriptor = Iterables.getFirst(serviceDescriptors, null);
+        ServiceDescriptor serviceDescriptor = Streams.stream(serviceDescriptors).findFirst().orElse(null);
         if (serviceDescriptor != null) {
             this.type = serviceDescriptor.getType();
             this.pool = serviceDescriptor.getPool();

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

@@ -31,7 +31,7 @@
 
 import static com.facebook.airlift.discovery.client.DiscoveryBinder.discoveryBinder;
 import static com.facebook.airlift.discovery.client.ServiceTypes.serviceType;
-import static com.google.common.collect.Iterables.getOnlyElement;
+import static com.google.common.collect.MoreCollectors.onlyElement;
 import static java.util.Objects.requireNonNull;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
@@ -97,10 +97,10 @@ public void testMerging()
                 });
 
         HttpServiceSelector selector = injector.getInstance(Key.get(HttpServiceSelector.class, serviceType("apple")));
-        assertEquals(getOnlyElement(selector.selectHttpService()), URI.create("http://127.0.0.1:4444"));
+        assertEquals(selector.selectHttpService().stream().collect(onlyElement()), URI.create("http://127.0.0.1:4444"));
 
         selector = injector.getInstance(Key.get(HttpServiceSelector.class, serviceType("banana")));
-        assertEquals(getOnlyElement(selector.selectHttpService()), URI.create("http://127.0.0.1:4444"));
+        assertEquals(selector.selectHttpService().stream().collect(onlyElement()), URI.create("http://127.0.0.1:4444"));
 
         selector = injector.getInstance(Key.get(HttpServiceSelector.class, serviceType("carrot")));
         assertTrue(selector.selectHttpService().isEmpty());

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

@@ -17,7 +17,6 @@
 
 import com.facebook.airlift.json.JsonCodec;
 import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Iterables;
 import com.google.common.io.Resources;
 import org.testng.annotations.Test;
 
@@ -28,6 +27,7 @@
 import static com.facebook.airlift.json.JsonCodec.jsonCodec;
 import static com.facebook.airlift.json.JsonCodec.mapJsonCodec;
 import static com.facebook.airlift.testing.EquivalenceTester.equivalenceTester;
+import static com.google.common.collect.MoreCollectors.onlyElement;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
@@ -53,7 +53,7 @@ public void testJsonEncode()
 
         // set id in expected
         List<Map<String, Object>> services = toServices(expected.get("services"));
-        services.get(0).put("id", Iterables.getOnlyElement(announcement.getServices()).getId().toString());
+        services.get(0).put("id", announcement.getServices().stream().collect(onlyElement()).getId().toString());
 
         assertEquals(actual, expected);
     }

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

@@ -16,7 +16,6 @@
 package com.facebook.airlift.discovery.client;
 
 import com.facebook.airlift.discovery.client.testing.TestingDiscoveryModule;
-import com.google.common.collect.Iterables;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 import com.google.inject.Key;
@@ -28,6 +27,7 @@
 
 import static com.facebook.airlift.discovery.client.DiscoveryBinder.discoveryBinder;
 import static com.facebook.airlift.discovery.client.ServiceAnnouncement.serviceAnnouncement;
+import static com.google.common.collect.MoreCollectors.onlyElement;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
 
@@ -154,7 +154,7 @@ private void assertAnnouncement(Set<ServiceAnnouncement> actualAnnouncements, Se
     {
         assertNotNull(actualAnnouncements);
         assertEquals(actualAnnouncements.size(), 1);
-        ServiceAnnouncement announcement = Iterables.getOnlyElement(actualAnnouncements);
+        ServiceAnnouncement announcement = actualAnnouncements.stream().collect(onlyElement());
         assertEquals(announcement.getType(), expected.getType());
         assertEquals(announcement.getProperties(), expected.getProperties());
     }

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

@@ -33,7 +33,7 @@
 import static com.facebook.airlift.discovery.client.DiscoveryBinder.discoveryBinder;
 import static com.facebook.airlift.discovery.client.ServiceAnnouncement.serviceAnnouncement;
 import static com.facebook.airlift.discovery.client.ServiceTypes.serviceType;
-import static com.google.common.collect.Iterables.getOnlyElement;
+import static com.google.common.collect.MoreCollectors.onlyElement;
 import static org.testng.Assert.assertEquals;
 
 public class TestHttpServiceSelectorBinder
@@ -51,7 +51,7 @@ public void testHttpSelectorString()
         discoveryClient.announce(ImmutableSet.of(serviceAnnouncement("apple").addProperty("http", "fake://server-http").build()));
 
         HttpServiceSelector selector = injector.getInstance(Key.get(HttpServiceSelector.class, serviceType("apple")));
-        assertEquals(getOnlyElement(selector.selectHttpService()), URI.create("fake://server-http"));
+        assertEquals(selector.selectHttpService().stream().collect(onlyElement()), URI.create("fake://server-http"));
     }
 
     @Test
@@ -67,7 +67,7 @@ public void testHttpSelectorAnnotation()
         discoveryClient.announce(ImmutableSet.of(serviceAnnouncement("apple").addProperty("http", "fake://server-http").build()));
 
         HttpServiceSelector selector = injector.getInstance(Key.get(HttpServiceSelector.class, serviceType("apple")));
-        assertEquals(getOnlyElement(selector.selectHttpService()), URI.create("fake://server-http"));
+        assertEquals(selector.selectHttpService().stream().collect(onlyElement()), URI.create("fake://server-http"));
 
         ServiceSelectorManager manager = injector.getInstance(ServiceSelectorManager.class);
         assertEquals(manager.getServiceSelectors().size(), 1);
@@ -88,7 +88,7 @@ public void testHttpsSelector()
         discoveryClient.announce(ImmutableSet.of(serviceAnnouncement("apple").addProperty("https", "fake://server-https").build()));
 
         HttpServiceSelector selector = injector.getInstance(Key.get(HttpServiceSelector.class, serviceType("apple")));
-        assertEquals(getOnlyElement(selector.selectHttpService()), URI.create("fake://server-https"));
+        assertEquals(selector.selectHttpService().stream().collect(onlyElement()), URI.create("fake://server-https"));
     }
 
     @Test

event/pom.xml

@@ -36,8 +36,9 @@
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
+            <groupId>com.facebook.airlift</groupId>
             <artifactId>units</artifactId>
+            <scope>runtime</scope>
         </dependency>
 
         <dependency>