From 20d1f9a69c18bfd11607063ec16fd24d1c835b55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20de=20la=20Pe=C3=B1a?= Date: Fri, 11 Dec 2020 15:15:49 +0000 Subject: [PATCH] Satisfy Java 1.7 in sources MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit patch by Andrés de la Peña; reviewed by Ekaterina Dimitrova and Brandon Williams for CASSANDRA-16300 --- .../config/YamlConfigurationLoader.java | 2 +- .../cassandra/net/MessagingService.java | 3 ++- .../apache/cassandra/utils/ExecutorUtils.java | 24 +++++++++++-------- .../apache/cassandra/utils/Throwables.java | 13 +++++++--- .../config/YamlConfigurationLoaderTest.java | 3 ++- 5 files changed, 29 insertions(+), 16 deletions(-) diff --git a/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java b/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java index 49418ac9f2..9c066c4de8 100644 --- a/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java +++ b/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java @@ -139,7 +139,7 @@ public class YamlConfigurationLoader implements ConfigurationLoader YamlConfigurationLoader.MissingPropertiesChecker propertiesChecker = new YamlConfigurationLoader.MissingPropertiesChecker(); constructor.setPropertyUtils(propertiesChecker); Yaml yaml = new Yaml(constructor); - Node node = yaml.represent(map); + final Node node = yaml.represent(map); constructor.setComposer(new Composer(null, null) { @Override diff --git a/src/java/org/apache/cassandra/net/MessagingService.java b/src/java/org/apache/cassandra/net/MessagingService.java index f125b094ad..4139a89d4c 100644 --- a/src/java/org/apache/cassandra/net/MessagingService.java +++ b/src/java/org/apache/cassandra/net/MessagingService.java @@ -776,7 +776,8 @@ public final class MessagingService implements MessagingServiceMBean handleIOException(e); } - connectionManagers.values().forEach(OutboundTcpConnectionPool::close); + for (OutboundTcpConnectionPool pool : connectionManagers.values()) + pool.close(); } catch (IOException e) { diff --git a/src/java/org/apache/cassandra/utils/ExecutorUtils.java b/src/java/org/apache/cassandra/utils/ExecutorUtils.java index 21933a3123..78f4e89dfe 100644 --- a/src/java/org/apache/cassandra/utils/ExecutorUtils.java +++ b/src/java/org/apache/cassandra/utils/ExecutorUtils.java @@ -31,18 +31,22 @@ import static java.util.concurrent.TimeUnit.NANOSECONDS; public class ExecutorUtils { - public static Runnable runWithThreadName(Runnable runnable, String threadName) + public static Runnable runWithThreadName(final Runnable runnable, final String threadName) { - return () -> { - String oldThreadName = Thread.currentThread().getName(); - try + return new Runnable() + { + public void run() { - Thread.currentThread().setName(threadName); - runnable.run(); - } - finally - { - Thread.currentThread().setName(oldThreadName); + String oldThreadName = Thread.currentThread().getName(); + try + { + Thread.currentThread().setName(threadName); + runnable.run(); + } + finally + { + Thread.currentThread().setName(oldThreadName); + } } }; } diff --git a/src/java/org/apache/cassandra/utils/Throwables.java b/src/java/org/apache/cassandra/utils/Throwables.java index 82703c8b0c..816255ada3 100644 --- a/src/java/org/apache/cassandra/utils/Throwables.java +++ b/src/java/org/apache/cassandra/utils/Throwables.java @@ -35,7 +35,7 @@ public class Throwables public static void maybeFail(Throwable fail) { - if (failIfCanCast(fail, null)) + if (failIfCanCast(fail)) throw new RuntimeException(fail); } @@ -45,7 +45,7 @@ public class Throwables throw new RuntimeException(fail); } - public static boolean failIfCanCast(Throwable fail, Class checked) throws T + public static boolean failIfCanCast(Throwable fail) { if (fail == null) return false; @@ -56,10 +56,17 @@ public class Throwables if (fail instanceof RuntimeException) throw (RuntimeException) fail; + return true; + } + + public static boolean failIfCanCast(Throwable fail, Class checked) throws T + { + boolean result = failIfCanCast(fail); + if (checked != null && checked.isInstance(fail)) throw checked.cast(fail); - return true; + return result; } public static Throwable close(Throwable accumulate, Iterable closeables) diff --git a/test/unit/org/apache/cassandra/config/YamlConfigurationLoaderTest.java b/test/unit/org/apache/cassandra/config/YamlConfigurationLoaderTest.java index c132ffc93d..8d021425fb 100644 --- a/test/unit/org/apache/cassandra/config/YamlConfigurationLoaderTest.java +++ b/test/unit/org/apache/cassandra/config/YamlConfigurationLoaderTest.java @@ -35,7 +35,8 @@ public class YamlConfigurationLoaderTest { Integer storagePort = 123; Config.CommitLogSync commitLogSync = Config.CommitLogSync.batch; - ParameterizedClass seedProvider = new ParameterizedClass("org.apache.cassandra.locator.SimpleSeedProvider", Collections.emptyMap()); + ParameterizedClass seedProvider = new ParameterizedClass("org.apache.cassandra.locator.SimpleSeedProvider", + Collections.emptyMap()); EncryptionOptions encryptionOptions = new EncryptionOptions.ClientEncryptionOptions(); encryptionOptions.keystore = "myNewKeystore"; encryptionOptions.cipher_suites = new String[] {"SomeCipher"};