Polish code

Author: mercyblitz

projects/stage-1/middleware-frameworks/my-cdi/src/main/java/org/geektimes/enterprise/inject/se/StandardContainer.java

@@ -16,8 +16,8 @@
  */
 package org.geektimes.enterprise.inject.se;
 
-import org.geektimes.enterprise.inject.standard.beans.BeanArchiveManager;
-import org.geektimes.enterprise.inject.standard.beans.StandardBeanManager;
+import org.geektimes.enterprise.inject.standard.beans.manager.BeanArchiveManager;
+import org.geektimes.enterprise.inject.standard.beans.manager.StandardBeanManager;
 
 import javax.enterprise.inject.Instance;
 import javax.enterprise.inject.se.SeContainer;

projects/stage-1/middleware-frameworks/my-cdi/src/main/java/org/geektimes/enterprise/inject/standard/AbstractAnnotatedTypeBean.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.geektimes.enterprise.inject.standard;
+package org.geektimes.enterprise.inject.standard.annotation;
 
 import org.geektimes.commons.collection.util.CollectionUtils;
 

projects/stage-1/middleware-frameworks/my-cdi/src/main/java/org/geektimes/enterprise/inject/standard/ReflectiveAnnotated.java projects/stage-1/middleware-frameworks/my-cdi/src/main/java/org/geektimes/enterprise/inject/standard/annotation/ReflectiveAnnotated.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.geektimes.enterprise.inject.standard;
+package org.geektimes.enterprise.inject.standard.annotation;
 
 import javax.enterprise.inject.spi.AnnotatedCallable;
 import javax.enterprise.inject.spi.AnnotatedParameter;

projects/stage-1/middleware-frameworks/my-cdi/src/main/java/org/geektimes/enterprise/inject/standard/ReflectiveAnnotatedCallable.java projects/stage-1/middleware-frameworks/my-cdi/src/main/java/org/geektimes/enterprise/inject/standard/annotation/ReflectiveAnnotatedCallable.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.geektimes.enterprise.inject.standard;
+package org.geektimes.enterprise.inject.standard.annotation;
 
 import javax.enterprise.inject.spi.AnnotatedConstructor;
 import javax.enterprise.inject.spi.AnnotatedType;

projects/stage-1/middleware-frameworks/my-cdi/src/main/java/org/geektimes/enterprise/inject/standard/ReflectiveAnnotatedConstructor.java projects/stage-1/middleware-frameworks/my-cdi/src/main/java/org/geektimes/enterprise/inject/standard/annotation/ReflectiveAnnotatedConstructor.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.geektimes.enterprise.inject.standard;
+package org.geektimes.enterprise.inject.standard.annotation;
 
 import javax.enterprise.inject.spi.AnnotatedField;
 import javax.enterprise.inject.spi.AnnotatedType;

projects/stage-1/middleware-frameworks/my-cdi/src/main/java/org/geektimes/enterprise/inject/standard/ReflectiveAnnotatedField.java projects/stage-1/middleware-frameworks/my-cdi/src/main/java/org/geektimes/enterprise/inject/standard/annotation/ReflectiveAnnotatedField.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.geektimes.enterprise.inject.standard;
+package org.geektimes.enterprise.inject.standard.annotation;
 
 import javax.enterprise.inject.spi.AnnotatedMember;
 import javax.enterprise.inject.spi.AnnotatedType;

projects/stage-1/middleware-frameworks/my-cdi/src/main/java/org/geektimes/enterprise/inject/standard/ReflectiveAnnotatedMember.java projects/stage-1/middleware-frameworks/my-cdi/src/main/java/org/geektimes/enterprise/inject/standard/annotation/ReflectiveAnnotatedMember.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.geektimes.enterprise.inject.standard;
+package org.geektimes.enterprise.inject.standard.annotation;
 
 import javax.enterprise.inject.spi.AnnotatedMethod;
 import javax.enterprise.inject.spi.AnnotatedType;

projects/stage-1/middleware-frameworks/my-cdi/src/main/java/org/geektimes/enterprise/inject/standard/ReflectiveAnnotatedMethod.java projects/stage-1/middleware-frameworks/my-cdi/src/main/java/org/geektimes/enterprise/inject/standard/annotation/ReflectiveAnnotatedMethod.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.geektimes.enterprise.inject.standard;
+package org.geektimes.enterprise.inject.standard.annotation;
 
 import javax.enterprise.inject.spi.AnnotatedCallable;
 import javax.enterprise.inject.spi.AnnotatedParameter;

projects/stage-1/middleware-frameworks/my-cdi/src/main/java/org/geektimes/enterprise/inject/standard/ReflectiveAnnotatedParameter.java projects/stage-1/middleware-frameworks/my-cdi/src/main/java/org/geektimes/enterprise/inject/standard/annotation/ReflectiveAnnotatedParameter.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.geektimes.enterprise.inject.standard;
+package org.geektimes.enterprise.inject.standard.annotation;
 
 
 import org.geektimes.commons.reflect.util.FieldUtils;

projects/stage-1/middleware-frameworks/my-cdi/src/main/java/org/geektimes/enterprise/inject/standard/ReflectiveAnnotatedType.java projects/stage-1/middleware-frameworks/my-cdi/src/main/java/org/geektimes/enterprise/inject/standard/annotation/ReflectiveAnnotatedType.java

@@ -14,8 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.geektimes.enterprise.inject.standard;
+package org.geektimes.enterprise.inject.standard.beans;
 
+import javax.enterprise.inject.spi.AnnotatedType;
 import javax.enterprise.inject.spi.Bean;
 import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Field;
@@ -36,8 +37,8 @@
  */
 public abstract class AbstractBean<A extends AnnotatedElement, T> extends AbstractBeanAttributes<A, T> implements Bean<T> {
 
-    public AbstractBean(A annotatedElement, Class<?> beanClass) {
-        super(annotatedElement, beanClass);
+    public AbstractBean(A annotatedElement, AnnotatedType<T> beanType) {
+        super(annotatedElement, beanType);
     }
 
     /**

projects/stage-1/middleware-frameworks/my-cdi/src/main/java/org/geektimes/enterprise/inject/standard/AbstractBean.java projects/stage-1/middleware-frameworks/my-cdi/src/main/java/org/geektimes/enterprise/inject/standard/beans/AbstractBean.java

@@ -14,8 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.geektimes.enterprise.inject.standard;
+package org.geektimes.enterprise.inject.standard.beans;
 
+import org.geektimes.enterprise.inject.standard.annotation.ReflectiveAnnotatedType;
 import org.geektimes.enterprise.inject.util.Qualifiers;
 
 import javax.enterprise.inject.Alternative;
@@ -60,23 +61,23 @@ public abstract class AbstractBeanAttributes<A extends AnnotatedElement, T> impl
 
     private boolean alternative;
 
-    private final AnnotatedType<T> annotatedType;
+    private final AnnotatedType<T> beanType;
 
     private boolean vetoed;
 
-    public AbstractBeanAttributes(A annotatedElement, Class<?> beanClass) {
+    public AbstractBeanAttributes(A annotatedElement, AnnotatedType<T> beanType) {
         requireNonNull(annotatedElement, "The 'annotatedElement' argument must not be null!");
-        requireNonNull(beanClass, "The 'beanClass' argument must not be null!");
+        requireNonNull(beanType, "The 'beanType' argument must not be null!");
         validateAnnotatedElement(annotatedElement);
         this.annotatedElement = annotatedElement;
-        this.beanClass = beanClass;
+        this.beanClass = beanType.getJavaClass();
         this.beanTypes = getBeanTypes(beanClass);
         this.qualifiers = Qualifiers.getQualifiers(annotatedElement);
         this.scopeType = getScopeType(annotatedElement);
         this.beanName = getBeanName(annotatedElement);
         this.stereotypeTypes = getStereotypeTypes(annotatedElement);
         this.alternative = isAnnotationPresent(annotatedElement, Alternative.class);
-        this.annotatedType = new ReflectiveAnnotatedType<>(beanClass);
+        this.beanType = beanType;
         this.vetoed = false;
     }
 
@@ -127,8 +128,8 @@ public A getAnnotatedElement() {
         return annotatedElement;
     }
 
-    public AnnotatedType getAnnotatedType() {
-        return annotatedType;
+    public AnnotatedType getBeanType() {
+        return beanType;
     }
 
     @Override