Checks for iterator hasNext element (airbytehq#18041)

* Checks for iterator hasNext element * Fix linter with newline
jhammarstedt · Oct 31, 2022 · 2dabf6b · 2dabf6b
1 parent b0c163a
commit 2dabf6b
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/...ntegrations/bases/base-java/src/main/java/io/airbyte/integrations/base/ssh/SshTunnel.java b/...ntegrations/bases/base-java/src/main/java/io/airbyte/integrations/base/ssh/SshTunnel.java
@@ -142,7 +142,7 @@ public SshTunnel(final JsonNode config,
         URL urlObject = null;
         try {
           urlObject = new URL(remoteServiceUrl);
-        } catch (MalformedURLException e) {
+        } catch (final MalformedURLException e) {
           AirbyteTraceMessageUtility.emitConfigErrorTrace(e,
               String.format("Provided value for remote service URL is not valid: %s", remoteServiceUrl));
         }
@@ -184,7 +184,8 @@ public JsonNode getConfigInTunnel() throws Exception {
         Jsons.replaceNestedInt(clone, portKey, tunnelLocalPort);
       }
       if (endPointKey != null) {
-        URL tunnelEndPointURL = new URL(remoteServiceProtocol, SshdSocketAddress.LOCALHOST_ADDRESS.getHostName(), tunnelLocalPort, remoteServicePath);
+        final URL tunnelEndPointURL =
+            new URL(remoteServiceProtocol, SshdSocketAddress.LOCALHOST_ADDRESS.getHostName(), tunnelLocalPort, remoteServicePath);
         Jsons.replaceNestedString(clone, Arrays.asList(endPointKey), tunnelEndPointURL.toString());
       }
       return clone;
@@ -306,7 +307,10 @@ KeyPair getPrivateKeyPair() throws IOException, GeneralSecurityException {
         .getKeyPairResourceParser()
         .loadKeyPairs(null, null, null, new StringReader(validatedKey));
 
-    return (keyPairs == null) ? null : keyPairs.iterator().next();
+    if (keyPairs != null && keyPairs.iterator().hasNext()) {
+      return keyPairs.iterator().next();
+    }
+    return null;
   }
 
   private String validateKey() {