From 97c1bc6a28411c5a78012a934de93d7a9d8669f3 Mon Sep 17 00:00:00 2001
From: Michael Jumper <mike.jumper@guac-dev.org>
Date: Tue, 26 Feb 2013 02:35:25 -0800
Subject: [PATCH] Ticket #269: Make all fields private, change default methods
 to public.

---
 .../net/auth/mysql/ConnectionDirectory.java   | 12 ++++-----
 .../net/auth/mysql/MySQLConnection.java       | 12 ++++-----
 .../net/auth/mysql/MySQLConnectionRecord.java |  6 ++---
 .../net/auth/mysql/MySQLGuacamoleSocket.java  |  2 +-
 .../guacamole/net/auth/mysql/MySQLUser.java   | 15 ++++++++---
 .../net/auth/mysql/MySQLUserContext.java      |  2 +-
 .../net/auth/mysql/UserDirectory.java         | 26 ++++++++++++-------
 .../mysql/service/PermissionCheckService.java | 14 +++++-----
 8 files changed, 52 insertions(+), 37 deletions(-)

diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/ConnectionDirectory.java b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/ConnectionDirectory.java
index e665b77c8..28eca88fc 100644
--- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/ConnectionDirectory.java
+++ b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/ConnectionDirectory.java
@@ -71,26 +71,26 @@ public class ConnectionDirectory implements Directory<String, Connection>{
     private int user_id;
 
     @Inject
-    PermissionCheckService permissionCheckUtility;
+    private PermissionCheckService permissionCheckUtility;
 
     @Inject
-    ProviderService providerUtility;
+    private ProviderService providerUtility;
 
     @Inject
-    ConnectionMapper connectionDAO;
+    private ConnectionMapper connectionDAO;
 
     @Inject
-    ConnectionPermissionMapper connectionPermissionDAO;
+    private ConnectionPermissionMapper connectionPermissionDAO;
 
     @Inject
-    ConnectionParameterMapper connectionParameterDAO;
+    private ConnectionParameterMapper connectionParameterDAO;
 
     /**
      * Set the user for this directory.
      * 
      * @param user_id The ID of the user owning this connection directory.
      */
-    void init(int user_id) {
+    public void init(int user_id) {
         this.user_id = user_id;
     }
 
diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLConnection.java b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLConnection.java
index 586233e6e..2a594f08d 100644
--- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLConnection.java
+++ b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLConnection.java
@@ -62,19 +62,19 @@ import net.sourceforge.guacamole.protocol.GuacamoleConfiguration;
 public class MySQLConnection implements Connection {
 
     @Inject
-    ConnectionMapper connectionDAO;
+    private ConnectionMapper connectionDAO;
 
     @Inject
-    ConnectionParameterMapper connectionParameterDAO;
+    private ConnectionParameterMapper connectionParameterDAO;
 
     @Inject
-    ProviderService providerUtility;
+    private ProviderService providerUtility;
 
     @Inject
-    ActiveConnectionSet activeConnectionSet;
+    private ActiveConnectionSet activeConnectionSet;
 
     @Inject
-    ConfigurationTranslationService configurationTranslationUtility;
+    private ConfigurationTranslationService configurationTranslationUtility;
 
     private net.sourceforge.guacamole.net.auth.mysql.model.Connection connection;
 
@@ -83,7 +83,7 @@ public class MySQLConnection implements Connection {
     /**
      * Create a default, empty connection.
      */
-    MySQLConnection() {
+    public MySQLConnection() {
         connection = new net.sourceforge.guacamole.net.auth.mysql.model.Connection();
         configuration = new GuacamoleConfiguration();
     }
diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLConnectionRecord.java b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLConnectionRecord.java
index a1a3cd88e..55919393c 100644
--- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLConnectionRecord.java
+++ b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLConnectionRecord.java
@@ -63,19 +63,19 @@ public class MySQLConnectionRecord implements ConnectionRecord {
      * DAO for accessing users.
      */
     @Inject
-    UserMapper userDAO;
+    private UserMapper userDAO;
 
     /**
      * DAO for accessing connections.
      */
     @Inject
-    ConnectionMapper connectionDAO;
+    private ConnectionMapper connectionDAO;
 
     /**
      * Service for creating and retrieving objects.
      */
     @Inject
-    ProviderService providerUtility;
+    private ProviderService providerUtility;
 
     /**
      * Initialize this MySQLConnectionRecord with the database record it
diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLGuacamoleSocket.java b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLGuacamoleSocket.java
index fcfb82e00..5e0603049 100644
--- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLGuacamoleSocket.java
+++ b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLGuacamoleSocket.java
@@ -53,7 +53,7 @@ public class MySQLGuacamoleSocket implements GuacamoleSocket {
      * Injected ActiveConnectionSet which will contain all active connections.
      */
     @Inject
-    ActiveConnectionSet activeConnectionSet;
+    private ActiveConnectionSet activeConnectionSet;
 
     /**
      * The wrapped socket.
diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLUser.java b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLUser.java
index 42809efdd..7149a1e03 100644
--- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLUser.java
+++ b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLUser.java
@@ -59,14 +59,23 @@ public class MySQLUser extends AbstractUser {
      */
     private Integer userID;
     
+    /**
+     * Service for encrypting passwords.
+     */
     @Inject
-    PasswordEncryptionService passwordUtility;
+    private PasswordEncryptionService passwordUtility;
 
+    /**
+     * Service for generating random salts.
+     */
     @Inject
-    SaltService saltUtility;
+    private SaltService saltUtility;
 
+    /**
+     * Service for checking permissions.
+     */
     @Inject
-    PermissionCheckService permissionCheckUtility;
+    private PermissionCheckService permissionCheckUtility;
 
     /**
      * The set of current permissions a user has.
diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLUserContext.java b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLUserContext.java
index b4b016230..77334d11c 100644
--- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLUserContext.java
+++ b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLUserContext.java
@@ -82,7 +82,7 @@ public class MySQLUserContext implements UserContext {
      *
      * @param user_id The ID of the user owning this context.
      */
-    void init(int user_id) {
+    public void init(int user_id) {
         this.user_id = user_id;
         userDirectory.init(user_id);
         connectionDirectory.init(user_id);
diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/UserDirectory.java b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/UserDirectory.java
index 54c1d724b..7c69118de 100644
--- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/UserDirectory.java
+++ b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/UserDirectory.java
@@ -93,50 +93,56 @@ public class UserDirectory implements Directory<String, net.sourceforge.guacamol
      * DAO for accessing users, which will be injected.
      */
     @Inject
-    UserMapper userDAO;
+    private UserMapper userDAO;
 
     /**
      * DAO for accessing connections, which will be injected.
      */
     @Inject
-    ConnectionMapper connectionDAO;
+    private ConnectionMapper connectionDAO;
 
     /**
      * DAO for accessing user permissions, which will be injected.
      */
     @Inject
-    UserPermissionMapper userPermissionDAO;
+    private UserPermissionMapper userPermissionDAO;
 
     /**
      * DAO for accessing connection permissions, which will be injected.
      */
     @Inject
-    ConnectionPermissionMapper connectionPermissionDAO;
+    private ConnectionPermissionMapper connectionPermissionDAO;
 
     /**
      * DAO for accessing system permissions, which will be injected.
      */
     @Inject
-    SystemPermissionMapper systemPermissionDAO;
+    private SystemPermissionMapper systemPermissionDAO;
 
     /**
      * Utility class for checking various permissions, which will be injected.
      */
     @Inject
-    PermissionCheckService permissionCheckUtility;
+    private PermissionCheckService permissionCheckUtility;
 
     /**
      * Utility class that provides convenient access to object creation and
      * retrieval functions.
      */
     @Inject
-    ProviderService providerUtility;
+    private ProviderService providerUtility;
     
+    /**
+     * Service for encrypting passwords.
+     */
     @Inject
-    PasswordEncryptionService passwordUtility;
+    private PasswordEncryptionService passwordUtility;
 
+    /**
+     * Service for generating random salts.
+     */
     @Inject
-    SaltService saltUtility;
+    private SaltService saltUtility;
 
     /**
      * Set the user for this directory.
@@ -144,7 +150,7 @@ public class UserDirectory implements Directory<String, net.sourceforge.guacamol
      * @param user_id The ID of the user whose permissions define the visibility
      *                of other users in this directory.
      */
-    void init(int user_id) {
+    public void init(int user_id) {
         this.user_id = user_id;
     }
 
diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/PermissionCheckService.java b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/PermissionCheckService.java
index 7cacd87e9..aa3279c92 100644
--- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/PermissionCheckService.java
+++ b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/PermissionCheckService.java
@@ -78,25 +78,25 @@ import net.sourceforge.guacamole.net.auth.permission.UserPermission;
 public class PermissionCheckService {
 
     @Inject
-    UserMapper userDAO;
+    private UserMapper userDAO;
 
     @Inject
-    ConnectionMapper connectionDAO;
+    private ConnectionMapper connectionDAO;
 
     @Inject
-    UserPermissionMapper userPermissionDAO;
+    private UserPermissionMapper userPermissionDAO;
 
     @Inject
-    ConnectionPermissionMapper connectionPermissionDAO;
+    private ConnectionPermissionMapper connectionPermissionDAO;
 
     @Inject
-    SystemPermissionMapper systemPermissionDAO;
+    private SystemPermissionMapper systemPermissionDAO;
 
     @Inject
-    Provider<MySQLUser> mySQLUserProvider;
+    private Provider<MySQLUser> mySQLUserProvider;
 
     @Inject
-    Provider<MySQLConnection> mySQLConnectionProvider;
+    private Provider<MySQLConnection> mySQLConnectionProvider;
 
     /**
      * Verifies that the user has read access to the given user. If not, throws a GuacamoleSecurityException.