From 95c4bb427f0a863ac19f93762266325b98024cd3 Mon Sep 17 00:00:00 2001
From: Michael Jumper <mjumper@apache.org>
Date: Sun, 29 Nov 2020 16:15:06 -0800
Subject: [PATCH] GUACAMOLE-1218: Use diamond operator and multi-catch where
 possible.

---
 .../guacamole/auth/json/CryptoService.java    | 30 +++++--------------
 .../auth/json/RequestValidationService.java   |  2 +-
 .../guacamole/auth/json/user/UserData.java    |  2 +-
 .../auth/json/user/UserDataDenylist.java      |  3 +-
 4 files changed, 10 insertions(+), 27 deletions(-)

diff --git a/extensions/guacamole-auth-json/src/main/java/org/apache/guacamole/auth/json/CryptoService.java b/extensions/guacamole-auth-json/src/main/java/org/apache/guacamole/auth/json/CryptoService.java
index 503a8b90f..28a1154c0 100644
--- a/extensions/guacamole-auth-json/src/main/java/org/apache/guacamole/auth/json/CryptoService.java
+++ b/extensions/guacamole-auth-json/src/main/java/org/apache/guacamole/auth/json/CryptoService.java
@@ -147,22 +147,12 @@ public class CryptoService {
         }
 
         // Rethrow all decryption failures identically
-        catch (InvalidAlgorithmParameterException e) {
-            throw new GuacamoleServerException(e);
-        }
-        catch (NoSuchAlgorithmException e) {
-            throw new GuacamoleServerException(e);
-        }
-        catch (NoSuchPaddingException e) {
-            throw new GuacamoleServerException(e);
-        }
-        catch (InvalidKeyException e) {
-            throw new GuacamoleServerException(e);
-        }
-        catch (IllegalBlockSizeException e) {
-            throw new GuacamoleServerException(e);
-        }
-        catch (BadPaddingException e) {
+        catch (InvalidAlgorithmParameterException
+                | NoSuchAlgorithmException
+                | NoSuchPaddingException
+                | InvalidKeyException
+                | IllegalBlockSizeException
+                | BadPaddingException e) {
             throw new GuacamoleServerException(e);
         }
 
@@ -200,13 +190,7 @@ public class CryptoService {
         }
 
         // Rethrow all signature failures identically
-        catch (NoSuchAlgorithmException e) {
-            throw new GuacamoleServerException(e);
-        }
-        catch (InvalidKeyException e) {
-            throw new GuacamoleServerException(e);
-        }
-        catch (IllegalStateException e) {
+        catch (NoSuchAlgorithmException | InvalidKeyException | IllegalStateException e) {
             throw new GuacamoleServerException(e);
         }
 
diff --git a/extensions/guacamole-auth-json/src/main/java/org/apache/guacamole/auth/json/RequestValidationService.java b/extensions/guacamole-auth-json/src/main/java/org/apache/guacamole/auth/json/RequestValidationService.java
index 0824f55a8..e187112e3 100644
--- a/extensions/guacamole-auth-json/src/main/java/org/apache/guacamole/auth/json/RequestValidationService.java
+++ b/extensions/guacamole-auth-json/src/main/java/org/apache/guacamole/auth/json/RequestValidationService.java
@@ -78,7 +78,7 @@ public class RequestValidationService {
         }
 
         // Build matchers for each trusted network
-        Collection<IpAddressMatcher> matchers = new ArrayList<IpAddressMatcher>(trustedNetworks.size());
+        Collection<IpAddressMatcher> matchers = new ArrayList<>(trustedNetworks.size());
         for (String network : trustedNetworks)
             matchers.add(new IpAddressMatcher(network));
 
diff --git a/extensions/guacamole-auth-json/src/main/java/org/apache/guacamole/auth/json/user/UserData.java b/extensions/guacamole-auth-json/src/main/java/org/apache/guacamole/auth/json/user/UserData.java
index 544cac063..41e02a4bd 100644
--- a/extensions/guacamole-auth-json/src/main/java/org/apache/guacamole/auth/json/user/UserData.java
+++ b/extensions/guacamole-auth-json/src/main/java/org/apache/guacamole/auth/json/user/UserData.java
@@ -342,7 +342,7 @@ public class UserData {
      *     connection.
      */
     public void setConnections(Map<String, Connection> connections) {
-        this.connections = new ConcurrentHashMap<String, Connection>(connections);
+        this.connections = new ConcurrentHashMap<>(connections);
     }
 
     /**
diff --git a/extensions/guacamole-auth-json/src/main/java/org/apache/guacamole/auth/json/user/UserDataDenylist.java b/extensions/guacamole-auth-json/src/main/java/org/apache/guacamole/auth/json/user/UserDataDenylist.java
index 888ea6ef9..92b2acee1 100644
--- a/extensions/guacamole-auth-json/src/main/java/org/apache/guacamole/auth/json/user/UserDataDenylist.java
+++ b/extensions/guacamole-auth-json/src/main/java/org/apache/guacamole/auth/json/user/UserDataDenylist.java
@@ -46,8 +46,7 @@ public class UserDataDenylist {
      * string produced by encoding the binary signature using DatatypeConverter.
      * A byte[] cannot be used directly.
      */
-    private final ConcurrentMap<String, UserData> denylist =
-            new ConcurrentHashMap<String, UserData>();
+    private final ConcurrentMap<String, UserData> denylist = new ConcurrentHashMap<>();
 
     /**
      * Removes all expired UserData objects from the denylist. This will