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=1799067&r1=1799066&r2=1799067&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 Sun Jun 18 09:59:10 2017 @@ -153,14 +153,14 @@ public class BeansDeployer getPackage = ClassLoader.class.getDeclaredMethod("getDefinedPackage", String.class); getPackage.setAccessible(true); } - catch (final NoSuchMethodException e) + catch (NoSuchMethodException e) { try { getPackage = ClassLoader.class.getDeclaredMethod("getPackage", String.class); getPackage.setAccessible(true); } - catch (final NoSuchMethodException ex) + catch (NoSuchMethodException ex) { throw new IllegalStateException(ex); } @@ -272,7 +272,7 @@ public class BeansDeployer addAdditionalAnnotatedTypes(fireAfterTypeDiscoveryEvent(), globalBdaAnnotatedTypes); - final Map<BeanArchiveInformation, Map<AnnotatedType<?>, ExtendedBeanAttributes<?>>> beanAttributesPerBda + Map<BeanArchiveInformation, Map<AnnotatedType<?>, ExtendedBeanAttributes<?>>> beanAttributesPerBda = getBeanAttributes(annotatedTypesPerBda); // shouldn't be used anymore, view is now beanAttributes @@ -291,7 +291,7 @@ public class BeansDeployer new SpecializationUtil.BeanAttributesProvider() { @Override - public <T> BeanAttributes get(final AnnotatedType<T> at) + public <T> BeanAttributes get(AnnotatedType<T> at) { ExtendedBeanAttributes<?> data = null; for (Map<AnnotatedType<?>, ExtendedBeanAttributes<?>> beanAttributes : beanAttributesPerBda.values()) @@ -383,9 +383,9 @@ public class BeansDeployer */ private void validateNames() { - final Collection<String> names = new HashSet<>(); - final Collection<String> partials = new HashSet<>(); - for (final Bean<?> bean : webBeansContext.getBeanManagerImpl().getBeans()) + Collection<String> names = new HashSet<>(); + Collection<String> partials = new HashSet<>(); + for (Bean<?> bean : webBeansContext.getBeanManagerImpl().getBeans()) { // the skip logic needs some revisit but this validation is not useful enough to justify to resolve all alternatives here if (bean.isAlternative()) @@ -397,12 +397,12 @@ public class BeansDeployer continue; } - final String name = bean.getName(); + String name = bean.getName(); if (name != null) { if (name.contains(".")) { - final String[] segments = name.split("\\."); + String[] segments = name.split("\\."); String current = ""; for (int i = 0; i < segments.length - 1; i++) { @@ -424,9 +424,9 @@ public class BeansDeployer } private Map<BeanArchiveInformation, Map<AnnotatedType<?>, ExtendedBeanAttributes<?>>> getBeanAttributes( - final Map<BeanArchiveInformation, List<AnnotatedType<?>>> annotatedTypesPerBda) + Map<BeanArchiveInformation, List<AnnotatedType<?>>> annotatedTypesPerBda) { - final Map<BeanArchiveInformation, Map<AnnotatedType<?>, ExtendedBeanAttributes<?>>> beanAttributesPerBda + Map<BeanArchiveInformation, Map<AnnotatedType<?>, ExtendedBeanAttributes<?>>> beanAttributesPerBda = new HashMap<BeanArchiveInformation, Map<AnnotatedType<?>, ExtendedBeanAttributes<?>>>(); for (Map.Entry<BeanArchiveInformation, List<AnnotatedType<?>>> atEntry : annotatedTypesPerBda.entrySet()) @@ -436,23 +436,23 @@ public class BeansDeployer boolean onlyScopedBeans = BeanDiscoveryMode.TRIM == bdaInfo.getBeanDiscoveryMode(); - final Map<AnnotatedType<?>, ExtendedBeanAttributes<?>> bdaBeanAttributes = new IdentityHashMap<AnnotatedType<?>, ExtendedBeanAttributes<?>>(annotatedTypes.size()); - final Iterator<AnnotatedType<?>> iterator = annotatedTypes.iterator(); + Map<AnnotatedType<?>, ExtendedBeanAttributes<?>> bdaBeanAttributes = new IdentityHashMap<AnnotatedType<?>, ExtendedBeanAttributes<?>>(annotatedTypes.size()); + Iterator<AnnotatedType<?>> iterator = annotatedTypes.iterator(); while (iterator.hasNext()) { - final AnnotatedType<?> at = iterator.next(); - final Class beanClass = at.getJavaClass(); - final boolean isEjb = discoverEjb && EJBWebBeansConfigurator.isSessionBean(beanClass, webBeansContext); + AnnotatedType<?> at = iterator.next(); + Class beanClass = at.getJavaClass(); + boolean isEjb = discoverEjb && EJBWebBeansConfigurator.isSessionBean(beanClass, webBeansContext); try { if (isEjb || (ClassUtil.isConcrete(beanClass) || WebBeansUtil.isDecorator(at)) && isValidManagedBean(at)) { - final BeanAttributesImpl beanAttributes = BeanAttributesBuilder.forContext(webBeansContext).newBeanAttibutes(at, onlyScopedBeans).build(); + BeanAttributesImpl beanAttributes = BeanAttributesBuilder.forContext(webBeansContext).newBeanAttibutes(at, onlyScopedBeans).build(); if (beanAttributes != null && (!beanAttributes.isAlternative() || webBeansContext.getAlternativesManager() .isAlternative(at.getJavaClass(), beanAttributes.getStereotypes()))) { - final ProcessBeanAttributesImpl<?> processBeanAttributes + ProcessBeanAttributesImpl<?> processBeanAttributes = webBeansContext.getWebBeansUtil().fireProcessBeanAttributes(at, at.getJavaClass(), beanAttributes); if (processBeanAttributes != null) { @@ -478,7 +478,7 @@ public class BeansDeployer iterator.remove(); } } - catch (final NoClassDefFoundError ncdfe) + catch (NoClassDefFoundError ncdfe) { logger.info("Skipping deployment of Class " + beanClass + "due to a NoClassDefFoundError: " + ncdfe.getMessage()); } @@ -493,16 +493,16 @@ public class BeansDeployer private void validateDisposeParameters() { - final WebBeansUtil webBeansUtil = webBeansContext.getWebBeansUtil(); - for (final Bean<?> bean : webBeansContext.getBeanManagerImpl().getBeans()) + WebBeansUtil webBeansUtil = webBeansContext.getWebBeansUtil(); + for (Bean<?> bean : webBeansContext.getBeanManagerImpl().getBeans()) { if (ProducerMethodBean.class.isInstance(bean)) { - final Producer<?> producer = AbstractProducerBean.class.cast(bean).getProducer(); + Producer<?> producer = AbstractProducerBean.class.cast(bean).getProducer(); if (BaseProducerProducer.class.isInstance(producer)) { - final BaseProducerProducer producerProducer = BaseProducerProducer.class.cast(producer); - final Set<InjectionPoint> disposalIPs = producerProducer.getDisposalIPs(); + BaseProducerProducer producerProducer = BaseProducerProducer.class.cast(producer); + Set<InjectionPoint> disposalIPs = producerProducer.getDisposalIPs(); if (disposalIPs != null && !producerProducer.isAnyDisposal()) // any can be ambiguous but that's not an issue { webBeansUtil.validate(disposalIPs, bean); @@ -530,26 +530,26 @@ 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 : decoratorsManager.getDecorators()) + for (Decorator<?> decorator : decoratorsManager.getDecorators()) { - final Type type = decorator.getDelegateType(); + Type type = decorator.getDelegateType(); // capture ParameterizedType from decorator type - final Collection<Type> types = new HashSet<Type>(); + Collection<Type> types = new HashSet<Type>(); if (Class.class.isInstance(type)) { Class<?> c = Class.class.cast(type); while (c != Object.class && c != null) { types.add(c); - for (final Type t : asList(c.getGenericInterfaces())) + for (Type t : asList(c.getGenericInterfaces())) { if (ParameterizedType.class.isInstance(t)) { types.add(t); } } - final Type genericSuperclass = c.getGenericSuperclass(); + Type genericSuperclass = c.getGenericSuperclass(); if (ParameterizedType.class.isInstance(genericSuperclass)) { types.add(genericSuperclass); @@ -559,19 +559,19 @@ public class BeansDeployer } // else? // check arguments matches with decorator API - for (final Type api : decorator.getTypes()) + for (Type api : decorator.getTypes()) { if (!ParameterizedType.class.isInstance(api)) // no need to check here { continue; } - final ParameterizedType pt1 = ParameterizedType.class.cast(api); - for (final Type t : types) + ParameterizedType pt1 = ParameterizedType.class.cast(api); + for (Type t : types) { if (ParameterizedType.class.isInstance(t)) { - final ParameterizedType pt2 = ParameterizedType.class.cast(t); + ParameterizedType pt2 = ParameterizedType.class.cast(t); if (pt1.getRawType() == pt2.getRawType() && !GenericsUtil.isAssignableFrom(true, false, pt1, pt2)) @@ -623,7 +623,7 @@ public class BeansDeployer Priority priority = annotatedType.getAnnotation(Priority.class); if (priority != null) { - final Class<?> javaClass = annotatedType.getJavaClass(); + Class<?> javaClass = annotatedType.getJavaClass(); interceptorsManager.addPriorityClazzInterceptor(javaClass, priority); } } @@ -632,7 +632,7 @@ public class BeansDeployer Priority priority = annotatedType.getAnnotation(Priority.class); if (priority != null) { - final Class<?> javaClass = annotatedType.getJavaClass(); + Class<?> javaClass = annotatedType.getJavaClass(); decoratorsManager.addPriorityClazzDecorator(javaClass, priority); } } @@ -706,7 +706,7 @@ public class BeansDeployer { if(System.getSecurityManager() != null) { - final Constructor<?> c = webBeansContext.getSecurityService().doPrivilegedGetConstructor(clazz, WebBeansContext.class); + Constructor<?> c = webBeansContext.getSecurityService().doPrivilegedGetConstructor(clazz, WebBeansContext.class); if (c == null) { return webBeansContext.getSecurityService().doPrivilegedObjectCreate(clazz); @@ -720,7 +720,7 @@ public class BeansDeployer { return clazz.getConstructor(new Class<?>[] { WebBeansContext.class }).newInstance(wbc); } - catch (final Exception e) + catch (Exception e) { return clazz.newInstance(); } @@ -779,7 +779,7 @@ public class BeansDeployer { BeanManagerImpl manager = webBeansContext.getBeanManagerImpl(); manager.setAfterBeanDiscoveryStart(); - final AfterBeanDiscoveryImpl event = new AfterBeanDiscoveryImpl(webBeansContext); + AfterBeanDiscoveryImpl event = new AfterBeanDiscoveryImpl(webBeansContext); manager.fireLifecycleEvent(event); event.deployConfiguredBeans(); @@ -796,18 +796,18 @@ public class BeansDeployer */ private List<AnnotatedType<?>> fireAfterTypeDiscoveryEvent() { - final BeanManagerImpl manager = webBeansContext.getBeanManagerImpl(); - final List<AnnotatedType<?>> newAt = new LinkedList<AnnotatedType<?>>(); - final List<Class<?>> interceptors = interceptorsManager.getPrioritizedInterceptors(); - final List<Class<?>> decorators = decoratorsManager.getPrioritizedDecorators(); - final List<Class<?>> alternatives = webBeansContext.getAlternativesManager().getPrioritizedAlternatives(); + BeanManagerImpl manager = webBeansContext.getBeanManagerImpl(); + List<AnnotatedType<?>> newAt = new LinkedList<AnnotatedType<?>>(); + List<Class<?>> interceptors = interceptorsManager.getPrioritizedInterceptors(); + List<Class<?>> decorators = decoratorsManager.getPrioritizedDecorators(); + List<Class<?>> alternatives = webBeansContext.getAlternativesManager().getPrioritizedAlternatives(); // match AfterTypeDiscovery expected order (1, 2, 3...) Collections.reverse(interceptors); Collections.reverse(decorators); Collections.reverse(alternatives); - final AfterTypeDiscoveryImpl event = new AfterTypeDiscoveryImpl(webBeansContext, newAt, + AfterTypeDiscoveryImpl event = new AfterTypeDiscoveryImpl(webBeansContext, newAt, interceptors, decorators, alternatives); manager.fireLifecycleEvent(event); @@ -841,9 +841,9 @@ public class BeansDeployer */ private void fireAfterDeploymentValidationEvent() { - final BeanManagerImpl manager = webBeansContext.getBeanManagerImpl(); + BeanManagerImpl manager = webBeansContext.getBeanManagerImpl(); manager.setAfterDeploymentValidationFired(true); - final AfterDeploymentValidationImpl event = new AfterDeploymentValidationImpl(manager); + AfterDeploymentValidationImpl event = new AfterDeploymentValidationImpl(manager); manager.fireLifecycleEvent(event); webBeansContext.getWebBeansUtil().inspectDeploymentErrorStack( @@ -1006,11 +1006,11 @@ public class BeansDeployer { if (BuiltInOwbBean.class.isInstance(bean)) { - final Class<?> proxyable = BuiltInOwbBean.class.cast(bean).proxyableType(); + Class<?> proxyable = BuiltInOwbBean.class.cast(bean).proxyableType(); if (proxyable != null) { - final AbstractProducer producer = AbstractProducer.class.cast(OwbBean.class.cast(bean).getProducer()); - final AnnotatedType<?> annotatedType = webBeansContext.getAnnotatedElementFactory().newAnnotatedType(proxyable); + AbstractProducer producer = AbstractProducer.class.cast(OwbBean.class.cast(bean).getProducer()); + AnnotatedType<?> annotatedType = webBeansContext.getAnnotatedElementFactory().newAnnotatedType(proxyable); producer.defineInterceptorStack(bean, annotatedType, webBeansContext); } } @@ -1204,7 +1204,7 @@ public class BeansDeployer // fire injection point events and forget AnnotatedType<?> annotatedType = annotatedElementFactory.newAnnotatedType(implClass); InjectionTarget<?> it = webBeansContext.getBeanManagerImpl().createInjectionTarget(annotatedType); - for (final InjectionPoint ip : it.getInjectionPoints()) + for (InjectionPoint ip : it.getInjectionPoints()) { webBeansContext.getWebBeansUtil().fireProcessInjectionPointEvent(ip); } @@ -1252,13 +1252,13 @@ public class BeansDeployer return annotatedTypes; } - private boolean isEEComponent(final Class<?> impl) + private boolean isEEComponent(Class<?> impl) { OpenWebBeansJavaEEPlugin eePlugin = webBeansContext.getPluginLoader().getJavaEEPlugin(); return eePlugin != null && eePlugin.isEEComponent(impl); } - private boolean isVetoed(final Class<?> implClass) + private boolean isVetoed(Class<?> implClass) { if (implClass.getAnnotation(Vetoed.class) != null) { @@ -1279,9 +1279,9 @@ public class BeansDeployer do { // yes we cache result with potentially different classloader but this is not portable by spec - final String name = pckge.getName(); + String name = pckge.getName(); { - final Boolean result = packageVetoCache.get(name); + Boolean result = packageVetoCache.get(name); if (result != null && result) { return result; @@ -1297,11 +1297,11 @@ public class BeansDeployer packageVetoCache.put(pckge.getName(), false); } - final int idx = name.lastIndexOf('.'); + int idx = name.lastIndexOf('.'); if (idx > 0) { - final String previousPackage = name.substring(0, idx); - final Boolean result = packageVetoCache.get(previousPackage); + String previousPackage = name.substring(0, idx); + Boolean result = packageVetoCache.get(previousPackage); if (result != null && result) { return result; @@ -1310,7 +1310,7 @@ public class BeansDeployer { pckge = Package.class.cast(GET_PACKAGE.invoke(classLoader, previousPackage)); } - catch (final Exception e) + catch (Exception e) { throw new IllegalStateException(e); } @@ -1426,10 +1426,10 @@ public class BeansDeployer } } - private boolean isValidManagedBean(final AnnotatedType<?> type) + private boolean isValidManagedBean(AnnotatedType<?> type) { - final Class<?> beanClass = type.getJavaClass(); - final WebBeansUtil webBeansUtil = webBeansContext.getWebBeansUtil(); + Class<?> beanClass = type.getJavaClass(); + WebBeansUtil webBeansUtil = webBeansContext.getWebBeansUtil(); // done separately to be able to swallow the logging when not relevant and avoid to pollute logs try @@ -1439,7 +1439,7 @@ public class BeansDeployer return false; } } - catch (final TypeNotPresentException cnfe) + catch (TypeNotPresentException cnfe) { return false; } @@ -1448,7 +1448,7 @@ public class BeansDeployer { webBeansUtil.checkManagedBean(beanClass); } - catch (final DefinitionException e) + catch (DefinitionException e) { logger.log(Level.FINE, "skipped deployment of: " + beanClass.getName() + " reason: " + e.getMessage()); logger.log(Level.FINER, "skipped deployment of: " + beanClass.getName() + " details: ", e); @@ -1833,10 +1833,10 @@ public class BeansDeployer logger.log(Level.FINE, "Found Managed Bean with class name : [{0}]", annotatedType.getJavaClass().getName()); } - final Set<ObserverMethod<?>> observerMethods; - final AnnotatedType<T> beanAnnotatedType = bean.getAnnotatedType(); - final AnnotatedType<T> defaultAt = webBeansContext.getAnnotatedElementFactory().getAnnotatedType(beanAnnotatedType.getJavaClass()); - final boolean ignoreProducer = defaultAt != beanAnnotatedType && annotatedTypes.containsKey(defaultAt); + Set<ObserverMethod<?>> observerMethods; + AnnotatedType<T> beanAnnotatedType = bean.getAnnotatedType(); + AnnotatedType<T> defaultAt = webBeansContext.getAnnotatedElementFactory().getAnnotatedType(beanAnnotatedType.getJavaClass()); + boolean ignoreProducer = defaultAt != beanAnnotatedType && annotatedTypes.containsKey(defaultAt); if(bean.isEnabled()) { observerMethods = new ObserverMethodsBuilder<T>(webBeansContext, beanAnnotatedType).defineObserverMethods(bean); @@ -1846,7 +1846,7 @@ public class BeansDeployer observerMethods = new HashSet<ObserverMethod<?>>(); } - final WebBeansContext wbc = bean.getWebBeansContext(); + WebBeansContext wbc = bean.getWebBeansContext(); Set<ProducerFieldBean<?>> producerFields = ignoreProducer ? Collections.emptySet() : new ProducerFieldBeansBuilder(wbc, beanAnnotatedType).defineProducerFields(bean); Set<ProducerMethodBean<?>> producerMethods = @@ -1858,7 +1858,7 @@ public class BeansDeployer if (!producerFields.isEmpty() || !producerMethods.isEmpty()) { - final Priority priority = annotatedType.getAnnotation(Priority.class); + Priority priority = annotatedType.getAnnotation(Priority.class); if (priority != null && !webBeansContext.getAlternativesManager() .isAlternative(annotatedType.getJavaClass(), Collections.<Class<? extends Annotation>>emptySet())) {
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=1799067&r1=1799066&r2=1799067&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 Sun Jun 18 09:59:10 2017 @@ -129,7 +129,7 @@ public class DeploymentValidationService } else if (Modifier.isPrivate(cons.getModifiers())) { - final boolean containsViolation = violationMessage.containsViolation(); + boolean containsViolation = violationMessage.containsViolation(); violationMessage.addLine(beanClass.getName(), " has a >private< no-arg constructor! CDI doesn't allow to proxy that."); if (!containsViolation) { // lazy @@ -210,7 +210,7 @@ public class DeploymentValidationService } } - private <T> void validatePassivationCapableInterceptorInfo(final OwbBean<T> bean, final BeanInterceptorInfo interceptorInfo) + private <T> void validatePassivationCapableInterceptorInfo(OwbBean<T> bean, BeanInterceptorInfo interceptorInfo) { if (interceptorInfo != null) { Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContext.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContext.java?rev=1799067&r1=1799066&r2=1799067&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContext.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContext.java Sun Jun 18 09:59:10 2017 @@ -504,7 +504,7 @@ public class WebBeansContext { r.run(); } - catch (final RuntimeException re) + catch (RuntimeException re) { logger.warning(re.getMessage()); } @@ -528,7 +528,7 @@ public class WebBeansContext return applicationBoundaryService; } - public boolean findMissingAnnotatedType(final Class<?> missing) + public boolean findMissingAnnotatedType(Class<?> missing) { return false; // used in hierarchical WBC } Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/configurator/BeanConfiguratorImpl.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/configurator/BeanConfiguratorImpl.java?rev=1799067&r1=1799066&r2=1799067&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/configurator/BeanConfiguratorImpl.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/configurator/BeanConfiguratorImpl.java Sun Jun 18 09:59:10 2017 @@ -492,7 +492,7 @@ public class BeanConfiguratorImpl<T> imp public String toString() { StringBuilder builder = new StringBuilder(); - final String simpleName = getReturnType().getSimpleName(); + String simpleName = getReturnType().getSimpleName(); builder.append(simpleName); builder.append(", WebBeansType:").append(getWebBeansType()).append(", Name:").append(getName()); builder.append(", API Types:["); Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/AnnotatedTypeWrapper.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/AnnotatedTypeWrapper.java?rev=1799067&r1=1799066&r2=1799067&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/AnnotatedTypeWrapper.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/AnnotatedTypeWrapper.java Sun Jun 18 09:59:10 2017 @@ -33,7 +33,7 @@ public class AnnotatedTypeWrapper<T> imp private final AnnotatedType<T> original; private final Extension source; - public AnnotatedTypeWrapper(final Extension source, final AnnotatedType<T> annotatedType) + public AnnotatedTypeWrapper(Extension source, AnnotatedType<T> annotatedType) { this.source = source; this.original = annotatedType; @@ -88,7 +88,7 @@ public class AnnotatedTypeWrapper<T> imp } @Override - public boolean isAnnotationPresent(final Class<? extends Annotation> aClass) + public boolean isAnnotationPresent(Class<? extends Annotation> aClass) { return original.isAnnotationPresent(aClass); } Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanCacheKey.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanCacheKey.java?rev=1799067&r1=1799066&r2=1799067&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanCacheKey.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanCacheKey.java Sun Jun 18 09:59:10 2017 @@ -44,7 +44,7 @@ public final class BeanCacheKey this.isDelegate = isDelegate; this.type = type; this.path = path; - final int length = qualifiers != null ? qualifiers.length : 0; + int length = qualifiers != null ? qualifiers.length : 0; if (length == 0) { qualifier = null; @@ -241,9 +241,9 @@ public final class BeanCacheKey @Override public int compare(Annotation annotation1, Annotation annotation2) { - final Class<? extends Annotation> type1 = annotation1.annotationType(); - final Class<? extends Annotation> type2 = annotation2.annotationType(); - final int temp = type1.getName().compareTo(type2.getName()); + Class<? extends Annotation> type1 = annotation1.annotationType(); + Class<? extends Annotation> type2 = annotation2.annotationType(); + int temp = type1.getName().compareTo(type2.getName()); if (temp != 0) { return temp; @@ -255,15 +255,15 @@ public final class BeanCacheKey return 0; } - final Method[] member1 = type1.getDeclaredMethods(); - final Method[] member2 = type2.getDeclaredMethods(); + Method[] member1 = type1.getDeclaredMethods(); + Method[] member2 = type2.getDeclaredMethods(); // TBD: the order of the list of members seems to be deterministic int i = 0; int j = 0; - final int length1 = member1.length; - final int length2 = member2.length; + int length1 = member1.length; + int length2 = member2.length; // find next nonbinding for (;; i++, j++) @@ -295,8 +295,8 @@ public final class BeanCacheKey { return c; } - final Object value1 = callMethod(annotation1, member1[i]); - final Object value2 = callMethod(annotation2, member2[j]); + Object value1 = callMethod(annotation1, member1[i]); + Object value2 = callMethod(annotation2, member2[j]); assert value1.getClass().equals(value2.getClass()); if (value1 instanceof Comparable) @@ -316,7 +316,7 @@ public final class BeanCacheKey return c; } - final int length = Array.getLength(value1); + int length = Array.getLength(value1); c = length - Array.getLength(value2); if (c != 0) { Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java?rev=1799067&r1=1799066&r2=1799067&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java Sun Jun 18 09:59:10 2017 @@ -504,17 +504,17 @@ public class BeanManagerImpl implements * {@inheritDoc} */ @Override - public List<Decorator<?>> resolveDecorators(final Set<Type> types, final Annotation... bindingTypes) + public List<Decorator<?>> resolveDecorators(Set<Type> types, Annotation... bindingTypes) { webBeansContext.getAnnotationManager().checkDecoratorResolverParams(types, bindingTypes); return unsafeResolveDecorators(types, bindingTypes); } - public List<Decorator<?>> unsafeResolveDecorators(final Set<Type> types, final Annotation[] bindingTypes) + public List<Decorator<?>> unsafeResolveDecorators(Set<Type> types, Annotation[] bindingTypes) { webBeansContext.getAnnotationManager().checkQualifiersParams(types, bindingTypes); // checkDecoratorResolverParams is too restrictive for repeatable bindings - final Set<Decorator<?>> intsSet = webBeansContext.getDecoratorsManager().findDeployedWebBeansDecorator(types, bindingTypes); - final List<Decorator<?>> decoratorList = new ArrayList<Decorator<?>>(intsSet); + Set<Decorator<?>> intsSet = webBeansContext.getDecoratorsManager().findDeployedWebBeansDecorator(types, bindingTypes); + List<Decorator<?>> decoratorList = new ArrayList<Decorator<?>>(intsSet); Collections.sort(decoratorList, new DecoratorComparator(webBeansContext)); return decoratorList; } @@ -579,7 +579,7 @@ public class BeanManagerImpl implements * {@inheritDoc} */ @Override - public <T> AnnotatedType<T> createAnnotatedType(final Class<T> type) + public <T> AnnotatedType<T> createAnnotatedType(Class<T> type) { return annotatedElementFactory.newAnnotatedType(type); } @@ -751,7 +751,7 @@ public class BeanManagerImpl implements //Check type if bean type is given if(beanType != null && beanType != Object.class) { - final boolean isProducer = AbstractProducerBean.class.isInstance(bean); + boolean isProducer = AbstractProducerBean.class.isInstance(bean); if(!isProducer && // we have different rules for producers !isBeanTypeAssignableToGivenType(bean.getTypes(), beanType, bean instanceof NewBean, isProducer) && !GenericsUtil.satisfiesDependency(false, isProducer, beanType, bean.getBeanClass()) && @@ -848,12 +848,12 @@ public class BeanManagerImpl implements { validate(injectionPoint); } - catch (final Exception e) + catch (Exception e) { throw new IllegalArgumentException(e); } } // TODO else constructor rules are a bit different - final GProcessInjectionPoint event = webBeansContext.getWebBeansUtil().fireProcessInjectionPointEvent(injectionPoint); + GProcessInjectionPoint event = webBeansContext.getWebBeansUtil().fireProcessInjectionPointEvent(injectionPoint); injectionPoint = event.getInjectionPoint(); event.setStarted(); return injectionPoint; @@ -874,14 +874,14 @@ public class BeanManagerImpl implements return new InjectionTargetFactoryImpl<X>(type, webBeansContext); } - public <T> Bean<T> createBean(final BeanAttributes<T> attributes, final Class<T> type, final InjectionTargetFactory<T> factory) + public <T> Bean<T> createBean(BeanAttributes<T> attributes, Class<T> type, InjectionTargetFactory<T> factory) { - final AnnotatedType annotatedType = InjectionTargetFactoryImpl.class.isInstance(factory) ? + AnnotatedType annotatedType = InjectionTargetFactoryImpl.class.isInstance(factory) ? InjectionTargetFactoryImpl.class.cast(factory).getAnnotatedType() : getOrCreateAnnotatedType(type); if (WebBeansUtil.isDecorator(annotatedType)) { - final DecoratorBeanBuilder<T> dbb = new DecoratorBeanBuilder<T>(webBeansContext, annotatedType, attributes); + DecoratorBeanBuilder<T> dbb = new DecoratorBeanBuilder<T>(webBeansContext, annotatedType, attributes); DecoratorBean<T> decorator = null; if (dbb.isDecoratorEnabled()) { @@ -893,7 +893,7 @@ public class BeanManagerImpl implements } else if(WebBeansUtil.isCdiInterceptor(annotatedType)) { - final CdiInterceptorBeanBuilder<T> ibb = new CdiInterceptorBeanBuilder<T>(webBeansContext, annotatedType, attributes); + CdiInterceptorBeanBuilder<T> ibb = new CdiInterceptorBeanBuilder<T>(webBeansContext, annotatedType, attributes); CdiInterceptorBean<T> interceptor = null; if (ibb.isInterceptorEnabled()) { @@ -904,7 +904,7 @@ public class BeanManagerImpl implements return interceptor; } - final InjectionTargetBean<T> bean = new InjectionTargetBean<T>( + InjectionTargetBean<T> bean = new InjectionTargetBean<T>( webBeansContext, WebBeansType.THIRDPARTY, annotatedType, @@ -918,7 +918,7 @@ public class BeanManagerImpl implements return bean; } - private <T> AnnotatedType<T> getOrCreateAnnotatedType(final Class<T> type) + private <T> AnnotatedType<T> getOrCreateAnnotatedType(Class<T> type) { AnnotatedType<T> annotatedType = webBeansContext.getAnnotatedElementFactory().getAnnotatedType(type); if (annotatedType == null) @@ -931,7 +931,7 @@ public class BeanManagerImpl implements private boolean isBeanTypeAssignableToGivenType(Set<Type> beanTypes, Type givenType, boolean newBean, boolean producer) { - for (final Type beanApiType : beanTypes) + for (Type beanApiType : beanTypes) { if (GenericsUtil.satisfiesDependency(false, producer, givenType, beanApiType)) { @@ -1139,7 +1139,7 @@ public class BeanManagerImpl implements */ public <T> BeanAttributes<T> createBeanAttributes(AnnotatedType<T> type) { - final OpenWebBeansEjbPlugin ejbPlugin = webBeansContext.getPluginLoader().getEjbPlugin(); + OpenWebBeansEjbPlugin ejbPlugin = webBeansContext.getPluginLoader().getEjbPlugin(); if (ejbPlugin != null && ejbPlugin.isSessionBean(type.getJavaClass())) { return ejbPlugin.createBeanAttributes(type); @@ -1148,7 +1148,7 @@ public class BeanManagerImpl implements } - public <T, X> Bean<T> createBean(final BeanAttributes<T> attributes, final Class<X> type, final ProducerFactory<X> factory) + public <T, X> Bean<T> createBean(BeanAttributes<T> attributes, Class<X> type, ProducerFactory<X> factory) { return new ProducerAwareInjectionTargetBean<T>( webBeansContext, @@ -1159,7 +1159,7 @@ public class BeanManagerImpl implements factory); } - private Class<?> findClass(final ProducerFactory<?> factory, final Class<?> type) + private Class<?> findClass(ProducerFactory<?> factory, Class<?> type) { if (MethodProducerFactory.class.isInstance(factory)) { @@ -1174,7 +1174,7 @@ public class BeanManagerImpl implements public <T extends Extension> T getExtension(Class<T> type) { - final T extension = webBeansContext.getExtensionLoader().getExtension(type); + T extension = webBeansContext.getExtensionLoader().getExtension(type); if (extension == null) { throw new IllegalArgumentException("extension " + type + " not registered"); @@ -1238,9 +1238,9 @@ public class BeanManagerImpl implements @Override public <T> InjectionTarget<T> createInjectionTarget(AnnotatedType<T> type) { - final InjectionTargetFactoryImpl<T> factory = new InjectionTargetFactoryImpl<T>(type, webBeansContext); - final InterceptorUtil interceptorUtil = webBeansContext.getInterceptorUtil(); - final InjectionTargetImpl<T> injectionTarget = new LazyInterceptorDefinedInjectionTarget<T>( + InjectionTargetFactoryImpl<T> factory = new InjectionTargetFactoryImpl<T>(type, webBeansContext); + InterceptorUtil interceptorUtil = webBeansContext.getInterceptorUtil(); + InjectionTargetImpl<T> injectionTarget = new LazyInterceptorDefinedInjectionTarget<T>( type, factory.createInjectionPoints(null), webBeansContext, @@ -1252,21 +1252,21 @@ public class BeanManagerImpl implements { webBeansContext.getWebBeansUtil().validate(injectionTarget.getInjectionPoints(), null); } - catch (final InjectionException ie) + catch (InjectionException ie) { throw new IllegalArgumentException(ie); } - catch (final WebBeansConfigurationException ie) + catch (WebBeansConfigurationException ie) { throw new IllegalArgumentException(ie); } - catch (final DeploymentException ie) + catch (DeploymentException ie) { throw new IllegalArgumentException(ie); } } GProcessInjectionTarget event = webBeansContext.getWebBeansUtil().fireProcessInjectionTargetEvent(injectionTarget, type); - final InjectionTarget it = event.getInjectionTarget(); + InjectionTarget it = event.getInjectionTarget(); event.setStarted(); return it; } @@ -1329,7 +1329,7 @@ public class BeanManagerImpl implements return; } - final AnnotatedType<T> annotatedType = new AnnotatedTypeWrapper<T>(Extension.class.cast(extension), inAnnotatedType); + AnnotatedType<T> annotatedType = new AnnotatedTypeWrapper<T>(Extension.class.cast(extension), inAnnotatedType); if (annotatedType.getAnnotation(Vetoed.class) != null) { // we could check package here too but would be a lost of time 99.99% of the time @@ -1417,12 +1417,12 @@ public class BeanManagerImpl implements return (AnnotatedType<T>)annotatedTypes.get(id); } - public <T> String getId(final Class<T> type, final AnnotatedType<T> at) + public <T> String getId(Class<T> type, AnnotatedType<T> at) { - final ConcurrentMap<String, AnnotatedType<?>> additionals = additionalAnnotatedTypes.get(type); + ConcurrentMap<String, AnnotatedType<?>> additionals = additionalAnnotatedTypes.get(type); if (additionals != null) { - for (final Map.Entry<String, AnnotatedType<?>> entry : additionals.entrySet()) + for (Map.Entry<String, AnnotatedType<?>> entry : additionals.entrySet()) { if (entry.getValue() == at) { @@ -1433,14 +1433,14 @@ public class BeanManagerImpl implements return null; } - public <T> Iterable<AnnotatedType<T>> getAnnotatedTypes(final Class<T> type) + public <T> Iterable<AnnotatedType<T>> getAnnotatedTypes(Class<T> type) { - final Collection<AnnotatedType<T>> types = new ArrayList<AnnotatedType<T>>(2); + Collection<AnnotatedType<T>> types = new ArrayList<AnnotatedType<T>>(2); types.add(annotatedElementFactory.getAnnotatedType(type)); - final ConcurrentMap<String, AnnotatedType<?>> aTypes = additionalAnnotatedTypes.get(type); + ConcurrentMap<String, AnnotatedType<?>> aTypes = additionalAnnotatedTypes.get(type); if (aTypes != null) { - for (final AnnotatedType at : aTypes.values()) + for (AnnotatedType at : aTypes.values()) { types.add(at); } Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectableBeanManager.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectableBeanManager.java?rev=1799067&r1=1799066&r2=1799067&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectableBeanManager.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectableBeanManager.java Sun Jun 18 09:59:10 2017 @@ -374,7 +374,7 @@ public class InjectableBeanManager imple @Override public int hashCode() { - final int prime = 31; + int prime = 31; int result = 1; result = prime * result + ((bm == null) ? 0 : System.identityHashCode(bm)); return result; Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java?rev=1799067&r1=1799066&r2=1799067&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java Sun Jun 18 09:59:10 2017 @@ -114,7 +114,7 @@ public class InjectionResolver this.startup = false; } - public void setFastMatching(final boolean fastMatching) + public void setFastMatching(boolean fastMatching) { this.fastMatching = fastMatching; } @@ -163,7 +163,7 @@ public class InjectionResolver } // not that happy about this check here and at runtime but few TCKs test Weld behavior only... - final Bean<?> bean = resolve(implResolveByType(false, type, injectionPoint.getQualifiers().toArray(new Annotation[injectionPoint.getQualifiers().size()])), + Bean<?> bean = resolve(implResolveByType(false, type, injectionPoint.getQualifiers().toArray(new Annotation[injectionPoint.getQualifiers().size()])), injectionPoint); if (bean != null && ManagedBean.class.isInstance(bean)) { @@ -171,7 +171,7 @@ public class InjectionResolver { ManagedBean.class.cast(bean).valid(); } - catch (final UnproxyableResolutionException ure) + catch (UnproxyableResolutionException ure) { throw new WebBeansDeploymentException(ure); } Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionTargetFactoryImpl.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionTargetFactoryImpl.java?rev=1799067&r1=1799066&r2=1799067&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionTargetFactoryImpl.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionTargetFactoryImpl.java Sun Jun 18 09:59:10 2017 @@ -62,14 +62,14 @@ public class InjectionTargetFactoryImpl< public InjectionTarget<T> createInjectionTarget(Bean<T> bean) { AnnotatedType<T> at = getAnnotatedType(); - final InjectionTargetImpl<T> injectionTarget + InjectionTargetImpl<T> injectionTarget = new InjectionTargetImpl<T>(at, createInjectionPoints(bean), webBeansContext, getPostConstructMethods(), getPreDestroyMethods()); if (ManagedBean.class.isInstance(bean)) { ManagedBean.class.cast(bean).setOriginalInjectionTarget(injectionTarget); } - final GProcessInjectionTarget event = webBeansContext.getWebBeansUtil().fireProcessInjectionTargetEvent(injectionTarget, at); - final InjectionTarget it = event.getInjectionTarget(); + GProcessInjectionTarget event = webBeansContext.getWebBeansUtil().fireProcessInjectionTargetEvent(injectionTarget, at); + InjectionTarget it = event.getInjectionTarget(); event.setStarted(); // creating the InjectionTarget must only be done once. Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InterceptionFactoryImpl.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InterceptionFactoryImpl.java?rev=1799067&r1=1799066&r2=1799067&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InterceptionFactoryImpl.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InterceptionFactoryImpl.java Sun Jun 18 09:59:10 2017 @@ -45,8 +45,8 @@ public class InterceptionFactoryImpl<T> private boolean ignoreFinals; private volatile boolean called; - public InterceptionFactoryImpl(final WebBeansContext context, final AnnotatedType<T> at, - final Set<Annotation> qualifiers, final CreationalContextImpl<T> cc) + public InterceptionFactoryImpl(WebBeansContext context, AnnotatedType<T> at, + Set<Annotation> qualifiers, CreationalContextImpl<T> cc) { this.context = context; this.configurator = new AnnotatedTypeConfiguratorImpl<>(context, at); @@ -68,7 +68,7 @@ public class InterceptionFactoryImpl<T> } @Override - public T createInterceptedInstance(final T originalInstance) + public T createInterceptedInstance(T originalInstance) { check(); @@ -78,21 +78,21 @@ public class InterceptionFactoryImpl<T> classLoader = WebBeansUtil.getCurrentClassLoader(); } - final InterceptorDecoratorProxyFactory factory = context.getInterceptorDecoratorProxyFactory(); - final AnnotatedTypeImpl<T> newAnnotatedType = configurator.getNewAnnotatedType(); - final InterceptorResolutionService.BeanInterceptorInfo interceptorInfo = + InterceptorDecoratorProxyFactory factory = context.getInterceptorDecoratorProxyFactory(); + AnnotatedTypeImpl<T> newAnnotatedType = configurator.getNewAnnotatedType(); + InterceptorResolutionService.BeanInterceptorInfo interceptorInfo = context.getInterceptorResolutionService() .calculateInterceptorInfo(newAnnotatedType.getTypeClosure(), qualifiers, newAnnotatedType, !ignoreFinals); - final Class<T> subClass = factory.getCachedProxyClass(interceptorInfo, newAnnotatedType, classLoader); + Class<T> subClass = factory.getCachedProxyClass(interceptorInfo, newAnnotatedType, classLoader); - final Map<Interceptor<?>,Object> interceptorInstances = context.getInterceptorResolutionService() + Map<Interceptor<?>,Object> interceptorInstances = context.getInterceptorResolutionService() .createInterceptorInstances(interceptorInfo, creationalContext); - final Map<Method, List<Interceptor<?>>> methodInterceptors = + Map<Method, List<Interceptor<?>>> methodInterceptors = context.getInterceptorResolutionService().createMethodInterceptors(interceptorInfo); // this is a good question actually, should we even support it? - final String passivationId = InterceptionFactory.class.getName() + ">>" + newAnnotatedType.toString(); + String passivationId = InterceptionFactory.class.getName() + ">>" + newAnnotatedType.toString(); return context.getInterceptorResolutionService().createProxiedInstance( originalInstance, creationalContext, creationalContext, interceptorInfo, subClass, Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/OwbCDI.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/OwbCDI.java?rev=1799067&r1=1799066&r2=1799067&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/OwbCDI.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/OwbCDI.java Sun Jun 18 09:59:10 2017 @@ -40,9 +40,9 @@ public class OwbCDI extends CDI<Object> protected Instance<Object> instance() { - final WebBeansContext webBeansContext = getWebBeansContext(); - final BeanManagerImpl bm = webBeansContext.getBeanManagerImpl(); - final CreationalContextImpl<Instance<Object>> creationalContext = bm.createCreationalContext(null); + WebBeansContext webBeansContext = getWebBeansContext(); + BeanManagerImpl bm = webBeansContext.getBeanManagerImpl(); + CreationalContextImpl<Instance<Object>> creationalContext = bm.createCreationalContext(null); return new InstanceBean<Object>(webBeansContext).create(creationalContext).select(DefaultLiteral.INSTANCE); } @@ -53,7 +53,7 @@ public class OwbCDI extends CDI<Object> } @Override - public Instance<Object> select(final Annotation... qualifiers) + public Instance<Object> select(Annotation... qualifiers) { return instance().select(qualifiers); } @@ -71,19 +71,19 @@ public class OwbCDI extends CDI<Object> } @Override - public void destroy(final Object instance) + public void destroy(Object instance) { InstanceImpl.class.cast(instance).destroy(instance); } @Override - public <U> Instance<U> select(final TypeLiteral<U> subtype, final Annotation... qualifiers) + public <U> Instance<U> select(TypeLiteral<U> subtype, Annotation... qualifiers) { return instance().select(subtype, qualifiers); } @Override - public <U> Instance<U> select(final Class<U> subtype, final Annotation... qualifiers) + public <U> Instance<U> select(Class<U> subtype, Annotation... qualifiers) { return instance().select(subtype, qualifiers); } Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContext.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContext.java?rev=1799067&r1=1799066&r2=1799067&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContext.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContext.java Sun Jun 18 09:59:10 2017 @@ -186,7 +186,7 @@ public abstract class AbstractContext im CreationalContext<Object> cc = (CreationalContext<Object>)instance.getBeanCreationalContext(); //Destroy instance - final Object beanInstance = instance.getBeanInstance(); + Object beanInstance = instance.getBeanInstance(); if (beanInstance != null) { destroyInstance((Contextual<Object>)contextual, beanInstance, cc); Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/RequestContext.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/RequestContext.java?rev=1799067&r1=1799066&r2=1799067&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/RequestContext.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/RequestContext.java Sun Jun 18 09:59:10 2017 @@ -93,7 +93,7 @@ public class RequestContext extends Abst return httpSession; } - public void setHttpSession(final Object httpSession) + public void setHttpSession(Object httpSession) { this.httpSession = httpSession; } Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java?rev=1799067&r1=1799066&r2=1799067&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java Sun Jun 18 09:59:10 2017 @@ -368,7 +368,7 @@ public class CreationalContextImpl<T> im public String toString() { - final StringBuilder sb = new StringBuilder("CreationalContext{bean="); + StringBuilder sb = new StringBuilder("CreationalContext{bean="); sb.append(bean != null ? bean.toString() : "null"); Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationImpl.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationImpl.java?rev=1799067&r1=1799066&r2=1799067&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationImpl.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationImpl.java Sun Jun 18 09:59:10 2017 @@ -139,7 +139,7 @@ public class ConversationImpl implements } // now store this conversation in the SessionContext - final ConversationManager conversationManager = webBeansContext.getConversationManager(); + ConversationManager conversationManager = webBeansContext.getConversationManager(); ConversationContext conversationContext = (ConversationContext) webBeansContext.getContextsService().getCurrentContext(ConversationScoped.class); conversationManager.addToConversationStorage(conversationContext, id); } @@ -166,7 +166,7 @@ public class ConversationImpl implements } // now store this conversation in the SessionContext - final ConversationManager conversationManager = webBeansContext.getConversationManager(); + ConversationManager conversationManager = webBeansContext.getConversationManager(); ConversationContext conversationContext = (ConversationContext) webBeansContext.getContextsService().getCurrentContext(ConversationScoped.class); conversationManager.removeConversationFromStorage(conversationContext); } Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/DefaultSingletonService.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/DefaultSingletonService.java?rev=1799067&r1=1799066&r2=1799067&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/DefaultSingletonService.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/DefaultSingletonService.java Sun Jun 18 09:59:10 2017 @@ -60,7 +60,7 @@ public class DefaultSingletonService imp } } - public void register(final ClassLoader key, final WebBeansContext context) + public void register(ClassLoader key, WebBeansContext context) { if (singletonMap.containsKey(key)) { Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/AbstractMetaDataDiscovery.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/AbstractMetaDataDiscovery.java?rev=1799067&r1=1799066&r2=1799067&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/AbstractMetaDataDiscovery.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/AbstractMetaDataDiscovery.java Sun Jun 18 09:59:10 2017 @@ -107,7 +107,7 @@ public abstract class AbstractMetaDataDi beanArchiveService = webBeansContext().getBeanArchiveService(); } - final Filter userFilter = webBeansContext().getService(Filter.class); + Filter userFilter = webBeansContext().getService(Filter.class); archive = new CdiArchive(beanArchiveService, WebBeansUtil.getCurrentClassLoader(), getBeanDeploymentUrls(), userFilter, getAdditionalArchive()); finder = new OwbAnnotationFinder(archive); @@ -246,14 +246,14 @@ public abstract class AbstractMetaDataDi protected void filterExcludedJars(Set<URL> classPathUrls) { - final Iterator<URL> it = classPathUrls.iterator(); + Iterator<URL> it = classPathUrls.iterator(); while (it.hasNext()) { - final URL url = it.next(); - final String path = url.toExternalForm(); + URL url = it.next(); + String path = url.toExternalForm(); // TODO: should extract file path and test file.getName(), not the whole path // + should be configurable - final int knownJarIdx = isExcludedJar(path); + int knownJarIdx = isExcludedJar(path); // -Prun-its openwebbeans-tomcat7 in path but WEB-INF/classes if (knownJarIdx > 0 && knownJarIdx < path.indexOf(".jar")) { @@ -264,14 +264,14 @@ public abstract class AbstractMetaDataDi } } - protected int isExcludedJar(final String path) + protected int isExcludedJar(String path) { // lazy init - required when using DS CdiTestRunner initScanningExcludes(); - for (final String p : scanningExcludes) + for (String p : scanningExcludes) { - final int i = path.indexOf(p); + int i = path.indexOf(p); if (i > 0) { return i; @@ -350,7 +350,7 @@ public abstract class AbstractMetaDataDi doAddWebBeansXmlLocation(beanArchiveUrl); } - protected void doAddWebBeansXmlLocation(final URL beanArchiveUrl) + protected void doAddWebBeansXmlLocation(URL beanArchiveUrl) { beanArchiveLocations.add(beanArchiveUrl); Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/xbean/CdiArchive.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/xbean/CdiArchive.java?rev=1799067&r1=1799066&r2=1799067&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/xbean/CdiArchive.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/xbean/CdiArchive.java Sun Jun 18 09:59:10 2017 @@ -52,20 +52,20 @@ public class CdiArchive implements Archi private final Archive delegate; - public CdiArchive(BeanArchiveService beanArchiveService, final ClassLoader loader, final Map<String, URL> urls, - final Filter userFilter, final Archive customArchive) + public CdiArchive(BeanArchiveService beanArchiveService, ClassLoader loader, Map<String, URL> urls, + Filter userFilter, Archive customArchive) { - final Collection<Archive> archives = new ArrayList<Archive>(); + Collection<Archive> archives = new ArrayList<Archive>(); if (customArchive != null) { archives.add(userFilter != null ? new FilteredArchive(customArchive, userFilter) : customArchive); } - for (final URL url : urls.values()) + for (URL url : urls.values()) { - final List<String> urlClasses = new ArrayList<String>(); + List<String> urlClasses = new ArrayList<String>(); BeanArchiveInformation beanArchiveInfo = beanArchiveService.getBeanArchiveInformation(url); - final Archive archive = new FilteredArchive( + Archive archive = new FilteredArchive( "openwebbeans".equals(url.getProtocol()) ? customArchive : ClasspathArchive.archive(loader, url), new BeanArchiveFilter(beanArchiveInfo, urlClasses, userFilter)); @@ -82,13 +82,13 @@ public class CdiArchive implements Archi } @Override - public InputStream getBytecode(final String className) throws IOException, ClassNotFoundException + public InputStream getBytecode(String className) throws IOException, ClassNotFoundException { return delegate.getBytecode(className); } @Override - public Class<?> loadClass(final String className) throws ClassNotFoundException + public Class<?> loadClass(String className) throws ClassNotFoundException { return delegate.loadClass(className); } Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorsManager.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorsManager.java?rev=1799067&r1=1799066&r2=1799067&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorsManager.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorsManager.java Sun Jun 18 09:59:10 2017 @@ -75,8 +75,8 @@ public class DecoratorsManager Asserts.assertNotNull(src, "src parameter"); Asserts.assertNotNull(target, "target parameter"); - final int p1 = priorityDecorators.getSorted().indexOf(src); - final int p2 = priorityDecorators.getSorted().indexOf(target); + int p1 = priorityDecorators.getSorted().indexOf(src); + int p2 = priorityDecorators.getSorted().indexOf(target); int srcIndex = p1; if (srcIndex == -1) @@ -260,7 +260,7 @@ public class DecoratorsManager return priorityDecorators.getSorted(); } - public void addPriorityClazzDecorator(final Class<?> javaClass, final Priority priority) + public void addPriorityClazzDecorator(Class<?> javaClass, Priority priority) { priorityDecorators.add(javaClass, priority); } Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/StereoTypeModel.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/StereoTypeModel.java?rev=1799067&r1=1799066&r2=1799067&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/StereoTypeModel.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/StereoTypeModel.java Sun Jun 18 09:59:10 2017 @@ -96,7 +96,7 @@ public class StereoTypeModel implements } } - final AnnotationManager annotationManager = webBeansContext.getAnnotationManager(); + AnnotationManager annotationManager = webBeansContext.getAnnotationManager(); Annotation[] qualifiers = annotationManager.getQualifierAnnotations(annotations); if(qualifiers != null) Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/ContainerEventObserverMethodImpl.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/ContainerEventObserverMethodImpl.java?rev=1799067&r1=1799066&r2=1799067&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/ContainerEventObserverMethodImpl.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/ContainerEventObserverMethodImpl.java Sun Jun 18 09:59:10 2017 @@ -35,8 +35,8 @@ public class ContainerEventObserverMetho { private final Class[] withAnnotations; - public ContainerEventObserverMethodImpl(final AbstractOwbBean<?> bean, final AnnotatedMethod<T> annotatedObserverMethod, - final AnnotatedParameter<T> annotatedObservesParameter) + public ContainerEventObserverMethodImpl(AbstractOwbBean<?> bean, AnnotatedMethod<T> annotatedObserverMethod, + AnnotatedParameter<T> annotatedObservesParameter) { super(bean, annotatedObserverMethod, annotatedObservesParameter); WithAnnotations withAnnotationsAnn = annotatedObservesParameter.getAnnotation(WithAnnotations.class); @@ -69,7 +69,7 @@ public class ContainerEventObserverMetho } @Override - protected void invoke(final Object object, final Object[] args) throws IllegalAccessException, InvocationTargetException + protected void invoke(Object object, Object[] args) throws IllegalAccessException, InvocationTargetException { ExtensionAware extensionAware = null; if (args.length > 0) Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/EventMetadataImpl.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/EventMetadataImpl.java?rev=1799067&r1=1799066&r2=1799067&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/EventMetadataImpl.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/EventMetadataImpl.java Sun Jun 18 09:59:10 2017 @@ -87,8 +87,8 @@ public class EventMetadataImpl implement if (selectType != null && ParameterizedType.class.isInstance(selectType)) { - final ParameterizedType parameterizedType = ParameterizedType.class.cast(selectType); - final Type rawType = parameterizedType.getRawType(); + ParameterizedType parameterizedType = ParameterizedType.class.cast(selectType); + Type rawType = parameterizedType.getRawType(); if (rawType == type) { return selectType; Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java?rev=1799067&r1=1799066&r2=1799067&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java Sun Jun 18 09:59:10 2017 @@ -152,7 +152,7 @@ public final class NotificationManager // instead of a direct spi // // logic is: if an Executor is registered as a spi use it, otherwise use JVM default one - final Executor service = webBeansContext.getService(Executor.class); + Executor service = webBeansContext.getService(Executor.class); return service != null ? service : new CloseableExecutor(); } @@ -329,7 +329,7 @@ public final class NotificationManager return true; } - for (final Annotation meta : annotation.annotationType().getAnnotations()) + for (Annotation meta : annotation.annotationType().getAnnotations()) { if (withAnnotation.isAssignableFrom(meta.annotationType())) { @@ -667,7 +667,7 @@ public final class NotificationManager */ public <T> CompletionStage<T> fireEvent(Object event, EventMetadataImpl metadata, boolean isLifecycleEvent, NotificationOptions notificationOptions) { - final boolean async = notificationOptions != null; + boolean async = notificationOptions != null; if (!isLifecycleEvent && webBeansContext.getWebBeansUtil().isContainerEventType(event)) { @@ -778,13 +778,13 @@ public final class NotificationManager return async ? complete(completableFutures, (T) event) : null; } - private <T> CompletableFuture<T> complete(final List<CompletableFuture<Void>> completableFutures, T event) + private <T> CompletableFuture<T> complete(List<CompletableFuture<Void>> completableFutures, T event) { if (completableFutures == null) { return null; } - final CDICompletionFuture<T> future = new CDICompletionFuture<>(event, completableFutures.size()); + CDICompletionFuture<T> future = new CDICompletionFuture<>(event, completableFutures.size()); completableFutures.forEach(f -> f.handle((t, e) -> { future.addResult(e); @@ -805,7 +805,7 @@ public final class NotificationManager runAsync(event, metadata, observer); future.complete(null); } - catch (final WebBeansException wbe) + catch (WebBeansException wbe) { future.completeExceptionally(wbe.getCause()); } @@ -827,7 +827,7 @@ public final class NotificationManager } } - private <T> void invokeObserverMethod(final T event, final EventMetadataImpl metadata, ObserverMethod<?> observer) + private <T> void invokeObserverMethod(T event, EventMetadataImpl metadata, ObserverMethod<?> observer) { observer.notify(new EventContextImpl(event, metadata)); } @@ -877,14 +877,14 @@ public final class NotificationManager return observer; } - public boolean isContainerEvent(final AnnotatedParameter<?> annotatedParameter) + public boolean isContainerEvent(AnnotatedParameter<?> annotatedParameter) { - final AnnotatedCallable<?> method = annotatedParameter.getDeclaringCallable(); + AnnotatedCallable<?> method = annotatedParameter.getDeclaringCallable(); if (!AnnotatedMethod.class.isInstance(method) || method.getParameters().size() == 0) { return false; } - final Class<?> paramType = AnnotatedMethod.class.cast(method).getJavaMember().getParameterTypes()[0]; + Class<?> paramType = AnnotatedMethod.class.cast(method).getJavaMember().getParameterTypes()[0]; return CONTAINER_EVENT_CLASSES.contains(paramType); } @@ -895,13 +895,13 @@ public final class NotificationManager private final AtomicInteger counter; private AtomicReference<CompletionException> error = new AtomicReference<>(); - private CDICompletionFuture(final T event, final int total) + private CDICompletionFuture(T event, int total) { this.event = event; this.counter = new AtomicInteger(total); } - CDICompletionFuture<T> addResult(final Throwable t) + CDICompletionFuture<T> addResult(Throwable t) { if (t != null) { @@ -940,7 +940,7 @@ public final class NotificationManager { r.run(); } - catch (final RuntimeException re) + catch (RuntimeException re) { WebBeansLoggerFacade.getLogger(NotificationManager.class).warning(re.getMessage()); } @@ -948,7 +948,7 @@ public final class NotificationManager } @Override - public void execute(final Runnable command) + public void execute(Runnable command) { if (reject) { Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverMethodImpl.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverMethodImpl.java?rev=1799067&r1=1799066&r2=1799067&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverMethodImpl.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverMethodImpl.java Sun Jun 18 09:59:10 2017 @@ -174,7 +174,7 @@ public class ObserverMethodImpl<T> imple priority = priorityAnn.value(); } - final OpenWebBeansEjbPlugin ejbPlugin = getWebBeansContext().getPluginLoader().getEjbPlugin(); + OpenWebBeansEjbPlugin ejbPlugin = getWebBeansContext().getPluginLoader().getEjbPlugin(); if (ejbPlugin != null && ejbPlugin.isNewSessionBean(ownerBean.getBeanClass())) { view = ejbPlugin.resolveViewMethod(ownerBean , annotatedObserverMethod.getJavaMember()); @@ -394,7 +394,7 @@ public class ObserverMethodImpl<T> imple } - protected void invoke(final Object object, final Object[] args) throws IllegalAccessException, InvocationTargetException + protected void invoke(Object object, Object[] args) throws IllegalAccessException, InvocationTargetException { view.invoke(object, args); } @@ -413,8 +413,8 @@ public class ObserverMethodImpl<T> imple param.instance = event; list.add(param); } - final WebBeansContext webBeansContext = ownerBean.getWebBeansContext(); - final BeanManagerImpl manager = webBeansContext.getBeanManagerImpl(); + WebBeansContext webBeansContext = ownerBean.getWebBeansContext(); + BeanManagerImpl manager = webBeansContext.getBeanManagerImpl(); for (InjectionPoint injectionPoint: injectionPoints) { Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableConstructor.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableConstructor.java?rev=1799067&r1=1799066&r2=1799067&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableConstructor.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableConstructor.java Sun Jun 18 09:59:10 2017 @@ -91,8 +91,8 @@ public class InjectableConstructor<T> ex return params; } - final List<Object> list = new ArrayList<Object>(); - final List<InjectionPoint> injectedPoints = getInjectionPoints(con); + List<Object> list = new ArrayList<Object>(); + List<InjectionPoint> injectedPoints = getInjectionPoints(con); for (int i=0; i<injectedPoints.size(); i++) { Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointFactory.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointFactory.java?rev=1799067&r1=1799066&r2=1799067&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointFactory.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointFactory.java Sun Jun 18 09:59:10 2017 @@ -135,7 +135,7 @@ public class InjectionPointFactory if (fireEvent) { - final GProcessInjectionPoint event = webBeansContext.getWebBeansUtil().fireProcessInjectionPointEvent(injectionPoint); + GProcessInjectionPoint event = webBeansContext.getWebBeansUtil().fireProcessInjectionPointEvent(injectionPoint); injectionPoint = event.getInjectionPoint(); event.setStarted(); } Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/instance/InstanceImpl.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/instance/InstanceImpl.java?rev=1799067&r1=1799066&r2=1799067&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/instance/InstanceImpl.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/instance/InstanceImpl.java Sun Jun 18 09:59:10 2017 @@ -283,7 +283,7 @@ public class InstanceImpl<T> implements } else { - final CreationalContextImpl<?> creationalContext = creationalContexts.remove(instance); + CreationalContextImpl<?> creationalContext = creationalContexts.remove(instance); if (creationalContext == null) { throw new IllegalArgumentException("instance " + instance + " not produced with this Instance<?>"); @@ -301,7 +301,7 @@ public class InstanceImpl<T> implements creationalContext.putInjectionPoint(injectionPoint); try { - final T reference = (T) beanManager.getReference(bean, injectionClazz, creationalContext); + T reference = (T) beanManager.getReference(bean, injectionClazz, creationalContext); if (creationalContexts == null) { creationalContexts = new IdentityHashMap<Object, CreationalContextImpl<?>>(); @@ -328,7 +328,7 @@ public class InstanceImpl<T> implements private void readObject(java.io.ObjectInputStream in) throws IOException, ClassNotFoundException { webBeansContext = WebBeansContext.currentInstance(); - final ObjectInputStream inputStream = new OwbCustomObjectInputStream(in, WebBeansUtil.getCurrentClassLoader()); + ObjectInputStream inputStream = new OwbCustomObjectInputStream(in, WebBeansUtil.getCurrentClassLoader()); injectionClazz = (Type)inputStream.readObject(); qualifierAnnotations = (Set<Annotation>)inputStream.readObject(); injectionPoint = (InjectionPoint) inputStream.readObject(); @@ -376,7 +376,7 @@ public class InstanceImpl<T> implements private InjectionPoint delegate; private Set<Annotation> qualifiers; - protected InstanceInjectionPoint(final InjectionPoint injectionPoint, final Annotation[] newQualifiersArray) + protected InstanceInjectionPoint(InjectionPoint injectionPoint, Annotation[] newQualifiersArray) { this.delegate = injectionPoint; this.qualifiers = Collections.unmodifiableSet(new HashSet<Annotation>(Arrays.asList(newQualifiersArray))); @@ -424,16 +424,16 @@ public class InstanceImpl<T> implements return delegate.isTransient(); } - private void readObject(final ObjectInputStream inp) throws IOException, ClassNotFoundException + private void readObject(ObjectInputStream inp) throws IOException, ClassNotFoundException { - final OwbCustomObjectInputStream owbCustomObjectInputStream = new OwbCustomObjectInputStream(inp, WebBeansUtil.getCurrentClassLoader()); + OwbCustomObjectInputStream owbCustomObjectInputStream = new OwbCustomObjectInputStream(inp, WebBeansUtil.getCurrentClassLoader()); qualifiers = Set.class.cast(owbCustomObjectInputStream.readObject()); delegate = InjectionPoint.class.cast(owbCustomObjectInputStream.readObject()); } - private void writeObject(final ObjectOutputStream op) throws IOException + private void writeObject(ObjectOutputStream op) throws IOException { - final ObjectOutputStream out = new ObjectOutputStream(op); + ObjectOutputStream out = new ObjectOutputStream(op); out.writeObject(qualifiers); out.writeObject(delegate); } Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/AbstractInvocationContext.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/AbstractInvocationContext.java?rev=1799067&r1=1799066&r2=1799067&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/AbstractInvocationContext.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/AbstractInvocationContext.java Sun Jun 18 09:59:10 2017 @@ -112,7 +112,7 @@ public abstract class AbstractInvocation { return getMethod().invoke(target.get(), parameters); } - catch (final InvocationTargetException ite) + catch (InvocationTargetException ite) { // unpack the reflection Exception throw ExceptionUtil.throwAsRuntimeException(ite.getCause()); Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/ConstructorInterceptorInvocationContext.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/ConstructorInterceptorInvocationContext.java?rev=1799067&r1=1799066&r2=1799067&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/ConstructorInterceptorInvocationContext.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/ConstructorInterceptorInvocationContext.java Sun Jun 18 09:59:10 2017 @@ -32,10 +32,10 @@ public class ConstructorInterceptorInvoc { protected Object newInstance; - public ConstructorInterceptorInvocationContext(final Provider<T> provider, - final List<Interceptor<?>> aroundConstructInterceptors, - final Map<Interceptor<?>, ?> interceptorInstances, - final Constructor<T> cons, final Object[] parameters) + public ConstructorInterceptorInvocationContext(Provider<T> provider, + List<Interceptor<?>> aroundConstructInterceptors, + Map<Interceptor<?>, ?> interceptorInstances, + Constructor<T> cons, Object[] parameters) { super(provider, InterceptionType.AROUND_CONSTRUCT, aroundConstructInterceptors, interceptorInstances, cons, parameters); } @@ -57,7 +57,7 @@ public class ConstructorInterceptorInvoc newInstance = getConstructor().newInstance(parameters); return null; } - catch (final InvocationTargetException ite) + catch (InvocationTargetException ite) { // unpack the reflection Exception throw ExceptionUtil.throwAsRuntimeException(ite.getCause());
