You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by gp...@apache.org on 2012/08/08 09:36:43 UTC
git commit: DELTASPIKE-261 moved BeanManager injection
Updated Branches:
refs/heads/master f12ab0fe2 -> b9534c33d
DELTASPIKE-261 moved BeanManager injection
Project: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/commit/b9534c33
Tree: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/tree/b9534c33
Diff: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/diff/b9534c33
Branch: refs/heads/master
Commit: b9534c33dbc28409e0eab7546d391e3130f81273
Parents: f12ab0f
Author: gpetracek <gp...@apache.org>
Authored: Mon Aug 6 23:16:30 2012 +0200
Committer: gpetracek <gp...@apache.org>
Committed: Wed Aug 8 09:26:27 2012 +0200
----------------------------------------------------------------------
.../security/impl/extension/Authorizer.java | 11 ++++-------
.../impl/extension/DefaultSecurityStrategy.java | 7 ++++++-
.../security/impl/extension/SecurityExtension.java | 2 +-
3 files changed, 11 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/b9534c33/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/extension/Authorizer.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/extension/Authorizer.java b/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/extension/Authorizer.java
index deda773..104c8a8 100644
--- a/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/extension/Authorizer.java
+++ b/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/extension/Authorizer.java
@@ -49,8 +49,6 @@ import org.apache.deltaspike.security.impl.util.SecurityUtils;
@Typed()
class Authorizer
{
- private BeanManager beanManager;
-
private Annotation bindingAnnotation;
private Map<Method, Object> bindingSecurityBindingMembers = new HashMap<Method, Object>();
@@ -59,11 +57,10 @@ class Authorizer
private InjectableMethod<?> boundAuthorizerMethodProxy;
- Authorizer(Annotation bindingAnnotation, AnnotatedMethod<?> boundAuthorizerMethod, BeanManager beanManager)
+ Authorizer(Annotation bindingAnnotation, AnnotatedMethod<?> boundAuthorizerMethod)
{
this.bindingAnnotation = bindingAnnotation;
this.boundAuthorizerMethod = boundAuthorizerMethod;
- this.beanManager = beanManager;
try
{
@@ -86,11 +83,11 @@ class Authorizer
}
}
- void authorize(final InvocationContext ic)
+ void authorize(final InvocationContext ic, BeanManager beanManager)
{
if (boundAuthorizerBean == null)
{
- lazyInitTargetBean();
+ lazyInitTargetBean(beanManager);
}
final CreationalContext<?> creationalContext = beanManager.createCreationalContext(boundAuthorizerBean);
@@ -120,7 +117,7 @@ class Authorizer
}
@SuppressWarnings({ "unchecked", "rawtypes" })
- private synchronized void lazyInitTargetBean()
+ private synchronized void lazyInitTargetBean(BeanManager beanManager)
{
if (boundAuthorizerBean == null)
{
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/b9534c33/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/extension/DefaultSecurityStrategy.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/extension/DefaultSecurityStrategy.java b/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/extension/DefaultSecurityStrategy.java
index d035c07..bbb3a49 100644
--- a/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/extension/DefaultSecurityStrategy.java
+++ b/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/extension/DefaultSecurityStrategy.java
@@ -21,6 +21,8 @@ package org.apache.deltaspike.security.impl.extension;
import org.apache.deltaspike.security.spi.authorization.SecurityStrategy;
import javax.enterprise.context.Dependent;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.inject.Inject;
import javax.interceptor.InvocationContext;
import java.lang.reflect.Method;
@@ -33,6 +35,9 @@ public class DefaultSecurityStrategy implements SecurityStrategy
{
private static final long serialVersionUID = 7992336651801599079L;
+ @Inject
+ private BeanManager beanManager;
+
/**
* {@inheritDoc}
*/
@@ -45,7 +50,7 @@ public class DefaultSecurityStrategy implements SecurityStrategy
for (Authorizer authorizer : metaDataStorage.getAuthorizers(invocationContext.getTarget().getClass(), method))
{
- authorizer.authorize(invocationContext);
+ authorizer.authorize(invocationContext, this.beanManager);
}
return invocationContext.proceed();
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/b9534c33/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/extension/SecurityExtension.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/extension/SecurityExtension.java b/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/extension/SecurityExtension.java
index 82e10de..576d896 100644
--- a/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/extension/SecurityExtension.java
+++ b/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/extension/SecurityExtension.java
@@ -246,7 +246,7 @@ public class SecurityExtension implements Extension, Deactivatable
}
}
- Authorizer authorizer = new Authorizer(binding, annotatedMethod, beanManager);
+ Authorizer authorizer = new Authorizer(binding, annotatedMethod);
getMetaDataStorage().addAuthorizer(authorizer);
}
}