You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by st...@apache.org on 2015/05/18 23:43:15 UTC
svn commit: r1680111 - in
/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans:
component/ config/ deployment/stereotype/ event/ exception/helper/ plugins/
portable/events/generics/ proxy/ util/
Author: struberg
Date: Mon May 18 21:43:15 2015
New Revision: 1680111
URL: http://svn.apache.org/r1680111
Log:
remove redundant interface modifiers
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/EnterpriseBeanMarker.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/IBeanHasParent.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/OwbBean.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/DeploymentValidationService.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/stereotype/IStereoTypeModel.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/OwbObserverMethod.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/exception/helper/DescriptiveException.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/plugins/OpenWebBeansEjbLCAPlugin.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/plugins/OpenWebBeansJmsPlugin.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GenericBeanEvent.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GenericProducerObserverEvent.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/InterceptorHandler.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/SpecializationUtil.java
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/EnterpriseBeanMarker.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/EnterpriseBeanMarker.java?rev=1680111&r1=1680110&r2=1680111&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/EnterpriseBeanMarker.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/EnterpriseBeanMarker.java Mon May 18 21:43:15 2015
@@ -27,5 +27,5 @@ package org.apache.webbeans.component;
*/
public interface EnterpriseBeanMarker
{
- public boolean isPassivationCapable();
+ boolean isPassivationCapable();
}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/IBeanHasParent.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/IBeanHasParent.java?rev=1680111&r1=1680110&r2=1680111&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/IBeanHasParent.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/IBeanHasParent.java Mon May 18 21:43:15 2015
@@ -22,7 +22,7 @@ import javax.enterprise.context.spi.Crea
public interface IBeanHasParent<T>
{
- public InjectionTargetBean<?> getParent();
+ InjectionTargetBean<?> getParent();
- public void dispose(T instance, CreationalContext<T> creationalContext);
+ void dispose(T instance, CreationalContext<T> creationalContext);
}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/OwbBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/OwbBean.java?rev=1680111&r1=1680110&r2=1680111&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/OwbBean.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/OwbBean.java Mon May 18 21:43:15 2015
@@ -36,7 +36,7 @@ public interface OwbBean<T> extends Bean
/**
* @return the producer for this bean;
*/
- public Producer<T> getProducer();
+ Producer<T> getProducer();
/**
* Returns bean type.
@@ -44,49 +44,49 @@ public interface OwbBean<T> extends Bean
* @return webbeans type
* @see WebBeansType
*/
- public WebBeansType getWebBeansType();
+ WebBeansType getWebBeansType();
/**
* Returns bean class type
* @return bean class type
*/
- public Class<T> getReturnType();
+ Class<T> getReturnType();
/**
* Set specialized flag.
* @param specialized flag
*/
- public void setSpecializedBean(boolean specialized);
+ void setSpecializedBean(boolean specialized);
/**
* Returns true if bean is a specialized bean, false otherwise.
* @return true if bean is a specialized bean
*/
- public boolean isSpecializedBean();
+ boolean isSpecializedBean();
/**
* Set enableed flag.
* @param enabled flag
*/
- public void setEnabled(boolean enabled);
+ void setEnabled(boolean enabled);
/**
* Bean is enabled or not.
* @return true if enabled
- */
- public boolean isEnabled();
+ */
+ boolean isEnabled();
/**
* Gets id of the bean.
* @return id of the bean
*/
- public String getId();
+ String getId();
/**
* True if passivation capable false otherwise.
* @return true if this bean is passivation capable
*/
- public boolean isPassivationCapable();
+ boolean isPassivationCapable();
/**
* This determines if this bean is really a dependent bean,
@@ -94,7 +94,7 @@ public interface OwbBean<T> extends Bean
* InjectionPoint. A BeanManagerBean is e.g. not a dependent bean.
* @return <code>true</code> if this is a dependent bean
*/
- public boolean isDependent();
+ boolean isDependent();
- public WebBeansContext getWebBeansContext();
+ WebBeansContext getWebBeansContext();
}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java?rev=1680111&r1=1680110&r2=1680111&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java Mon May 18 21:43:15 2015
@@ -377,7 +377,7 @@ public class BeansDeployer
*/
private void validateDecoratorDecoratedTypes()
{
- for (Decorator decorator : webBeansContext.getDecoratorsManager().getDecorators())
+ for (Decorator decorator : decoratorsManager.getDecorators())
{
if (decorator.getDecoratedTypes().isEmpty())
{
@@ -389,7 +389,7 @@ public class BeansDeployer
// avoid delegate implementing Foo<A> and decorator implementing Foo<B> with no link between A and B
private void validateDecoratorGenericTypes()
{
- for (final Decorator<?> decorator : webBeansContext.getDecoratorsManager().getDecorators())
+ for (final Decorator<?> decorator : decoratorsManager.getDecorators())
{
final Type type = decorator.getDelegateType();
@@ -432,12 +432,10 @@ public class BeansDeployer
{
final ParameterizedType pt2 = ParameterizedType.class.cast(t);
- if (pt1.getRawType() == pt2.getRawType())
+ if (pt1.getRawType() == pt2.getRawType() &&
+ !GenericsUtil.isAssignableFrom(true, false, pt1, pt2))
{
- if (!GenericsUtil.isAssignableFrom(true, false, pt1, pt2))
- {
- throw new WebBeansConfigurationException("Generic error matching " + api + " and " + t);
- }
+ throw new WebBeansConfigurationException("Generic error matching " + api + " and " + t);
}
}
}
@@ -468,7 +466,6 @@ public class BeansDeployer
private void registerAlternativesDecoratorsAndInterceptorsWithPriority(List<AnnotatedType<?>> annotatedTypes)
{
AlternativesManager alternativesManager = webBeansContext.getAlternativesManager();
- InterceptorsManager interceptorsManager = webBeansContext.getInterceptorsManager();
for (AnnotatedType<?> annotatedType : annotatedTypes)
{
@@ -645,8 +642,8 @@ public class BeansDeployer
{
final BeanManagerImpl manager = webBeansContext.getBeanManagerImpl();
final List<AnnotatedType<?>> newAt = new LinkedList<AnnotatedType<?>>();
- final List<Class<?>> interceptors = webBeansContext.getInterceptorsManager().getPrioritizedInterceptors();
- final List<Class<?>> decorators = webBeansContext.getDecoratorsManager().getPrioritizedDecorators();
+ final List<Class<?>> interceptors = interceptorsManager.getPrioritizedInterceptors();
+ final List<Class<?>> decorators = decoratorsManager.getPrioritizedDecorators();
final List<Class<?>> alternatives = webBeansContext.getAlternativesManager().getPrioritizedAlternatives();
// match AfterTypeDiscovery expected order (1, 2, 3...)
@@ -693,11 +690,11 @@ public class BeansDeployer
{
logger.fine("Validation of injection points has started.");
- webBeansContext.getDecoratorsManager().validateDecoratorClasses();
- webBeansContext.getInterceptorsManager().validateInterceptorClasses();
+ decoratorsManager.validateDecoratorClasses();
+ interceptorsManager.validateInterceptorClasses();
//Adding decorators to validate
- Set<Decorator<?>> decorators = webBeansContext.getDecoratorsManager().getDecorators();
+ Set<Decorator<?>> decorators = decoratorsManager.getDecorators();
logger.fine("Validation of the decorator's injection points has started.");
@@ -705,7 +702,7 @@ public class BeansDeployer
validate(decorators);
//Adding interceptors to validate
- List<javax.enterprise.inject.spi.Interceptor<?>> interceptors = webBeansContext.getInterceptorsManager().getCdiInterceptors();
+ List<javax.enterprise.inject.spi.Interceptor<?>> interceptors = interceptorsManager.getCdiInterceptors();
logger.fine("Validation of the interceptor's injection points has started.");
@@ -1485,7 +1482,7 @@ public class BeansDeployer
{
dbb.defineDecoratorRules();
DecoratorBean<T> decorator = dbb.getBean();
- webBeansContext.getDecoratorsManager().addDecorator(decorator);
+ decoratorsManager.addDecorator(decorator);
}
}
else if(WebBeansUtil.isCdiInterceptor(annotatedType))
@@ -1500,15 +1497,15 @@ public class BeansDeployer
{
ibb.defineCdiInterceptorRules();
CdiInterceptorBean<T> interceptor = ibb.getBean();
- webBeansContext.getInterceptorsManager().addCdiInterceptor(interceptor);
+ interceptorsManager.addCdiInterceptor(interceptor);
}
}
else
{
InjectionTargetBean<T> bean = managedBeanCreator.getBean();
- if (webBeansContext.getDecoratorsManager().containsCustomDecoratorClass(annotatedType.getJavaClass()) ||
- webBeansContext.getInterceptorsManager().containsCustomInterceptorClass(annotatedType.getJavaClass()))
+ if (decoratorsManager.containsCustomDecoratorClass(annotatedType.getJavaClass()) ||
+ interceptorsManager.containsCustomInterceptorClass(annotatedType.getJavaClass()))
{
return; //TODO discuss this case (it was ignored before)
}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/DeploymentValidationService.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/DeploymentValidationService.java?rev=1680111&r1=1680110&r2=1680111&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/DeploymentValidationService.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/DeploymentValidationService.java Mon May 18 21:43:15 2015
@@ -243,7 +243,7 @@ public class DeploymentValidationService
return bean instanceof OwbBean? ((OwbBean<?>)bean).isPassivationCapable(): bean instanceof PassivationCapable;
}
- public static interface BeanInterceptorInfoProvider
+ public interface BeanInterceptorInfoProvider
{
BeanInterceptorInfo interceptorInfo();
}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/stereotype/IStereoTypeModel.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/stereotype/IStereoTypeModel.java?rev=1680111&r1=1680110&r2=1680111&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/stereotype/IStereoTypeModel.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/stereotype/IStereoTypeModel.java Mon May 18 21:43:15 2015
@@ -34,38 +34,38 @@ public interface IStereoTypeModel
* its class name.
* @return the name
*/
- public String getName();
+ String getName();
/**
* Sets name.
* @param name the name to set
*/
- public void setName(String name);
+ void setName(String name);
/**
* Gets default deployment type.
* @return the defaultDeploymentType
*/
- public Annotation getDefaultDeploymentType();
+ Annotation getDefaultDeploymentType();
/**
* Sets default deployment type.
* @return the defaultScopeType
*/
- public Annotation getDefaultScopeType();
+ Annotation getDefaultScopeType();
/**
* Returns set of interceptor binding that are
* definen by the stereotype.
* @return set of interceptor bindings.
*/
- public Set<Annotation> getInterceptorBindingTypes();
+ Set<Annotation> getInterceptorBindingTypes();
/**
* Returns a set of inherited stereotypes.
* @return set of inherited stereotypes.
*/
- public Set<Annotation> getInheritedStereoTypes();
+ Set<Annotation> getInheritedStereoTypes();
boolean isNamed();
}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/OwbObserverMethod.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/OwbObserverMethod.java?rev=1680111&r1=1680110&r2=1680111&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/OwbObserverMethod.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/OwbObserverMethod.java Mon May 18 21:43:15 2015
@@ -32,11 +32,11 @@ public interface OwbObserverMethod<T> ex
/**
* Returns the {@link InjectionPoint}s for the parameters of this observer method.
*/
- public Set<InjectionPoint> getInjectionPoints();
+ Set<InjectionPoint> getInjectionPoints();
/**
* will actually call the underlying observer method with the specified event metadata
*/
- public void notify(T event, EventMetadata metadata);
+ void notify(T event, EventMetadata metadata);
}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/exception/helper/DescriptiveException.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/exception/helper/DescriptiveException.java?rev=1680111&r1=1680110&r2=1680111&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/exception/helper/DescriptiveException.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/exception/helper/DescriptiveException.java Mon May 18 21:43:15 2015
@@ -32,5 +32,5 @@ public interface DescriptiveException
* Add some additional information to the message.
* @param additionalInformation
*/
- public void addInformation(String additionalInformation);
+ void addInformation(String additionalInformation);
}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/plugins/OpenWebBeansEjbLCAPlugin.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/plugins/OpenWebBeansEjbLCAPlugin.java?rev=1680111&r1=1680110&r2=1680111&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/plugins/OpenWebBeansEjbLCAPlugin.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/plugins/OpenWebBeansEjbLCAPlugin.java Mon May 18 21:43:15 2015
@@ -26,9 +26,9 @@ import org.apache.webbeans.spi.plugins.O
*/
public interface OpenWebBeansEjbLCAPlugin extends OpenWebBeansPlugin
{
- public Class<? extends Annotation> getPrePassivateClass();
+ Class<? extends Annotation> getPrePassivateClass();
- public Class<? extends Annotation> getPostActivateClass();
+ Class<? extends Annotation> getPostActivateClass();
- public Class<? extends Annotation> getAroundTimeoutClass();
+ Class<? extends Annotation> getAroundTimeoutClass();
}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/plugins/OpenWebBeansJmsPlugin.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/plugins/OpenWebBeansJmsPlugin.java?rev=1680111&r1=1680110&r2=1680111&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/plugins/OpenWebBeansJmsPlugin.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/plugins/OpenWebBeansJmsPlugin.java Mon May 18 21:43:15 2015
@@ -25,7 +25,7 @@ import org.apache.webbeans.spi.plugins.O
public interface OpenWebBeansJmsPlugin extends OpenWebBeansPlugin
{
- public Bean<?> getJmsBean(JMSModel jmsModel);
+ Bean<?> getJmsBean(JMSModel jmsModel);
- public Object getJmsBeanProxy(Bean<?> bean, Class<?> iface);
+ Object getJmsBeanProxy(Bean<?> bean, Class<?> iface);
}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GenericBeanEvent.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GenericBeanEvent.java?rev=1680111&r1=1680110&r2=1680111&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GenericBeanEvent.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GenericBeanEvent.java Mon May 18 21:43:15 2015
@@ -28,5 +28,5 @@ public interface GenericBeanEvent
* @param eventClass the class of event we are treating this event as
* @return the generic type parameter of this event considered as an "eventClass"
*/
- public Class<?> getBeanClassFor(Class<?> eventClass);
+ Class<?> getBeanClassFor(Class<?> eventClass);
}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GenericProducerObserverEvent.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GenericProducerObserverEvent.java?rev=1680111&r1=1680110&r2=1680111&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GenericProducerObserverEvent.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GenericProducerObserverEvent.java Mon May 18 21:43:15 2015
@@ -20,7 +20,7 @@ package org.apache.webbeans.portable.eve
public interface GenericProducerObserverEvent
{
- public Class<?> getBeanClass();
+ Class<?> getBeanClass();
- public Class<?> getProducerOrObserverType();
+ Class<?> getProducerOrObserverType();
}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/InterceptorHandler.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/InterceptorHandler.java?rev=1680111&r1=1680110&r2=1680111&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/InterceptorHandler.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/InterceptorHandler.java Mon May 18 21:43:15 2015
@@ -34,5 +34,5 @@ public interface InterceptorHandler
* @param args original invocation parameters
* @return the return value of the intercepted methos
*/
- public Object invoke(Method method, Object[] args);
+ Object invoke(Method method, Object[] args);
}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/SpecializationUtil.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/SpecializationUtil.java?rev=1680111&r1=1680110&r2=1680111&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/SpecializationUtil.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/SpecializationUtil.java Mon May 18 21:43:15 2015
@@ -238,7 +238,7 @@ public class SpecializationUtil
return Collections.emptySet();
}
- public static interface BeanAttributesProvider
+ public interface BeanAttributesProvider
{
<T> BeanAttributes<T> get(AnnotatedType<T> at);
}