GUACAMOLE-38: Fix up string checks in QCParser class.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/cf241f04 Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/cf241f04 Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/cf241f04 Branch: refs/heads/staging/1.0.0 Commit: cf241f041e34e64515fe185314af5ade5b716309 Parents: 0cbf90a Author: Nick Couchman <vn...@apache.org> Authored: Tue Apr 17 22:29:46 2018 -0400 Committer: Nick Couchman <vn...@apache.org> Committed: Fri Jun 1 13:40:51 2018 -0400 ---------------------------------------------------------------------- .../auth/quickconnect/utility/QCParser.java | 22 ++++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/cf241f04/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/utility/QCParser.java ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/utility/QCParser.java b/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/utility/QCParser.java index be157dc..ba6e3fd 100644 --- a/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/utility/QCParser.java +++ b/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/utility/QCParser.java @@ -95,16 +95,16 @@ public class QCParser { String password = null; List<String> paramList = null; - if (protocol == null || protocol.equals("")) + if (protocol == null || protocol.isEmpty()) protocol = DEFAULT_URI_PROTOCOL; - if (host == null || host.equals("")) + if (host == null || host.isEmpty()) host = DEFAULT_URI_HOST; - if (query != null && !query.equals("")) + if (query != null && !query.isEmpty()) paramList = Arrays.asList(query.split("&")); - if (userInfo != null && !userInfo.equals("")) { + if (userInfo != null && !userInfo.isEmpty()) { Matcher userinfoMatcher = userinfoPattern.matcher(userInfo); if (userinfoMatcher.matches()) { @@ -121,15 +121,15 @@ public class QCParser { if (port > 0) qcConfig.setParameter("port", Integer.toString(port)); - if (username != null && username.length() > 0) + if (username != null && !username.isEmpty()) qcConfig.setParameter("username", username); - if (password != null && password.length() > 0) + if (password != null && !password.isEmpty()) qcConfig.setParameter("password", password); if (paramList != null) { for (String parameter : paramList) { - String[] paramArray = parameter.split("="); + String[] paramArray = parameter.split("=", 2); qcConfig.setParameter(paramArray[0],paramArray[1]); } } @@ -166,16 +166,16 @@ public class QCParser { String name = ""; - if (protocol != null && !protocol.equals("")) + if (protocol != null && !protocol.isEmpty()) name += protocol + "://"; - if (user != null && !user.equals("")) + if (user != null && !user.isEmpty()) name += user + "@"; - if (host != null && !host.equals("")) + if (host != null && !host.isEmpty()) name += host; - if (port != null && !port.equals("")) + if (port != null && !port.isEmpty()) name += ":" + port; name += "/";
