From da889d489da5d7fa8c71d9f21f24b1dc2e29d8e1 Mon Sep 17 00:00:00 2001
From: rsanchez <rsanchez@curisit.net>
Date: Wed, 28 Jan 2015 08:53:21 +0000
Subject: [PATCH] #0 refactoring - Removing Google Guice by CDI standard
---
securis/src/main/java/net/curisit/securis/security/SecurityInterceptor.java | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/securis/src/main/java/net/curisit/securis/security/SecurityInterceptor.java b/securis/src/main/java/net/curisit/securis/security/SecurityInterceptor.java
index be14791..3c02ac0 100644
--- a/securis/src/main/java/net/curisit/securis/security/SecurityInterceptor.java
+++ b/securis/src/main/java/net/curisit/securis/security/SecurityInterceptor.java
@@ -31,27 +31,27 @@
import org.jboss.resteasy.spi.ResteasyProviderFactory;
@Provider
-// @PreMatching
@Priority(Priorities.AUTHENTICATION)
public class SecurityInterceptor implements javax.ws.rs.container.ContainerRequestFilter {
private static final Logger LOG = LogManager.getLogger(SecurityInterceptor.class);
-
- @Inject
- private TokenHelper tokenHelper;
@Context
private HttpServletRequest servletRequest;
@Inject
- CacheTTL cache;
-
- @Context
- Dispatcher dispatcher;
+ private CacheTTL cache;
@Inject
- com.google.inject.Provider<EntityManager> emProvider;
+ private TokenHelper tokenHelper;
+
+ @Context
+ private Dispatcher dispatcher;
+
+ @Inject
+ private EntityManager em;
public void filter(ContainerRequestContext containerRequestContext) throws IOException {
+
ResourceMethodInvoker methodInvoker = (ResourceMethodInvoker) containerRequestContext
.getProperty("org.jboss.resteasy.core.ResourceMethodInvoker");
Method method = methodInvoker.getMethod();
@@ -76,6 +76,7 @@
containerRequestContext.setSecurityContext(scw);
// Next line provide injection in resource methods
ResteasyProviderFactory.pushContext(BasicSecurityContext.class, scw);
+ ResteasyProviderFactory.pushContext(EntityManager.class, em);
LOG.debug("Added custom SecurityContext for user {}, orgs: {}", username, orgs);
}
}
@@ -85,7 +86,6 @@
Set<Integer> userOrgs = cache.get("orgs_" + username, Set.class);
if (userOrgs == null) {
// Theorically this shouldn't be never null, but just in case...
- EntityManager em = emProvider.get();
User user = em.find(User.class, username);
if (user != null) {
userOrgs = user.getAllOrgsIds();
@@ -103,7 +103,6 @@
}
Integer userRoles = cache.get("roles_" + username, Integer.class);
if (userRoles == null) {
- EntityManager em = emProvider.get();
User user = em.find(User.class, username);
if (user != null) {
userRoles = 0;
--
Gitblit v1.3.2