Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/MethodProducerFactory.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/MethodProducerFactory.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/MethodProducerFactory.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/MethodProducerFactory.java Sun Jun 18 13:57:08 2017 @@ -57,12 +57,12 @@ public class MethodProducerFactory<P> ex public <T> Producer<T> createProducer(Bean<T> bean) { Set<InjectionPoint> disposalIPs = getInjectionPoints(bean); - Producer<T> producer = new ProducerMethodProducer<T, P>(parent, producerMethod, disposalMethod, createInjectionPoints(bean), disposalIPs, webBeansContext); + Producer<T> producer = new ProducerMethodProducer<>(parent, producerMethod, disposalMethod, createInjectionPoints(bean), disposalIPs, webBeansContext); return webBeansContext.getWebBeansUtil().fireProcessProducerEvent(producer, producerMethod); } protected Set<InjectionPoint> createInjectionPoints(Bean<?> bean) { - return new HashSet<InjectionPoint>(webBeansContext.getInjectionPointFactory().buildInjectionPoints(bean, producerMethod)); + return new HashSet<>(webBeansContext.getInjectionPointFactory().buildInjectionPoints(bean, producerMethod)); } }
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ObserverMethodsBuilder.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ObserverMethodsBuilder.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ObserverMethodsBuilder.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ObserverMethodsBuilder.java Sun Jun 18 13:57:08 2017 @@ -71,7 +71,7 @@ public class ObserverMethodsBuilder<T> */ public Set<ObserverMethod<?>> defineObserverMethods(AbstractOwbBean<T> ownerBean) { - Set<ObserverMethod<?>> definedObservers = new HashSet<ObserverMethod<?>>(); + Set<ObserverMethod<?>> definedObservers = new HashSet<>(); for (AnnotatedMethod<?> annotatedMethod : webBeansContext.getAnnotatedElementFactory().getFilteredAnnotatedMethods(annotatedType)) { ObserverMethod<?> observerMethod = defineObserverMethod(ownerBean, annotatedMethod); Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerFieldBeansBuilder.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerFieldBeansBuilder.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerFieldBeansBuilder.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerFieldBeansBuilder.java Sun Jun 18 13:57:08 2017 @@ -67,7 +67,7 @@ public class ProducerFieldBeansBuilder<T */ public Set<ProducerFieldBean<?>> defineProducerFields(InjectionTargetBean<T> bean) { - Set<ProducerFieldBean<?>> producerBeans = new HashSet<ProducerFieldBean<?>>(); + Set<ProducerFieldBean<?>> producerBeans = new HashSet<>(); Set<AnnotatedField<? super T>> annotatedFields = annotatedType.getFields(); for(AnnotatedField<? super T> annotatedField: annotatedFields) { @@ -83,8 +83,8 @@ public class ProducerFieldBeansBuilder<T { //Check for valid resource annotation //WebBeansUtil.checkForValidResources(annotatedField.getDeclaringType().getJavaClass(), field.getType(), field.getName(), anns); - ResourceReference<T, Annotation> resourceRef = new ResourceReference<T, Annotation>(annotatedType.getJavaClass(), field.getName(), - (Class<T>)field.getType(), resourceAnnotation); + ResourceReference<T, Annotation> resourceRef = new ResourceReference<>(annotatedType.getJavaClass(), field.getName(), + (Class<T>) field.getType(), resourceAnnotation); //Can not define EL name if(annotatedField.isAnnotationPresent(Named.class)) @@ -96,7 +96,7 @@ public class ProducerFieldBeansBuilder<T if (processBeanAttributes != null) { ResourceBeanBuilder<T, Annotation> resourceBeanCreator - = new ResourceBeanBuilder<T, Annotation>(bean, resourceRef, annotatedField, processBeanAttributes.getAttributes()); + = new ResourceBeanBuilder<>(bean, resourceRef, annotatedField, processBeanAttributes.getAttributes()); ResourceBean<T, Annotation> resourceBean = resourceBeanCreator.getBean(); resourceBean.setProducerField(field); producerBeans.add(resourceBean); Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerMethodBeanBuilder.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerMethodBeanBuilder.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerMethodBeanBuilder.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerMethodBeanBuilder.java Sun Jun 18 13:57:08 2017 @@ -47,7 +47,7 @@ public class ProducerMethodBeanBuilder<T public void configureProducerSpecialization(ProducerMethodBean<T> bean, AnnotatedMethod<T> annotatedMethod) { List<AnnotatedParameter<T>> annotatedParameters = annotatedMethod.getParameters(); - List<Class<?>> parameters = new ArrayList<Class<?>>(); + List<Class<?>> parameters = new ArrayList<>(); for(AnnotatedParameter<T> annotatedParam : annotatedParameters) { parameters.add(ClassUtil.getClass(annotatedParam.getBaseType())); @@ -78,7 +78,7 @@ public class ProducerMethodBeanBuilder<T { AnnotatedMethod<P> annotatedMethod = (AnnotatedMethod<P>) annotatedMember; ProducerMethodBean<T> producerMethodBean - = new ProducerMethodBean<T>(parent, beanAttributes, beanClass, new MethodProducerFactory<P>(annotatedMethod, parent, parent.getWebBeansContext())); + = new ProducerMethodBean<>(parent, beanAttributes, beanClass, new MethodProducerFactory<>(annotatedMethod, parent, parent.getWebBeansContext())); return producerMethodBean; } Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerMethodBeansBuilder.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerMethodBeansBuilder.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerMethodBeansBuilder.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerMethodBeansBuilder.java Sun Jun 18 13:57:08 2017 @@ -67,9 +67,9 @@ public class ProducerMethodBeansBuilder< */ public Set<ProducerMethodBean<?>> defineProducerMethods(InjectionTargetBean<T> bean, Set<ProducerFieldBean<?>> producerFields) { - Set<ProducerMethodBean<?>> producerBeans = new HashSet<ProducerMethodBean<?>>(); + Set<ProducerMethodBean<?>> producerBeans = new HashSet<>(); Set<AnnotatedMethod<? super T>> annotatedMethods = webBeansContext.getAnnotatedElementFactory().getFilteredAnnotatedMethods(annotatedType); - Collection<AnnotatedMethod<?>> skipMethods = new HashSet<AnnotatedMethod<?>>(); + Collection<AnnotatedMethod<?>> skipMethods = new HashSet<>(); for(AnnotatedMethod<? super T> annotatedMethod: annotatedMethods) { @@ -95,7 +95,7 @@ public class ProducerMethodBeansBuilder< BeanAttributesBuilder.forContext(webBeansContext).newBeanAttibutes(method).build()); if (processBeanAttributes != null) { - ProducerMethodBeanBuilder<T> producerMethodBeanCreator = new ProducerMethodBeanBuilder<T>(bean, annotatedMethod, processBeanAttributes.getAttributes()); + ProducerMethodBeanBuilder<T> producerMethodBeanCreator = new ProducerMethodBeanBuilder<>(bean, annotatedMethod, processBeanAttributes.getAttributes()); ProducerMethodBean<T> producerMethodBean = producerMethodBeanCreator.getBean(); Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ResourceBeanBuilder.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ResourceBeanBuilder.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ResourceBeanBuilder.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ResourceBeanBuilder.java Sun Jun 18 13:57:08 2017 @@ -48,7 +48,7 @@ public class ResourceBeanBuilder<T, R ex new ResourceProducerFactory( !Dependent.class.equals(beanAttributes.getScope()), owner, - new ResourceProvider<T>(resourceRef, owner.getWebBeansContext()), beanClass, owner.getWebBeansContext(), + new ResourceProvider<>(resourceRef, owner.getWebBeansContext()), beanClass, owner.getWebBeansContext(), annotatedMember, resourceRef)); } Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/SelfInterceptorBeanBuilder.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/SelfInterceptorBeanBuilder.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/SelfInterceptorBeanBuilder.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/SelfInterceptorBeanBuilder.java Sun Jun 18 13:57:08 2017 @@ -61,6 +61,6 @@ public class SelfInterceptorBeanBuilder< @Override protected SelfInterceptorBean<T> createBean(Class<T> beanClass, boolean enabled, Map<InterceptionType, Method[]> interceptionMethods) { - return new SelfInterceptorBean<T>(webBeansContext, annotatedType, beanAttributes, beanClass, interceptionMethods); + return new SelfInterceptorBean<>(webBeansContext, annotatedType, beanAttributes, beanClass, interceptionMethods); } } Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/third/ThirdpartyBeanAttributesImpl.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/third/ThirdpartyBeanAttributesImpl.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/third/ThirdpartyBeanAttributesImpl.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/third/ThirdpartyBeanAttributesImpl.java Sun Jun 18 13:57:08 2017 @@ -59,7 +59,7 @@ class ThirdpartyBeanAttributesImpl<T> ex } else { - return new SingleItemSet<Annotation>(AnyLiteral.INSTANCE); + return new SingleItemSet<>(AnyLiteral.INSTANCE); } } } Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java Sun Jun 18 13:57:08 2017 @@ -183,7 +183,7 @@ public class BeansDeployer private final DecoratorsManager decoratorsManager; private final InterceptorsManager interceptorsManager; - private final Map<String, Boolean> packageVetoCache = new HashMap<String, Boolean>(); + private final Map<String, Boolean> packageVetoCache = new HashMap<>(); /** * This BdaInfo is used for all manually added annotated types or in case @@ -427,7 +427,7 @@ public class BeansDeployer Map<BeanArchiveInformation, List<AnnotatedType<?>>> annotatedTypesPerBda) { Map<BeanArchiveInformation, Map<AnnotatedType<?>, ExtendedBeanAttributes<?>>> beanAttributesPerBda - = new HashMap<BeanArchiveInformation, Map<AnnotatedType<?>, ExtendedBeanAttributes<?>>>(); + = new HashMap<>(); for (Map.Entry<BeanArchiveInformation, List<AnnotatedType<?>>> atEntry : annotatedTypesPerBda.entrySet()) { @@ -436,7 +436,7 @@ public class BeansDeployer boolean onlyScopedBeans = BeanDiscoveryMode.TRIM == bdaInfo.getBeanDiscoveryMode(); - Map<AnnotatedType<?>, ExtendedBeanAttributes<?>> bdaBeanAttributes = new IdentityHashMap<AnnotatedType<?>, ExtendedBeanAttributes<?>>(annotatedTypes.size()); + Map<AnnotatedType<?>, ExtendedBeanAttributes<?>> bdaBeanAttributes = new IdentityHashMap<>(annotatedTypes.size()); Iterator<AnnotatedType<?>> iterator = annotatedTypes.iterator(); while (iterator.hasNext()) { @@ -535,7 +535,7 @@ public class BeansDeployer Type type = decorator.getDelegateType(); // capture ParameterizedType from decorator type - Collection<Type> types = new HashSet<Type>(); + Collection<Type> types = new HashSet<>(); if (Class.class.isInstance(type)) { Class<?> c = Class.class.cast(type); @@ -797,7 +797,7 @@ public class BeansDeployer private List<AnnotatedType<?>> fireAfterTypeDiscoveryEvent() { BeanManagerImpl manager = webBeansContext.getBeanManagerImpl(); - List<AnnotatedType<?>> newAt = new LinkedList<AnnotatedType<?>>(); + List<AnnotatedType<?>> newAt = new LinkedList<>(); List<Class<?>> interceptors = interceptorsManager.getPrioritizedInterceptors(); List<Class<?>> decorators = decoratorsManager.getPrioritizedDecorators(); List<Class<?>> alternatives = webBeansContext.getAlternativesManager().getPrioritizedAlternatives(); @@ -989,7 +989,7 @@ public class BeansDeployer if (beans != null && beans.size() > 0) { - Stack<String> beanNames = new Stack<String>(); + Stack<String> beanNames = new Stack<>(); for (Bean<?> bean : beans) { try @@ -1141,10 +1141,10 @@ public class BeansDeployer private Map<BeanArchiveInformation, List<AnnotatedType<?>>> annotatedTypesFromClassPath(ScannerService scanner) { logger.fine("Creating AnnotatedTypes from class files has started."); - Set<Class<?>> foundClasses = new HashSet<Class<?>>(100); + Set<Class<?>> foundClasses = new HashSet<>(100); Map<BeanArchiveInformation, List<AnnotatedType<?>>> annotatedTypesPerBda - = new HashMap<BeanArchiveInformation, List<AnnotatedType<?>>>(); + = new HashMap<>(); if (scanner instanceof BdaScannerService) { @@ -1180,7 +1180,7 @@ public class BeansDeployer */ private List<AnnotatedType<?>> annotatedTypesFromBdaClassPath(Set<Class<?>> classIndex, Set<Class<?>> foundClasses) { - List<AnnotatedType<?>> annotatedTypes = new ArrayList<AnnotatedType<?>>(); + List<AnnotatedType<?>> annotatedTypes = new ArrayList<>(); //Iterating over each class if (classIndex != null) @@ -1500,7 +1500,7 @@ public class BeansDeployer // the alternatives in this beans.xml // this gets used to detect multiple definitions of the // same alternative in one beans.xml file. - Set<String> alternativesInFile = new HashSet<String>(); + Set<String> alternativesInFile = new HashSet<>(); for (String alternativeName : alternatives) { @@ -1533,7 +1533,7 @@ public class BeansDeployer private void configureDecorators(URL bdaLocation, List<String> decorators) { - Set<Class> decoratorsInFile = new HashSet<Class>(); + Set<Class> decoratorsInFile = new HashSet<>(); for (String decorator : decorators) { @@ -1564,7 +1564,7 @@ public class BeansDeployer // the interceptors in this beans.xml // this gets used to detect multiple definitions of the // same interceptor in one beans.xml file. - Set<Class> interceptorsInFile = new HashSet<Class>(); + Set<Class> interceptorsInFile = new HashSet<>(); for (String interceptor : interceptors) { @@ -1839,11 +1839,11 @@ public class BeansDeployer boolean ignoreProducer = defaultAt != beanAnnotatedType && annotatedTypes.containsKey(defaultAt); if(bean.isEnabled()) { - observerMethods = new ObserverMethodsBuilder<T>(webBeansContext, beanAnnotatedType).defineObserverMethods(bean); + observerMethods = new ObserverMethodsBuilder<>(webBeansContext, beanAnnotatedType).defineObserverMethods(bean); } else { - observerMethods = new HashSet<ObserverMethod<?>>(); + observerMethods = new HashSet<>(); } WebBeansContext wbc = bean.getWebBeansContext(); @@ -1854,7 +1854,7 @@ public class BeansDeployer ManagedBean<T> managedBean = (ManagedBean<T>)bean; Map<ProducerMethodBean<?>,AnnotatedMethod<?>> annotatedMethods = - new HashMap<ProducerMethodBean<?>, AnnotatedMethod<?>>(); + new HashMap<>(); if (!producerFields.isEmpty() || !producerMethods.isEmpty()) { @@ -1876,7 +1876,7 @@ public class BeansDeployer } Map<ProducerFieldBean<?>,AnnotatedField<?>> annotatedFields = - new HashMap<ProducerFieldBean<?>, AnnotatedField<?>>(); + new HashMap<>(); for(ProducerFieldBean<?> producerField : producerFields) { @@ -1890,7 +1890,7 @@ public class BeansDeployer } Map<ObserverMethod<?>,AnnotatedMethod<?>> observerMethodsMap = - new HashMap<ObserverMethod<?>, AnnotatedMethod<?>>(); + new HashMap<>(); for(ObserverMethod<?> observerMethod : observerMethods) { Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OpenWebBeansConfiguration.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OpenWebBeansConfiguration.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OpenWebBeansConfiguration.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OpenWebBeansConfiguration.java Sun Jun 18 13:57:08 2017 @@ -207,7 +207,7 @@ public class OpenWebBeansConfiguration * will get stored in a Set. * */ - private Map<String, Set<String>> configuredLists = new HashMap<String, Set<String>>(); + private Map<String, Set<String>> configuredLists = new HashMap<>(); /** @@ -260,7 +260,7 @@ public class OpenWebBeansConfiguration */ public List<String> splitValues(String commaSeparatedVals) { - ArrayList<String> values = new ArrayList<String>(); + ArrayList<String> values = new ArrayList<>(); if (commaSeparatedVals != null) { for (String value : commaSeparatedVals.split(",")) @@ -403,7 +403,7 @@ public class OpenWebBeansConfiguration String ignoredInterfacesString = getProperty(IGNORED_INTERFACES); if (ignoredInterfacesString != null) { - ignoredInterfaces = new HashSet<String>(Arrays.asList(ignoredInterfacesString.split("[,\\p{javaWhitespace}]"))); + ignoredInterfaces = new HashSet<>(Arrays.asList(ignoredInterfacesString.split("[,\\p{javaWhitespace}]"))); } else { @@ -427,7 +427,7 @@ public class OpenWebBeansConfiguration return allValues; } - allValues = new HashSet<String>(); + allValues = new HashSet<>(); try { List<Properties> properties = PropertyLoader.loadAllProperties(DEFAULT_CONFIG_PROPERTIES_NAME); Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/PropertyLoader.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/PropertyLoader.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/PropertyLoader.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/PropertyLoader.java Sun Jun 18 13:57:08 2017 @@ -110,7 +110,7 @@ public final class PropertyLoader return null; } - List<Properties> properties = new ArrayList<Properties>(); + List<Properties> properties = new ArrayList<>(); while (propertyUrls.hasMoreElements()) { @@ -149,7 +149,7 @@ public final class PropertyLoader */ private static List<Properties> sortProperties(List<Properties> allProperties) { - List<Properties> sortedProperties = new ArrayList<Properties>(); + List<Properties> sortedProperties = new ArrayList<>(); for (Properties p : allProperties) { int configOrder = getConfigurationOrdinal(p); Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContext.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContext.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContext.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContext.java Sun Jun 18 13:57:08 2017 @@ -74,9 +74,9 @@ public class WebBeansContext { private static final Logger logger = WebBeansLoggerFacade.getLogger(WebBeansContext.class); - private final Map<Class<?>, Object> managerMap = new HashMap<Class<?>, Object>(); + private final Map<Class<?>, Object> managerMap = new HashMap<>(); - private final Map<Class<?>, Object> serviceMap = new HashMap<Class<?>, Object>(); + private final Map<Class<?>, Object> serviceMap = new HashMap<>(); private final WebBeansUtil webBeansUtil = new WebBeansUtil(this); private final AlternativesManager alternativesManager = new AlternativesManager(this); Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/configurator/BeanAttributesConfiguratorImpl.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/configurator/BeanAttributesConfiguratorImpl.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/configurator/BeanAttributesConfiguratorImpl.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/configurator/BeanAttributesConfiguratorImpl.java Sun Jun 18 13:57:08 2017 @@ -201,6 +201,6 @@ public class BeanAttributesConfiguratorI // make sure we always have an @Any Qualifier as well. qualifiers.add(AnyLiteral.INSTANCE); - return new BeanAttributesImpl<T>(types, qualifiers, scope, name, false, stereotypes, alternative); + return new BeanAttributesImpl<>(types, qualifiers, scope, name, false, stereotypes, alternative); } } Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java Sun Jun 18 13:57:08 2017 @@ -130,7 +130,7 @@ public class BeanManagerImpl implements * we don't even need a ConcurrentHashMap. * @see #singleContextMap */ - private Map<Class<? extends Annotation>, List<Context>> contextMap = new HashMap<Class<? extends Annotation>, List<Context>>(); + private Map<Class<? extends Annotation>, List<Context>> contextMap = new HashMap<>(); /** * This will hold non-standard contexts where only one Context implementation got registered @@ -140,13 +140,13 @@ public class BeanManagerImpl implements * we don't even need a ConcurrentHashMap. * @see #contextMap */ - private Map<Class<? extends Annotation>, Context> singleContextMap = new HashMap<Class<? extends Annotation>, Context>(); + private Map<Class<? extends Annotation>, Context> singleContextMap = new HashMap<>(); /**Deployment archive beans*/ - private Set<Bean<?>> deploymentBeans = new HashSet<Bean<?>>(); + private Set<Bean<?>> deploymentBeans = new HashSet<>(); /**Normal scoped cache proxies*/ - private Map<Contextual<?>, Object> cacheProxies = new ConcurrentHashMap<Contextual<?>, Object>(); + private Map<Contextual<?>, Object> cacheProxies = new ConcurrentHashMap<>(); /**Injection resolver instance*/ private InjectionResolver injectionResolver; @@ -156,20 +156,20 @@ public class BeanManagerImpl implements * {@link javax.enterprise.inject.spi.BeforeBeanDiscovery#addQualifier(Class)} * event function. */ - private List<Class<? extends Annotation>> additionalQualifiers = new ArrayList<Class<? extends Annotation>>(); - private Map<Class<?>, AnnotatedType<? extends Annotation>> additionalAnnotatedTypeQualifiers = new HashMap<Class<?>, AnnotatedType<? extends Annotation>>(); + private List<Class<? extends Annotation>> additionalQualifiers = new ArrayList<>(); + private Map<Class<?>, AnnotatedType<? extends Annotation>> additionalAnnotatedTypeQualifiers = new HashMap<>(); /** * This list contains additional scopes which got set via the * {@link javax.enterprise.inject.spi.BeforeBeanDiscovery#addScope(Class, boolean, boolean)} event function. */ - private List<ExternalScope> additionalScopes = new ArrayList<ExternalScope>(); + private List<ExternalScope> additionalScopes = new ArrayList<>(); /** quick detection if an annotation is a scope-annotation */ - private Set<Class<? extends Annotation>> scopeAnnotations = new HashSet<Class<? extends Annotation>>(); + private Set<Class<? extends Annotation>> scopeAnnotations = new HashSet<>(); /** quick detection if an annotation is NOT a scope-annotation */ - private Set<Class<? extends Annotation>> nonscopeAnnotations = new HashSet<Class<? extends Annotation>>(); + private Set<Class<? extends Annotation>> nonscopeAnnotations = new HashSet<>(); private ConcurrentMap<Class<?>, ConcurrentMap<String, AnnotatedType<?>>> additionalAnnotatedTypes = new ConcurrentHashMap<>(); @@ -180,11 +180,11 @@ public class BeanManagerImpl implements * This map stores all beans along with their unique {@link javax.enterprise.inject.spi.PassivationCapable} id. * This is used as a reference for serialization. */ - private ConcurrentMap<String, Bean<?>> passivationBeans = new ConcurrentHashMap<String, Bean<?>>(); + private ConcurrentMap<String, Bean<?>> passivationBeans = new ConcurrentHashMap<>(); /**InjectionTargets for Java EE component instances that supports injections*/ private Map<Class<?>, Producer<?>> producersForJavaEeComponents = - new ConcurrentHashMap<Class<?>, Producer<?>>(); + new ConcurrentHashMap<>(); private AnnotatedElementFactory annotatedElementFactory; @@ -216,7 +216,7 @@ public class BeanManagerImpl implements * hierarchies, because each cl has other classes. */ private static Map<Class<? extends Annotation>, Boolean> isScopeTypeNormalCache = - new ConcurrentHashMap<Class<? extends Annotation>, Boolean>(); + new ConcurrentHashMap<>(); /** * Map to be able to lookup always 3rd party beans when user does lookups with custom beans. @@ -369,11 +369,11 @@ public class BeanManagerImpl implements ThirdpartyBeanImpl<?> bean; if (!PassivationCapable.class.isInstance(newBean)) { - bean = new ThirdpartyBeanImpl<T>(webBeansContext, newBean); + bean = new ThirdpartyBeanImpl<>(webBeansContext, newBean); } else { - bean = new PassivationCapableThirdpartyBeanImpl<T>(webBeansContext, newBean); + bean = new PassivationCapableThirdpartyBeanImpl<>(webBeansContext, newBean); } addPassivationInfo(bean); deploymentBeans.add(bean); @@ -514,7 +514,7 @@ public class BeanManagerImpl implements { 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<Decorator<?>>(intsSet); + List<Decorator<?>> decoratorList = new ArrayList<>(intsSet); Collections.sort(decoratorList, new DecoratorComparator(webBeansContext)); return decoratorList; } @@ -554,7 +554,7 @@ public class BeanManagerImpl implements else { // from the 2nd Context for this scopetype on, we need to maintain a List for them - contextList = new ArrayList<Context>(); + contextList = new ArrayList<>(); contextList.add(singleContext); contextList.add(context); @@ -701,7 +701,7 @@ public class BeanManagerImpl implements public Set<Annotation> getInterceptorBindingDefinition(Class<? extends Annotation> binding) { Annotation[] annotations = binding.getDeclaredAnnotations(); - Set<Annotation> set = new HashSet<Annotation>(); + Set<Annotation> set = new HashSet<>(); if(binding.isAnnotationPresent(InterceptorBinding.class)) { @@ -861,17 +861,17 @@ public class BeanManagerImpl implements public <X> ProducerFactory<X> getProducerFactory(AnnotatedField<? super X> field, Bean<X> bean) { - return new FieldProducerFactory<X>(field, bean, webBeansContext); + return new FieldProducerFactory<>(field, bean, webBeansContext); } public <X> ProducerFactory<X> getProducerFactory(AnnotatedMethod<? super X> method, Bean<X> bean) { - return new MethodProducerFactory<X>(method, bean, webBeansContext); + return new MethodProducerFactory<>(method, bean, webBeansContext); } public <X> InjectionTargetFactory<X> getInjectionTargetFactory(AnnotatedType<X> type) { - return new InjectionTargetFactoryImpl<X>(type, webBeansContext); + return new InjectionTargetFactoryImpl<>(type, webBeansContext); } public <T> Bean<T> createBean(BeanAttributes<T> attributes, Class<T> type, InjectionTargetFactory<T> factory) @@ -998,7 +998,7 @@ public class BeanManagerImpl implements public Set<Annotation> getStereotypeDefinition(Class<? extends Annotation> stereotype) { Annotation[] annotations = stereotype.getDeclaredAnnotations(); - Set<Annotation> set = new HashSet<Annotation>(); + Set<Annotation> set = new HashSet<>(); if(stereotype.isAnnotationPresent(Stereotype.class)) { @@ -1150,13 +1150,13 @@ public class BeanManagerImpl implements public <T, X> Bean<T> createBean(BeanAttributes<T> attributes, Class<X> type, ProducerFactory<X> factory) { - return new ProducerAwareInjectionTargetBean<T>( - webBeansContext, - WebBeansType.THIRDPARTY, - attributes, - findClass(factory, type), - false, - factory); + return new ProducerAwareInjectionTargetBean<>( + webBeansContext, + WebBeansType.THIRDPARTY, + attributes, + findClass(factory, type), + false, + factory); } private Class<?> findClass(ProducerFactory<?> factory, Class<?> type) @@ -1238,14 +1238,14 @@ public class BeanManagerImpl implements @Override public <T> InjectionTarget<T> createInjectionTarget(AnnotatedType<T> type) { - InjectionTargetFactoryImpl<T> factory = new InjectionTargetFactoryImpl<T>(type, webBeansContext); + InjectionTargetFactoryImpl<T> factory = new InjectionTargetFactoryImpl<>(type, webBeansContext); InterceptorUtil interceptorUtil = webBeansContext.getInterceptorUtil(); - InjectionTargetImpl<T> injectionTarget = new LazyInterceptorDefinedInjectionTarget<T>( - type, - factory.createInjectionPoints(null), - webBeansContext, - interceptorUtil.getLifecycleMethods(type, PostConstruct.class), - interceptorUtil.getLifecycleMethods(type, PreDestroy.class)); + InjectionTargetImpl<T> injectionTarget = new LazyInterceptorDefinedInjectionTarget<>( + type, + factory.createInjectionPoints(null), + webBeansContext, + interceptorUtil.getLifecycleMethods(type, PostConstruct.class), + interceptorUtil.getLifecycleMethods(type, PreDestroy.class)); if (isAfterBeanDiscoveryDone()) { try @@ -1329,7 +1329,7 @@ public class BeanManagerImpl implements return; } - AnnotatedType<T> annotatedType = new AnnotatedTypeWrapper<T>(Extension.class.cast(extension), inAnnotatedType); + AnnotatedType<T> annotatedType = new AnnotatedTypeWrapper<>(Extension.class.cast(extension), inAnnotatedType); if (annotatedType.getAnnotation(Vetoed.class) != null) { // we could check package here too but would be a lost of time 99.99% of the time @@ -1340,7 +1340,7 @@ public class BeanManagerImpl implements ConcurrentMap<String, AnnotatedType<?>> annotatedTypes = additionalAnnotatedTypes.get(annotatedType.getJavaClass()); if (annotatedTypes == null) { - annotatedTypes = new ConcurrentHashMap<String, AnnotatedType<?>>(); + annotatedTypes = new ConcurrentHashMap<>(); ConcurrentMap<String, AnnotatedType<?>> oldAnnotatedTypes = additionalAnnotatedTypes.putIfAbsent(annotatedType.getJavaClass(), annotatedTypes); if (oldAnnotatedTypes != null) { @@ -1394,7 +1394,7 @@ public class BeanManagerImpl implements public Collection<AnnotatedType<?>> getAdditionalAnnotatedTypes() { - Collection<AnnotatedType<?>> annotatedTypes = new ArrayList<AnnotatedType<?>>(); + Collection<AnnotatedType<?>> annotatedTypes = new ArrayList<>(); for (ConcurrentMap<String,AnnotatedType<?>> types: additionalAnnotatedTypes.values()) { annotatedTypes.addAll(types.values()); @@ -1435,7 +1435,7 @@ public class BeanManagerImpl implements public <T> Iterable<AnnotatedType<T>> getAnnotatedTypes(Class<T> type) { - Collection<AnnotatedType<T>> types = new ArrayList<AnnotatedType<T>>(2); + Collection<AnnotatedType<T>> types = new ArrayList<>(2); types.add(annotatedElementFactory.getAnnotatedType(type)); ConcurrentMap<String, AnnotatedType<?>> aTypes = additionalAnnotatedTypes.get(type); if (aTypes != null) Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/DecoratorInjectionTargetFactory.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/DecoratorInjectionTargetFactory.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/DecoratorInjectionTargetFactory.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/DecoratorInjectionTargetFactory.java Sun Jun 18 13:57:08 2017 @@ -40,12 +40,12 @@ public class DecoratorInjectionTargetFac { if (Modifier.isAbstract(getAnnotatedType().getJavaClass().getModifiers())) { - return new AbstractDecoratorInjectionTarget<T>( - getAnnotatedType(), - createInjectionPoints(bean), - getWebBeansContext(), - getPostConstructMethods(), - getPreDestroyMethods()); + return new AbstractDecoratorInjectionTarget<>( + getAnnotatedType(), + createInjectionPoints(bean), + getWebBeansContext(), + getPostConstructMethods(), + getPreDestroyMethods()); } else { Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java Sun Jun 18 13:57:08 2017 @@ -92,12 +92,12 @@ public class InjectionResolver * If a bean have resolved as not existing, the entry will contain <code>null</code> as value. * The Long key is a hashCode, see {@link BeanCacheKey#BeanCacheKey(boolean, Type, String, Annotation...)} */ - private Map<BeanCacheKey, Set<Bean<?>>> resolvedBeansByType = new ConcurrentHashMap<BeanCacheKey, Set<Bean<?>>>(); + private Map<BeanCacheKey, Set<Bean<?>>> resolvedBeansByType = new ConcurrentHashMap<>(); /** * This Map contains all resolved beans via it's ExpressionLanguage name. */ - private Map<String, Set<Bean<?>>> resolvedBeansByName = new ConcurrentHashMap<String, Set<Bean<?>>>(); + private Map<String, Set<Bean<?>>> resolvedBeansByName = new ConcurrentHashMap<>(); private boolean startup; private boolean fastMatching; @@ -363,7 +363,7 @@ public class InjectionResolver return resolvedComponents; } - resolvedComponents = new HashSet<Bean<?>>(); + resolvedComponents = new HashSet<>(); Set<Bean<?>> deployedComponents = webBeansContext.getBeanManagerImpl().getBeans(); Iterator<Bean<?>> it = deployedComponents.iterator(); @@ -466,7 +466,7 @@ public class InjectionResolver return resolvedComponents; } - resolvedComponents = new HashSet<Bean<?>>(); + resolvedComponents = new HashSet<>(); boolean returnAll = injectionPointType.equals(Object.class) && currentQualifier; @@ -551,7 +551,7 @@ public class InjectionResolver private Set<Bean<?>> findByBeanType(Set<Bean<?>> allComponents, Type injectionPointType, boolean isDelegate) { - Set<Bean<?>> resolved = new HashSet<Bean<?>>(); + Set<Bean<?>> resolved = new HashSet<>(); for (Bean<?> bean : allComponents) { boolean isProducer = AbstractProducerBean.class.isInstance(bean); @@ -576,7 +576,7 @@ public class InjectionResolver { Bean<?> rawProducerBean = null; - Set<Bean<?>> resolvedComponents = new HashSet<Bean<?>>(); + Set<Bean<?>> resolvedComponents = new HashSet<>(); for (Bean<?> component : allComponents) { boolean isProducer = AbstractProducerBean.class.isInstance(component); @@ -641,7 +641,7 @@ public class InjectionResolver { if (alternativeClazz.equals(bean.getBeanClass())) { - return new SingleItemSet<Bean<? extends X>>(bean); + return new SingleItemSet<>(bean); } } @@ -649,8 +649,8 @@ public class InjectionResolver // if none such Alternative got found let's check the 'old' alternatives from beans.xml - Set<Bean<? extends X>> alternativeSet = new HashSet<Bean<? extends X>>(); - Set<Bean<? extends X>> enableSet = new HashSet<Bean<? extends X>>(); + Set<Bean<? extends X>> alternativeSet = new HashSet<>(); + Set<Bean<? extends X>> enableSet = new HashSet<>(); for (Bean<? extends X> bean : beans) { @@ -749,7 +749,7 @@ public class InjectionResolver private Set<Bean<?>> findByQualifier(Set<Bean<?>> remainingSet, Type type, Annotation... annotations) { Iterator<Bean<?>> it = remainingSet.iterator(); - Set<Bean<?>> result = new HashSet<Bean<?>>(); + Set<Bean<?>> result = new HashSet<>(); while (it.hasNext()) { Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionTargetFactoryImpl.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionTargetFactoryImpl.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionTargetFactoryImpl.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionTargetFactoryImpl.java Sun Jun 18 13:57:08 2017 @@ -63,7 +63,7 @@ public class InjectionTargetFactoryImpl< { AnnotatedType<T> at = getAnnotatedType(); InjectionTargetImpl<T> injectionTarget - = new InjectionTargetImpl<T>(at, createInjectionPoints(bean), webBeansContext, getPostConstructMethods(), getPreDestroyMethods()); + = new InjectionTargetImpl<>(at, createInjectionPoints(bean), webBeansContext, getPostConstructMethods(), getPreDestroyMethods()); if (ManagedBean.class.isInstance(bean)) { ManagedBean.class.cast(bean).setOriginalInjectionTarget(injectionTarget); Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/OwbCDI.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/OwbCDI.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/OwbCDI.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/OwbCDI.java Sun Jun 18 13:57:08 2017 @@ -43,7 +43,7 @@ public class OwbCDI extends CDI<Object> WebBeansContext webBeansContext = getWebBeansContext(); BeanManagerImpl bm = webBeansContext.getBeanManagerImpl(); CreationalContextImpl<Instance<Object>> creationalContext = bm.createCreationalContext(null); - return new InstanceBean<Object>(webBeansContext).create(creationalContext).select(DefaultLiteral.INSTANCE); + return new InstanceBean<>(webBeansContext).create(creationalContext).select(DefaultLiteral.INSTANCE); } @Override Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/SerializableBeanVault.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/SerializableBeanVault.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/SerializableBeanVault.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/SerializableBeanVault.java Sun Jun 18 13:57:08 2017 @@ -44,7 +44,7 @@ import org.apache.webbeans.util.WebBeans public class SerializableBeanVault { - private Map<String, SerializableBean<?>> serializableBeans = new ConcurrentHashMap<String, SerializableBean<?>>(); + private Map<String, SerializableBean<?>> serializableBeans = new ConcurrentHashMap<>(); @SuppressWarnings("unchecked") public <T> Contextual<T> getSerializableBean(Contextual<T> bean) @@ -62,7 +62,7 @@ public class SerializableBeanVault SerializableBean<T> sb = (SerializableBean<T>) serializableBeans.get(id); if (sb == null) { - sb = new SerializableBean<T>((Bean<T>) bean); + sb = new SerializableBean<>((Bean<T>) bean); serializableBeans.put(id, sb); } Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContext.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContext.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContext.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContext.java Sun Jun 18 13:57:08 2017 @@ -65,7 +65,7 @@ public abstract class AbstractContext im @SuppressWarnings("unchecked") private <T> BeanInstanceBag<T> createContextualBag(Contextual<T> contextual, CreationalContext<T> creationalContext) { - BeanInstanceBag<T> bag = new BeanInstanceBag<T>(creationalContext); + BeanInstanceBag<T> bag = new BeanInstanceBag<>(creationalContext); if(componentInstanceMap instanceof ConcurrentMap) { @@ -212,7 +212,7 @@ public abstract class AbstractContext im */ public void destroy() { - Set<Contextual<?>> keySet = new HashSet<Contextual<?>>(componentInstanceMap.keySet()); + Set<Contextual<?>> keySet = new HashSet<>(componentInstanceMap.keySet()); for (Contextual<?> contextual: keySet) { destroyInstance(contextual); @@ -281,7 +281,7 @@ public abstract class AbstractContext im SerializableBeanVault sbv = org.apache.webbeans.config.WebBeansContext.getInstance().getSerializableBeanVault(); Map<Contextual<?>, BeanInstanceBag<?>> serializableInstanceMap = - new HashMap<Contextual<?>, BeanInstanceBag<?>>(); + new HashMap<>(); for (Map.Entry<Contextual<?>, BeanInstanceBag<?>> componentInstanceMapEntry : componentInstanceMap.entrySet()) { Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ApplicationContext.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ApplicationContext.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ApplicationContext.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ApplicationContext.java Sun Jun 18 13:57:08 2017 @@ -26,7 +26,6 @@ import javax.enterprise.context.Applicat import javax.enterprise.context.spi.Contextual; import org.apache.webbeans.component.BuiltInOwbBean; -import org.apache.webbeans.context.creational.BeanInstanceBag; /** * Application context implementation. @@ -50,7 +49,7 @@ public class ApplicationContext extends @Override public void setComponentInstanceMap() { - componentInstanceMap = new ConcurrentHashMap<Contextual<?>, BeanInstanceBag<?>>(); + componentInstanceMap = new ConcurrentHashMap<>(); } @@ -61,7 +60,7 @@ public class ApplicationContext extends @Override public void destroy() { - Set<Contextual<?>> keySet = new HashSet<Contextual<?>>(componentInstanceMap.keySet()); + Set<Contextual<?>> keySet = new HashSet<>(componentInstanceMap.keySet()); for (Contextual<?> contextual: keySet) { if (contextual instanceof BuiltInOwbBean) Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ConversationContext.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ConversationContext.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ConversationContext.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ConversationContext.java Sun Jun 18 13:57:08 2017 @@ -21,10 +21,8 @@ package org.apache.webbeans.context; import java.util.concurrent.ConcurrentHashMap; import javax.enterprise.context.ConversationScoped; -import javax.enterprise.context.spi.Contextual; import org.apache.webbeans.config.WebBeansContext; -import org.apache.webbeans.context.creational.BeanInstanceBag; import org.apache.webbeans.conversation.ConversationImpl; /** @@ -57,7 +55,7 @@ public class ConversationContext extends @Override public void setComponentInstanceMap() { - componentInstanceMap = new ConcurrentHashMap<Contextual<?>, BeanInstanceBag<?>>(); + componentInstanceMap = new ConcurrentHashMap<>(); } public ConversationImpl getConversation() Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/PassivatingContext.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/PassivatingContext.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/PassivatingContext.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/PassivatingContext.java Sun Jun 18 13:57:08 2017 @@ -70,7 +70,7 @@ public abstract class PassivatingContext public void writeExternal(ObjectOutput out) throws IOException { out.writeObject(scopeType); - Map<String, BeanInstanceBag<?>> map = new HashMap<String, BeanInstanceBag<?>>(componentInstanceMap.size()); + Map<String, BeanInstanceBag<?>> map = new HashMap<>(componentInstanceMap.size()); for (Map.Entry<Contextual<?>, BeanInstanceBag<?>> beanBagEntry : componentInstanceMap.entrySet()) { Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/RequestContext.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/RequestContext.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/RequestContext.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/RequestContext.java Sun Jun 18 13:57:08 2017 @@ -23,7 +23,6 @@ import java.util.HashMap; import javax.enterprise.context.RequestScoped; import javax.enterprise.context.spi.Contextual; -import org.apache.webbeans.context.creational.BeanInstanceBag; import org.apache.webbeans.intercept.RequestScopedBeanInterceptorHandler; /** @@ -56,7 +55,7 @@ public class RequestContext extends Abst @Override public void setComponentInstanceMap() { - componentInstanceMap = new HashMap<Contextual<?>, BeanInstanceBag<?>>(); + componentInstanceMap = new HashMap<>(); } /** Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/SessionContext.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/SessionContext.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/SessionContext.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/SessionContext.java Sun Jun 18 13:57:08 2017 @@ -23,7 +23,6 @@ import java.util.concurrent.ConcurrentHa import javax.enterprise.context.SessionScoped; import javax.enterprise.context.spi.Contextual; -import org.apache.webbeans.context.creational.BeanInstanceBag; import org.apache.webbeans.intercept.SessionScopedBeanInterceptorHandler; /** @@ -41,7 +40,7 @@ public class SessionContext extends Pass @Override public void setComponentInstanceMap() { - componentInstanceMap = new ConcurrentHashMap<Contextual<?>, BeanInstanceBag<?>>(); + componentInstanceMap = new ConcurrentHashMap<>(); } @Override Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/SingletonContext.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/SingletonContext.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/SingletonContext.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/SingletonContext.java Sun Jun 18 13:57:08 2017 @@ -20,11 +20,8 @@ package org.apache.webbeans.context; import java.util.concurrent.ConcurrentHashMap; -import javax.enterprise.context.spi.Contextual; import javax.inject.Singleton; -import org.apache.webbeans.context.creational.BeanInstanceBag; - /** * Application context implementation. * @@ -41,6 +38,6 @@ public class SingletonContext extends Ab @Override public void setComponentInstanceMap() { - componentInstanceMap = new ConcurrentHashMap<Contextual<?>, BeanInstanceBag<?>>(); + componentInstanceMap = new ConcurrentHashMap<>(); } } Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextFactory.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextFactory.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextFactory.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextFactory.java Sun Jun 18 13:57:08 2017 @@ -51,12 +51,12 @@ public final class CreationalContextFact */ public CreationalContextImpl<T> getCreationalContext(Contextual<T> contextual) { - return new CreationalContextImpl<T>(contextual, webBeansContext); + return new CreationalContextImpl<>(contextual, webBeansContext); } public CreationalContextImpl<T> wrappedCreationalContext(CreationalContext<T> creationalContext, Contextual<T> contextual) { - return new WrappedCreationalContext<T>(contextual, creationalContext, webBeansContext); + return new WrappedCreationalContext<>(contextual, creationalContext, webBeansContext); } } Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java Sun Jun 18 13:57:08 2017 @@ -128,7 +128,7 @@ public class CreationalContextImpl<T> im { if (injectionPoints == null) { - injectionPoints = new Stack<InjectionPoint>(); + injectionPoints = new Stack<>(); } injectionPoints.push(injectionPoint); } @@ -155,7 +155,7 @@ public class CreationalContextImpl<T> im { if (eventMetadata == null) { - eventMetadata = new Stack<EventMetadata>(); + eventMetadata = new Stack<>(); } eventMetadata.push(metadata); } @@ -190,14 +190,14 @@ public class CreationalContextImpl<T> im { if(instance != null) { - DependentCreationalContext<K> dependentCreational = new DependentCreationalContext<K>(dependent); + DependentCreationalContext<K> dependentCreational = new DependentCreationalContext<>(dependent); dependentCreational.setInstance(instance); synchronized(this) { if (dependentObjects == null) { - dependentObjects = new ArrayList<DependentCreationalContext<?>>(); + dependentObjects = new ArrayList<>(); } if (dependent == bean) Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationImpl.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationImpl.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationImpl.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationImpl.java Sun Jun 18 13:57:08 2017 @@ -75,7 +75,7 @@ public class ConversationImpl implements * String to be serializable. * TODO: serialization should be done manually to use the manager otherwise all is broken */ - private transient Set<Long> threadsUsingIt = new HashSet<Long>(); + private transient Set<Long> threadsUsingIt = new HashSet<>(); private transient WebBeansContext webBeansContext; @@ -278,6 +278,6 @@ public class ConversationImpl implements { in.defaultReadObject(); webBeansContext = WebBeansContext.currentInstance(); - threadsUsingIt = new HashSet<Long>(); + threadsUsingIt = new HashSet<>(); } } Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/DefaultSingletonService.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/DefaultSingletonService.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/DefaultSingletonService.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/DefaultSingletonService.java Sun Jun 18 13:57:08 2017 @@ -31,7 +31,7 @@ public class DefaultSingletonService imp * Keys --> ClassLoaders * Values --> WebBeansContext */ - private final Map<ClassLoader, WebBeansContext> singletonMap = new WeakHashMap<ClassLoader, WebBeansContext>(); + private final Map<ClassLoader, WebBeansContext> singletonMap = new WeakHashMap<>(); /** * Gets singleton instance for deployment. Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/AbstractMetaDataDiscovery.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/AbstractMetaDataDiscovery.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/AbstractMetaDataDiscovery.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/AbstractMetaDataDiscovery.java Sun Jun 18 13:57:08 2017 @@ -78,7 +78,7 @@ public abstract class AbstractMetaDataDi * We store this information since not all containers and storages do support * new URL(...). */ - private final Map<String, URL> beanDeploymentUrls = new HashMap<String, URL>(); + private final Map<String, URL> beanDeploymentUrls = new HashMap<>(); /** * for having proper scan mode 'SCOPED' support we need to know which bean class @@ -374,11 +374,11 @@ public abstract class AbstractMetaDataDi { if (beanClassesPerBda == null) { - beanClassesPerBda = new HashMap<BeanArchiveService.BeanArchiveInformation, Set<Class<?>>>(); + beanClassesPerBda = new HashMap<>(); for (CdiArchive.FoundClasses foundClasses : archive.classesByUrl().values()) { - Set<Class<?>> classSet = new HashSet<Class<?>>(); + Set<Class<?>> classSet = new HashSet<>(); boolean scanModeAnnotated = BeanDiscoveryMode.ANNOTATED == foundClasses.getBeanArchiveInfo().getBeanDiscoveryMode(); for (String className : foundClasses.getClassNames()) { Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/xbean/CdiArchive.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/xbean/CdiArchive.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/xbean/CdiArchive.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/xbean/CdiArchive.java Sun Jun 18 13:57:08 2017 @@ -48,21 +48,21 @@ public class CdiArchive implements Archi * key: URL#toExternalForm of the scanned classpath entry * value: small data container with URL and class names */ - private final Map<String, FoundClasses> classesByUrl = new HashMap<String, FoundClasses>(); + private final Map<String, FoundClasses> classesByUrl = new HashMap<>(); private final Archive delegate; public CdiArchive(BeanArchiveService beanArchiveService, ClassLoader loader, Map<String, URL> urls, Filter userFilter, Archive customArchive) { - Collection<Archive> archives = new ArrayList<Archive>(); + Collection<Archive> archives = new ArrayList<>(); if (customArchive != null) { archives.add(userFilter != null ? new FilteredArchive(customArchive, userFilter) : customArchive); } for (URL url : urls.values()) { - List<String> urlClasses = new ArrayList<String>(); + List<String> urlClasses = new ArrayList<>(); BeanArchiveInformation beanArchiveInfo = beanArchiveService.getBeanArchiveInformation(url); Archive archive = new FilteredArchive( Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultApplicationBoundaryService.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultApplicationBoundaryService.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultApplicationBoundaryService.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultApplicationBoundaryService.java Sun Jun 18 13:57:08 2017 @@ -53,7 +53,7 @@ public class DefaultApplicationBoundaryS protected void init() { applicationClassLoader = BeanManagerImpl.class.getClassLoader(); - parentClassLoaders = new HashSet<ClassLoader>(); + parentClassLoaders = new HashSet<>(); ClassLoader cl = applicationClassLoader; while (cl.getParent() != null) { Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultBDABeansXmlScanner.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultBDABeansXmlScanner.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultBDABeansXmlScanner.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultBDABeansXmlScanner.java Sun Jun 18 13:57:08 2017 @@ -66,11 +66,11 @@ public class DefaultBDABeansXmlScanner i public DefaultBDABeansXmlScanner() { - interceptorsPerBDA = new HashMap<String, Set<Class<?>>>(); - decoratorsPerBDA = new HashMap<String, Set<Class<?>>>(); - stereotypesPerBDA = new HashMap<String, Set<Class<? extends Annotation>>>(); - alternativesPerBDA = new HashMap<String, Set<Class<?>>>(); - jarBeanClasses = new HashMap<Class<?>, String>(); + interceptorsPerBDA = new HashMap<>(); + decoratorsPerBDA = new HashMap<>(); + stereotypesPerBDA = new HashMap<>(); + alternativesPerBDA = new HashMap<>(); + jarBeanClasses = new HashMap<>(); } /** @@ -92,7 +92,7 @@ public class DefaultBDABeansXmlScanner i Set<Class<?>> interceptorClasses = interceptorsPerBDA.get(beansXMLFilePath); if (interceptorClasses == null) { - interceptorClasses = new HashSet<Class<?>>(); + interceptorClasses = new HashSet<>(); interceptorsPerBDA.put(beansXMLFilePath, interceptorClasses); } return interceptorClasses.add(interceptorClass); @@ -113,11 +113,11 @@ public class DefaultBDABeansXmlScanner i set = interceptorsPerBDA.get(beansXMLFilePath); if (set != null) { - return new HashSet<Class<?>>(set); + return new HashSet<>(set); } else { - return new HashSet<Class<?>>(); + return new HashSet<>(); } } } @@ -136,11 +136,11 @@ public class DefaultBDABeansXmlScanner i set = decoratorsPerBDA.get(beansXMLFilePath); if (set != null) { - return new HashSet<Class<?>>(set); + return new HashSet<>(set); } else { - return new HashSet<Class<?>>(); + return new HashSet<>(); } } } @@ -164,7 +164,7 @@ public class DefaultBDABeansXmlScanner i Set<Class<?>> decoratorClasses = decoratorsPerBDA.get(beansXMLFilePath); if (decoratorClasses == null) { - decoratorClasses = new HashSet<Class<?>>(); + decoratorClasses = new HashSet<>(); decoratorsPerBDA.put(beansXMLFilePath, decoratorClasses); } return decoratorClasses.add(decoratorClass); @@ -191,7 +191,7 @@ public class DefaultBDABeansXmlScanner i Set<Class<?>> alternativeClasses = alternativesPerBDA.get(beansXMLFilePath); if (alternativeClasses == null) { - alternativeClasses = new HashSet<Class<?>>(); + alternativeClasses = new HashSet<>(); alternativesPerBDA.put(beansXMLFilePath, alternativeClasses); } return alternativeClasses.add(alternativeClass); @@ -217,7 +217,7 @@ public class DefaultBDABeansXmlScanner i Set<Class<? extends Annotation>> stereoTypeClasses = stereotypesPerBDA.get(beansXMLFilePath); if (stereoTypeClasses == null) { - stereoTypeClasses = new HashSet<Class<? extends Annotation>>(); + stereoTypeClasses = new HashSet<>(); stereotypesPerBDA.put(beansXMLFilePath, stereoTypeClasses); } return stereoTypeClasses.add(stereoTypeClass); @@ -238,11 +238,11 @@ public class DefaultBDABeansXmlScanner i set = alternativesPerBDA.get(beansXMLFilePath); if (set != null) { - return new HashSet<Class<?>>(set); + return new HashSet<>(set); } else { - return new HashSet<Class<?>>(); + return new HashSet<>(); } } } @@ -261,11 +261,11 @@ public class DefaultBDABeansXmlScanner i set = stereotypesPerBDA.get(beansXMLFilePath); if (set != null) { - return new HashSet<Class<? extends Annotation>>(set); + return new HashSet<>(set); } else { - return new HashSet<Class<? extends Annotation>>(); + return new HashSet<>(); } } } Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultContextsService.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultContextsService.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultContextsService.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultContextsService.java Sun Jun 18 13:57:08 2017 @@ -65,11 +65,11 @@ public class DefaultContextsService exte static { - requestContext = new ThreadLocal<RequestContext>(); - sessionContext = new ThreadLocal<SessionContext>(); - conversationContext = new ThreadLocal<ConversationContext>(); - dependentContext = new ThreadLocal<DependentContext>(); - singletonContext = new ThreadLocal<SingletonContext>(); + requestContext = new ThreadLocal<>(); + sessionContext = new ThreadLocal<>(); + conversationContext = new ThreadLocal<>(); + dependentContext = new ThreadLocal<>(); + singletonContext = new ThreadLocal<>(); } public DefaultContextsService(WebBeansContext webBeansContext) Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultJndiService.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultJndiService.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultJndiService.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultJndiService.java Sun Jun 18 13:57:08 2017 @@ -36,7 +36,7 @@ import org.apache.webbeans.spi.JNDIServi public class DefaultJndiService implements JNDIService { - private HashMap<String, Object> jndiContent = new HashMap<String, Object>(); + private HashMap<String, Object> jndiContent = new HashMap<>(); /** * {@inheritDoc} Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorsManager.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorsManager.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorsManager.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorsManager.java Sun Jun 18 13:57:08 2017 @@ -41,18 +41,18 @@ import org.apache.webbeans.util.Priority public class DecoratorsManager { - private List<Class<?>> enabledDecorators = new CopyOnWriteArrayList<Class<?>>(); + private List<Class<?>> enabledDecorators = new CopyOnWriteArrayList<>(); private final WebBeansContext webBeansContext; /** * Additional decorator classes added by Extensions */ - private List<Class<?>> additionalDecoratorClasses = new ArrayList<Class<?>>(); + private List<Class<?>> additionalDecoratorClasses = new ArrayList<>(); /** * Active and enabled decorators */ - private Set<Decorator<?>> webBeansDecorators = new CopyOnWriteArraySet<Decorator<?>>(); + private Set<Decorator<?>> webBeansDecorators = new CopyOnWriteArraySet<>(); private final PriorityClasses priorityDecorators = new PriorityClasses(); @@ -166,10 +166,10 @@ public class DecoratorsManager public Set<Decorator<?>> findDeployedWebBeansDecorator(Set<Type> apiTypes, Annotation... anns) { - Set<Decorator<?>> set = new HashSet<Decorator<?>>(); + Set<Decorator<?>> set = new HashSet<>(); - List<Class<? extends Annotation>> bindingTypes = new ArrayList<Class<? extends Annotation>>(); - Set<Annotation> listAnnot = new HashSet<Annotation>(); + List<Class<? extends Annotation>> bindingTypes = new ArrayList<>(); + Set<Annotation> listAnnot = new HashSet<>(); for (Annotation ann : anns) { bindingTypes.add(ann.annotationType()); Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/StereoTypeManager.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/StereoTypeManager.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/StereoTypeManager.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/StereoTypeManager.java Sun Jun 18 13:57:08 2017 @@ -35,7 +35,7 @@ import org.apache.webbeans.util.Asserts; public class StereoTypeManager { /**Stereotype model instances, stereotype mode name to model instance*/ - private Map<String, IStereoTypeModel> stereoTypeMap = new ConcurrentHashMap<String, IStereoTypeModel>(); + private Map<String, IStereoTypeModel> stereoTypeMap = new ConcurrentHashMap<>(); /** * Default constructor Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/StereoTypeModel.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/StereoTypeModel.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/StereoTypeModel.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/StereoTypeModel.java Sun Jun 18 13:57:08 2017 @@ -58,10 +58,10 @@ public class StereoTypeModel implements private Annotation defaultScopeType; /** Interceptor Bindings */ - private Set<Annotation> interceptorBindingTypes = new HashSet<Annotation>(); + private Set<Annotation> interceptorBindingTypes = new HashSet<>(); /** Inherit StereoType annotations */ - private Set<Annotation> inherits = new HashSet<Annotation>(); + private Set<Annotation> inherits = new HashSet<>(); private static final Logger logger = WebBeansLoggerFacade.getLogger(StereoTypeModel.class); Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/ELContextStore.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/ELContextStore.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/ELContextStore.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/ELContextStore.java Sun Jun 18 13:57:08 2017 @@ -44,7 +44,7 @@ import javax.enterprise.inject.spi.Bean; */ public final class ELContextStore { - private static ThreadLocal<ELContextStore> contextStores = new ThreadLocal<ELContextStore>(); + private static ThreadLocal<ELContextStore> contextStores = new ThreadLocal<>(); /** * @param createIfNotExist if <code>false</code> doesn't create a new ELContextStore if none exists @@ -66,8 +66,8 @@ public final class ELContextStore /** * The same Expression must get same instances of @Dependent beans */ - private Map<Bean<?>, CreationalStore<?>> dependentObjects = new HashMap<Bean<?>, CreationalStore<?>>(); - private Map<String, Bean<?>> beanNameToDependentBeanMapping = new HashMap<String, Bean<?>>(); + private Map<Bean<?>, CreationalStore<?>> dependentObjects = new HashMap<>(); + private Map<String, Bean<?>> beanNameToDependentBeanMapping = new HashMap<>(); /** * Cache for resolved proxies of @NormalScoped beans. This heavily speeds up pages with @@ -75,7 +75,7 @@ public final class ELContextStore * property. If we wouldn't cache this, every EL call would create a new proxy and * drops it after the EL. */ - private Map<String, Object> normalScopedObjects = new HashMap<String, Object>(); + private Map<String, Object> normalScopedObjects = new HashMap<>(); public Object findBeanByName(String name) { Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/EventImpl.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/EventImpl.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/EventImpl.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/EventImpl.java Sun Jun 18 13:57:08 2017 @@ -105,7 +105,7 @@ public class EventImpl<T> implements Eve @Override public Event<T> select(Annotation... bindings) { - return new EventImpl<T>(metadata.select(bindings), webBeansContext); + return new EventImpl<>(metadata.select(bindings), webBeansContext); } /** @@ -114,7 +114,7 @@ public class EventImpl<T> implements Eve @Override public <U extends T> Event<U> select(Class<U> subtype, Annotation... bindings) { - return new EventImpl<U>(metadata.select(subtype, bindings), webBeansContext); + return new EventImpl<>(metadata.select(subtype, bindings), webBeansContext); } /** @@ -123,7 +123,7 @@ public class EventImpl<T> implements Eve @Override public <U extends T> Event<U> select(TypeLiteral<U> subtype, Annotation... bindings) { - return new EventImpl<U>(metadata.select(subtype, bindings), webBeansContext); + return new EventImpl<>(metadata.select(subtype, bindings), webBeansContext); } private void readObject(java.io.ObjectInputStream in) throws IOException, ClassNotFoundException Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java Sun Jun 18 13:57:08 2017 @@ -99,7 +99,7 @@ import org.apache.webbeans.util.WebBeans public final class NotificationManager { - private final Map<Type, Set<ObserverMethod<?>>> observers = new ConcurrentHashMap<Type, Set<ObserverMethod<?>>>(); + private final Map<Type, Set<ObserverMethod<?>>> observers = new ConcurrentHashMap<>(); private final WebBeansContext webBeansContext; private final NotificationOptions defaultNotificationOptions; @@ -194,7 +194,7 @@ public final class NotificationManager public List<ObserverMethod<?>> getObserverMethods() { - List<ObserverMethod<?>> observerMethods = new ArrayList<ObserverMethod<?>>(); + List<ObserverMethod<?>> observerMethods = new ArrayList<>(); for (Set<ObserverMethod<?>> methods: observers.values()) { for (ObserverMethod<?> method: methods) @@ -212,7 +212,7 @@ public final class NotificationManager Set<ObserverMethod<?>> set = observers.get(observer.getObservedType()); if (set == null) { - set = new HashSet<ObserverMethod<?>>(); + set = new HashSet<>(); observers.put(observer.getObservedType(), set); } @@ -244,7 +244,7 @@ public final class NotificationManager private <T> Set<ObserverMethod<? super T>> filterByWithAnnotations(Set<ObserverMethod<? super T>> observersMethods, AnnotatedType annotatedType) { - Set<ObserverMethod<? super T>> observerMethodsWithAnnotations = new HashSet<ObserverMethod<? super T>>(); + Set<ObserverMethod<? super T>> observerMethodsWithAnnotations = new HashSet<>(); for (ObserverMethod<? super T> observerMethod : observersMethods) { @@ -361,7 +361,7 @@ public final class NotificationManager } } - Set<ObserverMethod<? super T>> matching = new HashSet<ObserverMethod<? super T>>(); + Set<ObserverMethod<? super T>> matching = new HashSet<>(); Set<Type> eventTypes = GenericsUtil.getTypeClosure(declaredEventType, eventClass); if (GenericsUtil.containTypeVariable(eventTypes)) @@ -400,7 +400,7 @@ public final class NotificationManager private <T> Set<ObserverMethod<? super T>> filterByExtensionEventType(T event, Type eventType) { Class<?> eventClass = ClassUtil.getClazz(eventType); - Set<ObserverMethod<? super T>> matching = new HashSet<ObserverMethod<? super T>>(); + Set<ObserverMethod<? super T>> matching = new HashSet<>(); Set<Type> keySet = observers.keySet(); for (Type type : keySet) { @@ -620,7 +620,7 @@ public final class NotificationManager */ private <T> Set<ObserverMethod<? super T>> filterByQualifiers(Set<ObserverMethod<? super T>> observers, Set<Annotation> eventQualifiers) { - Set<ObserverMethod<? super T>> matching = new HashSet<ObserverMethod<? super T>>(); + Set<ObserverMethod<? super T>> matching = new HashSet<>(); search: for (ObserverMethod<? super T> ob : observers) { Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverMethodImpl.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverMethodImpl.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverMethodImpl.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverMethodImpl.java Sun Jun 18 13:57:08 2017 @@ -158,7 +158,7 @@ public class ObserverMethodImpl<T> imple isAsync = true; } - observedQualifiers = new HashSet<Annotation>(); + observedQualifiers = new HashSet<>(); for (Annotation annotation: annotatedObservesParameter.getAnnotations()) { if (ownerBean.getWebBeansContext().getAnnotationManager().isQualifierAnnotation(annotation.annotationType())) @@ -406,7 +406,7 @@ public class ObserverMethodImpl<T> imple */ protected List<ObserverParams> getMethodArguments(Object event, EventMetadata metadata) { - List<ObserverParams> list = new ArrayList<ObserverParams>(); + List<ObserverParams> list = new ArrayList<>(); if (annotatedObservesParameter.getPosition() == 0) { ObserverParams param = new ObserverParams(); Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/exception/helper/ExceptionMessageBuilder.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/exception/helper/ExceptionMessageBuilder.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/exception/helper/ExceptionMessageBuilder.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/exception/helper/ExceptionMessageBuilder.java Sun Jun 18 13:57:08 2017 @@ -36,7 +36,7 @@ public class ExceptionMessageBuilder imp { if (additionalInformations == null) { - additionalInformations = new ArrayList<String>(); + additionalInformations = new ArrayList<>(); } additionalInformations.add(additionalInformation); }
