From eefd252e24fd8cdea9fbf6becb605a679e8b2f18 Mon Sep 17 00:00:00 2001
From: ulrich@undisclosed
Date: Fri, 15 May 2020 12:48:26 +0000
Subject: [PATCH] Code aufgeraeumt

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

diff --git a/src/java/de/uhilger/um/api/UserMgr.java b/src/java/de/uhilger/um/api/UserMgr.java
index 3f06be7..864587f 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  
@@ -63,11 +55,6 @@
   
   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";
 
@@ -96,31 +83,24 @@
   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);
-  /** 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);
-  
   /* ----------- Benutzer -------------- */
   
-  public User createUser(User user) throws ClassNotFoundException, InstantiationException, IllegalAccessException {
+  public User createUser(User user) throws ClassNotFoundException, InstantiationException, IllegalAccessException {      
     String kw = user.getPw();
     String digesterClassName = getServletContext().getInitParameter(P_DIGESTER);
     Digester digester = (Digester) Class.forName(digesterClassName).newInstance();
-    /*
-      MD5 geht nicht mehr,
-      vgl. http://stackoverflow.com/questions/39967289/how-to-use-digest-authentication-in-tomcat-8-5
-    */
     String digestedPw = digester.digest(kw, Digester.SHA256, null);
-    user.setPw(digestedPw);
+    user.setPw(digestedPw);    
     getDb().insert(user, getMapper(MP_USER));
     return user;
   }
   
   public List getUserNameList() {
     return removeHeadline(getDb().select(getSql(SQL_GET_USER_NAME_LIST), WITHOUT_BLOBS));
+  }
+  
+  public List getUserList() {
+    return getDb().select(getSql(SQL_GET_USER_LIST), getMapper(MP_USER), WITHOUT_BLOBS);
   }
   
   public User deleteUser(User user) {
@@ -167,56 +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);
-  }
-  
-  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;
-  }
-
-  @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