Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/AnnotationUtil.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/AnnotationUtil.java?rev=1799067&r1=1799066&r2=1799067&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/AnnotationUtil.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/AnnotationUtil.java Sun Jun 18 09:59:10 2017 @@ -155,12 +155,12 @@ public final class AnnotationUtil throw new IllegalArgumentException("annotation @" + annotation.getName() + " not found on any parameter"); } - private static boolean areParamEquals(final Annotation annotation1, final Annotation annotation2, final List<Method> bindingCdiAnnotationMethods) + private static boolean areParamEquals(Annotation annotation1, Annotation annotation2, List<Method> bindingCdiAnnotationMethods) { - for (final Method method : bindingCdiAnnotationMethods) + for (Method method : bindingCdiAnnotationMethods) { - final Object value1 = callMethod(annotation1, method); - final Object value2 = callMethod(annotation2, method); + Object value1 = callMethod(annotation1, method); + Object value2 = callMethod(annotation2, method); if (!checkEquality(value1, value2)) { return false; @@ -179,7 +179,7 @@ public final class AnnotationUtil * @param annotation2 * @return */ - public static boolean isCdiAnnotationEqual(final AnnotatedType<?> at, final Annotation annotation1, final Annotation annotation2) + public static boolean isCdiAnnotationEqual(AnnotatedType<?> at, Annotation annotation1, Annotation annotation2) { Asserts.assertNotNull(annotation1, "annotation1 argument"); Asserts.assertNotNull(annotation2, "annotation2 argument"); @@ -412,10 +412,10 @@ public final class AnnotationUtil return Collections.emptyList(); } - private static List<Method> getBindingCdiAnnotationMethods(final AnnotatedType<?> at) + private static List<Method> getBindingCdiAnnotationMethods(AnnotatedType<?> at) { - final List<Method> bindingMethods = new ArrayList<Method>(); - for (final AnnotatedMethod<?> method : at.getMethods()) + List<Method> bindingMethods = new ArrayList<Method>(); + for (AnnotatedMethod<?> method : at.getMethods()) { if (method.isAnnotationPresent(Nonbinding.class)) {
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/Asserts.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/Asserts.java?rev=1799067&r1=1799066&r2=1799067&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/Asserts.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/Asserts.java Sun Jun 18 09:59:10 2017 @@ -73,7 +73,7 @@ public final class Asserts */ public static void nullCheckForClass(Class<?> clazz) { - Asserts.assertNotNull(clazz, "clazz argument"); + assertNotNull(clazz, "clazz argument"); } /** @@ -83,7 +83,7 @@ public final class Asserts */ public static void nullCheckForClass(Class<?> clazz, String message) { - Asserts.assertNotNull(clazz, message); + assertNotNull(clazz, message); } /** @@ -93,7 +93,7 @@ public final class Asserts */ public static void nullCheckForMethod(Method method) { - Asserts.assertNotNull(method, "method argument can not be null"); + assertNotNull(method, "method argument can not be null"); } } Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ClassUtil.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ClassUtil.java?rev=1799067&r1=1799066&r2=1799067&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ClassUtil.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ClassUtil.java Sun Jun 18 09:59:10 2017 @@ -283,7 +283,7 @@ public final class ClassUtil if (!clazz.isAnnotation() && clazz.isInterface()) { addNonPrivateMethods(topClass, excludeFinalMethods, methodMap, allMethods, clazz); - for (final Class<?> parent : clazz.getInterfaces()) + for (Class<?> parent : clazz.getInterfaces()) { addNonPrivateMethods(topClass, excludeFinalMethods, methodMap, allMethods, parent); } @@ -326,7 +326,7 @@ public final class ClassUtil continue; } - final int modifiers = method.getModifiers(); + int modifiers = method.getModifiers(); if (Modifier.isPrivate(modifiers) || Modifier.isStatic(modifiers)) { @@ -461,9 +461,9 @@ public final class ClassUtil * @param subclassMethods * @param superclassMethod */ - public static boolean isOverridden(final List<Method> subclassMethods, final Method superclassMethod) + public static boolean isOverridden(List<Method> subclassMethods, Method superclassMethod) { - for (final Method m : subclassMethods) + for (Method m : subclassMethods) { if (isOverridden(m, superclassMethod)) { @@ -658,7 +658,7 @@ public final class ClassUtil } } } - else if(ClassUtil.isTypeVariable(beanTypeArg)) + else if(isTypeVariable(beanTypeArg)) { TypeVariable<?> tvBeanTypeArg = (TypeVariable<?>)beanTypeArg; Type tvBound = tvBeanTypeArg.getBounds()[0]; Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/GenericsUtil.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/GenericsUtil.java?rev=1799067&r1=1799066&r2=1799067&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/GenericsUtil.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/GenericsUtil.java Sun Jun 18 09:59:10 2017 @@ -283,7 +283,7 @@ public final class GenericsUtil { if (isProducer) { - for (final Type t : injectionPointType.getActualTypeArguments()) + for (Type t : injectionPointType.getActualTypeArguments()) { if (!TypeVariable.class.isInstance(t) || !isNotBound(TypeVariable.class.cast(t).getBounds())) { @@ -316,12 +316,12 @@ public final class GenericsUtil private static boolean isAssignableFrom(boolean isDelegateOrEvent, boolean isProducer, ParameterizedType injectionPointType, TypeVariable<?> beanType) { - final Type[] types = beanType.getBounds(); + Type[] types = beanType.getBounds(); if (isNotBound(types)) { return true; } - for (final Type bounds: types) + for (Type bounds: types) { if (isAssignableFrom(isDelegateOrEvent, isProducer, injectionPointType, bounds)) { @@ -354,11 +354,11 @@ public final class GenericsUtil (injectionPointTypeArgument instanceof Class || injectionPointTypeArgument instanceof TypeVariable) && beanTypeArgument instanceof TypeVariable) { - final Type[] bounds = ((TypeVariable<?>) beanTypeArgument).getBounds(); - final boolean isNotBound = isNotBound(bounds); + Type[] bounds = ((TypeVariable<?>) beanTypeArgument).getBounds(); + boolean isNotBound = isNotBound(bounds); if (!isNotBound) { - for (final Type upperBound : bounds) + for (Type upperBound : bounds) { if (!isAssignableFrom(true, false, upperBound, injectionPointTypeArgument)) { @@ -385,7 +385,7 @@ public final class GenericsUtil return true; } - private static boolean isNotBound(final Type... bounds) + private static boolean isNotBound(Type... bounds) { return bounds == null || bounds.length == 0 || (bounds.length == 1 && Object.class == bounds[0]); } @@ -405,8 +405,8 @@ public final class GenericsUtil // rules are a bit different when in an array so we handle ParameterizedType manually (not reusing isAssignableFrom) private static boolean isAssignableFrom(boolean isDelegateOrEvent, GenericArrayType injectionPointType, Type beanType) { - final Type genericComponentType = injectionPointType.getGenericComponentType(); - final Class componentType = Class.class.cast(beanType).getComponentType(); + Type genericComponentType = injectionPointType.getGenericComponentType(); + Class componentType = Class.class.cast(beanType).getComponentType(); if (Class.class.isInstance(genericComponentType)) { return Class.class.cast(genericComponentType).isAssignableFrom(componentType); @@ -668,7 +668,7 @@ public final class GenericsUtil Type[] resolvedTypeArguments = new Type[types.length]; for (int i = 0; i < types.length; i++) { - final Type type = resolveType(types[i], actualType, seen); + Type type = resolveType(types[i], actualType, seen); if (type != null) // means a stackoverflow was avoided, just keep what we have { resolvedTypeArguments[i] = type; @@ -754,7 +754,7 @@ public final class GenericsUtil return getDirectTypeClosure(type, actualType); } - public static Set<Type> getDirectTypeClosure(final Type type, final Type actualType) + public static Set<Type> getDirectTypeClosure(Type type, Type actualType) { Set<Type> typeClosure = new HashSet<Type>(); typeClosure.add(Object.class); @@ -768,9 +768,9 @@ public final class GenericsUtil { return; } - Type resolvedType = GenericsUtil.resolveType(type, actualType, newSeenList()); + Type resolvedType = resolveType(type, actualType, newSeenList()); set.add(resolvedType); - Class<?> resolvedClass = GenericsUtil.getRawType(resolvedType, actualType); + Class<?> resolvedClass = getRawType(resolvedType, actualType); if (resolvedClass.getSuperclass() != null) { fillTypeHierarchy(set, resolvedClass.getGenericSuperclass(), resolvedType); Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/OwbCustomObjectInputStream.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/OwbCustomObjectInputStream.java?rev=1799067&r1=1799066&r2=1799067&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/OwbCustomObjectInputStream.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/OwbCustomObjectInputStream.java Sun Jun 18 09:59:10 2017 @@ -49,7 +49,7 @@ public class OwbCustomObjectInputStream @Override protected Class resolveProxyClass(String[] interfaces) throws IOException, ClassNotFoundException { - final Class[] cinterfaces = new Class[interfaces.length]; + Class[] cinterfaces = new Class[interfaces.length]; for (int i = 0; i < interfaces.length; i++) { cinterfaces[i] = Class.forName(interfaces[i], false, classLoader); @@ -65,7 +65,7 @@ public class OwbCustomObjectInputStream } } - private static String[] toArray(final String property) + private static String[] toArray(String property) { return property == null ? null : property.split(" *, *"); } @@ -75,18 +75,18 @@ public class OwbCustomObjectInputStream private final String[] blacklist; private final String[] whitelist; - protected BlacklistClassResolver(final String[] blacklist, final String[] whitelist) + protected BlacklistClassResolver(String[] blacklist, String[] whitelist) { this.whitelist = whitelist; this.blacklist = blacklist; } - protected boolean isBlacklisted(final String name) + protected boolean isBlacklisted(String name) { return (whitelist != null && !contains(whitelist, name)) || contains(blacklist, name); } - public final String check(final String name) + public final String check(String name) { if (isBlacklisted(name)) { @@ -95,11 +95,11 @@ public class OwbCustomObjectInputStream return name; } - private static boolean contains(final String[] list, String name) + private static boolean contains(String[] list, String name) { if (list != null) { - for (final String white : list) + for (String white : list) { if (name.startsWith(white)) { Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/PriorityClasses.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/PriorityClasses.java?rev=1799067&r1=1799066&r2=1799067&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/PriorityClasses.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/PriorityClasses.java Sun Jun 18 09:59:10 2017 @@ -34,7 +34,7 @@ public class PriorityClasses private final List<PriorityClass> raw = new ArrayList<PriorityClass>(); private List<Class<?>> sorted; - public void add(final Class<?> clazz, final Priority priority) + public void add(Class<?> clazz, Priority priority) { raw.add(new PriorityClass(clazz, priority.value())); sorted = null; @@ -58,7 +58,7 @@ public class PriorityClasses return sorted; } - public boolean contains(final Class<?> beanType) + public boolean contains(Class<?> beanType) { return getSorted().contains(beanType); } Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java?rev=1799067&r1=1799066&r2=1799067&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java Sun Jun 18 09:59:10 2017 @@ -420,7 +420,7 @@ public final class WebBeansUtil { Asserts.nullCheckForClass(type); - final OpenWebBeansEjbPlugin ejbPlugin = webBeansContext.getPluginLoader().getEjbPlugin(); + OpenWebBeansEjbPlugin ejbPlugin = webBeansContext.getPluginLoader().getEjbPlugin(); if (ejbPlugin != null && ejbPlugin.isNewSessionBean(type)) { return ejbPlugin.defineNewSessionBean(type); @@ -1030,7 +1030,7 @@ public final class WebBeansUtil */ public <T> GProcessInjectionTarget fireProcessInjectionTargetEvent(InjectionTargetImpl<T> injectionTarget, AnnotatedType<T> annotatedType) { - final GProcessInjectionTarget processInjectionTargetEvent = new GProcessInjectionTarget(injectionTarget, annotatedType); + GProcessInjectionTarget processInjectionTargetEvent = new GProcessInjectionTarget(injectionTarget, annotatedType); return fireProcessInjectionTargetEvent(processInjectionTargetEvent); } @@ -1048,9 +1048,9 @@ public final class WebBeansUtil */ public <T> GProcessInjectionTarget fireProcessInjectionTargetEventForJavaEeComponents(Class<T> componentClass) { - final AnnotatedType<T> annotatedType = webBeansContext.getAnnotatedElementFactory().newAnnotatedType(componentClass); - final InjectionTargetImpl<T> injectionTarget = InjectionTargetImpl.class.cast(webBeansContext.getBeanManagerImpl().createInjectionTarget(annotatedType)); - final GProcessInjectionTarget processInjectionTargetEvent = new GProcessInjectionTarget(injectionTarget,annotatedType); + AnnotatedType<T> annotatedType = webBeansContext.getAnnotatedElementFactory().newAnnotatedType(componentClass); + InjectionTargetImpl<T> injectionTarget = InjectionTargetImpl.class.cast(webBeansContext.getBeanManagerImpl().createInjectionTarget(annotatedType)); + GProcessInjectionTarget processInjectionTargetEvent = new GProcessInjectionTarget(injectionTarget,annotatedType); //Fires ProcessInjectionTarget return fireProcessInjectionTargetEvent(processInjectionTargetEvent); @@ -1642,7 +1642,7 @@ public final class WebBeansUtil return builder.toString(); } - public void validate(final Set<InjectionPoint> injectionPoints, Bean<?> bean) + public void validate(Set<InjectionPoint> injectionPoints, Bean<?> bean) { boolean isDecorator = false; @@ -1685,12 +1685,12 @@ public final class WebBeansUtil throw new WebBeansConfigurationException( "No type specified for the interception factory, ensure to paramterize it"); } - final ParameterizedType pt = ParameterizedType.class.cast(injectionPoint.getType()); + ParameterizedType pt = ParameterizedType.class.cast(injectionPoint.getType()); if (pt.getActualTypeArguments() == null || pt.getActualTypeArguments().length != 1) { throw new WebBeansConfigurationException("No explicit type specified for the interception factory"); } - final Type type = pt.getActualTypeArguments()[0]; + Type type = pt.getActualTypeArguments()[0]; if (!Class.class.isInstance(type)) { throw new WebBeansConfigurationException("InterceptionFactory only works with Class, no generics"); @@ -1767,9 +1767,9 @@ public final class WebBeansUtil - public void checkTypeVariables(final TypeLiteral<?> subtype) + public void checkTypeVariables(TypeLiteral<?> subtype) { - final Type t = subtype.getType(); + Type t = subtype.getType(); Boolean result = noTypeVariables.get(t); if (result != null) { @@ -1782,7 +1782,7 @@ public final class WebBeansUtil if (ParameterizedType.class.isInstance(t)) { - for (final Type arg : ParameterizedType.class.cast(t).getActualTypeArguments()) + for (Type arg : ParameterizedType.class.cast(t).getActualTypeArguments()) { if (TypeVariable.class.isInstance(arg)) { @@ -1794,9 +1794,9 @@ public final class WebBeansUtil noTypeVariables.putIfAbsent(t, true); } - public void validEventType(final Type eventType, final Type metadataType) + public void validEventType(Type eventType, Type metadataType) { - final EventCacheKey key = new EventCacheKey(eventType, metadataType); + EventCacheKey key = new EventCacheKey(eventType, metadataType); if (validEventType.containsKey(key)) { return; @@ -1804,10 +1804,10 @@ public final class WebBeansUtil if (GenericsUtil.hasTypeParameters(eventType)) { - final Type et = GenericsUtil.resolveType(GenericsUtil.getParameterizedType(eventType), metadataType); + Type et = GenericsUtil.resolveType(GenericsUtil.getParameterizedType(eventType), metadataType); if (OwbParametrizedTypeImpl.class.isInstance(et)) { - for (final Type t : OwbParametrizedTypeImpl.class.cast(et).getActualTypeArguments()) + for (Type t : OwbParametrizedTypeImpl.class.cast(et).getActualTypeArguments()) { if (OwbWildcardTypeImpl.class.isInstance(t)) { @@ -1819,14 +1819,14 @@ public final class WebBeansUtil validEventType.putIfAbsent(key, true); // we don't care about the value but that's thread safe to use this map } - public boolean isContainerEventType(final Object event) + public boolean isContainerEventType(Object event) { if (event == null) { return false; } - final Class<?> eventType = event.getClass(); + Class<?> eventType = event.getClass(); if (notContainerEvents.containsKey(eventType)) { return false; @@ -1854,15 +1854,15 @@ public final class WebBeansUtil return false; } - public <T> ProcessBeanAttributesImpl<T> fireProcessBeanAttributes(final Annotated annotatedType, final Class<?> type, final BeanAttributes<T> ba) + public <T> ProcessBeanAttributesImpl<T> fireProcessBeanAttributes(Annotated annotatedType, Class<?> type, BeanAttributes<T> ba) { // we don't use bm stack since it is actually quite useless - final ProcessBeanAttributesImpl event = new GProcessBeanAttributes(webBeansContext, type, annotatedType, ba); + ProcessBeanAttributesImpl event = new GProcessBeanAttributes(webBeansContext, type, annotatedType, ba); try { webBeansContext.getBeanManagerImpl().fireEvent(event, true, AnnotationUtil.EMPTY_ANNOTATION_ARRAY); } - catch (final Exception e) + catch (Exception e) { throw new WebBeansConfigurationException("event ProcessBeanAttributes thrown an exception for " + annotatedType, e); } @@ -1872,7 +1872,7 @@ public final class WebBeansUtil throw new WebBeansConfigurationException(event.getDefinitionError()); } - final BeanAttributes<T> beanAttributes; + BeanAttributes<T> beanAttributes; if (event.getAttributes() != ba) { beanAttributes = event.getAttributes(); @@ -1889,21 +1889,21 @@ public final class WebBeansUtil return event; } - public void validateBeanInjection(final Bean<?> bean) + public void validateBeanInjection(Bean<?> bean) { - for (final InjectionPoint injectionPoint : bean.getInjectionPoints()) + for (InjectionPoint injectionPoint : bean.getInjectionPoints()) { - final Type type = injectionPoint.getType(); + Type type = injectionPoint.getType(); if (type instanceof ParameterizedType) { - final Bean injectionPointBean = injectionPoint.getBean(); + Bean injectionPointBean = injectionPoint.getBean(); ParameterizedType pt = (ParameterizedType) type; if (pt.getRawType() == Bean.class) { - final Class<?> beanClass = AbstractOwbBean.class.isInstance(injectionPointBean) ? + Class<?> beanClass = AbstractOwbBean.class.isInstance(injectionPointBean) ? AbstractOwbBean.class.cast(injectionPointBean).getReturnType() : injectionPointBean.getBeanClass(); - final Type beanType = pt.getActualTypeArguments()[0]; + Type beanType = pt.getActualTypeArguments()[0]; if (!GenericsUtil.isAssignableFrom(false, AbstractProducerBean.class.isInstance(bean), beanClass, beanType)) { throw new WebBeansConfigurationException("@Inject Bean<X> can only be done in X, found " + beanType + " and " + beanClass); @@ -1962,7 +1962,7 @@ public final class WebBeansUtil private final Type metadata; private final int hashCache; - private EventCacheKey(final Type event, final Type metadata) + private EventCacheKey(Type event, Type metadata) { this.event = event; this.metadata = metadata; @@ -1973,7 +1973,7 @@ public final class WebBeansUtil } @Override - public boolean equals(final Object o) + public boolean equals(Object o) { if (this == o) { @@ -1984,7 +1984,7 @@ public final class WebBeansUtil return false; } - final EventCacheKey that = EventCacheKey.class.cast(o); + EventCacheKey that = EventCacheKey.class.cast(o); if (event != null ? !event.equals(that.event) : that.event != null) { return false; Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/DefaultBeanArchiveService.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/DefaultBeanArchiveService.java?rev=1799067&r1=1799066&r2=1799067&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/DefaultBeanArchiveService.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/DefaultBeanArchiveService.java Sun Jun 18 09:59:10 2017 @@ -445,33 +445,33 @@ public class DefaultBeanArchiveService i private void fillExcludes(DefaultBeanArchiveInformation bdaInfo, Element scanElement) { - final ClassLoader loader = Thread.currentThread().getContextClassLoader(); - final NodeList childNodes = scanElement.getChildNodes(); + ClassLoader loader = Thread.currentThread().getContextClassLoader(); + NodeList childNodes = scanElement.getChildNodes(); for (int i = 0; i < childNodes.getLength(); i++) { - final Node nd = childNodes.item(i); + Node nd = childNodes.item(i); if (!Element.class.isInstance(nd)) { continue; } - final Element child = Element.class.cast(nd); + Element child = Element.class.cast(nd); if (WebBeansConstants.WEB_BEANS_XML_EXCLUDE.equalsIgnoreCase(child.getLocalName())) { - final String name = getTrimmedAttribute(child, "name"); - final NodeList children = child.getChildNodes(); + String name = getTrimmedAttribute(child, "name"); + NodeList children = child.getChildNodes(); boolean skip = false; for (int j = 0; j < children.getLength(); j++) { - final Node ndChild = children.item(j); + Node ndChild = children.item(j); if (!Element.class.isInstance(ndChild)) { continue; } - final Element condition = Element.class.cast(ndChild); + Element condition = Element.class.cast(ndChild); - final String localName = condition.getLocalName(); + String localName = condition.getLocalName(); if (WebBeansConstants.WEB_BEANS_XML_IF_CLASS_AVAILABLE.equalsIgnoreCase(localName)) { if (!isClassAvailable(loader, getTrimmedAttribute(condition, "name"))) @@ -490,8 +490,8 @@ public class DefaultBeanArchiveService i } else if (WebBeansConstants.WEB_BEANS_XML_IF_SYSTEM_PROPERTY.equalsIgnoreCase(localName)) { - final String value = getTrimmedAttribute(condition, "value"); - final String systProp = System.getProperty(getTrimmedAttribute(condition, "name")); + String value = getTrimmedAttribute(condition, "value"); + String systProp = System.getProperty(getTrimmedAttribute(condition, "name")); if ((value == null && systProp == null) || !(value != null && value.equals(systProp))) { skip = true; @@ -542,7 +542,7 @@ public class DefaultBeanArchiveService i - private static boolean isClassAvailable(final ClassLoader loader, final String name) + private static boolean isClassAvailable(ClassLoader loader, String name) { try { @@ -550,7 +550,7 @@ public class DefaultBeanArchiveService i loader.loadClass(name); return true; } - catch (final Throwable e) // NoClassDefFoundError or ClassNotFoundException + catch (Throwable e) // NoClassDefFoundError or ClassNotFoundException { return false; } Modified: openwebbeans/trunk/webbeans-jms/src/main/java/org/apache/webbeans/jms/util/JmsUtil.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-jms/src/main/java/org/apache/webbeans/jms/util/JmsUtil.java?rev=1799067&r1=1799066&r2=1799067&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-jms/src/main/java/org/apache/webbeans/jms/util/JmsUtil.java (original) +++ openwebbeans/trunk/webbeans-jms/src/main/java/org/apache/webbeans/jms/util/JmsUtil.java Sun Jun 18 09:59:10 2017 @@ -166,7 +166,7 @@ public final class JmsUtil { try { - final Class<?>[] interfaces = {Closable.class, Serializable.class, intf}; + Class<?>[] interfaces = {Closable.class, Serializable.class, intf}; //X TODO do we still need this? throw new WebBeansException("Support got temporarily removed while moving from Javassist to ASM"); Modified: openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/JSFUtil.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/JSFUtil.java?rev=1799067&r1=1799066&r2=1799067&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/JSFUtil.java (original) +++ openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/JSFUtil.java Sun Jun 18 09:59:10 2017 @@ -144,7 +144,7 @@ public final class JSFUtil public static String getConversationPropagation() { - final String conversationPropagation = getJSFRequestParameter("conversationPropagation"); + String conversationPropagation = getJSFRequestParameter("conversationPropagation"); if (conversationPropagation == null && "true".equalsIgnoreCase(getJSFRequestParameter("nocid"))) // compat { return "none"; Modified: openwebbeans/trunk/webbeans-maven/src/main/java/org/apache/openwebbeans/maven/shade/OpenWebBeansPropertiesTransformer.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-maven/src/main/java/org/apache/openwebbeans/maven/shade/OpenWebBeansPropertiesTransformer.java?rev=1799067&r1=1799066&r2=1799067&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-maven/src/main/java/org/apache/openwebbeans/maven/shade/OpenWebBeansPropertiesTransformer.java (original) +++ openwebbeans/trunk/webbeans-maven/src/main/java/org/apache/openwebbeans/maven/shade/OpenWebBeansPropertiesTransformer.java Sun Jun 18 09:59:10 2017 @@ -39,15 +39,15 @@ public class OpenWebBeansPropertiesTrans private boolean reverseOrder; @Override - public boolean canTransformResource(final String s) + public boolean canTransformResource(String s) { return resource.equals(s); } @Override - public void processResource(final String s, final InputStream inputStream, final List<Relocator> list) throws IOException + public void processResource(String s, InputStream inputStream, List<Relocator> list) throws IOException { - final Properties p = new Properties(); + Properties p = new Properties(); p.load(inputStream); configurations.add(p); } @@ -59,45 +59,45 @@ public class OpenWebBeansPropertiesTrans } @Override - public void modifyOutputStream(final JarOutputStream jarOutputStream) throws IOException + public void modifyOutputStream(JarOutputStream jarOutputStream) throws IOException { - final Properties out = mergeProperties(sortProperties(configurations)); + Properties out = mergeProperties(sortProperties(configurations)); jarOutputStream.putNextEntry(new ZipEntry(resource)); out.store(jarOutputStream, "# maven " + resource + " merge"); jarOutputStream.closeEntry(); } - public void setReverseOrder(final boolean reverseOrder) + public void setReverseOrder(boolean reverseOrder) { this.reverseOrder = reverseOrder; } - public void setResource(final String resource) + public void setResource(String resource) { this.resource = resource; } - public void setOrdinalKey(final String ordinalKey) + public void setOrdinalKey(String ordinalKey) { this.ordinalKey = ordinalKey; } - public void setDefaultOrdinal(final int defaultOrdinal) + public void setDefaultOrdinal(int defaultOrdinal) { this.defaultOrdinal = defaultOrdinal; } private List<Properties> sortProperties(List<Properties> allProperties) { - final List<Properties> sortedProperties = new ArrayList<Properties>(); - for (final Properties p : allProperties) + List<Properties> sortedProperties = new ArrayList<Properties>(); + for (Properties p : allProperties) { - final int configOrder = getConfigurationOrdinal(p); + int configOrder = getConfigurationOrdinal(p); int i; for (i = 0; i < sortedProperties.size(); i++) { - final int listConfigOrder = getConfigurationOrdinal(sortedProperties.get(i)); + int listConfigOrder = getConfigurationOrdinal(sortedProperties.get(i)); if ((!reverseOrder && listConfigOrder > configOrder) || (reverseOrder && listConfigOrder < configOrder)) { break; @@ -108,9 +108,9 @@ public class OpenWebBeansPropertiesTrans return sortedProperties; } - private int getConfigurationOrdinal(final Properties p) + private int getConfigurationOrdinal(Properties p) { - final String configOrderString = p.getProperty(ordinalKey); + String configOrderString = p.getProperty(ordinalKey); if (configOrderString != null && configOrderString.length() > 0) { return Integer.parseInt(configOrderString); @@ -118,10 +118,10 @@ public class OpenWebBeansPropertiesTrans return defaultOrdinal; } - private static Properties mergeProperties(final List<Properties> sortedProperties) + private static Properties mergeProperties(List<Properties> sortedProperties) { - final Properties mergedProperties = new Properties(); - for (final Properties p : sortedProperties) + Properties mergedProperties = new Properties(); + for (Properties p : sortedProperties) { mergedProperties.putAll(p); } Modified: openwebbeans/trunk/webbeans-se/src/main/java/org/apache/openwebbeans/se/CDISeBeanArchiveService.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-se/src/main/java/org/apache/openwebbeans/se/CDISeBeanArchiveService.java?rev=1799067&r1=1799066&r2=1799067&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-se/src/main/java/org/apache/openwebbeans/se/CDISeBeanArchiveService.java (original) +++ openwebbeans/trunk/webbeans-se/src/main/java/org/apache/openwebbeans/se/CDISeBeanArchiveService.java Sun Jun 18 09:59:10 2017 @@ -29,13 +29,13 @@ public class CDISeBeanArchiveService ext private final DefaultBeanArchiveInformation embeddedBai; - public CDISeBeanArchiveService(final DefaultBeanArchiveInformation bai) + public CDISeBeanArchiveService(DefaultBeanArchiveInformation bai) { embeddedBai = bai; } @Override - public BeanArchiveInformation getBeanArchiveInformation(final URL beanArchiveUrl) + public BeanArchiveInformation getBeanArchiveInformation(URL beanArchiveUrl) { if ("openwebbeans".equals(beanArchiveUrl.getProtocol())) { Modified: openwebbeans/trunk/webbeans-se/src/main/java/org/apache/openwebbeans/se/CDISeLoaderService.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-se/src/main/java/org/apache/openwebbeans/se/CDISeLoaderService.java?rev=1799067&r1=1799066&r2=1799067&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-se/src/main/java/org/apache/openwebbeans/se/CDISeLoaderService.java (original) +++ openwebbeans/trunk/webbeans-se/src/main/java/org/apache/openwebbeans/se/CDISeLoaderService.java Sun Jun 18 09:59:10 2017 @@ -29,22 +29,22 @@ public class CDISeLoaderService extends private final Collection<Extension> extensions; private final ClassLoader loader; - public CDISeLoaderService(final Collection<Extension> extensions, final ClassLoader loader) + public CDISeLoaderService(Collection<Extension> extensions, ClassLoader loader) { this.extensions = extensions; this.loader = loader; } @Override - public <T> List<T> load(final Class<T> serviceType) + public <T> List<T> load(Class<T> serviceType) { return load(serviceType, loader); } @Override - public <T> List<T> load(final Class<T> serviceType, final ClassLoader classLoader) + public <T> List<T> load(Class<T> serviceType, ClassLoader classLoader) { - final List<T> loaded = super.load(serviceType, classLoader); + List<T> loaded = super.load(serviceType, classLoader); if (Extension.class == serviceType) { loaded.addAll(Collection.class.cast(extensions)); Modified: openwebbeans/trunk/webbeans-se/src/main/java/org/apache/openwebbeans/se/CDISeScannerService.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-se/src/main/java/org/apache/openwebbeans/se/CDISeScannerService.java?rev=1799067&r1=1799066&r2=1799067&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-se/src/main/java/org/apache/openwebbeans/se/CDISeScannerService.java (original) +++ openwebbeans/trunk/webbeans-se/src/main/java/org/apache/openwebbeans/se/CDISeScannerService.java Sun Jun 18 09:59:10 2017 @@ -46,23 +46,23 @@ public class CDISeScannerService extends private boolean autoScanning; private final Collection<Class<?>> classes = new ArrayList<>(); - public void loader(final ClassLoader loader) + public void loader(ClassLoader loader) { this.loader = loader; } - public void classes(final Class<?>[] classes) + public void classes(Class<?>[] classes) { this.classes.addAll(asList(classes)); } - public void packages(final boolean recursive, final Class<?>[] markers) + public void packages(boolean recursive, Class<?>[] markers) { Stream.of(markers) .forEach(c -> this.addPackages(recursive, c.getName().replace('.', '/') + ".class", c.getPackage().getName())); } - public void packages(final boolean recursive, final Package[] packages) + public void packages(boolean recursive, Package[] packages) { Stream.of(packages) .forEach(p -> this.addPackages(recursive, p.getName().replace('.', '/'), p.getName())); @@ -88,13 +88,13 @@ public class CDISeScannerService extends addDeploymentUrl(CDISeBeanArchiveService.EMBEDDED_URL, new URL("openwebbeans", null, 0, "cdise", new URLStreamHandler() { @Override - protected URLConnection openConnection(final URL u) throws IOException + protected URLConnection openConnection(URL u) throws IOException { return null; } })); } - catch (final MalformedURLException e) + catch (MalformedURLException e) { throw new IllegalArgumentException(e); // quite unlikely } @@ -108,19 +108,19 @@ public class CDISeScannerService extends } // not sure why it is in the spec, no way to make it portable - private void addPackages(final boolean recursive, final String resource, final String pack) + private void addPackages(boolean recursive, String resource, String pack) { try { - final Enumeration<URL> urls = loader.getResources(resource); + Enumeration<URL> urls = loader.getResources(resource); if (!urls.hasMoreElements()) { throw new IllegalArgumentException("No matching jar for '" + resource + "'"); } while (urls.hasMoreElements()) { - final URL url = urls.nextElement(); - final CaptureClasses capturedClasses = new CaptureClasses(pack, classes, recursive, loader); + URL url = urls.nextElement(); + CaptureClasses capturedClasses = new CaptureClasses(pack, classes, recursive, loader); switch (url.getProtocol()) { case "jar": @@ -159,7 +159,7 @@ public class CDISeScannerService extends } } - private void consume(final FilteredArchive entries) + private void consume(FilteredArchive entries) { StreamSupport.stream(entries.spliterator(), false).forEach(e -> { @@ -174,7 +174,7 @@ public class CDISeScannerService extends private final long prefixSegments; private final ClassLoader loader; - private CaptureClasses(final String prefix, final Collection<Class<?>> classes, final boolean recursive, final ClassLoader loader) + private CaptureClasses(String prefix, Collection<Class<?>> classes, boolean recursive, ClassLoader loader) { this.prefix = prefix == null ? "" : prefix; this.prefixSegments = this.prefix.chars().filter(c -> c == '.').count(); @@ -184,16 +184,16 @@ public class CDISeScannerService extends } @Override - public boolean accept(final String name) + public boolean accept(String name) { - final boolean accepts = name.startsWith(prefix) && (recursive || name.chars().filter(c -> c == '.').count() == prefixSegments + 1); + boolean accepts = name.startsWith(prefix) && (recursive || name.chars().filter(c -> c == '.').count() == prefixSegments + 1); if (accepts) { try { classes.add(loader.loadClass(name)); } - catch (final ClassNotFoundException e) + catch (ClassNotFoundException e) { logger.warning(e.getMessage()); } Modified: openwebbeans/trunk/webbeans-se/src/main/java/org/apache/openwebbeans/se/OWBContainer.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-se/src/main/java/org/apache/openwebbeans/se/OWBContainer.java?rev=1799067&r1=1799066&r2=1799067&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-se/src/main/java/org/apache/openwebbeans/se/OWBContainer.java (original) +++ openwebbeans/trunk/webbeans-se/src/main/java/org/apache/openwebbeans/se/OWBContainer.java Sun Jun 18 09:59:10 2017 @@ -42,7 +42,7 @@ public class OWBContainer implements SeC private AtomicBoolean running = new AtomicBoolean(true); // let's it be public in case we extend it - public OWBContainer(final WebBeansContext context, final Object startObj) + public OWBContainer(WebBeansContext context, Object startObj) { this.context = context; this.startEvent = startObj; @@ -70,7 +70,7 @@ public class OWBContainer implements SeC } @Override - public Instance<Object> select(final Annotation... qualifiers) + public Instance<Object> select(Annotation... qualifiers) { return instance().select(qualifiers); } @@ -88,19 +88,19 @@ public class OWBContainer implements SeC } @Override - public void destroy(final Object instance) // not sure it is the right impl + public void destroy(Object instance) // not sure it is the right impl { 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); } @@ -119,8 +119,8 @@ public class OWBContainer implements SeC private Instance<Object> instance() { - final BeanManagerImpl bm = context.getBeanManagerImpl(); - final CreationalContextImpl<Instance<Object>> creationalContext = bm.createCreationalContext(null); + BeanManagerImpl bm = context.getBeanManagerImpl(); + CreationalContextImpl<Instance<Object>> creationalContext = bm.createCreationalContext(null); return new InstanceBean<>(context).create(creationalContext).select(DefaultLiteral.INSTANCE); } } Modified: openwebbeans/trunk/webbeans-se/src/main/java/org/apache/openwebbeans/se/OWBInitializer.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-se/src/main/java/org/apache/openwebbeans/se/OWBInitializer.java?rev=1799067&r1=1799066&r2=1799067&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-se/src/main/java/org/apache/openwebbeans/se/OWBInitializer.java (original) +++ openwebbeans/trunk/webbeans-se/src/main/java/org/apache/openwebbeans/se/OWBInitializer.java Sun Jun 18 09:59:10 2017 @@ -61,33 +61,33 @@ public class OWBInitializer extends SeCo @Override public SeContainer initialize() { - final Thread thread = Thread.currentThread(); - final ClassLoader old = thread.getContextClassLoader(); + Thread thread = Thread.currentThread(); + ClassLoader old = thread.getContextClassLoader(); thread.setContextClassLoader(loader); try { services.putIfAbsent(ScannerService.class.getName(), scannerService); services.putIfAbsent(LoaderService.class.getName(), new CDISeLoaderService(extensions, loader)); services.putIfAbsent(BeanArchiveService.class.getName(), new CDISeBeanArchiveService(bai)); - final Map<Class<?>, Object> preparedServices = services.entrySet().stream() + Map<Class<?>, Object> preparedServices = services.entrySet().stream() .collect(toMap(e -> { try { return loader.loadClass(e.getKey()); } - catch (final ClassNotFoundException e1) + catch (ClassNotFoundException e1) { throw new IllegalArgumentException(e1); } }, Map.Entry::getValue)); - final WebBeansContext context = new WebBeansContext(preparedServices, properties); + WebBeansContext context = new WebBeansContext(preparedServices, properties); - final SingletonService<WebBeansContext> singletonInstance = WebBeansFinder.getSingletonService(); + SingletonService<WebBeansContext> singletonInstance = WebBeansFinder.getSingletonService(); DefaultSingletonService.class.cast(singletonInstance).register(loader, context); - final Object startObj = new Object(); + Object startObj = new Object(); context.getService(ContainerLifecycle.class).startApplication(startObj); return new OWBContainer(context, startObj); } @@ -98,75 +98,75 @@ public class OWBInitializer extends SeCo } @Override - public SeContainerInitializer addBeanClasses(final Class<?>... classes) + public SeContainerInitializer addBeanClasses(Class<?>... classes) { scannerService.classes(classes); return this; } @Override - public SeContainerInitializer addPackages(final Package... packages) + public SeContainerInitializer addPackages(Package... packages) { return addPackages(false, packages); } @Override - public SeContainerInitializer addPackages(final boolean scanRecursively, final Package... packages) + public SeContainerInitializer addPackages(boolean scanRecursively, Package... packages) { scannerService.packages(scanRecursively, packages); return this; } @Override - public SeContainerInitializer addPackages(final Class<?>... packageClasses) + public SeContainerInitializer addPackages(Class<?>... packageClasses) { return addPackages(false, packageClasses); } @Override - public SeContainerInitializer addPackages(final boolean scanRecursively, final Class<?>... packageClasses) + public SeContainerInitializer addPackages(boolean scanRecursively, Class<?>... packageClasses) { scannerService.packages(scanRecursively, packageClasses); return this; } @Override - public SeContainerInitializer enableInterceptors(final Class<?>... interceptorClasses) + public SeContainerInitializer enableInterceptors(Class<?>... interceptorClasses) { bai.getInterceptors().addAll(Stream.of(interceptorClasses).map(Class::getName).collect(toList())); return this; } @Override - public SeContainerInitializer enableDecorators(final Class<?>... decoratorClasses) + public SeContainerInitializer enableDecorators(Class<?>... decoratorClasses) { bai.getDecorators().addAll(Stream.of(decoratorClasses).map(Class::getName).collect(toList())); return this; } @Override - public SeContainerInitializer selectAlternatives(final Class<?>... alternativeClasses) + public SeContainerInitializer selectAlternatives(Class<?>... alternativeClasses) { bai.getAlternativeClasses().addAll(Stream.of(alternativeClasses).map(Class::getName).collect(toList())); return this; } @Override - public SeContainerInitializer selectAlternativeStereotypes(final Class<? extends Annotation>... alternativeStereotypeClasses) + public SeContainerInitializer selectAlternativeStereotypes(Class<? extends Annotation>... alternativeStereotypeClasses) { bai.getAlternativeStereotypes().addAll(Stream.of(alternativeStereotypeClasses).map(Class::getName).collect(toList())); return this; } @Override - public SeContainerInitializer addExtensions(final Extension... extensions) + public SeContainerInitializer addExtensions(Extension... extensions) { this.extensions.addAll(asList(extensions)); return this; } @Override - public SeContainerInitializer addExtensions(final Class<? extends Extension>... extensions) + public SeContainerInitializer addExtensions(Class<? extends Extension>... extensions) { this.extensions.addAll(Stream.of(extensions).map(e -> { @@ -174,11 +174,11 @@ public class OWBInitializer extends SeCo { return e.getConstructor().newInstance(); } - catch (final InstantiationException | IllegalAccessException | NoSuchMethodException e1) + catch (InstantiationException | IllegalAccessException | NoSuchMethodException e1) { throw new IllegalArgumentException(e1); } - catch (final InvocationTargetException e1) + catch (InvocationTargetException e1) { throw new IllegalArgumentException(e1.getCause()); } @@ -187,7 +187,7 @@ public class OWBInitializer extends SeCo } @Override - public SeContainerInitializer addProperty(final String key, final Object value) + public SeContainerInitializer addProperty(String key, Object value) { if (String.class.isInstance(value)) { @@ -201,7 +201,7 @@ public class OWBInitializer extends SeCo } @Override - public SeContainerInitializer setProperties(final Map<String, Object> properties) + public SeContainerInitializer setProperties(Map<String, Object> properties) { properties.forEach(this::addProperty); return this; @@ -215,7 +215,7 @@ public class OWBInitializer extends SeCo } @Override - public SeContainerInitializer setClassLoader(final ClassLoader classLoader) + public SeContainerInitializer setClassLoader(ClassLoader classLoader) { loader = classLoader; scannerService.loader(loader); Modified: openwebbeans/trunk/webbeans-se/src/main/java/org/apache/openwebbeans/se/SeInitializerFacade.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-se/src/main/java/org/apache/openwebbeans/se/SeInitializerFacade.java?rev=1799067&r1=1799066&r2=1799067&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-se/src/main/java/org/apache/openwebbeans/se/SeInitializerFacade.java (original) +++ openwebbeans/trunk/webbeans-se/src/main/java/org/apache/openwebbeans/se/SeInitializerFacade.java Sun Jun 18 09:59:10 2017 @@ -42,79 +42,79 @@ public class SeInitializerFacade extends } @Override - public SeContainerInitializer addBeanClasses(final Class<?>... classes) + public SeContainerInitializer addBeanClasses(Class<?>... classes) { return delegate.addBeanClasses(classes); } @Override - public SeContainerInitializer addPackages(final Class<?>... packageClasses) + public SeContainerInitializer addPackages(Class<?>... packageClasses) { return delegate.addPackages(packageClasses); } @Override - public SeContainerInitializer addPackages(final boolean scanRecursively, final Class<?>... packageClasses) + public SeContainerInitializer addPackages(boolean scanRecursively, Class<?>... packageClasses) { return delegate.addPackages(scanRecursively, packageClasses); } @Override - public SeContainerInitializer addPackages(final Package... packages) + public SeContainerInitializer addPackages(Package... packages) { return delegate.addPackages(packages); } @Override - public SeContainerInitializer addPackages(final boolean scanRecursively, final Package... packages) + public SeContainerInitializer addPackages(boolean scanRecursively, Package... packages) { return delegate.addPackages(scanRecursively, packages); } @Override - public SeContainerInitializer addExtensions(final Extension... extensions) + public SeContainerInitializer addExtensions(Extension... extensions) { return delegate.addExtensions(extensions); } @Override - public SeContainerInitializer addExtensions(final Class<? extends Extension>... extensions) + public SeContainerInitializer addExtensions(Class<? extends Extension>... extensions) { return delegate.addExtensions(extensions); } @Override - public SeContainerInitializer enableInterceptors(final Class<?>... interceptorClasses) + public SeContainerInitializer enableInterceptors(Class<?>... interceptorClasses) { return delegate.enableInterceptors(interceptorClasses); } @Override - public SeContainerInitializer enableDecorators(final Class<?>... decoratorClasses) + public SeContainerInitializer enableDecorators(Class<?>... decoratorClasses) { return delegate.enableDecorators(decoratorClasses); } @Override - public SeContainerInitializer selectAlternatives(final Class<?>... alternativeClasses) + public SeContainerInitializer selectAlternatives(Class<?>... alternativeClasses) { return delegate.selectAlternatives(alternativeClasses); } @Override - public SeContainerInitializer selectAlternativeStereotypes(final Class<? extends Annotation>... alternativeStereotypeClasses) + public SeContainerInitializer selectAlternativeStereotypes(Class<? extends Annotation>... alternativeStereotypeClasses) { return delegate.selectAlternativeStereotypes(alternativeStereotypeClasses); } @Override - public SeContainerInitializer addProperty(final String key, final Object value) + public SeContainerInitializer addProperty(String key, Object value) { return delegate.addProperty(key, value); } @Override - public SeContainerInitializer setProperties(final Map<String, Object> properties) + public SeContainerInitializer setProperties(Map<String, Object> properties) { return delegate.setProperties(properties); } @@ -126,7 +126,7 @@ public class SeInitializerFacade extends } @Override - public SeContainerInitializer setClassLoader(final ClassLoader classLoader) + public SeContainerInitializer setClassLoader(ClassLoader classLoader) { return delegate.setClassLoader(classLoader); } Modified: openwebbeans/trunk/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat7/ContextLifecycleListener.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat7/ContextLifecycleListener.java?rev=1799067&r1=1799066&r2=1799067&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat7/ContextLifecycleListener.java (original) +++ openwebbeans/trunk/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat7/ContextLifecycleListener.java Sun Jun 18 09:59:10 2017 @@ -117,7 +117,7 @@ public class ContextLifecycleListener im } - private void wrapInstanceManager(final StandardContext context) + private void wrapInstanceManager(StandardContext context) { if (context.getInstanceManager() instanceof TomcatInstanceManager) { @@ -138,7 +138,7 @@ public class ContextLifecycleListener im { // used as a hook to know we can override eagerly the InstanceManager try { - final StandardContext context = (StandardContext) getContext(servletContextAttributeEvent.getServletContext()); + StandardContext context = (StandardContext) getContext(servletContextAttributeEvent.getServletContext()); wrapInstanceManager(context); } catch (NoSuchFieldException e) @@ -152,10 +152,10 @@ public class ContextLifecycleListener im } } - private static Object getContext(final Object o) throws NoSuchFieldException, IllegalAccessException + private static Object getContext(Object o) throws NoSuchFieldException, IllegalAccessException { - final Field getContext = o.getClass().getDeclaredField("context"); - final boolean acc = getContext.isAccessible(); + Field getContext = o.getClass().getDeclaredField("context"); + boolean acc = getContext.isAccessible(); getContext.setAccessible(true); try { Modified: openwebbeans/trunk/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat7/TomcatUtil.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat7/TomcatUtil.java?rev=1799067&r1=1799066&r2=1799067&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat7/TomcatUtil.java (original) +++ openwebbeans/trunk/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat7/TomcatUtil.java Sun Jun 18 09:59:10 2017 @@ -30,12 +30,12 @@ public class TomcatUtil { public static Object inject(Object object, ClassLoader loader) { - final ClassLoader oldLoader = Thread.currentThread().getContextClassLoader(); + ClassLoader oldLoader = Thread.currentThread().getContextClassLoader(); Thread.currentThread().setContextClassLoader(loader); CreationalContext<?> context = null; try { - final BeanManager beanManager = WebBeansContext.currentInstance().getBeanManagerImpl(); + BeanManager beanManager = WebBeansContext.currentInstance().getBeanManagerImpl(); context = beanManager.createCreationalContext(null); OWBInjector.inject(beanManager, object, context); } @@ -48,13 +48,13 @@ public class TomcatUtil public static void destroy(Object injectorInstance, ClassLoader loader) { - final Instance instance = (TomcatUtil.Instance) injectorInstance; - final ClassLoader oldLoader = Thread.currentThread().getContextClassLoader(); + Instance instance = (TomcatUtil.Instance) injectorInstance; + ClassLoader oldLoader = Thread.currentThread().getContextClassLoader(); Thread.currentThread().setContextClassLoader(loader); try { - final BeanManagerImpl beanManager = WebBeansContext.currentInstance().getBeanManagerImpl(); - final Producer producer = beanManager.getProducerForJavaEeComponent(instance.object.getClass()); + BeanManagerImpl beanManager = WebBeansContext.currentInstance().getBeanManagerImpl(); + Producer producer = beanManager.getProducerForJavaEeComponent(instance.object.getClass()); if (producer != null) { producer.dispose(instance.object); Modified: openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/ServletContextBean.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/ServletContextBean.java?rev=1799067&r1=1799066&r2=1799067&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/ServletContextBean.java (original) +++ openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/ServletContextBean.java Sun Jun 18 09:59:10 2017 @@ -29,7 +29,7 @@ import javax.servlet.ServletContext; class ServletContextBean extends BuiltInOwbBean<ServletContext> { - ServletContextBean(final WebBeansContext ctx, final ServletContext context) + ServletContextBean(WebBeansContext ctx, ServletContext context) { super(ctx, WebBeansType.SERVLET_CONTEXT, ServletContext.class, new SimpleProducerFactory<ServletContext>( new ProviderBasedProducer<>(ctx, ServletContext.class, new Provider<ServletContext>() Modified: openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/ServletRequestBean.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/ServletRequestBean.java?rev=1799067&r1=1799066&r2=1799067&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/ServletRequestBean.java (original) +++ openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/ServletRequestBean.java Sun Jun 18 09:59:10 2017 @@ -31,7 +31,7 @@ import javax.servlet.http.HttpServletReq class ServletRequestBean extends BuiltInOwbBean<HttpServletRequest> { - ServletRequestBean(final WebBeansContext ctx, final WebContextsService contexts) + ServletRequestBean(WebBeansContext ctx, WebContextsService contexts) { super(ctx, WebBeansType.SERVLET_REQUEST, HttpServletRequest.class, new SimpleProducerFactory<HttpServletRequest>( new ProviderBasedProducer<>(ctx, HttpServletRequest.class, new Provider<HttpServletRequest>() @@ -39,7 +39,7 @@ class ServletRequestBean extends BuiltIn @Override public HttpServletRequest get() { - final ServletRequestContext requestContext = contexts.getRequestContext(false); + ServletRequestContext requestContext = contexts.getRequestContext(false); return requestContext == null ? null : requestContext.getServletRequest(); } }, true))); Modified: openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/WebContainerLifecycle.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/WebContainerLifecycle.java?rev=1799067&r1=1799066&r2=1799067&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/WebContainerLifecycle.java (original) +++ openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/WebContainerLifecycle.java Sun Jun 18 09:59:10 2017 @@ -89,7 +89,7 @@ public class WebContainerLifecycle exten { webBeansContext.getBeanManagerImpl().addInternalBean(new ServletContextBean(webBeansContext, servletContext)); - final ContextsService contextsService = webBeansContext.getContextsService(); + ContextsService contextsService = webBeansContext.getContextsService(); if (WebContextsService.class.isInstance(contextsService)) { webBeansContext.getBeanManagerImpl().addInternalBean(new ServletRequestBean(webBeansContext, WebContextsService.class.cast(contextsService))); @@ -112,7 +112,7 @@ public class WebContainerLifecycle exten * {@inheritDoc} */ @Override - protected void afterStartApplication(final Object startupObject) + protected void afterStartApplication(Object startupObject) { //Application is configured as JSP if(getWebBeansContext().getOpenWebBeansConfiguration().isJspApplication()) @@ -253,13 +253,13 @@ public class WebContainerLifecycle exten { // no need of using the tccl since in OSGi it is init elsewhere and using container shortcut can just make it faster Class.forName("org.apache.jasper.servlet.JasperInitializer", true, WebContainerLifecycle.class.getClassLoader()); } - catch (final Throwable th) + catch (Throwable th) { Class.forName("org.apache.jasper.compiler.JspRuntimeContext", true, WebContainerLifecycle.class.getClassLoader()); } factory = JspFactory.getDefaultFactory(); } - catch (final Exception e) + catch (Exception e) { // ignore }
