First parts of the new MOA-ID configuration module

1 files changed, 19 insertions, 3 deletions

diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/DatabaseConfigPropertyImpl.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/DatabaseConfigPropertyImpl.java
index 8e845478b..00c191228 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/DatabaseConfigPropertyImpl.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/DatabaseConfigPropertyImpl.java
@@ -100,7 +100,10 @@ public class DatabaseConfigPropertyImpl extends AbstractConfigurationImpl {
 	
 	protected void deleteKey(String key) {
 		log.debug("Deleting entry with key '{}'.", key);
-		em.remove(em.find(ConfigProperty.class, key));
+		ConfigProperty el = em.find(ConfigProperty.class, key);
+		if (el != null)
+			em.remove(el);
+			
 	}
 	
 	/* (non-Javadoc)
@@ -117,7 +120,10 @@ public class DatabaseConfigPropertyImpl extends AbstractConfigurationImpl {
 		TypedQuery<String> query = em.createQuery("select key from ConfigProperty dbconfig where dbconfig.key like :key", String.class);
 		query.setParameter("key", searchString.replace("*", "%"));
 		List<String> result = query.getResultList();
-		return result.toArray(new String[result.size()]);
+		if (result == null)
+			return null;
+		else
+			return result.toArray(new String[result.size()]);
 	}
 
 	/* (non-Javadoc)
@@ -166,7 +172,17 @@ public class DatabaseConfigPropertyImpl extends AbstractConfigurationImpl {
 		return result;
 	}
 
-	
+	/* (non-Javadoc)
+	 * @see at.gv.egiz.components.configuration.api.AbstractConfigurationImpl#deleteIds(java.lang.String)
+	 */
+	@Override
+	public void deleteIds(String idSearch) throws ConfigurationException {
+		String[] keyList = findConfigurationId(idSearch);
+		for (String el : keyList) {
+			deleteKey(el);
+			
+		}
+	}
 	
 //	@Override
 //	public String getPropertyValue(String key) {