From 35c04d9ae69fd2ddb3c8f8105b6aaa83aed2c61c Mon Sep 17 00:00:00 2001
From: ulrich <not disclosed>
Date: Tue, 27 Dec 2016 18:39:15 +0000
Subject: [PATCH] Verlagerung statischer Elemente in den ServletContext

---
 src/java/de/uhilger/um/api/UserMgr.java |   40 ++++++++++++++++++++++------------------
 1 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/src/java/de/uhilger/um/api/UserMgr.java b/src/java/de/uhilger/um/api/UserMgr.java
index 6b1a321..be04ea2 100644
--- a/src/java/de/uhilger/um/api/UserMgr.java
+++ b/src/java/de/uhilger/um/api/UserMgr.java
@@ -21,7 +21,6 @@
 import de.uhilger.baselink.PersistenceManager;
 import de.uhilger.baselink.Record;
 import de.uhilger.transit.web.WebKontext;
-import de.uhilger.um.App;
 import de.uhilger.um.Digester;
 import de.uhilger.um.daten.User;
 import de.uhilger.um.daten.UserRole;
@@ -67,9 +66,14 @@
   /** Name, unter dem das Properties-Objekt mit den SQL-Befehlen im ServletContext hinterlegt ist */
   public static final String UM_SQL_PROPERTIES = "umSqlProperties";
 
+  public static final String P_DIGESTER = "digester";
+
   /** Name, unter dem das Zugriffsobjekt zur Datenbank im ServletContext hinterlegt ist */
   public static final String UM_DB = "umDb";
   
+  /** Boolean-Konstante zur Kennzeichnung von Datenbankergebnissen ohne Blobs */
+  public static final boolean WITHOUT_BLOBS = false;
+
   public static final String SQL_GET_USER_LIST = "getUserList";
   public static final String SQL_GET_USER_NAME_LIST = "getUserNameList";
   public static final String SQL_GET_ROLE_LIST = "getRoleList";
@@ -79,25 +83,25 @@
   
   /* ----------- Benutzer -------------- */
   
-  public User createUser(User user) {
+  public User createUser(User user) throws ClassNotFoundException, InstantiationException, IllegalAccessException {
     String kw = user.getPw();
-    String digestedPw = App.getDigester().digest(kw, Digester.MD5, null);
+    String digesterClassName = ctx.getInitParameter(P_DIGESTER);
+    Digester digester = (Digester) Class.forName(digesterClassName).newInstance();
+    String digestedPw = digester.digest(kw, Digester.MD5, null);
     user.setPw(digestedPw);
-    App.getDatabase().insert(user, UserMapper);
+    getDb().insert(user, UserMapper);
     return user;
   }
   
   public List getUserNameList() {
-    String sql = getSqlStatement(SQL_GET_USER_NAME_LIST);
-    return App.getDatabase().select(sql, App.WITHOUT_BLOBS);
+    return getDb().select(getSql(SQL_GET_USER_NAME_LIST), WITHOUT_BLOBS);
   }
   
   public User deleteUser(User user) {
-    PersistenceManager pm = App.getDatabase();
+    PersistenceManager pm = getDb();
     Connection c = pm.getConnection();
     pm.startTransaction(c);
-    String sql = getSqlStatement(SQL_DELETE_USER_ROLES);
-    pm.execute(c, sql, user.getId());
+    pm.execute(c, getSql(SQL_DELETE_USER_ROLES), user.getId());
     User deletedUser = (User) pm.delete(c, user, UserMapper);
     pm.commit(c);
     return deletedUser;
@@ -109,7 +113,7 @@
     UserRole ur = new UserRole();
     ur.setRole(roleName);
     ur.setUser(userId);
-    App.getDatabase().insert(ur, UserRoleMapper);
+    getDb().insert(ur, UserRoleMapper);
     return ur;
   }
   
@@ -117,34 +121,34 @@
     UserRole ur = new UserRole();
     ur.setRole(roleName);
     ur.setUser(userId);
-    App.getDatabase().delete(ur, UserRoleMapper);
+    getDb().delete(ur, UserRoleMapper);
     return ur;
   }
   
   public List getRoleNamesGranted() {
-    String sql = getSqlStatement(SQL_GET_ROLE_LIST);
-    return App.getDatabase().select(sql, App.WITHOUT_BLOBS);
+    return getDb().select(getSql(SQL_GET_ROLE_LIST), WITHOUT_BLOBS);
   }
   
   public List getUserRoleNames(String userId) {
-    String sql = getSqlStatement(SQL_GET_USER_ROLES);
-    return App.getDatabase().select(sql, App.WITHOUT_BLOBS, userId);
+    return getDb().select(getSql(SQL_GET_USER_ROLES), WITHOUT_BLOBS, userId);
   }
   
-  
   /* ----------- Helfer ---- */
-  
   
   /**
    * Ein benanntes SQL-Kommando ermitteln 
    * @param id Name des gewuenschten SQL-Kommandos
    * @return das SQL-Kommando mit der in id angegebenen Bezeichnung 
    */
-  private String getSqlStatement(String id) {
+  private String getSql(String id) {
     Properties sql = (Properties) ctx.getAttribute(UserMgr.UM_SQL_PROPERTIES);
     return sql.getProperty(id);
   }
   
+  private PersistenceManager getDb() {
+    return (PersistenceManager) ctx.getAttribute(UM_DB);
+  }
+  
   /* ------------- Implementierung WebKontext ------------- */
 
   @Override

--
Gitblit v1.9.3