From 627850aeb788606f3c4a5ee5f59784b7a0ee5fc3 Mon Sep 17 00:00:00 2001
From: ulrich <not disclosed>
Date: Tue, 27 Dec 2016 14:14:01 +0000
Subject: [PATCH] Kommentare zu Java-Klassen hinzugefuegt (in Arbeit)
---
src/java/de/uhilger/um/api/UserMgr.java | 59 +++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 39 insertions(+), 20 deletions(-)
diff --git a/src/java/de/uhilger/um/api/UserMgr.java b/src/java/de/uhilger/um/api/UserMgr.java
index 399a461..58dd5ab 100644
--- a/src/java/de/uhilger/um/api/UserMgr.java
+++ b/src/java/de/uhilger/um/api/UserMgr.java
@@ -1,14 +1,20 @@
package de.uhilger.um.api;
import de.uhilger.baselink.GenericRecord;
+import de.uhilger.baselink.PersistenceManager;
import de.uhilger.baselink.Record;
import de.uhilger.um.App;
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;
/**
- * Klasse zur Verwaltung von Benutzern in einer Datenbank
+ * Klasse zur Verwaltung von Benutzern und Rollen
+ * in einer Datenbank
+ *
+ * Das SQL findet sich in WEB-INF/sql.properties
*
* @author Ulrich Hilger
*/
@@ -17,10 +23,14 @@
private static final String MD5 = "MD5";
private static final Record UserMapper = new GenericRecord(User.class);
+ private static final Record UserRoleMapper = new GenericRecord(UserRole.class);
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";
+ public static final String SQL_GET_USER_ROLES = "getUserRoles";
public static final String SQL_DELETE_USER = "deleteUser";
+ public static final String SQL_DELETE_USER_ROLES = "deleteUserRoles";
/* ----------- Benutzer -------------- */
@@ -39,35 +49,44 @@
}
public User deleteUser(User user) {
- return (User) App.getDatabase().delete(user, UserMapper);
+ PersistenceManager pm = App.getDatabase();
+ Connection c = pm.getConnection();
+ pm.startTransaction(c);
+ String sql = App.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 String grantRole(String userId, String roleName) {
- return "not implemented";
+ public UserRole grantRole(String userId, String roleName) {
+ UserRole ur = new UserRole();
+ ur.setRole(roleName);
+ ur.setUser(userId);
+ App.getDatabase().insert(ur, UserRoleMapper);
+ return ur;
}
- public String revokeRole(String userId, String roleName) {
- return "not implemented";
+ public UserRole revokeRole(String userId, String roleName) {
+ UserRole ur = new UserRole();
+ ur.setRole(roleName);
+ ur.setUser(userId);
+ App.getDatabase().delete(ur, UserRoleMapper);
+ return ur;
}
public List getRoleNamesGranted() {
- return null;
+ String sql = App.getSqlStatement(SQL_GET_ROLE_LIST);
+ List roleNames = App.getDatabase().select(sql, App.WITHOUT_BLOBS);
+ return roleNames;
}
- /* ------------ sonstige Methoden -------------- */
-
- public String hallo() {
- return "Hallo Welt";
+ 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;
}
}
--
Gitblit v1.9.3