implement advanced statistic logger

1 files changed, 3 insertions, 9 deletions

diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/ConfigurationDBRead.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/ConfigurationDBRead.java
index d281eebbc..47136d162 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/ConfigurationDBRead.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/ConfigurationDBRead.java
@@ -15,6 +15,7 @@ import at.gv.egovernment.moa.id.commons.db.dao.config.UserDatabase;
 import at.gv.egovernment.moa.logging.Logger;
 import at.gv.egovernment.moa.util.MiscUtil;
 
+@SuppressWarnings("rawtypes")
 public class ConfigurationDBRead {
 
       private static Map<String, String> QUERIES = new HashMap<String, String>();    	
@@ -36,20 +37,16 @@ public class ConfigurationDBRead {
     	  QUERIES.put("getUsersWithOADBID", "select userdatabase from UserDatabase userdatabase inner join userdatabase.onlineApplication oa where oa.hjid = :id");
     	  QUERIES.put("searchOnlineApplicationsWithID", "select onlineapplication from OnlineApplication onlineapplication where onlineapplication.friendlyName like :id");      }
       
-	  @SuppressWarnings("rawtypes")
 	  public static OnlineApplication getActiveOnlineApplication(String id) {
 	  	MiscUtil.assertNotNull(id, "OnlineApplictionID");
 		Logger.trace("Getting OnlineApplication with ID " + id + " from database.");
-	
-		//TODO: check!!!
-		id = StringEscapeUtils.escapeHtml(id);
 		
 		List result;
   		EntityManager session = ConfigurationDBUtils.getCurrentSession();
 	  	
   		javax.persistence.Query query = session.createQuery(QUERIES.get("getActiveOnlineApplicationWithID"));  	
   		//query.setParameter("id", id+"%");
-  		query.setParameter("id", id);
+  		query.setParameter("id", StringEscapeUtils.escapeHtml(id));
   		result = query.getResultList();
   	
   		Logger.trace("Found entries: " + result.size());
@@ -62,8 +59,6 @@ public class ConfigurationDBRead {
   		return (OnlineApplication) result.get(0);
 	  }
 	
-	  
-	  @SuppressWarnings("rawtypes")
 	  public static OnlineApplication getOnlineApplication(String id) {
 	  	MiscUtil.assertNotNull(id, "OnlineApplictionID");
 		Logger.trace("Getting OnlineApplication with ID " + id + " from database.");
@@ -86,7 +81,6 @@ public class ConfigurationDBRead {
   		return (OnlineApplication) result.get(0);
 	  }
 	  
-	  @SuppressWarnings("rawtypes")
 	  public static OnlineApplication getOnlineApplication(long dbid) {
 	  	MiscUtil.assertNotNull(dbid, "OnlineApplictionID");
 		Logger.trace("Getting OnlineApplication with DBID " + dbid + " from database.");
@@ -112,7 +106,7 @@ public class ConfigurationDBRead {
 	  public static MOAIDConfiguration getMOAIDConfiguration() {
 		  Logger.trace("Load MOAID Configuration from database.");
 			
-			List result;
+			List<MOAIDConfiguration> result;
 		  	EntityManager session = ConfigurationDBUtils.getCurrentSession();
 		
 		  	javax.persistence.Query query = session.createQuery(QUERIES.get("getMOAIDConfiguration"));