You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by st...@apache.org on 2012/08/08 10:17:46 UTC
[1/2] git commit: DELTASPIKE-261 fix handling for Alternative beans.
Updated Branches:
refs/heads/master b9534c33d -> ec93c4cde
DELTASPIKE-261 fix handling for Alternative beans.
Project: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/commit/ec93c4cd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/tree/ec93c4cd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/diff/ec93c4cd
Branch: refs/heads/master
Commit: ec93c4cde78f2d73f756e2ba050dc965af675ccb
Parents: 3646c59
Author: Mark Struberg <st...@apache.org>
Authored: Wed Aug 8 10:12:04 2012 +0200
Committer: Mark Struberg <st...@apache.org>
Committed: Wed Aug 8 10:12:04 2012 +0200
----------------------------------------------------------------------
.../security/impl/extension/Authorizer.java | 14 +++-----------
.../security/impl/extension/SecurityExtension.java | 4 ++--
2 files changed, 5 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/ec93c4cd/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 104c8a8..02911a1 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
@@ -124,22 +124,14 @@ class Authorizer
Method method = boundAuthorizerMethod.getJavaMember();
Set<Bean<?>> beans = beanManager.getBeans(method.getDeclaringClass());
- if (beans.size() == 1)
- {
- boundAuthorizerBean = beans.iterator().next();
- }
- else if (beans.isEmpty())
+ boundAuthorizerBean = beanManager.resolve(beans);
+
+ if (boundAuthorizerBean == null)
{
throw new IllegalStateException("Exception looking up authorizer method bean - " +
"no beans found for method [" + method.getDeclaringClass() + "." +
method.getName() + "]");
}
- else if (beans.size() > 1)
- {
- throw new IllegalStateException("Exception looking up authorizer method bean - " +
- "multiple beans found for method [" + method.getDeclaringClass().getName() + "." +
- method.getName() + "]");
- }
boundAuthorizerMethodProxy = new InjectableMethod(boundAuthorizerMethod, boundAuthorizerBean, beanManager);
}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/ec93c4cd/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 576d896..5646232 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
@@ -118,7 +118,7 @@ public class SecurityExtension implements Extension, Deactivatable
{
if (m.isAnnotationPresent(Secures.class))
{
- registerAuthorizer(m, beanManager);
+ registerAuthorizer(m);
continue;
}
@@ -219,7 +219,7 @@ public class SecurityExtension implements Extension, Deactivatable
*
* @throws SecurityDefinitionException
*/
- private void registerAuthorizer(AnnotatedMethod<?> annotatedMethod, BeanManager beanManager)
+ private void registerAuthorizer(AnnotatedMethod<?> annotatedMethod)
{
if (!annotatedMethod.getJavaMember().getReturnType().equals(Boolean.class) &&
!annotatedMethod.getJavaMember().getReturnType().equals(Boolean.TYPE))