Use beanManager.isNormalScope() instead of beanManager.getServices().…

…get(MetaAnnotationStore.class).getScopeModel(bean.getScope()).isNormal()
weld · Aug 5, 2013 · 8c7810b · 8c7810b
1 parent 835d159
commit 8c7810b
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 11 deletions.
diff --git a/impl/src/main/java/org/jboss/weld/bean/AbstractBean.java b/impl/src/main/java/org/jboss/weld/bean/AbstractBean.java
@@ -202,10 +202,6 @@ public boolean isDependent() {
         return Dependent.class.equals(getScope());
     }
 
-    public boolean isNormalScoped() {
-        return getBeanManager().getServices().get(MetaAnnotationStore.class).getScopeModel(getScope()).isNormal();
-    }
-
     public boolean isSpecializing() {
         return getAnnotated().isAnnotationPresent(Specializes.class);
     }

diff --git a/impl/src/main/java/org/jboss/weld/bean/RIBean.java b/impl/src/main/java/org/jboss/weld/bean/RIBean.java
@@ -89,6 +89,10 @@ public boolean isDependent() {
         return getScope().equals(Dependent.class);
     }
 
+    public boolean isNormalScoped() {
+        return getBeanManager().isNormalScope(getScope());
+    }
+
     public abstract boolean isProxyable();
 
     public abstract boolean isPassivationCapableBean();

diff --git a/impl/src/main/java/org/jboss/weld/bean/builtin/AbstractBuiltInBean.java b/impl/src/main/java/org/jboss/weld/bean/builtin/AbstractBuiltInBean.java
@@ -54,11 +54,7 @@ public void preInitialize() {
 
     @Override
     public void internalInitialize(BeanDeployerEnvironment environment) {
-        if (getScope() != null) {
-            proxyRequired = getBeanManager().getServices().get(MetaAnnotationStore.class).getScopeModel(getScope()).isNormal();
-        } else {
-            proxyRequired = false;
-        }
+        proxyRequired = getScope() != null && isNormalScoped();
     }
 
     @Override

diff --git a/impl/src/main/java/org/jboss/weld/bootstrap/Validator.java b/impl/src/main/java/org/jboss/weld/bootstrap/Validator.java
@@ -965,7 +965,7 @@ private static void validatePseudoScopedInjectionPoint(InjectionPoint ij, BeanMa
         if (bean != null) {
             if (!(bean instanceof AbstractBuiltInBean<?>)) {
                 if (!ij.isDelegate()) {
-                    boolean normalScoped = beanManager.getServices().get(MetaAnnotationStore.class).getScopeModel(bean.getScope()).isNormal();
+                    boolean normalScoped = beanManager.isNormalScope(bean.getScope());
                     if (!normalScoped) {
                         reallyValidatePseudoScopedBean(bean, beanManager, dependencyPath, validatedBeans);
                     }

diff --git a/impl/src/main/java/org/jboss/weld/manager/BeanManagerImpl.java b/impl/src/main/java/org/jboss/weld/manager/BeanManagerImpl.java
@@ -988,7 +988,7 @@ public BeanManagerImpl createActivity() {
     }
 
     public BeanManagerImpl setCurrent(Class<? extends Annotation> scopeType) {
-        if (!getServices().get(MetaAnnotationStore.class).getScopeModel(scopeType).isNormal()) {
+        if (!isNormalScope(scopeType)) {
             throw new IllegalArgumentException(NON_NORMAL_SCOPE, scopeType);
         }
         currentActivities.add(new CurrentActivity(getContext(scopeType), this));