From 70a614a0d43b3a8a614e751df442aac1900aedba Mon Sep 17 00:00:00 2001
From: ulrich <ulrich@uhilger.de>
Date: Fri, 10 Feb 2017 06:55:52 +0000
Subject: [PATCH] SessionManager hinzugefuegt, abstrakte Api-Klasse hinzugefuegt

---
 src/java/de/uhilger/um/api/UserMgr.java |   42 ++++++++++++++++++++++++++++++------------
 1 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/src/java/de/uhilger/um/api/UserMgr.java b/src/java/de/uhilger/um/api/UserMgr.java
index f32072a..3f06be7 100644
--- a/src/java/de/uhilger/um/api/UserMgr.java
+++ b/src/java/de/uhilger/um/api/UserMgr.java
@@ -59,14 +59,14 @@
  *
  * @version 2, December 27, 2016
  */
-public class UserMgr implements WebKontext, RequestKontext {
+public class UserMgr extends Api /*implements WebKontext, RequestKontext*/ {
   
   private static final Logger logger = Logger.getLogger(UserMgr.class.getName());
   
   /** Zeiger zum Servlet-Kontext dieser Anwendung */
-  private ServletContext ctx;
+  //private ServletContext ctx;
   
-  private HttpServletRequest request;
+  //private HttpServletRequest request;
   
   /** Name, unter dem das Properties-Objekt mit den SQL-Befehlen im ServletContext hinterlegt ist */
   public static final String UM_SQL_PROPERTIES = "umSqlProperties";
@@ -90,19 +90,24 @@
   public static final String SQL_GET_USER_ROLES = "getUserRoles";
   /** Referenz zum SQL-Befehl zum Loeschen aller Rollen eines Nutzers */
   public static final String SQL_DELETE_USER_ROLES = "deleteUserRoles";
+  public static final String SQL_GET_USER_DATA = "getUserData";
+  
+  public static final String MP_USER = "userMapper";
+  public static final String MP_USER_DATA = "userDataMapper";
+  public static final String MP_USER_ROLE = "userRoleMapper";
   
   /** Mapper-Objekt fuer Benutzer */
-  private static final Record UserMapper = new GenericRecord(User.class);
+  //private static final Record UserMapper = new GenericRecord(User.class);
   /** Mapper-Objekt fuer Benutzerdaten */
   //private static final Record UserDataMapper = new GenericRecord(UserData.class);
   /** Mapper-Objekt fuer Benutzerrollen */
-  private static final Record UserRoleMapper = new GenericRecord(UserRole.class);
+  //private static final Record UserRoleMapper = new GenericRecord(UserRole.class);
   
   /* ----------- Benutzer -------------- */
   
   public User createUser(User user) throws ClassNotFoundException, InstantiationException, IllegalAccessException {
     String kw = user.getPw();
-    String digesterClassName = ctx.getInitParameter(P_DIGESTER);
+    String digesterClassName = getServletContext().getInitParameter(P_DIGESTER);
     Digester digester = (Digester) Class.forName(digesterClassName).newInstance();
     /*
       MD5 geht nicht mehr,
@@ -110,7 +115,7 @@
     */
     String digestedPw = digester.digest(kw, Digester.SHA256, null);
     user.setPw(digestedPw);
-    getDb().insert(user, UserMapper);
+    getDb().insert(user, getMapper(MP_USER));
     return user;
   }
   
@@ -123,11 +128,11 @@
     Connection c = pm.getConnection();
     pm.startTransaction(c);
     pm.execute(c, getSql(SQL_DELETE_USER_ROLES), user.getId());
-    User deletedUser = (User) pm.delete(c, user, UserMapper);
+    User deletedUser = (User) pm.delete(c, user, getMapper(MP_USER));
     pm.commit(c);
     return deletedUser;
   }
-    
+     
   public String logout() {
     getRequest().getSession().invalidate();
 		return "logged out";
@@ -136,12 +141,12 @@
   /* ------------ Rollen ------------------ */
   
   public UserRole grantRole(UserRole role) {
-    getDb().insert(role, UserRoleMapper);
+    getDb().insert(role, getMapper(MP_USER_ROLE));
     return role;
   }
   
   public UserRole revokeRole(UserRole role) {
-    getDb().delete(role, UserRoleMapper);
+    getDb().delete(role, getMapper(MP_USER_ROLE));
     return role;
   }
   
@@ -167,6 +172,7 @@
    * @param id Name des gewuenschten SQL-Kommandos
    * @return das SQL-Kommando mit der in id angegebenen Bezeichnung 
    */
+  /*
   private String getSql(String id) {
     Properties sql = (Properties) ctx.getAttribute(UserMgr.UM_SQL_PROPERTIES);
     return sql.getProperty(id);
@@ -176,8 +182,18 @@
     return (PersistenceManager) ctx.getAttribute(UM_DB);
   }
   
+  private Record getMapper(String mapperName) {
+    Record record = null;
+    Object o = getServletContext().getAttribute(mapperName);
+    if(o instanceof Record) {
+      record = (Record) o;
+    }
+    return record;
+  }
+  */
   /* ------------- Implementierung WebKontext ------------- */
 
+  /*
   @Override
   public ServletContext getServletContext() {
     return ctx;
@@ -187,9 +203,11 @@
   public void setServletContext(ServletContext servletContext) {
     this.ctx = servletContext;
   }
+  */
   
   /* ------------- Implementierung RequestKontext ------------- */
 
+  /*
   @Override
   public HttpServletRequest getRequest() {
     return request;
@@ -199,6 +217,6 @@
   public void setRequest(HttpServletRequest r) {
     this.request = r;
   }
-  
+  */
   
 }

--
Gitblit v1.9.3