From d2d543028f0fa6ced798375ccd91270b5b6f54a7 Mon Sep 17 00:00:00 2001
From: Nick Couchman <vnick@apache.org>
Date: Mon, 5 Jun 2017 15:13:19 -0400
Subject: [PATCH] GUACAMOLE-102: Clean up code style issues, remove the
 unnecessary getDefaultConnectionWeight method.

---
 .../apache/guacamole/auth/jdbc/JDBCEnvironment.java   | 11 -----------
 .../auth/jdbc/connection/ModeledConnection.java       |  3 +--
 .../jdbc/tunnel/RestrictedGuacamoleTunnelService.java |  4 ++--
 .../apache/guacamole/auth/mysql/MySQLEnvironment.java |  8 --------
 .../auth/postgresql/PostgreSQLEnvironment.java        |  8 --------
 5 files changed, 3 insertions(+), 31 deletions(-)

diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/JDBCEnvironment.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/JDBCEnvironment.java
index a856d2ae0..53935e62f 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/JDBCEnvironment.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/JDBCEnvironment.java
@@ -82,17 +82,6 @@ public abstract class JDBCEnvironment extends LocalEnvironment {
      */
     public abstract int getDefaultMaxConnections() throws GuacamoleException;
 
-    /**
-     * Returns the connection weight for the purpose of WRR calculation
-     *
-     * @return
-     *     The weight of the connection.
-     *
-     * @throws GuacamoleException  
-     *     If an error occurs while retrieving the property.
-     */
-    public abstract int getDefaultConnectionWeight() throws GuacamoleException;
-    
     /**
      * Returns the default maximum number of concurrent connections to allow to 
      * any one connection group, unless specified differently on an individual 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ModeledConnection.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ModeledConnection.java
index 7e11a762b..29a8b6f7c 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ModeledConnection.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ModeledConnection.java
@@ -417,12 +417,11 @@ public class ModeledConnection extends ModeledChildDirectoryObject<ConnectionMod
      *  
      * @return
      *     The weight of the connection.
-     *  
      */
     public int getConnectionWeight() {
 
         Integer connectionWeight = getModel().getConnectionWeight();
-        if(connectionWeight == null)
+        if (connectionWeight == null)
             return 1;
         return connectionWeight;
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/RestrictedGuacamoleTunnelService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/RestrictedGuacamoleTunnelService.java
index bee5dd3d9..d4ab8aa79 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/RestrictedGuacamoleTunnelService.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/RestrictedGuacamoleTunnelService.java
@@ -188,7 +188,7 @@ public class RestrictedGuacamoleTunnelService
             public int compare(ModeledConnection a, ModeledConnection b) {
 
                 return ((getActiveConnections(a).size() + 1) * b.getConnectionWeight() -
-                        (getActiveConnections(b).size() + 1) * a.getConnectionWeight());
+                            (getActiveConnections(b).size() + 1) * a.getConnectionWeight());
 
             }
 
@@ -202,7 +202,7 @@ public class RestrictedGuacamoleTunnelService
 
             // If connection weight is zero or negative, this host is disabled and should not be used.
             if (connection.getConnectionWeight() < 1) {
-                logger.warn("Weight for {} is < 1, connection will be skipped.", connection.getName());
+                logger.debug("Weight for {} is < 1, connection will be skipped.", connection.getName());
                 continue;
             }
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLEnvironment.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLEnvironment.java
index 6495fcc6f..088d18685 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLEnvironment.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLEnvironment.java
@@ -200,14 +200,6 @@ public class MySQLEnvironment extends JDBCEnvironment {
         );
     }
 
-    @Override
-    public int getDefaultConnectionWeight() throws GuacamoleException {
-        return getProperty(
-            MySQLGuacamoleProperties.MYSQL_DEFAULT_CONNECTION_WEIGHT,
-            DEFAULT_CONNECTION_WEIGHT
-        );
-    }
-
     @Override
     public int getDefaultMaxGroupConnections() throws GuacamoleException {
         return getProperty(
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/apache/guacamole/auth/postgresql/PostgreSQLEnvironment.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/apache/guacamole/auth/postgresql/PostgreSQLEnvironment.java
index e0ad4ec30..1f4b6e5f5 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/apache/guacamole/auth/postgresql/PostgreSQLEnvironment.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/apache/guacamole/auth/postgresql/PostgreSQLEnvironment.java
@@ -200,14 +200,6 @@ public class PostgreSQLEnvironment extends JDBCEnvironment {
         );
     }
 
-    @Override
-    public int getDefaultConnectionWeight() throws GuacamoleException {
-        return getProperty(
-            PostgreSQLGuacamoleProperties.POSTGRESQL_DEFAULT_CONNECTION_WEIGHT,
-            DEFAULT_CONNECTION_WEIGHT
-        );
-    }
-
     @Override
     public int getDefaultMaxGroupConnections() throws GuacamoleException {
         return getProperty(