From e28ac168910783e457f92f7c935a8049c770a499 Mon Sep 17 00:00:00 2001
From: ulrich <not disclosed>
Date: Sat, 11 Feb 2017 13:45:07 +0000
Subject: [PATCH] Lizenzhinweis hinzugefuegt wo er noch fehlte

---
 src/java/de/uhilger/um/api/UserMgr.java |   80 ++++++---------------------------------
 1 files changed, 13 insertions(+), 67 deletions(-)

diff --git a/src/java/de/uhilger/um/api/UserMgr.java b/src/java/de/uhilger/um/api/UserMgr.java
index f32072a..3b26615 100644
--- a/src/java/de/uhilger/um/api/UserMgr.java
+++ b/src/java/de/uhilger/um/api/UserMgr.java
@@ -1,6 +1,6 @@
 /*
  *  Nutzerverwaltung - User and role management in your browser
- *  Copyright (C) 2011-2016 Ulrich Hilger, http://uhilger.de
+ *  Copyright (C) 2011-2017 Ulrich Hilger, http://uhilger.de
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -18,21 +18,13 @@
 
 package de.uhilger.um.api;
 
-import de.uhilger.baselink.GenericRecord;
 import de.uhilger.baselink.PersistenceManager;
-import de.uhilger.baselink.Record;
-import de.uhilger.transit.web.RequestKontext;
-import de.uhilger.transit.web.WebKontext;
 import de.uhilger.um.Digester;
 import de.uhilger.um.daten.User;
-import de.uhilger.um.daten.UserData;
 import de.uhilger.um.daten.UserRole;
 import java.sql.Connection;
 import java.util.List;
-import java.util.Properties;
 import java.util.logging.Logger;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
 
 /**
  * <p>Die Methoden der Klasse UserMgr sind  
@@ -59,14 +51,9 @@
  *
  * @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 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 +77,17 @@
   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";
   
-  /** Mapper-Objekt fuer Benutzer */
-  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);
+  public static final String MP_USER = "userMapper";
+  public static final String MP_USER_DATA = "userDataMapper";
+  public static final String MP_USER_ROLE = "userRoleMapper";
   
   /* ----------- 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 +95,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 +108,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 +121,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;
   }
   
@@ -162,43 +147,4 @@
     return list;
   }
   
-  /**
-   * Ein benanntes SQL-Kommando ermitteln 
-   * @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);
-  }
-  
-  private PersistenceManager getDb() {
-    return (PersistenceManager) ctx.getAttribute(UM_DB);
-  }
-  
-  /* ------------- Implementierung WebKontext ------------- */
-
-  @Override
-  public ServletContext getServletContext() {
-    return ctx;
-  }
-
-  @Override
-  public void setServletContext(ServletContext servletContext) {
-    this.ctx = servletContext;
-  }
-  
-  /* ------------- Implementierung RequestKontext ------------- */
-
-  @Override
-  public HttpServletRequest getRequest() {
-    return request;
-  }
-
-  @Override
-  public void setRequest(HttpServletRequest r) {
-    this.request = r;
-  }
-  
-  
-}
+}
\ No newline at end of file

--
Gitblit v1.9.3