Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/DecoratorHandler.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/DecoratorHandler.java?rev=1799067&r1=1799066&r2=1799067&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/DecoratorHandler.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/DecoratorHandler.java Sun Jun 18 09:59:10 2017 @@ -125,21 +125,21 @@ public class DecoratorHandler implements } @Override - public void writeExternal(final ObjectOutput out) throws IOException + public void writeExternal(ObjectOutput out) throws IOException { out.writeInt(index); out.writeObject(target); out.writeInt(instances.size()); - for (final Map.Entry<Decorator<?>, ?> entry : instances.entrySet()) + for (Map.Entry<Decorator<?>, ?> entry : instances.entrySet()) { - final Decorator<?> key = entry.getKey(); + Decorator<?> key = entry.getKey(); serializeDecorator(out, key); out.writeObject(entry.getValue()); } out.writeInt(decorators.size()); - for (final Decorator<?> decorator : decorators) + for (Decorator<?> decorator : decorators) { serializeDecorator(out, decorator); } @@ -149,9 +149,9 @@ public class DecoratorHandler implements Object readResolve() throws ObjectStreamException { - final WebBeansContext webBeansContext = WebBeansContext.getInstance(); - final BeanManager beanManager = webBeansContext.getBeanManagerImpl(); - final Bean<?> bean = beanManager.getPassivationCapableBean(passivationId); + WebBeansContext webBeansContext = WebBeansContext.getInstance(); + BeanManager beanManager = webBeansContext.getBeanManagerImpl(); + Bean<?> bean = beanManager.getPassivationCapableBean(passivationId); return webBeansContext.getInterceptorDecoratorProxyFactory().createProxyInstance( webBeansContext.getInterceptorDecoratorProxyFactory().getCachedProxyClass(bean), @@ -161,25 +161,25 @@ public class DecoratorHandler implements } @Override - public void readExternal(final ObjectInput in) throws IOException, ClassNotFoundException + public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { index = in.readInt(); target = in.readObject(); - final int instancesSize = in.readInt(); - final WebBeansContext webBeansContext = WebBeansContext.getInstance(); - final BeanManager beanManager = webBeansContext.getBeanManagerImpl(); + int instancesSize = in.readInt(); + WebBeansContext webBeansContext = WebBeansContext.getInstance(); + BeanManager beanManager = webBeansContext.getBeanManagerImpl(); - final Map<Decorator<?>, Object> tmpInstances = new HashMap<Decorator<?>, Object>(); + Map<Decorator<?>, Object> tmpInstances = new HashMap<Decorator<?>, Object>(); for (int i = 0; i < instancesSize; i++) { - final Decorator<?> bean = (Decorator<?>) beanManager.getPassivationCapableBean(in.readUTF()); - final Object value = in.readObject(); + Decorator<?> bean = (Decorator<?>) beanManager.getPassivationCapableBean(in.readUTF()); + Object value = in.readObject(); tmpInstances.put(bean, value); } instances = tmpInstances; - final int decoratorsSize = in.readInt(); + int decoratorsSize = in.readInt(); decorators = new CopyOnWriteArrayList<Decorator<?>>(); for (int i = 0; i < decoratorsSize; i++) { @@ -187,10 +187,10 @@ public class DecoratorHandler implements } passivationId = in.readUTF(); - final Bean<?> bean = beanManager.getPassivationCapableBean(passivationId); + Bean<?> bean = beanManager.getPassivationCapableBean(passivationId); if (bean instanceof OwbBean) { - final Producer<?> producer = ((OwbBean<?>)bean).getProducer(); + Producer<?> producer = ((OwbBean<?>)bean).getProducer(); if (producer instanceof AbstractProducer) { interceptorInfo = ((AbstractProducer<?>)producer).getInterceptorInfo(); @@ -198,9 +198,9 @@ public class DecoratorHandler implements } } - private static void serializeDecorator(final ObjectOutput out, final Decorator<?> key) throws IOException + private static void serializeDecorator(ObjectOutput out, Decorator<?> key) throws IOException { - final String id = WebBeansUtil.getPassivationId(key); + String id = WebBeansUtil.getPassivationId(key); if (id == null) { throw new NotSerializableException(key + " is not serializable");
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/DefaultInterceptorHandler.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/DefaultInterceptorHandler.java?rev=1799067&r1=1799066&r2=1799067&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/DefaultInterceptorHandler.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/DefaultInterceptorHandler.java Sun Jun 18 09:59:10 2017 @@ -161,9 +161,9 @@ public class DefaultInterceptorHandler<T @SuppressWarnings("unused") Object readResolve() throws ObjectStreamException { - final WebBeansContext webBeansContext = WebBeansContext.getInstance(); - final BeanManager beanManager = webBeansContext.getBeanManagerImpl(); - final Bean<T> bean = (Bean<T>) beanManager.getPassivationCapableBean(beanPassivationId); + WebBeansContext webBeansContext = WebBeansContext.getInstance(); + BeanManager beanManager = webBeansContext.getBeanManagerImpl(); + Bean<T> bean = (Bean<T>) beanManager.getPassivationCapableBean(beanPassivationId); return webBeansContext.getInterceptorDecoratorProxyFactory().createProxyInstance( webBeansContext.getInterceptorDecoratorProxyFactory().getCachedProxyClass(bean), @@ -173,11 +173,11 @@ public class DefaultInterceptorHandler<T } @Override - public void writeExternal(final ObjectOutput out) throws IOException + public void writeExternal(ObjectOutput out) throws IOException { out.writeObject(target); - final boolean noDecorator = target == delegate; + boolean noDecorator = target == delegate; out.writeBoolean(noDecorator); if (!noDecorator) { @@ -185,9 +185,9 @@ public class DefaultInterceptorHandler<T } out.writeInt(instances.size()); - for (final Map.Entry<Interceptor<?>, ?> entry : instances.entrySet()) + for (Map.Entry<Interceptor<?>, ?> entry : instances.entrySet()) { - final Interceptor<?> key = entry.getKey(); + Interceptor<?> key = entry.getKey(); if (serializeInterceptor(out, key)) { out.writeObject(entry.getValue()); @@ -195,16 +195,16 @@ public class DefaultInterceptorHandler<T } out.writeInt(interceptors.size()); - for (final Map.Entry<Method, List<Interceptor<?>>> entry : interceptors.entrySet()) + for (Map.Entry<Method, List<Interceptor<?>>> entry : interceptors.entrySet()) { - final Method key = entry.getKey(); + Method key = entry.getKey(); out.writeObject(key.getDeclaringClass()); out.writeUTF(key.getName()); out.writeObject(key.getParameterTypes()); - final List<Interceptor<?>> value = entry.getValue(); + List<Interceptor<?>> value = entry.getValue(); out.writeInt(value.size()); - for (final Interceptor<?> i : value) + for (Interceptor<?> i : value) { serializeInterceptor(out, i); } @@ -214,7 +214,7 @@ public class DefaultInterceptorHandler<T } @Override - public void readExternal(final ObjectInput in) throws IOException, ClassNotFoundException + public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { target = (T) in.readObject(); if (in.readBoolean()) @@ -226,17 +226,17 @@ public class DefaultInterceptorHandler<T delegate = (T) in.readObject(); } - final int instancesSize = in.readInt(); - final WebBeansContext webBeansContext = WebBeansContext.getInstance(); - final BeanManager beanManager = webBeansContext.getBeanManagerImpl(); + int instancesSize = in.readInt(); + WebBeansContext webBeansContext = WebBeansContext.getInstance(); + BeanManager beanManager = webBeansContext.getBeanManagerImpl(); - final Map<Interceptor<?>, Object> tmpInstances = new HashMap<Interceptor<?>, Object>(); + Map<Interceptor<?>, Object> tmpInstances = new HashMap<Interceptor<?>, Object>(); for (int i = 0; i < instancesSize; i++) { - final Interceptor<?> interceptor = readInterceptor(in.readUTF(), beanManager); + Interceptor<?> interceptor = readInterceptor(in.readUTF(), beanManager); if (!SelfInterceptorBean.class.isInstance(interceptor)) { - final Object value = in.readObject(); + Object value = in.readObject(); tmpInstances.put(interceptor, value); } else @@ -246,25 +246,25 @@ public class DefaultInterceptorHandler<T } instances = tmpInstances; - final int interceptorsSize = in.readInt(); + int interceptorsSize = in.readInt(); interceptors = new HashMap<Method, List<Interceptor<?>>>(interceptorsSize); for (int i = 0; i < interceptorsSize; i++) { - final Class<?> declaringClass = (Class<?>) in.readObject(); - final String name = in.readUTF(); - final Class<?>[] parameters = (Class<?>[]) in.readObject(); - final Method method; + Class<?> declaringClass = (Class<?>) in.readObject(); + String name = in.readUTF(); + Class<?>[] parameters = (Class<?>[]) in.readObject(); + Method method; try { method = declaringClass.getDeclaredMethod(name, parameters); } - catch (final NoSuchMethodException e) + catch (NoSuchMethodException e) { throw new NotSerializableException(target.getClass().getName()); } - final int interceptorListSize = in.readInt(); - final List<Interceptor<?>> interceptorList = new ArrayList<Interceptor<?>>(interceptorListSize); + int interceptorListSize = in.readInt(); + List<Interceptor<?>> interceptorList = new ArrayList<Interceptor<?>>(interceptorListSize); for (int j = 0; j < interceptorListSize; j++) { interceptorList.add(readInterceptor(in.readUTF(), beanManager)); @@ -278,17 +278,17 @@ public class DefaultInterceptorHandler<T /** * @return false if the interceptor value can be ignored */ - private static boolean serializeInterceptor(final ObjectOutput out, final Interceptor<?> key) throws IOException + private static boolean serializeInterceptor(ObjectOutput out, Interceptor<?> key) throws IOException { if (SelfInterceptorBean.class.isInstance(key)) { - final String beanName = WebBeansUtil.getPassivationId(key) + String beanName = WebBeansUtil.getPassivationId(key) .replace(WebBeansType.INTERCEPTOR.name(), WebBeansType.MANAGED.name()); out.writeUTF(SELF_KEY + beanName); return false; } - final String id = WebBeansUtil.getPassivationId(key); + String id = WebBeansUtil.getPassivationId(key); if (id == null) { throw new NotSerializableException(key + " is not serializable"); @@ -297,17 +297,17 @@ public class DefaultInterceptorHandler<T return true; } - private static Interceptor<?> readInterceptor(final String id, final BeanManager beanManager) throws IOException + private static Interceptor<?> readInterceptor(String id, BeanManager beanManager) throws IOException { if (id.startsWith(SELF_KEY)) { - final Bean<?> bean = beanManager.getPassivationCapableBean(id.substring(SELF_KEY.length())); + Bean<?> bean = beanManager.getPassivationCapableBean(id.substring(SELF_KEY.length())); if (InjectionTargetBean.class.isInstance(bean)) { - final InjectionTarget<?> it = InjectionTargetBean.class.cast(bean).getInjectionTarget(); + InjectionTarget<?> it = InjectionTargetBean.class.cast(bean).getInjectionTarget(); if (InjectionTargetImpl.class.isInstance(it)) { - final InterceptorResolutionService.BeanInterceptorInfo info = InjectionTargetImpl.class.cast(it) + InterceptorResolutionService.BeanInterceptorInfo info = InjectionTargetImpl.class.cast(it) .getInterceptorInfo(); return info.getSelfInterceptorBean(); } @@ -328,7 +328,7 @@ public class DefaultInterceptorHandler<T { private final T value; - public InstanceProvider(final T delegate) + public InstanceProvider(T delegate) { this.value = delegate; } Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorComparator.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorComparator.java?rev=1799067&r1=1799066&r2=1799067&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorComparator.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorComparator.java Sun Jun 18 09:59:10 2017 @@ -44,8 +44,8 @@ public class InterceptorComparator<T> im } else { - final Class<?> o1Clazz = o1.getBeanClass(); - final Class<?> o2Clazz = o2.getBeanClass(); + Class<?> o1Clazz = o1.getBeanClass(); + Class<?> o2Clazz = o2.getBeanClass(); return interceptorsManager.compareCdiInterceptors(o1Clazz, o2Clazz); Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorResolutionService.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorResolutionService.java?rev=1799067&r1=1799066&r2=1799067&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorResolutionService.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorResolutionService.java Sun Jun 18 09:59:10 2017 @@ -168,7 +168,7 @@ public class InterceptorResolutionServic } for (AnnotatedConstructor annotatedConstructor : annotatedType.getConstructors()) { - final BusinessMethodInterceptorInfo constructorInterceptorInfo = new BusinessMethodInterceptorInfo(); + BusinessMethodInterceptorInfo constructorInterceptorInfo = new BusinessMethodInterceptorInfo(); calculateEjbMethodInterceptors(constructorInterceptorInfo, allUsedEjbInterceptors, classLevelEjbInterceptors, annotatedConstructor, failOnFinal); if (constructorInterceptorInfo.isEmpty() && (selfInterceptorBean == null || !selfInterceptorBean.isAroundInvoke())) { @@ -271,7 +271,7 @@ public class InterceptorResolutionServic Set<Interceptor<?>> allUsedCdiInterceptors, Set<Interceptor<?>> allUsedConstructorCdiInterceptors) { - final BeanManagerImpl beanManagerImpl = webBeansContext.getBeanManagerImpl(); + BeanManagerImpl beanManagerImpl = webBeansContext.getBeanManagerImpl(); Annotation[] interceptorBindings = null; if (classInterceptorBindings.size() > 0) @@ -285,7 +285,7 @@ public class InterceptorResolutionServic AnnotatedConstructor<?> constructorToUse = null; if (!annotatedType.getConstructors().isEmpty()) // avoid to use class annotations for not used constructors { - for (final AnnotatedConstructor<?> c : annotatedType.getConstructors()) + for (AnnotatedConstructor<?> c : annotatedType.getConstructors()) { if (constructorToUse == null && c.getParameters().isEmpty()) { @@ -300,11 +300,11 @@ public class InterceptorResolutionServic } if (constructorToUse != null) { - final Set<Annotation> constructorAnnot = webBeansContext.getAnnotationManager().getInterceptorAnnotations(constructorToUse.getAnnotations()); - for (final Annotation classA : classInterceptorBindings) + Set<Annotation> constructorAnnot = webBeansContext.getAnnotationManager().getInterceptorAnnotations(constructorToUse.getAnnotations()); + for (Annotation classA : classInterceptorBindings) { boolean overriden = false; - for (final Annotation consA : constructorAnnot) + for (Annotation consA : constructorAnnot) { if (classA.annotationType() == consA.annotationType()) { @@ -444,10 +444,10 @@ public class InterceptorResolutionServic } } - private boolean isUnproxyable(final AnnotatedCallable annotatedMethod, final boolean failOnFinal) + private boolean isUnproxyable(AnnotatedCallable annotatedMethod, boolean failOnFinal) { int modifiers = annotatedMethod.getJavaMember().getModifiers(); - final boolean isFinal = Modifier.isFinal(modifiers); + boolean isFinal = Modifier.isFinal(modifiers); if (failOnFinal && isFinal) { throw new UnproxyableResolutionException(annotatedMethod + " is not proxyable"); @@ -760,9 +760,9 @@ public class InterceptorResolutionServic return interceptableAnnotatedMethods; } - public Map<Method, List<Interceptor<?>>> createMethodInterceptors(final BeanInterceptorInfo interceptorInfo) + public Map<Method, List<Interceptor<?>>> createMethodInterceptors(BeanInterceptorInfo interceptorInfo) { - final Map<Method, List<Interceptor<?>>> methodInterceptors = new HashMap<>(interceptorInfo.getBusinessMethodsInfo().size()); + Map<Method, List<Interceptor<?>>> methodInterceptors = new HashMap<>(interceptorInfo.getBusinessMethodsInfo().size()); for (Map.Entry<Method, BusinessMethodInterceptorInfo> miEntry : interceptorInfo.getBusinessMethodsInfo().entrySet()) { Method interceptedMethod = miEntry.getKey(); @@ -798,28 +798,28 @@ public class InterceptorResolutionServic return methodInterceptors; } - public <T> Map<Interceptor<?>, Object> createInterceptorInstances(final BeanInterceptorInfo interceptorInfo, - final CreationalContextImpl<T> creationalContextImpl) + public <T> Map<Interceptor<?>, Object> createInterceptorInstances(BeanInterceptorInfo interceptorInfo, + CreationalContextImpl<T> creationalContextImpl) { - final Map<Interceptor<?>,Object> interceptorInstances = new HashMap<>(); + Map<Interceptor<?>,Object> interceptorInstances = new HashMap<>(); if (interceptorInfo != null) { // apply interceptorInfo // create EJB-style interceptors - for (final Interceptor interceptorBean : interceptorInfo.getEjbInterceptors()) + for (Interceptor interceptorBean : interceptorInfo.getEjbInterceptors()) { creationalContextImpl.putContextual(interceptorBean); interceptorInstances.put(interceptorBean, interceptorBean.create(creationalContextImpl)); } // create CDI-style interceptors - for (final Interceptor interceptorBean : interceptorInfo.getCdiInterceptors()) + for (Interceptor interceptorBean : interceptorInfo.getCdiInterceptors()) { creationalContextImpl.putContextual(interceptorBean); interceptorInstances.put(interceptorBean, interceptorBean.create(creationalContextImpl)); } - for (final Interceptor interceptorBean : interceptorInfo.getConstructorCdiInterceptors()) + for (Interceptor interceptorBean : interceptorInfo.getConstructorCdiInterceptors()) { creationalContextImpl.putContextual(interceptorBean); interceptorInstances.put(interceptorBean, interceptorBean.create(creationalContextImpl)); @@ -828,13 +828,13 @@ public class InterceptorResolutionServic return interceptorInstances; } - public <T> T createProxiedInstance(final T instance, final CreationalContextImpl<T> creationalContextImpl, - final CreationalContext<T> creationalContext, - final BeanInterceptorInfo interceptorInfo, - final Class<? extends T> proxyClass, final Map<Method, List<Interceptor<?>>> methodInterceptors, - final String passivationId, final Map<Interceptor<?>, Object> interceptorInstances, - final Function<CreationalContextImpl<?>, Boolean> isDelegateInjection, - final BiFunction<T, List<Decorator<?>>, List<Decorator<?>>> filterDecorators) + public <T> T createProxiedInstance(T instance, CreationalContextImpl<T> creationalContextImpl, + CreationalContext<T> creationalContext, + BeanInterceptorInfo interceptorInfo, + Class<? extends T> proxyClass, Map<Method, List<Interceptor<?>>> methodInterceptors, + String passivationId, Map<Interceptor<?>, Object> interceptorInstances, + Function<CreationalContextImpl<?>, Boolean> isDelegateInjection, + BiFunction<T, List<Decorator<?>>, List<Decorator<?>>> filterDecorators) { // register the bean itself for self-interception if (interceptorInfo.getSelfInterceptorBean() != null) Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorsManager.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorsManager.java?rev=1799067&r1=1799066&r2=1799067&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorsManager.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorsManager.java Sun Jun 18 09:59:10 2017 @@ -157,8 +157,8 @@ public class InterceptorsManager Asserts.assertNotNull(src, "src"); Asserts.assertNotNull(target, "target"); - final int p1 = priorityInterceptors.getSorted().indexOf(src); - final int p2 = priorityInterceptors.getSorted().indexOf(target); + int p1 = priorityInterceptors.getSorted().indexOf(src); + int p2 = priorityInterceptors.getSorted().indexOf(target); int srcIndex = p1; if (srcIndex == -1) @@ -229,7 +229,7 @@ public class InterceptorsManager // first check AT since it can override some methods (@NonBinding) boolean found = false; - for (final AnnotatedType<?> at : additionalInterceptorBindingTypesAnnotatedTypes) + for (AnnotatedType<?> at : additionalInterceptorBindingTypesAnnotatedTypes) { if (interceptorBinding.annotationType().equals(at.getJavaClass())) { @@ -252,9 +252,9 @@ public class InterceptorsManager return true; } - private boolean inBindingArray(final AnnotatedType<?> at, final Annotation interceptorBinding, final Annotation[] requestedInterceptorBindings) + private boolean inBindingArray(AnnotatedType<?> at, Annotation interceptorBinding, Annotation[] requestedInterceptorBindings) { - for (final Annotation requestedBinding : requestedInterceptorBindings) + for (Annotation requestedBinding : requestedInterceptorBindings) { if (AnnotationUtil.isCdiAnnotationEqual(at, requestedBinding, interceptorBinding)) { @@ -305,7 +305,7 @@ public class InterceptorsManager return additionalInterceptorClasses.contains(clazz); } - public void addInterceptorBindingType(final AnnotatedType<? extends Annotation> annotatedType) + public void addInterceptorBindingType(AnnotatedType<? extends Annotation> annotatedType) { additionalInterceptorBindingTypesAnnotatedTypes.add(annotatedType); } @@ -323,12 +323,12 @@ public class InterceptorsManager public boolean hasInterceptorBindingType(Class<? extends Annotation> bindingType) { - final boolean contains = additionalInterceptorBindingTypes.keySet().contains(bindingType); + boolean contains = additionalInterceptorBindingTypes.keySet().contains(bindingType); if (contains) { return true; } - for (final AnnotatedType<?> at : additionalInterceptorBindingTypesAnnotatedTypes) + for (AnnotatedType<?> at : additionalInterceptorBindingTypesAnnotatedTypes) { if (bindingType.equals(at.getJavaClass())) { @@ -359,7 +359,7 @@ public class InterceptorsManager return priorityInterceptors.getSorted(); } - public void addPriorityClazzInterceptor(final Class<?> javaClass, final Priority priority) + public void addPriorityClazzInterceptor(Class<?> javaClass, Priority priority) { priorityInterceptors.add(javaClass, priority); } Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/LifecycleInterceptorInvocationContext.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/LifecycleInterceptorInvocationContext.java?rev=1799067&r1=1799066&r2=1799067&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/LifecycleInterceptorInvocationContext.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/LifecycleInterceptorInvocationContext.java Sun Jun 18 09:59:10 2017 @@ -102,7 +102,7 @@ public class LifecycleInterceptorInvocat { m.invoke(getTarget()); } - catch (final InvocationTargetException ite) + catch (InvocationTargetException ite) { throw ExceptionUtil.throwAsRuntimeException(ite.getCause()); } Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/jms/JMSModel.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/jms/JMSModel.java?rev=1799067&r1=1799066&r2=1799067&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/jms/JMSModel.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/jms/JMSModel.java Sun Jun 18 09:59:10 2017 @@ -101,7 +101,7 @@ public class JMSModel @Override public int hashCode() { - final int prime = 31; + int prime = 31; int result = 1; result = prime * result + ((bindings == null) ? 0 : bindings.hashCode()); result = prime * result + ((jmsType == null) ? 0 : jmsType.hashCode()); Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/logger/WebBeansLoggerFacade.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/logger/WebBeansLoggerFacade.java?rev=1799067&r1=1799066&r2=1799067&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/logger/WebBeansLoggerFacade.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/logger/WebBeansLoggerFacade.java Sun Jun 18 09:59:10 2017 @@ -50,7 +50,7 @@ public final class WebBeansLoggerFacade static { - final String factoryClassname = System.getProperty(OPENWEBBEANS_LOGGING_FACTORY_PROP); + String factoryClassname = System.getProperty(OPENWEBBEANS_LOGGING_FACTORY_PROP); WebBeansLoggerFactory factory = null; Exception error = null; if (factoryClassname != null) @@ -81,7 +81,7 @@ public final class WebBeansLoggerFacade FACTORY = new JULLoggerFactory(); } - final Logger logger = FACTORY.getLogger(WebBeansLoggerFacade.class); + Logger logger = FACTORY.getLogger(WebBeansLoggerFacade.class); if (error != null && logger.isLoggable(Level.SEVERE)) { logger.log(Level.SEVERE, OWBLogConst.ERROR_0028, error); @@ -147,7 +147,7 @@ public final class WebBeansLoggerFacade } // helper method - public static Object[] args(final Object... values) + public static Object[] args(Object... values) { return values; } Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/plugins/PluginLoader.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/plugins/PluginLoader.java?rev=1799067&r1=1799066&r2=1799067&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/plugins/PluginLoader.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/plugins/PluginLoader.java Sun Jun 18 09:59:10 2017 @@ -77,7 +77,7 @@ public class PluginLoader { if (logger.isLoggable(Level.INFO)) { - final Class<? extends OpenWebBeansPlugin> pluginClass = plugin.getClass(); + Class<? extends OpenWebBeansPlugin> pluginClass = plugin.getClass(); if (!Proxy.isProxyClass(pluginClass)) { logger.log(Level.INFO, OWBLogConst.INFO_0004, pluginClass.getSimpleName()); Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractAnnotated.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractAnnotated.java?rev=1799067&r1=1799066&r2=1799067&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractAnnotated.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractAnnotated.java Sun Jun 18 09:59:10 2017 @@ -87,25 +87,25 @@ public abstract class AbstractAnnotated this.annotations.addAll(annotated.getAnnotations()); } - protected void buildRepeatableAnnotations(final Set<Annotation> annotations) + protected void buildRepeatableAnnotations(Set<Annotation> annotations) { if (annotations.isEmpty()) { return; } - final List<Annotation> repeatables = annotations.stream() + List<Annotation> repeatables = annotations.stream() .map(a -> { - final Class<?> type = a.annotationType(); + Class<?> type = a.annotationType(); try { - final Method repeatableMethod = webBeansContext.getAnnotationManager().getRepeatableMethod(type); + Method repeatableMethod = webBeansContext.getAnnotationManager().getRepeatableMethod(type); if (repeatableMethod == null) { return null; } return (Annotation[]) repeatableMethod.invoke(a); } - catch (final Exception e) + catch (Exception e) { return null; } @@ -230,7 +230,7 @@ public abstract class AbstractAnnotated } } - protected Set<Type> extractTypeClojure(final Type baseType) + protected Set<Type> extractTypeClojure(Type baseType) { return GenericsUtil.getTypeClosure(baseType, getOwningClass()); } Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractDecoratorInjectionTarget.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractDecoratorInjectionTarget.java?rev=1799067&r1=1799066&r2=1799067&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractDecoratorInjectionTarget.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractDecoratorInjectionTarget.java Sun Jun 18 09:59:10 2017 @@ -63,7 +63,7 @@ public class AbstractDecoratorInjectionT { parentCtor = classToProxy.getConstructor(ct.getParameterTypes()); } - catch (final NoSuchMethodException e) + catch (NoSuchMethodException e) { throw new IllegalStateException(e); } @@ -91,10 +91,10 @@ public class AbstractDecoratorInjectionT { private final Constructor<T> parentConstructor; - public SubClassAnnotatedConstructorImpl(final WebBeansContext webBeansContext, - final Constructor<T> parentConstructor, - final Constructor<T> javaMember, - final AnnotatedType<T> declaringType) + public SubClassAnnotatedConstructorImpl(WebBeansContext webBeansContext, + Constructor<T> parentConstructor, + Constructor<T> javaMember, + AnnotatedType<T> declaringType) { super(webBeansContext, javaMember, declaringType); this.parentConstructor = parentConstructor; @@ -105,9 +105,9 @@ public class AbstractDecoratorInjectionT { private final Constructor<T> parent; - public AbstractDecoratorInjectableConstructor(final Constructor<T> parentConstructor, - final Constructor<T> cons, final InjectionTarget<T> owner, - final CreationalContextImpl<T> creationalContext) + public AbstractDecoratorInjectableConstructor(Constructor<T> parentConstructor, + Constructor<T> cons, InjectionTarget<T> owner, + CreationalContextImpl<T> creationalContext) { super(cons, owner, creationalContext); this.parent = parentConstructor; Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractProducer.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractProducer.java?rev=1799067&r1=1799066&r2=1799067&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractProducer.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractProducer.java Sun Jun 18 09:59:10 2017 @@ -123,11 +123,11 @@ public abstract class AbstractProducer<T @Override public T produce(CreationalContext<T> creationalContext) { - final CreationalContextImpl<T> creationalContextImpl = (CreationalContextImpl<T>) creationalContext; + CreationalContextImpl<T> creationalContextImpl = (CreationalContextImpl<T>) creationalContext; - final Contextual<T> oldContextual = creationalContextImpl.getContextual(); + Contextual<T> oldContextual = creationalContextImpl.getContextual(); - final Map<Interceptor<?>, Object> interceptorInstances = creationalContextImpl.getWebBeansContext() + Map<Interceptor<?>, Object> interceptorInstances = creationalContextImpl.getWebBeansContext() .getInterceptorResolutionService().createInterceptorInstances(interceptorInfo, creationalContextImpl); creationalContextImpl.putContextual(oldContextual); @@ -145,7 +145,7 @@ public abstract class AbstractProducer<T return instance; } - protected List<Decorator<?>> filterDecorators(final T instance, final List<Decorator<?>> decorators) + protected List<Decorator<?>> filterDecorators(T instance, List<Decorator<?>> decorators) { return decorators; } @@ -177,9 +177,9 @@ public abstract class AbstractProducer<T return interceptorInfo != null && proxyClass != null; } - protected boolean isDelegateInjection(final CreationalContextImpl<?> cc) + protected boolean isDelegateInjection(CreationalContextImpl<?> cc) { - final InjectionPoint ip = cc.getInjectionPoint(); + InjectionPoint ip = cc.getInjectionPoint(); if (ip == null) { return false; Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedConstructorImpl.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedConstructorImpl.java?rev=1799067&r1=1799066&r2=1799067&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedConstructorImpl.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedConstructorImpl.java Sun Jun 18 09:59:10 2017 @@ -63,16 +63,16 @@ public class AnnotatedConstructorImpl<X> } } - private static Annotation[] findAnnotations(final Constructor<?> javaMember) + private static Annotation[] findAnnotations(Constructor<?> javaMember) { // I really don't like this code, can make thing not respecting java like // class A { A() { super("yep"); } class B { @Foo public B() {} B(String value) {} } // but TCKs mandate it if (javaMember.getParameterTypes().length == 0) { - final Class<?> clazz = javaMember.getDeclaringClass(); - final Map<Class<?>, Annotation> annotations = new HashMap<Class<?>, Annotation>(); - for (final Annotation a : javaMember.getDeclaredAnnotations()) + Class<?> clazz = javaMember.getDeclaringClass(); + Map<Class<?>, Annotation> annotations = new HashMap<Class<?>, Annotation>(); + for (Annotation a : javaMember.getDeclaredAnnotations()) { annotations.put(a.annotationType(), a); } @@ -80,19 +80,19 @@ public class AnnotatedConstructorImpl<X> Class<?> current = clazz.getSuperclass(); while (current != null && current != Object.class) { - final Constructor<?> parentCons; + Constructor<?> parentCons; try { parentCons = current.getConstructor(); } - catch (final Throwable e) + catch (Throwable e) { break; } - for (final Annotation a : parentCons.getAnnotations()) + for (Annotation a : parentCons.getAnnotations()) { - final Class<? extends Annotation> annotationType = a.annotationType(); + Class<? extends Annotation> annotationType = a.annotationType(); if (!annotations.containsKey(annotationType) && annotationType.getAnnotation(Inherited.class) != null) { annotations.put(annotationType, a); Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedMethodImpl.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedMethodImpl.java?rev=1799067&r1=1799066&r2=1799067&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedMethodImpl.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedMethodImpl.java Sun Jun 18 09:59:10 2017 @@ -67,7 +67,7 @@ public class AnnotatedMethodImpl<X> exte } @Override - protected Set<Type> extractTypeClojure(final Type baseType) + protected Set<Type> extractTypeClojure(Type baseType) { // we want to skip hasTypeParameters() check which is already done for methods return GenericsUtil.getDirectTypeClosure(baseType, getOwningClass()); } Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedTypeImpl.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedTypeImpl.java?rev=1799067&r1=1799066&r2=1799067&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedTypeImpl.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedTypeImpl.java Sun Jun 18 09:59:10 2017 @@ -77,7 +77,7 @@ public class AnnotatedTypeImpl<X> } else { - final BeanManager bm = webBeansContext.getBeanManagerImpl(); + BeanManager bm = webBeansContext.getBeanManagerImpl(); Set<Class<? extends Annotation>> annotationTypes = new HashSet<Class<? extends Annotation>>(); List<Annotation> annotations = new ArrayList<Annotation>(); boolean hasScope = false; @@ -92,7 +92,7 @@ public class AnnotatedTypeImpl<X> } for (Annotation annotation : supertype.getAnnotations()) { - final Class<? extends Annotation> annotationType = annotation.annotationType(); + Class<? extends Annotation> annotationType = annotation.annotationType(); if (annotationType.isAnnotationPresent(Inherited.class) && !annotationTypes.contains(annotationType) && (!bm.isScope(annotationType) || !hasScope)) @@ -227,9 +227,9 @@ public class AnnotatedTypeImpl<X> Constructor<?>[] decCtxs = getWebBeansContext().getSecurityService().doPrivilegedGetDeclaredConstructors(annotatedClass); - final Set<AnnotatedConstructor<X>> constructors = new HashSet<AnnotatedConstructor<X>>(); - final Set<AnnotatedField<? super X>> fields = new HashSet<AnnotatedField<? super X>>(); - final Set<AnnotatedMethod<? super X>> methods = new HashSet<AnnotatedMethod<? super X>>(); + Set<AnnotatedConstructor<X>> constructors = new HashSet<AnnotatedConstructor<X>>(); + Set<AnnotatedField<? super X>> fields = new HashSet<AnnotatedField<? super X>>(); + Set<AnnotatedMethod<? super X>> methods = new HashSet<AnnotatedMethod<? super X>>(); this.constructors = Collections.unmodifiableSet(constructors); this.fields = Collections.unmodifiableSet(fields); Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/BaseProducerProducer.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/BaseProducerProducer.java?rev=1799067&r1=1799066&r2=1799067&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/BaseProducerProducer.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/BaseProducerProducer.java Sun Jun 18 09:59:10 2017 @@ -58,7 +58,7 @@ public abstract class BaseProducerProduc this.webBeansContext = webBeansContext; this.disposalIPs = disposalIPs; - final OpenWebBeansEjbPlugin ejbPlugin = webBeansContext.getPluginLoader().getEjbPlugin(); + OpenWebBeansEjbPlugin ejbPlugin = webBeansContext.getPluginLoader().getEjbPlugin(); if (ejbPlugin != null) { if (disposerMethod != null) @@ -75,7 +75,7 @@ public abstract class BaseProducerProduc } if (disposerMethod != null) { - for (final AnnotatedParameter<?> param : disposerMethod.getParameters()) + for (AnnotatedParameter<?> param : disposerMethod.getParameters()) { if (param.isAnnotationPresent(Disposes.class)) { @@ -93,7 +93,7 @@ public abstract class BaseProducerProduc } @Override - public void defineInterceptorStack(final Bean<T> bean, final AnnotatedType<T> annotatedType, final WebBeansContext webBeansContext) + public void defineInterceptorStack(Bean<T> bean, AnnotatedType<T> annotatedType, WebBeansContext webBeansContext) { if (webBeansContext.getOpenWebBeansConfiguration().supportsInterceptionOnProducers()) { Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/EventProducer.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/EventProducer.java?rev=1799067&r1=1799066&r2=1799067&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/EventProducer.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/EventProducer.java Sun Jun 18 09:59:10 2017 @@ -48,22 +48,22 @@ public class EventProducer<T> extends Ab } @Override - protected List<Decorator<?>> filterDecorators(final Event<T> instance, final List<Decorator<?>> decorators) + protected List<Decorator<?>> filterDecorators(Event<T> instance, List<Decorator<?>> decorators) { if (!EventImpl.class.isInstance(instance)) // is this test useless? { return decorators; } - final Type type = EventImpl.class.cast(instance).getMetadata().getType(); - final ArrayList<Decorator<?>> list = new ArrayList<Decorator<?>>(decorators.size()); - for (final Decorator<?> original : decorators) + Type type = EventImpl.class.cast(instance).getMetadata().getType(); + ArrayList<Decorator<?>> list = new ArrayList<Decorator<?>>(decorators.size()); + for (Decorator<?> original : decorators) { - final Type event = original.getDelegateType(); + Type event = original.getDelegateType(); if (ParameterizedType.class.isInstance(event)) { - final ParameterizedType arg = ParameterizedType.class.cast(event); - final Type[] actualTypeArguments = arg.getActualTypeArguments(); + ParameterizedType arg = ParameterizedType.class.cast(event); + Type[] actualTypeArguments = arg.getActualTypeArguments(); if (actualTypeArguments.length > 0 && GenericsUtil.isAssignableFrom(true, false, actualTypeArguments[0], type)) { list.add(original); Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/InjectionPointProducer.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/InjectionPointProducer.java?rev=1799067&r1=1799066&r2=1799067&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/InjectionPointProducer.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/InjectionPointProducer.java Sun Jun 18 09:59:10 2017 @@ -57,7 +57,7 @@ public class InjectionPointProducer exte // the first injection point on the stack is of type InjectionPoint, so we need the second one InjectionPoint first = creationalContextImpl.removeInjectionPoint(); - final InjectionPoint injectionPoint; + InjectionPoint injectionPoint; if (!InjectionPoint.class.isAssignableFrom(ClassUtil.getClass(first.getType()))) { if (!ThirdpartyBeanImpl.class.isInstance(creationalContextImpl.getBean())) @@ -78,13 +78,13 @@ public class InjectionPointProducer exte try { - final Type type = injectionPoint.getType(); + Type type = injectionPoint.getType(); if (ParameterizedType.class.isInstance(type)) { - final ParameterizedType parameterizedType = ParameterizedType.class.cast(type); + ParameterizedType parameterizedType = ParameterizedType.class.cast(type); if (parameterizedType.getRawType() == Instance.class) { - final Bean<InjectionPoint> bean = creationalContextImpl.getBean(); + Bean<InjectionPoint> bean = creationalContextImpl.getBean(); return new InjectionPointDelegate( injectionPoint, bean.getBeanClass() != null ? bean.getBeanClass() : parameterizedType.getActualTypeArguments()[0]); @@ -109,7 +109,7 @@ public class InjectionPointProducer exte private InjectionPoint ip; private Type type; - public InjectionPointDelegate(final InjectionPoint injectionPoint, final Type type) + public InjectionPointDelegate(InjectionPoint injectionPoint, Type type) { this.ip = injectionPoint; this.type = type; @@ -157,16 +157,16 @@ public class InjectionPointProducer exte return ip.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()); type = Type.class.cast(owbCustomObjectInputStream.readObject()); ip = 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(type); out.writeObject(ip); } Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/InjectionTargetImpl.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/InjectionTargetImpl.java?rev=1799067&r1=1799066&r2=1799067&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/InjectionTargetImpl.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/InjectionTargetImpl.java Sun Jun 18 09:59:10 2017 @@ -136,11 +136,11 @@ public class InjectionTargetImpl<T> exte preDestroyInterceptors = getLifecycleInterceptors(interceptorInfo.getEjbInterceptors(), interceptorInfo.getCdiInterceptors(), InterceptionType.PRE_DESTROY); - final InterceptorResolutionService.BusinessMethodInterceptorInfo constructorInterceptorInfo = + InterceptorResolutionService.BusinessMethodInterceptorInfo constructorInterceptorInfo = interceptorInfo.getConstructorInterceptorInfos().get(getConstructor().getJavaMember()); - final Interceptor<?>[] constructorEjbInterceptorArray = constructorInterceptorInfo == null ? + Interceptor<?>[] constructorEjbInterceptorArray = constructorInterceptorInfo == null ? null : constructorInterceptorInfo.getEjbInterceptors(); - final List<Interceptor<?>> constructorEjbInterceptors = constructorEjbInterceptorArray == null ? + List<Interceptor<?>> constructorEjbInterceptors = constructorEjbInterceptorArray == null ? Collections.<Interceptor<?>>emptyList() : asList(constructorEjbInterceptorArray); aroundConstructInterceptors = getLifecycleInterceptors( constructorEjbInterceptors, @@ -155,10 +155,10 @@ public class InjectionTargetImpl<T> exte { try { - final Constructor<T> cons = getConstructor().getJavaMember(); - final InjectableConstructor<T> injectableConstructor = new InjectableConstructor<T>(cons, this, creationalContext); - final ConstructorInstanceProvider provider = new ConstructorInstanceProvider(); - final ConstructorInterceptorInvocationContext<T> invocationContext = new ConstructorInterceptorInvocationContext<T>( + Constructor<T> cons = getConstructor().getJavaMember(); + InjectableConstructor<T> injectableConstructor = new InjectableConstructor<T>(cons, this, creationalContext); + ConstructorInstanceProvider provider = new ConstructorInstanceProvider(); + ConstructorInterceptorInvocationContext<T> invocationContext = new ConstructorInterceptorInvocationContext<T>( provider, aroundConstructInterceptors, interceptorInstances, cons, injectableConstructor.createParameters()); provider.setContext(invocationContext); invocationContext.proceed(); @@ -170,7 +170,7 @@ public class InjectionTargetImpl<T> exte } return (T) newInstance; } - catch (final Exception e) // CDI 1.0 + catch (Exception e) // CDI 1.0 { throw ExceptionUtil.throwAsRuntimeException(e); } @@ -203,7 +203,7 @@ public class InjectionTargetImpl<T> exte inject(instance.getClass(), unwrapProxyInstance(instance), (CreationalContextImpl<T>) context); } - private void inject(Class<?> type, final T instance, CreationalContextImpl<T> context) + private void inject(Class<?> type, T instance, CreationalContextImpl<T> context) { if (type == null || type.equals(Object.class)) { @@ -293,7 +293,7 @@ public class InjectionTargetImpl<T> exte } @Override - public void postConstruct(final T instance) + public void postConstruct(T instance) { Map<Interceptor<?>, ?> interceptorInstances = null; T internalInstance = instance; @@ -388,7 +388,7 @@ public class InjectionTargetImpl<T> exte } } - final Constructor<T> defaultConstructor = getDefaultConstructor(); + Constructor<T> defaultConstructor = getDefaultConstructor(); if (defaultConstructor == null) { throw new WebBeansCreationException("No default constructor for " + annotatedType.getJavaClass().getName()); @@ -479,7 +479,7 @@ public class InjectionTargetImpl<T> exte } // this dependency sucks, we should find something a bit more sexy - public void setContext(final ConstructorInterceptorInvocationContext<T> context) + public void setContext(ConstructorInterceptorInvocationContext<T> context) { this.context = context; } Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/LazyInterceptorDefinedInjectionTarget.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/LazyInterceptorDefinedInjectionTarget.java?rev=1799067&r1=1799066&r2=1799067&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/LazyInterceptorDefinedInjectionTarget.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/LazyInterceptorDefinedInjectionTarget.java Sun Jun 18 09:59:10 2017 @@ -36,17 +36,17 @@ public class LazyInterceptorDefinedInjec { private volatile boolean init; - public LazyInterceptorDefinedInjectionTarget(final AnnotatedType<T> annotatedType, - final Set<InjectionPoint> injectionPoints, - final WebBeansContext webBeansContext, - final List<AnnotatedMethod<?>> postConstructMethods, - final List<AnnotatedMethod<?>> preDestroyMethods) + public LazyInterceptorDefinedInjectionTarget(AnnotatedType<T> annotatedType, + Set<InjectionPoint> injectionPoints, + WebBeansContext webBeansContext, + List<AnnotatedMethod<?>> postConstructMethods, + List<AnnotatedMethod<?>> preDestroyMethods) { super(annotatedType, injectionPoints, webBeansContext, postConstructMethods, preDestroyMethods); } @Override - public T produce(final CreationalContext<T> creationalContext) + public T produce(CreationalContext<T> creationalContext) { if (!init) { @@ -54,13 +54,13 @@ public class LazyInterceptorDefinedInjec { if (!init) { - final CreationalContextImpl<T> creationalContextImpl = (CreationalContextImpl<T>) creationalContext; + CreationalContextImpl<T> creationalContextImpl = (CreationalContextImpl<T>) creationalContext; Bean<T> bean = creationalContextImpl.getBean(); if (bean == null) // try to find it { - final BeanManagerImpl bm = webBeansContext.getBeanManagerImpl(); - final Set<Annotation> annotations = new HashSet<Annotation>(); - for (final Annotation a : annotatedType.getAnnotations()) + BeanManagerImpl bm = webBeansContext.getBeanManagerImpl(); + Set<Annotation> annotations = new HashSet<Annotation>(); + for (Annotation a : annotatedType.getAnnotations()) { if (bm.isQualifier(a.annotationType())) { @@ -69,10 +69,10 @@ public class LazyInterceptorDefinedInjec } try { - final Set<Bean<?>> beans = bm.getBeans(annotatedType.getJavaClass(), annotations.toArray(new Annotation[annotations.size()])); + Set<Bean<?>> beans = bm.getBeans(annotatedType.getJavaClass(), annotations.toArray(new Annotation[annotations.size()])); bean = (Bean<T>) bm.resolve(beans); } - catch (final Exception e) + catch (Exception e) { // no-op: whatever can be thrown we don't want it } Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProducerFieldProducer.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProducerFieldProducer.java?rev=1799067&r1=1799066&r2=1799067&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProducerFieldProducer.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProducerFieldProducer.java Sun Jun 18 09:59:10 2017 @@ -86,7 +86,7 @@ public class ProducerFieldProducer<T, P> if (OwbInterceptorProxy.class.isInstance(parentInstance)) { - final InterceptorHandler handler = webBeansContext.getInterceptorDecoratorProxyFactory() + InterceptorHandler handler = webBeansContext.getInterceptorDecoratorProxyFactory() .getInterceptorHandler(OwbInterceptorProxy.class.cast(parentInstance)); if (DefaultInterceptorHandler.class.isInstance(handler)) { Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProducerMethodProducer.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProducerMethodProducer.java?rev=1799067&r1=1799066&r2=1799067&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProducerMethodProducer.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProducerMethodProducer.java Sun Jun 18 09:59:10 2017 @@ -58,7 +58,7 @@ public class ProducerMethodProducer<T, P throw new IllegalArgumentException("owner may not be null for non-static producer method " + producerMethod); } } - final OpenWebBeansEjbPlugin ejbPlugin = webBeansContext.getPluginLoader().getEjbPlugin(); + OpenWebBeansEjbPlugin ejbPlugin = webBeansContext.getPluginLoader().getEjbPlugin(); if (ejbPlugin != null) { this.producerMethod = ejbPlugin.resolveViewMethod(owner, producerMethod.getJavaMember()); Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessBeanAttributesImpl.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessBeanAttributesImpl.java?rev=1799067&r1=1799066&r2=1799067&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessBeanAttributesImpl.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessBeanAttributesImpl.java Sun Jun 18 09:59:10 2017 @@ -58,7 +58,7 @@ public class ProcessBeanAttributesImpl<T } @Override - public void setBeanAttributes(final BeanAttributes<T> tBeanAttributes) + public void setBeanAttributes(BeanAttributes<T> tBeanAttributes) { checkState(); attributes = tBeanAttributes; @@ -73,7 +73,7 @@ public class ProcessBeanAttributesImpl<T } @Override - public void addDefinitionError(final Throwable throwable) + public void addDefinitionError(Throwable throwable) { checkState(); definitionError = throwable; Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/AfterBeanDiscoveryImpl.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/AfterBeanDiscoveryImpl.java?rev=1799067&r1=1799066&r2=1799067&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/AfterBeanDiscoveryImpl.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/AfterBeanDiscoveryImpl.java Sun Jun 18 09:59:10 2017 @@ -162,7 +162,7 @@ public class AfterBeanDiscoveryImpl exte } boolean found = false; - for (final InjectionPoint ip : bean.getInjectionPoints()) + for (InjectionPoint ip : bean.getInjectionPoints()) { if (ip.isDelegate()) { Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/BeforeBeanDiscoveryImpl.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/BeforeBeanDiscoveryImpl.java?rev=1799067&r1=1799066&r2=1799067&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/BeforeBeanDiscoveryImpl.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/BeforeBeanDiscoveryImpl.java Sun Jun 18 09:59:10 2017 @@ -186,7 +186,7 @@ public class BeforeBeanDiscoveryImpl ext beanManager.addAdditionalQualifier(annotatedType); } - public void setExtension(final Extension extension) + public void setExtension(Extension extension) { this.extension = extension; } Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessBeanAttributes.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessBeanAttributes.java?rev=1799067&r1=1799066&r2=1799067&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessBeanAttributes.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessBeanAttributes.java Sun Jun 18 09:59:10 2017 @@ -28,14 +28,14 @@ public class GProcessBeanAttributes exte { private final Class<?> type; - public GProcessBeanAttributes(WebBeansContext webBeansContext, final Class<?> type, final Annotated annotated, final BeanAttributes attributes) + public GProcessBeanAttributes(WebBeansContext webBeansContext, Class<?> type, Annotated annotated, BeanAttributes attributes) { super(webBeansContext, annotated, attributes); this.type = type; } @Override - public Class<?> getBeanClassFor(final Class<?> eventClass) + public Class<?> getBeanClassFor(Class<?> eventClass) { return type; } Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/AbstractProxyFactory.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/AbstractProxyFactory.java?rev=1799067&r1=1799066&r2=1799067&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/AbstractProxyFactory.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/AbstractProxyFactory.java Sun Jun 18 09:59:10 2017 @@ -197,7 +197,7 @@ public abstract class AbstractProxyFacto * If so, move it to org.apache.webbeans.custom. * @param forbiddenPackagePrefix including the '.', e.g. 'javax.' */ - private String fixPreservedPackage(final String className, final String forbiddenPackagePrefix) + private String fixPreservedPackage(String className, String forbiddenPackagePrefix) { String fixedClassName = className; @@ -231,7 +231,7 @@ public abstract class AbstractProxyFacto { String proxyClassFileName = proxyClassName.replace('.', '/'); - final byte[] proxyBytes = generateProxy(classLoader, + byte[] proxyBytes = generateProxy(classLoader, classToProxy, proxyClassName, proxyClassFileName, @@ -359,7 +359,7 @@ public abstract class AbstractProxyFacto try { - final Class<T> definedClass; + Class<T> definedClass; if (defineClassMethod != null) { @@ -405,7 +405,7 @@ public abstract class AbstractProxyFacto /** * @return the wrapper type for a primitive, e.g. java.lang.Integer for int */ - protected String getWrapperType(final Class<?> type) + protected String getWrapperType(Class<?> type) { if (Integer.TYPE.equals(type)) { @@ -453,7 +453,7 @@ public abstract class AbstractProxyFacto * @param type Type to load * @return Bytecode instruction to use */ - protected int getVarInsn(final Class<?> type) + protected int getVarInsn(Class<?> type) { if (type.isPrimitive()) { @@ -500,7 +500,7 @@ public abstract class AbstractProxyFacto * @param mv * @param i */ - protected void pushIntOntoStack(final MethodVisitor mv, final int i) + protected void pushIntOntoStack(MethodVisitor mv, int i) { if (i == 0) { @@ -542,7 +542,7 @@ public abstract class AbstractProxyFacto * @param type Type the needs to be returned * @return The matching bytecode instruction */ - protected int getReturnInsn(final Class<?> type) + protected int getReturnInsn(Class<?> type) { if (type.isPrimitive()) { @@ -593,7 +593,7 @@ public abstract class AbstractProxyFacto * @param returnType The type to cast to with CHECKCAST * @return CHECKCAST parameter */ - protected String getCastType(final Class<?> returnType) + protected String getCastType(Class<?> returnType) { if (returnType.isPrimitive()) { @@ -611,7 +611,7 @@ public abstract class AbstractProxyFacto * @param type Type whose primitive method we want to lookup * @return The name of the method to use */ - protected String getPrimitiveMethod(final Class<?> type) + protected String getPrimitiveMethod(Class<?> type) { if (Integer.TYPE.equals(type)) { @@ -651,7 +651,7 @@ public abstract class AbstractProxyFacto protected void generateReturn(MethodVisitor mv, Method delegatedMethod) { - final Class<?> returnType = delegatedMethod.getReturnType(); + Class<?> returnType = delegatedMethod.getReturnType(); mv.visitInsn(getReturnInsn(returnType)); } @@ -690,7 +690,7 @@ public abstract class AbstractProxyFacto private void initializeUnsafe() { - final Class<?> unsafeClass; + Class<?> unsafeClass; try { unsafeClass = AccessController.doPrivileged(new PrivilegedAction<Class<?>>() @@ -799,7 +799,7 @@ public abstract class AbstractProxyFacto // keep copy of array on stack mv.visitInsn(Opcodes.DUP); - final Class<?> parameterType = parameterTypes[i]; + Class<?> parameterType = parameterTypes[i]; // push number onto stack pushIntOntoStack(mv, i); @@ -840,7 +840,7 @@ public abstract class AbstractProxyFacto * @param type Type of array to create * @throws ProxyGenerationException */ - protected void createArrayDefinition(final MethodVisitor mv, final int size, final Class<?> type) + protected void createArrayDefinition(MethodVisitor mv, int size, Class<?> type) throws ProxyGenerationException { // create a new array of java.lang.class (2) Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/InterceptorDecoratorProxyFactory.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/InterceptorDecoratorProxyFactory.java?rev=1799067&r1=1799066&r2=1799067&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/InterceptorDecoratorProxyFactory.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/InterceptorDecoratorProxyFactory.java Sun Jun 18 09:59:10 2017 @@ -190,14 +190,14 @@ public class InterceptorDecoratorProxyFa return proxyClass; } - public synchronized <T> Class<T> createProxyClass(final InterceptorResolutionService.BeanInterceptorInfo interceptorInfo, - final AnnotatedType<T> at, final ClassLoader classLoader) + public synchronized <T> Class<T> createProxyClass(InterceptorResolutionService.BeanInterceptorInfo interceptorInfo, + AnnotatedType<T> at, ClassLoader classLoader) throws ProxyGenerationException { - final Collection<Method> intercepted = interceptorInfo.getBusinessMethodsInfo().keySet(); - final Collection<Method> others = interceptorInfo.getNonInterceptedMethods(); + Collection<Method> intercepted = interceptorInfo.getBusinessMethodsInfo().keySet(); + Collection<Method> others = interceptorInfo.getNonInterceptedMethods(); - final Class<T> proxyClass = createProxyClass( + Class<T> proxyClass = createProxyClass( classLoader, at.getJavaClass(), intercepted.toArray(new Method[intercepted.size()]), others.toArray(new Method[others.size()])); cachedProxyClassesByAt.put(at, proxyClass); @@ -227,8 +227,8 @@ public class InterceptorDecoratorProxyFa return clazz; } - public <T> Class<T> getCachedProxyClass(final InterceptorResolutionService.BeanInterceptorInfo interceptorInfo, - final AnnotatedType<T> at, final ClassLoader classLoader) + public <T> Class<T> getCachedProxyClass(InterceptorResolutionService.BeanInterceptorInfo interceptorInfo, + AnnotatedType<T> at, ClassLoader classLoader) { Class<T> value = (Class<T>) cachedProxyClassesByAt.get(at); if (value == null) @@ -318,7 +318,7 @@ public class InterceptorDecoratorProxyFa // was: final String descriptor = Type.getConstructorDescriptor(classToProxy.getDeclaredConstructor()); // but we need to get a default constructor even if the bean uses constructor injection - final MethodVisitor mv = cw.visitMethod(Opcodes.ACC_PUBLIC, "<init>", descriptor, null, null); + MethodVisitor mv = cw.visitMethod(Opcodes.ACC_PUBLIC, "<init>", descriptor, null, null); mv.visitCode(); mv.visitVarInsn(Opcodes.ALOAD, 0); mv.visitMethodInsn(Opcodes.INVOKESPECIAL, parentClassFileName, "<init>", descriptor, false); @@ -351,7 +351,7 @@ public class InterceptorDecoratorProxyFa continue; } - final int modifiers = delegatedMethod.getModifiers(); + int modifiers = delegatedMethod.getModifiers(); if (Modifier.isProtected(modifiers) && !delegatedMethod.getDeclaringClass().getPackage().getName() .equals(classToProxy.getPackage().getName())) @@ -383,12 +383,12 @@ public class InterceptorDecoratorProxyFa int offset = 1; for (Class<?> aClass : delegatedMethod.getParameterTypes()) { - final Type type = Type.getType(aClass); + Type type = Type.getType(aClass); mv.visitVarInsn(type.getOpcode(Opcodes.ILOAD), offset); offset += type.getSize(); } - final Type declaringClass = Type.getType(delegatedMethod.getDeclaringClass()); + Type declaringClass = Type.getType(delegatedMethod.getDeclaringClass()); boolean isItf = delegatedMethod.getDeclaringClass().isInterface(); mv.visitMethodInsn( isItf ? Opcodes.INVOKEINTERFACE : Opcodes.INVOKEVIRTUAL, declaringClass.getInternalName(), @@ -421,10 +421,10 @@ public class InterceptorDecoratorProxyFa return; } - final Class<?> returnType = method.getReturnType(); - final Class<?>[] parameterTypes = method.getParameterTypes(); - final Class<?>[] exceptionTypes = method.getExceptionTypes(); - final int modifiers = method.getModifiers(); + Class<?> returnType = method.getReturnType(); + Class<?>[] parameterTypes = method.getParameterTypes(); + Class<?>[] exceptionTypes = method.getExceptionTypes(); + int modifiers = method.getModifiers(); if (Modifier.isFinal(modifiers) || Modifier.isStatic(modifiers)) { @@ -439,9 +439,9 @@ public class InterceptorDecoratorProxyFa mv.visitCode(); // push try/catch block, to catch declared exceptions, and to catch java.lang.Throwable - final Label l0 = new Label(); - final Label l1 = new Label(); - final Label l2 = new Label(); + Label l0 = new Label(); + Label l1 = new Label(); + Label l2 = new Label(); if (exceptionTypes.length > 0) { @@ -450,7 +450,7 @@ public class InterceptorDecoratorProxyFa // push try code mv.visitLabel(l0); - final String classNameToOverride = method.getDeclaringClass().getName().replace('.', '/'); + String classNameToOverride = method.getDeclaringClass().getName().replace('.', '/'); mv.visitLdcInsn(Type.getType("L" + classNameToOverride + ";")); // the following code generates the bytecode for this line of Java: @@ -470,7 +470,7 @@ public class InterceptorDecoratorProxyFa // keep copy of array on stack mv.visitInsn(Opcodes.DUP); - final Class<?> parameterType = parameterTypes[i]; + Class<?> parameterType = parameterTypes[i]; // push number onto stack pushIntOntoStack(mv, i); @@ -500,7 +500,7 @@ public class InterceptorDecoratorProxyFa // the following code generates bytecode equivalent to: // return ((<returntype>) invocationHandler.invoke(this, {methodIndex}, new Object[] { <function arguments }))[.<primitive>Value()]; - final Label l4 = new Label(); + Label l4 = new Label(); mv.visitLabel(l4); mv.visitVarInsn(Opcodes.ALOAD, 0); @@ -566,12 +566,12 @@ public class InterceptorDecoratorProxyFa mv.visitLabel(l2); mv.visitVarInsn(Opcodes.ASTORE, length); - final Label l5 = new Label(); + Label l5 = new Label(); mv.visitLabel(l5); for (int i = 0; i < exceptionTypes.length; i++) { - final Class<?> exceptionType = exceptionTypes[i]; + Class<?> exceptionType = exceptionTypes[i]; mv.visitLdcInsn(Type.getType("L" + exceptionType.getCanonicalName().replace('.', '/') + ";")); mv.visitVarInsn(Opcodes.ALOAD, length); @@ -580,10 +580,10 @@ public class InterceptorDecoratorProxyFa mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "java/lang/Object", "getClass", "()Ljava/lang/Class;", false); mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "java/lang/Object", "equals", "(Ljava/lang/Object;)Z", false); - final Label l6 = new Label(); + Label l6 = new Label(); mv.visitJumpInsn(Opcodes.IFEQ, l6); - final Label l7 = new Label(); + Label l7 = new Label(); mv.visitLabel(l7); mv.visitVarInsn(Opcodes.ALOAD, length); Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/NormalScopeProxyFactory.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/NormalScopeProxyFactory.java?rev=1799067&r1=1799066&r2=1799067&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/NormalScopeProxyFactory.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/NormalScopeProxyFactory.java Sun Jun 18 09:59:10 2017 @@ -117,7 +117,7 @@ public class NormalScopeProxyFactory ext public <T> T createNormalScopeProxy(Bean<T> bean) { - final ClassLoader classLoader; + ClassLoader classLoader; if (bean.getBeanClass() != null) { classLoader = getProxyClassLoader(bean.getBeanClass()); @@ -323,8 +323,8 @@ public class NormalScopeProxyFactory ext superDefaultCt = classToProxy.getDeclaredConstructor(null); } - final String descriptor = Type.getConstructorDescriptor(superDefaultCt); - final MethodVisitor mv = cw.visitMethod(Opcodes.ACC_PUBLIC, "<init>", descriptor, null, null); + String descriptor = Type.getConstructorDescriptor(superDefaultCt); + MethodVisitor mv = cw.visitMethod(Opcodes.ACC_PUBLIC, "<init>", descriptor, null, null); mv.visitCode(); mv.visitVarInsn(Opcodes.ALOAD, 0); mv.visitMethodInsn(Opcodes.INVOKESPECIAL, parentClassFileName, "<init>", descriptor, false); @@ -417,13 +417,13 @@ public class NormalScopeProxyFactory ext int offset = 1; for (Class<?> aClass : delegatedMethod.getParameterTypes()) { - final Type type = Type.getType(aClass); + Type type = Type.getType(aClass); mv.visitVarInsn(type.getOpcode(Opcodes.ILOAD), offset); offset += type.getSize(); } // and finally invoke the target method on the provided Contextual Instance - final Type declaringClass = Type.getType(delegatedMethod.getDeclaringClass()); + Type declaringClass = Type.getType(delegatedMethod.getDeclaringClass()); boolean interfaceMethod = Modifier.isInterface(delegatedMethod.getDeclaringClass().getModifiers()); mv.visitMethodInsn(interfaceMethod ? Opcodes.INVOKEINTERFACE : Opcodes.INVOKEVIRTUAL, declaringClass.getInternalName(), delegatedMethod.getName(), methodDescriptor, interfaceMethod); @@ -439,9 +439,9 @@ public class NormalScopeProxyFactory ext private void generateDelegationMethod(ClassWriter cw, Method method, int methodIndex, Class<?> classToProxy, String proxyClassFileName) { - final Class<?> returnType = method.getReturnType(); - final Class<?>[] parameterTypes = method.getParameterTypes(); - final int modifiers = method.getModifiers(); + Class<?> returnType = method.getReturnType(); + Class<?>[] parameterTypes = method.getParameterTypes(); + int modifiers = method.getModifiers(); // push the method definition int modifier = modifiers & (Opcodes.ACC_PUBLIC | Opcodes.ACC_PROTECTED | Opcodes.ACC_VARARGS); Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/SubclassProxyFactory.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/SubclassProxyFactory.java?rev=1799067&r1=1799066&r2=1799067&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/SubclassProxyFactory.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/SubclassProxyFactory.java Sun Jun 18 09:59:10 2017 @@ -167,8 +167,8 @@ public class SubclassProxyFactory extend } } - final String descriptor = Type.getConstructorDescriptor(superDefaultCt); - final MethodVisitor mv = cw.visitMethod(Opcodes.ACC_PUBLIC, "<init>", descriptor, null, exceptions); + String descriptor = Type.getConstructorDescriptor(superDefaultCt); + MethodVisitor mv = cw.visitMethod(Opcodes.ACC_PUBLIC, "<init>", descriptor, null, exceptions); mv.visitCode(); mv.visitVarInsn(Opcodes.ALOAD, 0); if (constructor != null) @@ -241,13 +241,13 @@ public class SubclassProxyFactory extend int offset = 1; for (Class<?> aClass : delegatedMethod.getParameterTypes()) { - final Type type = Type.getType(aClass); + Type type = Type.getType(aClass); mv.visitVarInsn(type.getOpcode(Opcodes.ILOAD), offset); offset += type.getSize(); } // and finally invoke the target method on the provided Contextual Instance - final Type declaringClass = Type.getType(delegatedMethod.getDeclaringClass()); + Type declaringClass = Type.getType(delegatedMethod.getDeclaringClass()); if (!abstractMethod) { // invoke the method on the super class;
