refactoring
Change-Id: I631ff6bfc2884287a8e629196b3810086bbd21cf
diff --git a/src/main/java/de/ids_mannheim/korap/security/ac/ConditionManagement.java b/src/main/java/de/ids_mannheim/korap/security/ac/ConditionManagement.java
index d0db4fa..bda8260 100644
--- a/src/main/java/de/ids_mannheim/korap/security/ac/ConditionManagement.java
+++ b/src/main/java/de/ids_mannheim/korap/security/ac/ConditionManagement.java
@@ -1,6 +1,6 @@
package de.ids_mannheim.korap.security.ac;
-import de.ids_mannheim.korap.config.BeanConfiguration;
+import de.ids_mannheim.korap.config.BeansFactory;
import de.ids_mannheim.korap.exceptions.EmptyResultException;
import de.ids_mannheim.korap.exceptions.KustvaktException;
import de.ids_mannheim.korap.exceptions.NotAuthorizedException;
@@ -28,7 +28,8 @@
public ConditionManagement (User user) {
this.user = user;
- this.policydao = BeanConfiguration.getBeans().getPolicyDbProvider();
+ this.policydao = BeansFactory.getKustvaktContext()
+ .getPolicyDbProvider();
}
diff --git a/src/main/java/de/ids_mannheim/korap/security/ac/SecurityManager.java b/src/main/java/de/ids_mannheim/korap/security/ac/SecurityManager.java
index 059d33b..0fc0863 100644
--- a/src/main/java/de/ids_mannheim/korap/security/ac/SecurityManager.java
+++ b/src/main/java/de/ids_mannheim/korap/security/ac/SecurityManager.java
@@ -58,13 +58,11 @@
this.policies[0] = new ArrayList<>();
this.silent = true;
this.user = user;
- overrideProviders(null);
+ overrideProviders(BeansFactory.getKustvaktContext());
}
public static void overrideProviders (ContextHolder beans) {
- if (beans == null)
- beans = BeansFactory.getKustvaktContext();
if (policydao == null | crypto == null) {
SecurityManager.policydao = beans.getPolicyDbProvider();
SecurityManager.crypto = beans.getEncryption();
diff --git a/src/main/java/de/ids_mannheim/korap/security/auth/KustvaktAuthenticationManager.java b/src/main/java/de/ids_mannheim/korap/security/auth/KustvaktAuthenticationManager.java
index 918650a..8decf1d 100644
--- a/src/main/java/de/ids_mannheim/korap/security/auth/KustvaktAuthenticationManager.java
+++ b/src/main/java/de/ids_mannheim/korap/security/auth/KustvaktAuthenticationManager.java
@@ -761,7 +761,7 @@
return data;
}
catch (KustvaktException e) {
- jlog.error("Error during user data retrieval!", e.getEntity());
+ jlog.error("Error during user data retrieval: {}", e.getEntity());
throw new WrappedException(e, StatusCodes.GET_ACCOUNT_FAILED);
}
}