From 1fc020b8ce526f562badb1a18318c10e00d54cdf Mon Sep 17 00:00:00 2001 From: ulrich <not disclosed> Date: Tue, 27 Dec 2016 17:32:39 +0000 Subject: [PATCH] Verlagerung statischer Elemente in den ServletContext (in Arbeit) --- src/java/de/uhilger/um/api/UserMgr.java | 123 ++++++++++++++++++++++++++++------------ 1 files changed, 86 insertions(+), 37 deletions(-) diff --git a/src/java/de/uhilger/um/api/UserMgr.java b/src/java/de/uhilger/um/api/UserMgr.java index 1c14853..6b1a321 100644 --- a/src/java/de/uhilger/um/api/UserMgr.java +++ b/src/java/de/uhilger/um/api/UserMgr.java @@ -1,27 +1,74 @@ +/* + Nutzerverwaltung - A Generic User Manager + Copyright (c) 2016 Ulrich Hilger + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + */ 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.WebKontext; import de.uhilger.um.App; +import de.uhilger.um.Digester; import de.uhilger.um.daten.User; import de.uhilger.um.daten.UserRole; import java.sql.Connection; import java.util.List; -import org.apache.catalina.realm.RealmBase; +import java.util.Properties; +import javax.servlet.ServletContext; /** - * Klasse zur Verwaltung von Benutzern und Rollen - * in einer Datenbank + * <p>Die Methoden der Klasse UserMgr sind + * die 'Fassade', die über Transit als Programmschnittstelle + * (Application Programming Interface, API) + * nach außen bereitgestellt wird. UserMgr dient weitgehend + * als 'Durchreiche' für die Funktionalität anderer Klassen.</p> * - * @author Ulrich Hilger + * <p> + * Der UserMgr erhält die benötigten Methoden aus dem ServletContext. + * Auf diese Weise sind keine statischen Abhängigkeiten in den Code + * gewandert. Die folgenden Elemente werden vom UserMgr im ServletContext + * erwartet: + * + * [noch auspraegen] + * + * PersistenceManager + * SQL-Properties + * Digester + * </p> + * + * @author Copyright (c) Ulrich Hilger, http://uhilger.de + * @author Published under the terms and conditions of the + * <a href="http://www.gnu.org/licenses/agpl-3.0" target="_blank">GNU Affero + * General Public License</a> + * + * @version 2, December 27, 2016 */ -public class UserMgr { +public class UserMgr implements WebKontext { - private static final String MD5 = "MD5"; + private ServletContext ctx; private static final Record UserMapper = new GenericRecord(User.class); private static final Record UserRoleMapper = new GenericRecord(UserRole.class); + + /** Name, unter dem das Properties-Objekt mit den SQL-Befehlen im ServletContext hinterlegt ist */ + public static final String UM_SQL_PROPERTIES = "umSqlProperties"; + + /** Name, unter dem das Zugriffsobjekt zur Datenbank im ServletContext hinterlegt ist */ + public static final String UM_DB = "umDb"; public static final String SQL_GET_USER_LIST = "getUserList"; public static final String SQL_GET_USER_NAME_LIST = "getUserNameList"; @@ -34,37 +81,28 @@ public User createUser(User user) { String kw = user.getPw(); - String digestedPw = RealmBase.Digest(kw, MD5, null); + String digestedPw = App.getDigester().digest(kw, Digester.MD5, null); user.setPw(digestedPw); App.getDatabase().insert(user, UserMapper); return user; } public List getUserNameList() { - String sql = App.getSqlStatement(SQL_GET_USER_NAME_LIST); - List userNames = App.getDatabase().select(sql, App.WITHOUT_BLOBS); - return userNames; + String sql = getSqlStatement(SQL_GET_USER_NAME_LIST); + return App.getDatabase().select(sql, App.WITHOUT_BLOBS); } public User deleteUser(User user) { PersistenceManager pm = App.getDatabase(); Connection c = pm.getConnection(); pm.startTransaction(c); - String sql = App.getSqlStatement(SQL_DELETE_USER_ROLES); + String sql = getSqlStatement(SQL_DELETE_USER_ROLES); pm.execute(c, sql, user.getId()); User deletedUser = (User) pm.delete(c, user, UserMapper); pm.commit(c); return deletedUser; } - - /* - public List getUserList() { - String sql = App.getSqlStatement(SQL_GET_USER_LIST); - List users = App.getDatabase().select(sql, UserMapper, App.WITHOUT_BLOBS); - return users; - } - */ - + /* ------------ Rollen ------------------ */ public UserRole grantRole(String userId, String roleName) { @@ -84,29 +122,40 @@ } public List getRoleNamesGranted() { - String sql = App.getSqlStatement(SQL_GET_ROLE_LIST); - List roleNames = App.getDatabase().select(sql, App.WITHOUT_BLOBS); - return roleNames; + String sql = getSqlStatement(SQL_GET_ROLE_LIST); + return App.getDatabase().select(sql, App.WITHOUT_BLOBS); } + + public List getUserRoleNames(String userId) { + String sql = getSqlStatement(SQL_GET_USER_ROLES); + return App.getDatabase().select(sql, App.WITHOUT_BLOBS, userId); + } + + + /* ----------- Helfer ---- */ + /** - * - * - * list.get(recordno).get(fieldno) - * - * @param userId ID des Benutzers - * @return List<List<String>> Rollennamen des Benutzers + * Ein benanntes SQL-Kommando ermitteln + * @param id Name des gewuenschten SQL-Kommandos + * @return das SQL-Kommando mit der in id angegebenen Bezeichnung */ - public List getUserRoleNames(String userId) { - String sql = App.getSqlStatement(SQL_GET_USER_ROLES); - List roleNames = App.getDatabase().select(sql, App.WITHOUT_BLOBS, userId); - return roleNames; + private String getSqlStatement(String id) { + Properties sql = (Properties) ctx.getAttribute(UserMgr.UM_SQL_PROPERTIES); + return sql.getProperty(id); } - /* ------------ sonstige Methoden -------------- */ - - public String hallo() { - return "Hallo Welt"; + /* ------------- Implementierung WebKontext ------------- */ + + @Override + public ServletContext getServletContext() { + return ctx; } + + @Override + public void setServletContext(ServletContext servletContext) { + this.ctx = servletContext; + } + } -- Gitblit v1.9.3