You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by ar...@apache.org on 2013/01/07 09:14:34 UTC
svn commit: r1429699 - in /openwebbeans/trunk/webbeans-impl: ./
src/main/java/org/apache/webbeans/component/
src/main/java/org/apache/webbeans/component/creation/
Author: arne
Date: Mon Jan 7 08:14:34 2013
New Revision: 1429699
URL: http://svn.apache.org/viewvc?rev=1429699&view=rev
Log:
OWB-745: Removed list of observer methods from Bean
Added:
openwebbeans/trunk/webbeans-impl/owb-checks-default.xml
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractInjectionTargetBean.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionTargetBean.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractInjecionTargetBeanCreator.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ManagedBeanCreatorImpl.java
Added: openwebbeans/trunk/webbeans-impl/owb-checks-default.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/owb-checks-default.xml?rev=1429699&view=auto
==============================================================================
--- openwebbeans/trunk/webbeans-impl/owb-checks-default.xml (added)
+++ openwebbeans/trunk/webbeans-impl/owb-checks-default.xml Mon Jan 7 08:14:34 2013
@@ -0,0 +1,192 @@
+<?xml version="1.0"?>
+<!--
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+-->
+
+<!DOCTYPE module PUBLIC
+ "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
+ "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
+
+<!--
+ Checkstyle configuration that checks the OpenWebBeans coding conventions.
+-->
+
+<module name="Checker">
+
+ <!-- Checks that a package.html file exists for each package. -->
+ <!-- See http://checkstyle.sf.net/config_javadoc.html#PackageHtml -->
+ <!-- module name="PackageHtml"/ -->
+
+ <!-- Checks whether files end with a new line. -->
+ <!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile -->
+ <!-- module name="NewlineAtEndOfFile"/ -->
+
+ <!-- Checks that property files contain the same keys. -->
+ <!-- See http://checkstyle.sf.net/config_misc.html#Translation -->
+ <!-- module name="Translation"/ -->
+
+ <!-- Checks for Headers -->
+ <!-- See http://checkstyle.sf.net/config_header.html -->
+ <module name="Header">
+ <property name="headerFile" value="${checkstyle.header.file}"/>
+ <property name="fileExtensions" value="java"/>
+ </module>
+
+ <!-- Checks for Size Violations. -->
+ <!-- See http://checkstyle.sf.net/config_sizes.html -->
+ <module name="FileLength">
+ <property name="max" value="3500" />
+ <property name="fileExtensions" value="java"/>
+ </module>
+
+ <!-- Checks for whitespace -->
+ <!-- See http://checkstyle.sf.net/config_whitespace.html -->
+ <module name="FileTabCharacter"/>
+
+
+ <module name="TreeWalker">
+
+ <property name="cacheFile" value="${checkstyle.cache.file}"/>
+
+ <!-- Checks for Javadoc comments. -->
+ <!-- See http://checkstyle.sf.net/config_javadoc.html -->
+ <!-- module name="JavadocMethod"/ -->
+ <!-- module name="JavadocType"/ -->
+ <!-- module name="JavadocVariable"/ -->
+
+
+ <!-- Checks for Naming Conventions. -->
+ <!-- See http://checkstyle.sf.net/config_naming.html -->
+<!--
+ <module name="MemberName">
+ <property name="format" value="^_[a-z][a-zA-Z0-9]*$"/>
+ </module>
+-->
+
+ <module name="ConstantName">
+ <!-- Normal rules, except that:
+ - * any name can start with an underscore.
+ - * "log" is allowed; this is a traditional name for log objects
+ - * names ending with "ThreadLocal" are allowed so that threadlocal vars don't have to be
+ - all-caps. They are static final, but are not really constants. Yes, type prefixes
+ - on variable names sucks ("hungarian notation") but checkstyle doesn't allow
+ - name rules to vary by the type of the constant, and no other alternative seems
+ - any better.
+ -->
+ <property name="format"
+ value="^_?((log)|(logger)|([a-z][a-zA-Z]*ThreadLocal)|([A-Z][A-Z0-9]*(_[A-Z0-9]+)*))$"/>
+ </module>
+
+ <module name="LocalVariableName"/>
+ <module name="MethodName">
+ <property name="format" value="^_?[a-z][a-zA-Z0-9]*$"/>
+ </module>
+ <module name="PackageName"/>
+ <module name="LocalFinalVariableName"/>
+ <module name="ParameterName"/>
+ <module name="StaticVariableName"/>
+ <module name="TypeName">
+ <property name="format" value="^_?[A-Z][a-zA-Z0-9]*$"/>
+ </module>
+
+ <!-- Checks for imports -->
+ <!-- See http://checkstyle.sf.net/config_import.html -->
+ <module name="AvoidStarImport">
+ <property name="excludes" value="java.io,java.net,java.util,javax.enterprise.inject.spi,javax.enterprise.context"/>
+ </module>
+ <module name="IllegalImport"/>
+ <module name="RedundantImport"/>
+ <module name="UnusedImports"/>
+
+
+ <module name="LineLength">
+ <property name="max" value="180" />
+ <property name="ignorePattern" value="@version|@see"/>
+ </module>
+ <module name="MethodLength">
+ <property name="max" value="250" />
+ </module>
+ <module name="ParameterNumber">
+ <property name="max" value="10" />
+ </module>
+
+
+ <!-- Modifier Checks -->
+ <!-- See http://checkstyle.sf.net/config_modifiers.html -->
+ <!-- module name="ModifierOrder"/ -->
+ <!-- module name="RedundantModifier"/ -->
+
+ <!-- Checks for blocks. You know, those {}'s -->
+ <!-- See http://checkstyle.sf.net/config_blocks.html -->
+ <!-- module name="EmptyBlock"/ -->
+ <module name="NeedBraces"/>
+ <module name="LeftCurly">
+ <property name="option" value="nl"/>
+ </module>
+ <module name="RightCurly">
+ <property name="option" value="alone"/>
+ </module>
+
+ <!-- Checks for common coding problems -->
+ <!-- See http://checkstyle.sf.net/config_coding.html -->
+ <module name="DoubleCheckedLocking"/>
+ <module name="EmptyStatement"/>
+ <module name="EqualsHashCode"/>
+ <module name="InnerAssignment"/>
+ <module name="DefaultComesLast"/>
+ <module name="MissingSwitchDefault"/>
+ <module name="FallThrough"/>
+ <module name="MultipleVariableDeclarations"/>
+
+ <!-- Checks for class design -->
+ <!-- See http://checkstyle.sf.net/config_design.html -->
+ <!-- module name="DesignForExtension"/ -->
+ <module name="com.puppycrawl.tools.checkstyle.checks.design.DesignForExtensionCheck">
+ <property name="severity" value="ignore"/>
+ </module>
+
+ <!-- module name="FinalClass"/ -->
+ <!-- module name="HideUtilityClassConstructor"/ -->
+ <!-- module name="InterfaceIsType"/ -->
+ <!-- module name="VisibilityModifier"/ -->
+ <module name="com.puppycrawl.tools.checkstyle.checks.design.VisibilityModifierCheck">
+ <property name="packageAllowed" value="false"/>
+ <property name="protectedAllowed" value="true"/>
+ <property name="publicMemberPattern" value="^serialVersionUID"/>
+ <property name="severity" value="warning"/>
+ </module>
+
+
+ <!-- Miscellaneous other checks. -->
+ <!-- See http://checkstyle.sf.net/config_misc.html -->
+ <!-- module name="ArrayTypeStyle"/ -->
+ <!-- module name="FinalParameters"/ -->
+ <!-- Line with Trailing Spaces (disabled as it's to noisy)
+ <module name="GenericIllegalRegexp">
+ <property name="format" value="\s+$"/>
+ <property name="message" value="Line has trailing spaces."/>
+ </module>
+ -->
+ <module name="UpperEll"/>
+
+ </module>
+
+</module>
+
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractInjectionTargetBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractInjectionTargetBean.java?rev=1429699&r1=1429698&r2=1429699&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractInjectionTargetBean.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractInjectionTargetBean.java Mon Jan 7 08:14:34 2013
@@ -64,9 +64,6 @@ import org.apache.webbeans.util.WebBeans
*/
public abstract class AbstractInjectionTargetBean<T> extends AbstractOwbBean<T> implements InjectionTargetBean<T>
{
- /** Bean observable method */
- private Set<Method> observableMethods = new HashSet<Method>();
-
/** Injected fields of the bean */
private Set<Field> injectedFields = new HashSet<Field>();
@@ -428,22 +425,6 @@ public abstract class AbstractInjectionT
}
/**
- * {@inheritDoc}
- */
- public void addObservableMethod(Method observerMethod)
- {
- observableMethods.add(observerMethod);
- }
-
- /**
- * {@inheritDoc}
- */
- public Set<Method> getObservableMethods()
- {
- return observableMethods;
- }
-
- /**
* Gets injected fields.
*
* @return injected fields
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionTargetBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionTargetBean.java?rev=1429699&r1=1429698&r2=1429699&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionTargetBean.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionTargetBean.java Mon Jan 7 08:14:34 2013
@@ -38,21 +38,7 @@ import org.apache.webbeans.intercept.Int
* @param <T> bean type
*/
public interface InjectionTargetBean<T> extends OwbBean<T>
-{
- /**
- * Returns set of observable methods.
- *
- * @return set of observable methods
- */
- public Set<Method> getObservableMethods();
-
- /**
- * Adds new observer method.
- *
- * @param observerMethod observer method
- */
- public void addObservableMethod(Method observerMethod);
-
+{
/**
* Inject JavaEE resources.
*
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractInjecionTargetBeanCreator.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractInjecionTargetBeanCreator.java?rev=1429699&r1=1429698&r2=1429699&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractInjecionTargetBeanCreator.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractInjecionTargetBeanCreator.java Mon Jan 7 08:14:34 2013
@@ -379,9 +379,6 @@ public abstract class AbstractInjecionTa
}
}
- //Add method
- getBean().addObservableMethod(annotatedMethod.getJavaMember());
-
//Add injection point data
addMethodInjectionPointMetaData(annotatedMethod);
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ManagedBeanCreatorImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ManagedBeanCreatorImpl.java?rev=1429699&r1=1429698&r2=1429699&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ManagedBeanCreatorImpl.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ManagedBeanCreatorImpl.java Mon Jan 7 08:14:34 2013
@@ -137,8 +137,6 @@ public class ManagedBeanCreatorImpl<T> e
public ManagedBean<T> defineManagedBean(ProcessInjectionTarget<T> processInjectionTargetEvent, boolean allowLazyInit)
{
- BeanManagerImpl manager = webBeansContext.getBeanManagerImpl();
-
//Annotated type
AnnotatedType<T> annotatedType = processInjectionTargetEvent.getAnnotatedType();
ManagedBean<T> managedBean = getBean();