This is an automated email from the ASF dual-hosted git repository. struberg pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openwebbeans.git
The following commit(s) were added to refs/heads/master by this push: new 9b04c5e various java8 simplifications 9b04c5e is described below commit 9b04c5e906294bcad7c61f30b5c5fcc8956b2f17 Author: Mark Struberg <strub...@apache.org> AuthorDate: Sun Jun 7 23:03:11 2020 +0200 various java8 simplifications no funcational change --- .../standalone/OwbArquillianScannerService.java | 7 +----- .../java/org/apache/webbeans/boot/Bootstrap.java | 10 +------- .../component/creation/BeanAttributesBuilder.java | 9 +------ .../component/creation/DecoratorBeanBuilder.java | 10 +------- .../org/apache/webbeans/config/BeansDeployer.java | 10 +------- .../org/apache/webbeans/config/PropertyLoader.java | 13 ++-------- .../AnnotatedConstructorConfiguratorImpl.java | 2 +- .../AnnotatedMethodConfiguratorImpl.java | 2 +- .../apache/webbeans/container/BeanManagerImpl.java | 4 ++-- .../corespi/se/DefaultBDABeansXmlScanner.java | 28 ++++------------------ .../apache/webbeans/event/NotificationManager.java | 7 +----- .../intercept/InterceptorResolutionService.java | 4 ++-- .../webbeans/intercept/InterceptorsManager.java | 9 ++----- .../webbeans/portable/AbstractAnnotated.java | 10 +------- .../java/org/apache/webbeans/util/ClassUtil.java | 10 +------- .../org/apache/webbeans/util/PriorityClass.java | 2 +- .../apache/webbeans/util/SpecializationUtil.java | 11 +-------- .../AnnotatedTypeConfiguratorImplTest.java | 8 ++----- .../BeanAttributesConfiguratorImplTest.java | 8 ++----- ...erMethodConfiguratorAfterBeanDiscoveryTest.java | 12 +++------- .../InterceptorDecoratorProxyFactoryTest.java | 8 +------ 21 files changed, 32 insertions(+), 152 deletions(-) diff --git a/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/OwbArquillianScannerService.java b/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/OwbArquillianScannerService.java index a1fcb23..c42aa5b 100644 --- a/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/OwbArquillianScannerService.java +++ b/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/OwbArquillianScannerService.java @@ -225,12 +225,7 @@ public class OwbArquillianScannerService implements BdaScannerService private void scanClasses(BeanArchiveService.BeanArchiveInformation info, Map<ArchivePath, Node> classes, String classBasePath) { - Set<Class<?>> bdaClasses = beanClassesPerBda.get(info); - if (bdaClasses == null) - { - bdaClasses = new HashSet<>(); - beanClassesPerBda.put(info, bdaClasses); - } + Set<Class<?>> bdaClasses = beanClassesPerBda.computeIfAbsent(info, k -> new HashSet<>()); if (info != null && info.getBeanDiscoveryMode() == BeanArchiveService.BeanDiscoveryMode.NONE) { // this jar should not get scanned at all. diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/boot/Bootstrap.java b/webbeans-impl/src/main/java/org/apache/webbeans/boot/Bootstrap.java index 83e3ac0..1435763 100644 --- a/webbeans-impl/src/main/java/org/apache/webbeans/boot/Bootstrap.java +++ b/webbeans-impl/src/main/java/org/apache/webbeans/boot/Bootstrap.java @@ -54,15 +54,7 @@ public class Bootstrap long begin = System.currentTimeMillis(); containerLifecycle.startApplication(properties); - Runtime.getRuntime().addShutdownHook(new Thread(){ - - @Override - public void run() - { - latch.countDown(); - } - - }); + Runtime.getRuntime().addShutdownHook(new Thread(() -> latch.countDown())); log.log(Level.INFO, OWBLogConst.INFO_0001, Long.toString(System.currentTimeMillis() - begin)); latch.await(); diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/BeanAttributesBuilder.java b/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/BeanAttributesBuilder.java index 22853d2..db00d22 100644 --- a/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/BeanAttributesBuilder.java +++ b/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/BeanAttributesBuilder.java @@ -187,14 +187,7 @@ public abstract class BeanAttributesBuilder<T, A extends Annotated> Set<String> ignored = webBeansContext.getOpenWebBeansConfiguration().getIgnoredInterfaces(); if (!ignored.isEmpty()) { - for (Iterator<Type> i = this.types.iterator(); i.hasNext(); ) - { - Type t = i.next(); - if (t instanceof Class && ignored.contains(((Class<?>) t).getName())) - { - i.remove(); - } - } + this.types.removeIf(t -> t instanceof Class && ignored.contains(((Class<?>) t).getName())); } } } diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/DecoratorBeanBuilder.java b/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/DecoratorBeanBuilder.java index abdf54e..8ce3c3e 100644 --- a/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/DecoratorBeanBuilder.java +++ b/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/DecoratorBeanBuilder.java @@ -37,7 +37,6 @@ import java.lang.reflect.Type; import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; -import java.util.Iterator; import java.util.List; import java.util.Set; import java.util.logging.Level; @@ -151,14 +150,7 @@ public class DecoratorBeanBuilder<T> extends AbstractBeanBuilder private void defineDecoratedTypes() { decoratedTypes.remove(Serializable.class); /* 8.1 */ - for (Iterator<Type> i = decoratedTypes.iterator(); i.hasNext(); ) - { - Type t = i.next(); - if (!ClassUtil.getClass(t).isInterface() || (t instanceof Class<?> && ignoredDecoratorInterfaces.contains(((Class) t).getName()))) - { - i.remove(); - } - } + decoratedTypes.removeIf(t -> !ClassUtil.getClass(t).isInterface() || (t instanceof Class<?> && ignoredDecoratorInterfaces.contains(((Class) t).getName()))); } private void defineDelegate(Set<InjectionPoint> injectionPoints) diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java b/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java index d3fdf09..5832fc1 100644 --- a/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java +++ b/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java @@ -587,15 +587,7 @@ public class BeansDeployer */ private void removeDisabledBeans() { - Iterator<Bean<?>> beans = webBeansContext.getBeanManagerImpl().getBeans().iterator(); - while(beans.hasNext()) - { - Bean<?> bean = beans.next(); - if (!((OwbBean) bean).isEnabled()) - { - beans.remove(); - } - } + webBeansContext.getBeanManagerImpl().getBeans().removeIf(bean -> !((OwbBean) bean).isEnabled()); } private void registerAlternativesDecoratorsAndInterceptorsWithPriority(List<AnnotatedType<?>> annotatedTypes) diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/config/PropertyLoader.java b/webbeans-impl/src/main/java/org/apache/webbeans/config/PropertyLoader.java index 9e0dd29..5a59ff0 100644 --- a/webbeans-impl/src/main/java/org/apache/webbeans/config/PropertyLoader.java +++ b/webbeans-impl/src/main/java/org/apache/webbeans/config/PropertyLoader.java @@ -133,28 +133,19 @@ public final class PropertyLoader while (propertyUrls.hasMoreElements()) { URL propertyUrl = propertyUrls.nextElement(); - InputStream is = null; - try + try (InputStream is = propertyUrl.openStream()) { - is = propertyUrl.openStream(); Properties prop = new Properties(); prop.load(is); properties.add(prop); // a bit debugging output int ordinal = getConfigurationOrdinal(prop); - if(logger.isLoggable(Level.FINE)) + if (logger.isLoggable(Level.FINE)) { logger.fine("loading properties with ordinal " + ordinal + " from file " + propertyUrl.getFile()); } } - finally - { - if (is != null) - { - is.close(); - } - } } return properties; diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/configurator/AnnotatedConstructorConfiguratorImpl.java b/webbeans-impl/src/main/java/org/apache/webbeans/configurator/AnnotatedConstructorConfiguratorImpl.java index fdbe130..71fc118 100644 --- a/webbeans-impl/src/main/java/org/apache/webbeans/configurator/AnnotatedConstructorConfiguratorImpl.java +++ b/webbeans-impl/src/main/java/org/apache/webbeans/configurator/AnnotatedConstructorConfiguratorImpl.java @@ -39,7 +39,7 @@ public class AnnotatedConstructorConfiguratorImpl<T> implements AnnotatedConstru this.annotatedConstructor = annotatedConstructor; annotatedParameterConfigurators = annotatedConstructor.getParameters().stream() - .map(m -> new AnnotatedParameterConfiguratorImpl<>(m)) + .map(AnnotatedParameterConfiguratorImpl::new) .collect(Collectors.toList()); } diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/configurator/AnnotatedMethodConfiguratorImpl.java b/webbeans-impl/src/main/java/org/apache/webbeans/configurator/AnnotatedMethodConfiguratorImpl.java index 3cdf040..ba95b51 100644 --- a/webbeans-impl/src/main/java/org/apache/webbeans/configurator/AnnotatedMethodConfiguratorImpl.java +++ b/webbeans-impl/src/main/java/org/apache/webbeans/configurator/AnnotatedMethodConfiguratorImpl.java @@ -40,7 +40,7 @@ public class AnnotatedMethodConfiguratorImpl<T> implements AnnotatedMethodConfig this.annotatedMethod = annotatedMethod; annotatedParameterConfigurators = annotatedMethod.getParameters().stream() - .map(m -> new AnnotatedParameterConfiguratorImpl<>(m)) + .map(AnnotatedParameterConfiguratorImpl::new) .collect(Collectors.toList()); } diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java b/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java index 22ee614..082409b 100644 --- a/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java +++ b/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java @@ -516,7 +516,7 @@ public class BeanManagerImpl implements BeanManager, Referenceable webBeansContext.getAnnotationManager().checkQualifiersParams(types, bindingTypes); // checkDecoratorResolverParams is too restrictive for repeatable bindings Set<Decorator<?>> intsSet = webBeansContext.getDecoratorsManager().findDeployedWebBeansDecorator(types, bindingTypes); List<Decorator<?>> decoratorList = new ArrayList<>(intsSet); - Collections.sort(decoratorList, new DecoratorComparator(webBeansContext)); + decoratorList.sort(new DecoratorComparator(webBeansContext)); return decoratorList; } @@ -1276,7 +1276,7 @@ public class BeanManagerImpl implements BeanManager, Referenceable = new LinkedList<>(webBeansContext.getNotificationManager().resolveObservers(event, metadata, false)); // new in CDI-2.0: sort observers - Collections.sort(observerMethods, Comparator.comparingInt(ObserverMethod::getPriority)); + observerMethods.sort(Comparator.comparingInt(ObserverMethod::getPriority)); return new LinkedHashSet<>(observerMethods); } diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultBDABeansXmlScanner.java b/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultBDABeansXmlScanner.java index 1c94182..6699c30 100644 --- a/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultBDABeansXmlScanner.java +++ b/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultBDABeansXmlScanner.java @@ -89,12 +89,7 @@ public class DefaultBDABeansXmlScanner implements BDABeansXmlScanner } synchronized (interceptorsPerBDA) { - Set<Class<?>> interceptorClasses = interceptorsPerBDA.get(beansXMLFilePath); - if (interceptorClasses == null) - { - interceptorClasses = new HashSet<>(); - interceptorsPerBDA.put(beansXMLFilePath, interceptorClasses); - } + Set<Class<?>> interceptorClasses = interceptorsPerBDA.computeIfAbsent(beansXMLFilePath, k -> new HashSet<>()); return interceptorClasses.add(interceptorClass); } } @@ -161,12 +156,7 @@ public class DefaultBDABeansXmlScanner implements BDABeansXmlScanner } synchronized (decoratorsPerBDA) { - Set<Class<?>> decoratorClasses = decoratorsPerBDA.get(beansXMLFilePath); - if (decoratorClasses == null) - { - decoratorClasses = new HashSet<>(); - decoratorsPerBDA.put(beansXMLFilePath, decoratorClasses); - } + Set<Class<?>> decoratorClasses = decoratorsPerBDA.computeIfAbsent(beansXMLFilePath, k -> new HashSet<>()); return decoratorClasses.add(decoratorClass); } @@ -188,12 +178,7 @@ public class DefaultBDABeansXmlScanner implements BDABeansXmlScanner } synchronized (alternativesPerBDA) { - Set<Class<?>> alternativeClasses = alternativesPerBDA.get(beansXMLFilePath); - if (alternativeClasses == null) - { - alternativeClasses = new HashSet<>(); - alternativesPerBDA.put(beansXMLFilePath, alternativeClasses); - } + Set<Class<?>> alternativeClasses = alternativesPerBDA.computeIfAbsent(beansXMLFilePath, k -> new HashSet<>()); return alternativeClasses.add(alternativeClass); } } @@ -214,12 +199,7 @@ public class DefaultBDABeansXmlScanner implements BDABeansXmlScanner } synchronized (stereotypesPerBDA) { - Set<Class<? extends Annotation>> stereoTypeClasses = stereotypesPerBDA.get(beansXMLFilePath); - if (stereoTypeClasses == null) - { - stereoTypeClasses = new HashSet<>(); - stereotypesPerBDA.put(beansXMLFilePath, stereoTypeClasses); - } + Set<Class<? extends Annotation>> stereoTypeClasses = stereotypesPerBDA.computeIfAbsent(beansXMLFilePath, k -> new HashSet<>()); return stereoTypeClasses.add(stereoTypeClass); } } diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java b/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java index c7703c7..8c7eea0 100644 --- a/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java +++ b/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java @@ -181,12 +181,7 @@ public final class NotificationManager { webBeansContext.getAnnotationManager().checkQualifierConditions(observer.getObservedQualifiers()); - Set<ObserverMethod<?>> set = observers.get(observer.getObservedType()); - if (set == null) - { - set = new HashSet<>(); - observers.put(observer.getObservedType(), set); - } + Set<ObserverMethod<?>> set = observers.computeIfAbsent(observer.getObservedType(), k -> new HashSet<>()); set.add(observer); } diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorResolutionService.java b/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorResolutionService.java index e1e1cf3..fee04fd 100644 --- a/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorResolutionService.java +++ b/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorResolutionService.java @@ -204,10 +204,10 @@ public class InterceptorResolutionService failOnFinal); List<Interceptor<?>> cdiInterceptors = new ArrayList<>(allUsedCdiInterceptors); - Collections.sort(cdiInterceptors, new InterceptorComparator(webBeansContext)); + cdiInterceptors.sort(new InterceptorComparator(webBeansContext)); List<Interceptor<?>> cdiConstructorInterceptors = new ArrayList<>(allUsedConstructorCdiInterceptors); - Collections.sort(cdiConstructorInterceptors, new InterceptorComparator(webBeansContext)); + cdiConstructorInterceptors.sort(new InterceptorComparator(webBeansContext)); boolean interceptedBean = !annotatedType.getJavaClass().isInterface() && ( allUsedEjbInterceptors.size() > 0 || diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorsManager.java b/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorsManager.java index 67caba3..1428cb3 100644 --- a/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorsManager.java +++ b/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorsManager.java @@ -215,7 +215,7 @@ public class InterceptorsManager } } - Collections.sort(interceptorList, new InterceptorComparator(webBeansContext)); + interceptorList.sort(new InterceptorComparator(webBeansContext)); return interceptorList; } @@ -312,12 +312,7 @@ public class InterceptorsManager public void addInterceptorBindingType(Class<? extends Annotation> bindingType, Annotation... inheritsArray) { - Set<Annotation> inherits = additionalInterceptorBindingTypes.get(bindingType); - if (inherits == null) - { - inherits = new HashSet<>(); - additionalInterceptorBindingTypes.put(bindingType, inherits); - } + Set<Annotation> inherits = additionalInterceptorBindingTypes.computeIfAbsent(bindingType, k -> new HashSet<>()); Collections.addAll(inherits, inheritsArray); } diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractAnnotated.java b/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractAnnotated.java index 60d1a87..7656168 100644 --- a/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractAnnotated.java +++ b/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractAnnotated.java @@ -23,7 +23,6 @@ import java.lang.reflect.Method; import java.lang.reflect.Type; import java.util.Collections; import java.util.HashSet; -import java.util.Iterator; import java.util.List; import java.util.Objects; import java.util.Optional; @@ -220,14 +219,7 @@ public abstract class AbstractAnnotated implements Annotated Set<String> ignoredInterfaces = webBeansContext.getOpenWebBeansConfiguration().getIgnoredInterfaces(); if (!ignoredInterfaces.isEmpty()) { - for (Iterator<Type> i = typeClosures.iterator(); i.hasNext(); ) - { - Type t = i.next(); - if (t instanceof Class && ignoredInterfaces.contains(((Class<?>) t).getName())) - { - i.remove(); - } - } + typeClosures.removeIf(t -> t instanceof Class && ignoredInterfaces.contains(((Class<?>) t).getName())); } } } diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/util/ClassUtil.java b/webbeans-impl/src/main/java/org/apache/webbeans/util/ClassUtil.java index 03d4308..2ecce48 100644 --- a/webbeans-impl/src/main/java/org/apache/webbeans/util/ClassUtil.java +++ b/webbeans-impl/src/main/java/org/apache/webbeans/util/ClassUtil.java @@ -31,7 +31,6 @@ import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; @@ -394,14 +393,7 @@ public final class ClassUtil List<Method> methods = getNonPrivateMethods(clazz, true); if (!methods.isEmpty()) { - Iterator<Method> iterator = methods.iterator(); - while (iterator.hasNext()) - { - if (!Modifier.isAbstract(iterator.next().getModifiers())) - { - iterator.remove(); - } - } + methods.removeIf(method -> !Modifier.isAbstract(method.getModifiers())); } return methods; diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/util/PriorityClass.java b/webbeans-impl/src/main/java/org/apache/webbeans/util/PriorityClass.java index 2dfdbe6..07cadfb 100644 --- a/webbeans-impl/src/main/java/org/apache/webbeans/util/PriorityClass.java +++ b/webbeans-impl/src/main/java/org/apache/webbeans/util/PriorityClass.java @@ -45,7 +45,7 @@ public class PriorityClass implements Comparable<PriorityClass> if (priority != o.priority) { // sort descending - return (priority > o.priority) ? -1 : ((priority == o.priority) ? 0 : 1); + return Integer.compare(o.priority, priority); } // we additionally sort according to the class name to at least diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/util/SpecializationUtil.java b/webbeans-impl/src/main/java/org/apache/webbeans/util/SpecializationUtil.java index 429e078..c47e45f 100644 --- a/webbeans-impl/src/main/java/org/apache/webbeans/util/SpecializationUtil.java +++ b/webbeans-impl/src/main/java/org/apache/webbeans/util/SpecializationUtil.java @@ -29,7 +29,6 @@ import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.HashSet; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; @@ -177,15 +176,7 @@ public class SpecializationUtil { for (Map<AnnotatedType<?>, BeansDeployer.ExtendedBeanAttributes<?>> beanAttributeMap : beanAttributesPerBda.values()) { - Iterator<Map.Entry<AnnotatedType<?>, BeansDeployer.ExtendedBeanAttributes<?>>> beanAttributeEntryIterator = beanAttributeMap.entrySet().iterator(); - while (beanAttributeEntryIterator.hasNext()) - { - Map.Entry<AnnotatedType<?>, BeansDeployer.ExtendedBeanAttributes<?>> beanAttributesEntry = beanAttributeEntryIterator.next(); - if (disabledClasses.contains(beanAttributesEntry.getKey().getJavaClass())) - { - beanAttributeEntryIterator.remove(); - } - } + beanAttributeMap.entrySet().removeIf(beanAttributesEntry -> disabledClasses.contains(beanAttributesEntry.getKey().getJavaClass())); } } diff --git a/webbeans-impl/src/test/java/org/apache/webbeans/test/configurator/AnnotatedTypeConfiguratorImplTest.java b/webbeans-impl/src/test/java/org/apache/webbeans/test/configurator/AnnotatedTypeConfiguratorImplTest.java index 02c001a..64f4ed6 100644 --- a/webbeans-impl/src/test/java/org/apache/webbeans/test/configurator/AnnotatedTypeConfiguratorImplTest.java +++ b/webbeans-impl/src/test/java/org/apache/webbeans/test/configurator/AnnotatedTypeConfiguratorImplTest.java @@ -149,13 +149,11 @@ public class AnnotatedTypeConfiguratorImplTest extends AbstractUnitTest { checkAnnotatedType( pat -> - { pat.configureAnnotatedType() .filterMethods(m -> m.getJavaMember().getName().equals("method1")) .findFirst() .get() - .add(new TheQualifierLiteral("Method1")); - }, + .add(new TheQualifierLiteral("Method1")), pba -> { Assert.assertTrue(pba.getAnnotated() instanceof AnnotatedType); @@ -198,13 +196,11 @@ public class AnnotatedTypeConfiguratorImplTest extends AbstractUnitTest { checkAnnotatedType( pat -> - { pat.configureAnnotatedType() .filterFields(m -> m.getJavaMember().getName().equals("field1")) .findFirst() .get() - .add(new TheQualifierLiteral("Field1")); - }, + .add(new TheQualifierLiteral("Field1")), pba -> { Assert.assertTrue(pba.getAnnotated() instanceof AnnotatedType); diff --git a/webbeans-impl/src/test/java/org/apache/webbeans/test/configurator/BeanAttributesConfiguratorImplTest.java b/webbeans-impl/src/test/java/org/apache/webbeans/test/configurator/BeanAttributesConfiguratorImplTest.java index b59b38f..a43984a 100644 --- a/webbeans-impl/src/test/java/org/apache/webbeans/test/configurator/BeanAttributesConfiguratorImplTest.java +++ b/webbeans-impl/src/test/java/org/apache/webbeans/test/configurator/BeanAttributesConfiguratorImplTest.java @@ -38,14 +38,10 @@ public class BeanAttributesConfiguratorImplTest extends AbstractUnitTest { checkBeanAttributes( pba -> - { pba.configureBeanAttributes() - .scope(ApplicationScoped.class); - }, + .scope(ApplicationScoped.class), pb -> - { - assertEquals(ApplicationScoped.class, pb.getBean().getScope()); - }, + assertEquals(ApplicationScoped.class, pb.getBean().getScope()), EmptyBean.class); } diff --git a/webbeans-impl/src/test/java/org/apache/webbeans/test/configurator/ObserverMethodConfiguratorAfterBeanDiscoveryTest.java b/webbeans-impl/src/test/java/org/apache/webbeans/test/configurator/ObserverMethodConfiguratorAfterBeanDiscoveryTest.java index 0887fbe..fb658b7 100644 --- a/webbeans-impl/src/test/java/org/apache/webbeans/test/configurator/ObserverMethodConfiguratorAfterBeanDiscoveryTest.java +++ b/webbeans-impl/src/test/java/org/apache/webbeans/test/configurator/ObserverMethodConfiguratorAfterBeanDiscoveryTest.java @@ -82,9 +82,7 @@ public class ObserverMethodConfiguratorAfterBeanDiscoveryTest extends AbstractUn .observedType(MyEvent.class) .priority(100) .notifyWith(eventContext -> - { - observedEvents.add("event1"); - }); + observedEvents.add("event1")); ObserverMethodConfigurator<MyEvent> observerCfg2 = abd.<MyEvent>addObserverMethod(); Assert.assertNotNull(observerCfg2); @@ -92,9 +90,7 @@ public class ObserverMethodConfiguratorAfterBeanDiscoveryTest extends AbstractUn .observedType(MyEvent.class) // with default prio .notifyWith(eventContext -> - { - observedEvents.add("event2"); - }); + observedEvents.add("event2")); ObserverMethodConfigurator<MyEvent> observerCfg3 = abd.<MyEvent>addObserverMethod(); Assert.assertNotNull(observerCfg3); @@ -105,9 +101,7 @@ public class ObserverMethodConfiguratorAfterBeanDiscoveryTest extends AbstractUn { // with @MyQualifier }) .notifyWith(eventContext -> - { - observedEvents.add("event3"); - }); + observedEvents.add("event3")); } } diff --git a/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/factory/InterceptorDecoratorProxyFactoryTest.java b/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/factory/InterceptorDecoratorProxyFactoryTest.java index 5d7b9f6..887342b 100644 --- a/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/factory/InterceptorDecoratorProxyFactoryTest.java +++ b/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/factory/InterceptorDecoratorProxyFactoryTest.java @@ -105,13 +105,7 @@ public class InterceptorDecoratorProxyFactoryTest extends AbstractUnitTest ClassLoader classLoader = new URLClassLoader(new URL[0]); List<Method> methods = ClassUtil.getNonPrivateMethods(ExtendedSpecificClass.class, true); - for (Iterator<Method> i = methods.iterator(); i.hasNext();) - { - if (i.next().isBridge()) - { - i.remove(); - } - } + methods.removeIf(Method::isBridge); Method[] interceptedMethods = methods.toArray(new Method[methods.size()]); Method[] nonInterceptedMethods = null;