Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AbstractInjectable.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AbstractInjectable.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AbstractInjectable.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AbstractInjectable.java Sun Jun 18 13:57:08 2017 @@ -150,7 +150,7 @@ public abstract class AbstractInjectable protected static List<InjectionPoint> createInjectionPoints(Producer<?> owner, Member member) { - List<InjectionPoint> injectionPoints = new ArrayList<InjectionPoint>(); + List<InjectionPoint> injectionPoints = new ArrayList<>(); for (InjectionPoint injectionPoint : owner.getInjectionPoints()) { if (injectionPoint.getMember().equals(member))
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AlternativesManager.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AlternativesManager.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AlternativesManager.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AlternativesManager.java Sun Jun 18 13:57:08 2017 @@ -58,13 +58,13 @@ public class AlternativesManager /** * All the stereotypes which are configured via XML <class> */ - private final Set<Class<?>> configuredAlternatives = new HashSet<Class<?>>(); + private final Set<Class<?>> configuredAlternatives = new HashSet<>(); /** * All Stereotypes which are declared as @Alternative in a beans.xml. * Please note that @Priority on a stereotype does <b>not</b> automatically enable it! */ - private final Set<Class<? extends Annotation>> configuredStereotypeAlternatives = new HashSet<Class<? extends Annotation>>(); + private final Set<Class<? extends Annotation>> configuredStereotypeAlternatives = new HashSet<>(); private final PriorityClasses priorityAlternatives = new PriorityClasses(); Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableConstructor.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableConstructor.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableConstructor.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableConstructor.java Sun Jun 18 13:57:08 2017 @@ -91,7 +91,7 @@ public class InjectableConstructor<T> ex return params; } - List<Object> list = new ArrayList<Object>(); + List<Object> list = new ArrayList<>(); List<InjectionPoint> injectedPoints = getInjectionPoints(con); for (int i=0; i<injectedPoints.size(); i++) Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableMethod.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableMethod.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableMethod.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableMethod.java Sun Jun 18 13:57:08 2017 @@ -56,13 +56,13 @@ public class InjectableMethod<T> extends /**Used in dispose method, represents produces method parameter instance*/ private Object producerMethodInstance; - private Map<Bean<?>, Object> dependentParameters = new HashMap<Bean<?>, Object>(); + private Map<Bean<?>, Object> dependentParameters = new HashMap<>(); private Set<InjectionPoint> injectionPoints; public InjectableMethod(Method m, Object instance, Producer<T> owner, CreationalContextImpl<T> creationalContext) { - this(m, instance, owner, creationalContext, new HashSet<InjectionPoint>(createInjectionPoints(owner, m))); + this(m, instance, owner, creationalContext, new HashSet<>(createInjectionPoints(owner, m))); } /** @@ -91,7 +91,7 @@ public class InjectableMethod<T> extends owner = NormalScopeProxyFactory.unwrapInstance(owner); } - List<Object> list = new ArrayList<Object>(); + List<Object> list = new ArrayList<>(); for(int i=0;i<injectionPoints.size();i++) Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointFactory.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointFactory.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointFactory.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointFactory.java Sun Jun 18 13:57:08 2017 @@ -62,7 +62,7 @@ public class InjectionPointFactory public <X> Set<InjectionPoint> buildInjectionPoints(Bean<X> owner, AnnotatedType<X> annotatedType) { - Set<InjectionPoint> injectionPoints = new HashSet<InjectionPoint>(); + Set<InjectionPoint> injectionPoints = new HashSet<>(); boolean constructorFound = false; for (AnnotatedConstructor<X> constructor: annotatedType.getConstructors()) { @@ -167,7 +167,7 @@ public class InjectionPointFactory public <X> List<InjectionPoint> buildInjectionPoints(Bean<?> owner, AnnotatedCallable<X> callable) { - List<InjectionPoint> lists = new ArrayList<InjectionPoint>(); + List<InjectionPoint> lists = new ArrayList<>(); buildInjectionPoints(owner, callable, lists); return lists; } Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointImpl.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointImpl.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointImpl.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointImpl.java Sun Jun 18 13:57:08 2017 @@ -59,7 +59,7 @@ public class InjectionPointImpl implemen { private static final long serialVersionUID = 1047233127758068484L; - private Set<Annotation> qualifierAnnotations = new HashSet<Annotation>(); + private Set<Annotation> qualifierAnnotations = new HashSet<>(); private Bean<?> ownerBean; @@ -96,7 +96,7 @@ public class InjectionPointImpl implemen this.injectionType = bean.getBeanClass(); this.qualifierAnnotations = bean.getQualifiers() == null ? Collections.<Annotation>emptySet() : - Collections.unmodifiableSet(new HashSet<Annotation>(bean.getQualifiers())); + Collections.unmodifiableSet(new HashSet<>(bean.getQualifiers())); this.annotated = null; this.injectionMember = null; this.delegate = false; @@ -116,7 +116,7 @@ public class InjectionPointImpl implemen Asserts.assertNotNull(qualifiers, "qualifiers"); this.ownerBean = ownerBean; injectionType = type; - qualifierAnnotations = Collections.unmodifiableSet(new HashSet<Annotation>(qualifiers)); + qualifierAnnotations = Collections.unmodifiableSet(new HashSet<>(qualifiers)); this.annotated = annotated; injectionMember = member; this.delegate = delegate; Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/instance/InstanceImpl.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/instance/InstanceImpl.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/instance/InstanceImpl.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/instance/InstanceImpl.java Sun Jun 18 13:57:08 2017 @@ -73,7 +73,7 @@ public class InstanceImpl<T> implements private InjectionPoint injectionPoint; /** Qualifier annotations appeared on the injection point */ - private Set<Annotation> qualifierAnnotations = new HashSet<Annotation>(); + private Set<Annotation> qualifierAnnotations = new HashSet<>(); private WebBeansContext webBeansContext; @@ -192,9 +192,9 @@ public class InstanceImpl<T> implements } Annotation[] newQualifiersArray = qualifiers; - return new InstanceImpl<T>( - injectionClazz, injectionPoint == null ? null : new InstanceInjectionPoint(injectionPoint, newQualifiersArray), - webBeansContext, parentCreationalContext, newQualifiersArray); + return new InstanceImpl<>( + injectionClazz, injectionPoint == null ? null : new InstanceInjectionPoint(injectionPoint, newQualifiersArray), + webBeansContext, parentCreationalContext, newQualifiersArray); } /** @@ -219,8 +219,8 @@ public class InstanceImpl<T> implements { mergedQualifiers.add(qualifier); } - return new InstanceImpl<U>(sub, injectionPoint, webBeansContext, parentCreationalContext, - mergedQualifiers.toArray(new Annotation[mergedQualifiers.size()])); + return new InstanceImpl<>(sub, injectionPoint, webBeansContext, parentCreationalContext, + mergedQualifiers.toArray(new Annotation[mergedQualifiers.size()])); } /** @@ -239,7 +239,7 @@ public class InstanceImpl<T> implements public Iterator<T> iterator() { Set<Bean<?>> beans = resolveBeans(); - List<T> instances = new ArrayList<T>(); + List<T> instances = new ArrayList<>(); parentCreationalContext.putInjectionPoint(injectionPoint); try { @@ -304,7 +304,7 @@ public class InstanceImpl<T> implements T reference = (T) beanManager.getReference(bean, injectionClazz, creationalContext); if (creationalContexts == null) { - creationalContexts = new IdentityHashMap<Object, CreationalContextImpl<?>>(); + creationalContexts = new IdentityHashMap<>(); } creationalContexts.put(reference, creationalContext); return reference; @@ -379,7 +379,7 @@ public class InstanceImpl<T> implements protected InstanceInjectionPoint(InjectionPoint injectionPoint, Annotation[] newQualifiersArray) { this.delegate = injectionPoint; - this.qualifiers = Collections.unmodifiableSet(new HashSet<Annotation>(Arrays.asList(newQualifiersArray))); + this.qualifiers = Collections.unmodifiableSet(new HashSet<>(Arrays.asList(newQualifiersArray))); } @Override Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/AbstractInvocationContext.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/AbstractInvocationContext.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/AbstractInvocationContext.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/AbstractInvocationContext.java Sun Jun 18 13:57:08 2017 @@ -89,7 +89,7 @@ public abstract class AbstractInvocation { if (contextData == null) { - contextData = new HashMap<String, Object>(); + contextData = new HashMap<>(); } return contextData; } Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/DecoratorHandler.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/DecoratorHandler.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/DecoratorHandler.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/DecoratorHandler.java Sun Jun 18 13:57:08 2017 @@ -170,7 +170,7 @@ public class DecoratorHandler implements WebBeansContext webBeansContext = WebBeansContext.getInstance(); BeanManager beanManager = webBeansContext.getBeanManagerImpl(); - Map<Decorator<?>, Object> tmpInstances = new HashMap<Decorator<?>, Object>(); + Map<Decorator<?>, Object> tmpInstances = new HashMap<>(); for (int i = 0; i < instancesSize; i++) { Decorator<?> bean = (Decorator<?>) beanManager.getPassivationCapableBean(in.readUTF()); @@ -180,7 +180,7 @@ public class DecoratorHandler implements instances = tmpInstances; int decoratorsSize = in.readInt(); - decorators = new CopyOnWriteArrayList<Decorator<?>>(); + decorators = new CopyOnWriteArrayList<>(); for (int i = 0; i < decoratorsSize; i++) { decorators.add((Decorator<?>) beanManager.getPassivationCapableBean(in.readUTF())); Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/DefaultInterceptorHandler.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/DefaultInterceptorHandler.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/DefaultInterceptorHandler.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/DefaultInterceptorHandler.java Sun Jun 18 13:57:08 2017 @@ -230,7 +230,7 @@ public class DefaultInterceptorHandler<T WebBeansContext webBeansContext = WebBeansContext.getInstance(); BeanManager beanManager = webBeansContext.getBeanManagerImpl(); - Map<Interceptor<?>, Object> tmpInstances = new HashMap<Interceptor<?>, Object>(); + Map<Interceptor<?>, Object> tmpInstances = new HashMap<>(); for (int i = 0; i < instancesSize; i++) { Interceptor<?> interceptor = readInterceptor(in.readUTF(), beanManager); @@ -247,7 +247,7 @@ public class DefaultInterceptorHandler<T instances = tmpInstances; int interceptorsSize = in.readInt(); - interceptors = new HashMap<Method, List<Interceptor<?>>>(interceptorsSize); + interceptors = new HashMap<>(interceptorsSize); for (int i = 0; i < interceptorsSize; i++) { Class<?> declaringClass = (Class<?>) in.readObject(); @@ -264,7 +264,7 @@ public class DefaultInterceptorHandler<T } int interceptorListSize = in.readInt(); - List<Interceptor<?>> interceptorList = new ArrayList<Interceptor<?>>(interceptorListSize); + List<Interceptor<?>> interceptorList = new ArrayList<>(interceptorListSize); for (int j = 0; j < interceptorListSize; j++) { interceptorList.add(readInterceptor(in.readUTF(), beanManager)); Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorResolutionService.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorResolutionService.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorResolutionService.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorResolutionService.java Sun Jun 18 13:57:08 2017 @@ -107,7 +107,7 @@ public class InterceptorResolutionServic // pick up EJB-style interceptors from a class level - List<Interceptor<?>> classLevelEjbInterceptors = new ArrayList<Interceptor<?>>(); + List<Interceptor<?>> classLevelEjbInterceptors = new ArrayList<>(); collectEjbInterceptors(classLevelEjbInterceptors, annotatedType, false, beanTypes); @@ -118,7 +118,7 @@ public class InterceptorResolutionServic decorators = Collections.emptyList(); // less to store } - Set<Interceptor<?>> allUsedCdiInterceptors = new HashSet<Interceptor<?>>(); + Set<Interceptor<?>> allUsedCdiInterceptors = new HashSet<>(); // pick up CDI interceptors from a class level Set<Annotation> classInterceptorBindings = annotationManager.getInterceptorAnnotations(annotatedType.getAnnotations()); @@ -133,16 +133,16 @@ public class InterceptorResolutionServic classLevelInterceptors = Collections.EMPTY_LIST; } - Set<Interceptor<?>> allUsedConstructorCdiInterceptors = new HashSet<Interceptor<?>>(); + Set<Interceptor<?>> allUsedConstructorCdiInterceptors = new HashSet<>(); addCdiClassLifecycleInterceptors(annotatedType, classInterceptorBindings, allUsedCdiInterceptors, allUsedConstructorCdiInterceptors); - LinkedHashSet<Interceptor<?>> allUsedEjbInterceptors = new LinkedHashSet<Interceptor<?>>(); // we need to preserve the order! + LinkedHashSet<Interceptor<?>> allUsedEjbInterceptors = new LinkedHashSet<>(); // we need to preserve the order! allUsedEjbInterceptors.addAll(classLevelEjbInterceptors); - Map<Method, BusinessMethodInterceptorInfo> businessMethodInterceptorInfos = new HashMap<Method, BusinessMethodInterceptorInfo>(); - Map<Constructor<?>, BusinessMethodInterceptorInfo> constructorInterceptorInfos = new HashMap<Constructor<?>, BusinessMethodInterceptorInfo>(); + Map<Method, BusinessMethodInterceptorInfo> businessMethodInterceptorInfos = new HashMap<>(); + Map<Constructor<?>, BusinessMethodInterceptorInfo> constructorInterceptorInfos = new HashMap<>(); - List<Method> nonInterceptedMethods = new ArrayList<Method>(); + List<Method> nonInterceptedMethods = new ArrayList<>(); SelfInterceptorBean<T> selfInterceptorBean = resolveSelfInterceptorBean(annotatedType); @@ -179,7 +179,7 @@ public class InterceptorResolutionServic } Map<InterceptionType, LifecycleMethodInfo> lifecycleMethodInterceptorInfos - = new HashMap<InterceptionType, LifecycleMethodInfo>(); + = new HashMap<>(); addLifecycleMethods( lifecycleMethodInterceptorInfos, @@ -203,10 +203,10 @@ public class InterceptorResolutionServic classInterceptorBindings, failOnFinal); - List<Interceptor<?>> cdiInterceptors = new ArrayList<Interceptor<?>>(allUsedCdiInterceptors); + List<Interceptor<?>> cdiInterceptors = new ArrayList<>(allUsedCdiInterceptors); Collections.sort(cdiInterceptors, new InterceptorComparator(webBeansContext)); - List<Interceptor<?>> cdiConstructorInterceptors = new ArrayList<Interceptor<?>>(allUsedConstructorCdiInterceptors); + List<Interceptor<?>> cdiConstructorInterceptors = new ArrayList<>(allUsedConstructorCdiInterceptors); Collections.sort(cdiConstructorInterceptors, new InterceptorComparator(webBeansContext)); boolean interceptedBean = allUsedEjbInterceptors.size() > 0 || @@ -336,7 +336,7 @@ public class InterceptorResolutionServic private <T> SelfInterceptorBean<T> resolveSelfInterceptorBean(AnnotatedType<T> annotatedType) { BeanAttributesImpl<T> beanAttributes = BeanAttributesBuilder.forContext(webBeansContext).newBeanAttibutes(annotatedType).build(); - SelfInterceptorBeanBuilder<T>sibb = new SelfInterceptorBeanBuilder<T>(webBeansContext, annotatedType, beanAttributes); + SelfInterceptorBeanBuilder<T>sibb = new SelfInterceptorBeanBuilder<>(webBeansContext, annotatedType, beanAttributes); sibb.defineSelfInterceptorRules(); if (!sibb.isInterceptorEnabled()) { @@ -356,7 +356,7 @@ public class InterceptorResolutionServic Set<Annotation> classInterceptorBindings, boolean failOnFinal) { - List<AnnotatedMethod<?>> foundMethods = new ArrayList<AnnotatedMethod<?>>(); + List<AnnotatedMethod<?>> foundMethods = new ArrayList<>(); BusinessMethodInterceptorInfo methodInterceptorInfo = new BusinessMethodInterceptorInfo(); List<AnnotatedMethod<?>> lifecycleMethodCandidates = webBeansContext.getInterceptorUtil().getLifecycleMethods(annotatedType, lifeycleAnnotation); @@ -421,7 +421,7 @@ public class InterceptorResolutionServic { boolean unproxyable = isUnproxyable(annotatedMethod, failOnFinal); - List<Interceptor<?>> methodInterceptors = new ArrayList<Interceptor<?>>(); + List<Interceptor<?>> methodInterceptors = new ArrayList<>(); if (classLevelEjbInterceptors != null && classLevelEjbInterceptors.size() > 0 && !unproxyable) { @@ -464,7 +464,7 @@ public class InterceptorResolutionServic return; } - LinkedHashMap<Decorator<?>, Method> appliedDecorators = new LinkedHashMap<Decorator<?>, Method>(); + LinkedHashMap<Decorator<?>, Method> appliedDecorators = new LinkedHashMap<>(); for (Decorator decorator : decorators) { @@ -605,7 +605,7 @@ public class InterceptorResolutionServic boolean unproxyable = isUnproxyable(annotatedMethod, failOnFinal); boolean hasMethodInterceptors = false; - Map<Class<? extends Annotation>, Annotation> cummulatedInterceptorBindings = new HashMap<Class<? extends Annotation>, Annotation>(); + Map<Class<? extends Annotation>, Annotation> cummulatedInterceptorBindings = new HashMap<>(); for (Annotation interceptorBinding: annotationManager.getInterceptorAnnotations(annotatedMethod.getAnnotations())) { cummulatedInterceptorBindings.put(interceptorBinding.annotationType(), interceptorBinding); @@ -707,19 +707,19 @@ public class InterceptorResolutionServic Class<?> javaClass = annotatedType.getJavaClass(); List<Method> interceptableMethods = ClassUtil.getNonPrivateMethods(javaClass, false); - List<AnnotatedMethod> interceptableAnnotatedMethods = new ArrayList<AnnotatedMethod>(); + List<AnnotatedMethod> interceptableAnnotatedMethods = new ArrayList<>(); AnnotatedElementFactory annotatedElementFactory = webBeansContext.getAnnotatedElementFactory(); Set<AnnotatedMethod> annotatedMethods = (Set<AnnotatedMethod>) annotatedElementFactory.getFilteredAnnotatedMethods(annotatedType); if (!javaClass.isAnnotation() && javaClass.isInterface()) { - Set<Type> types = new HashSet<Type>(annotatedType.getTypeClosure()); + Set<Type> types = new HashSet<>(annotatedType.getTypeClosure()); types.remove(javaClass); types.remove(Object.class); if (!types.isEmpty()) // AT only supports 1 parent and ignores interface inheritance so add it manually here { - annotatedMethods = new HashSet<AnnotatedMethod>(annotatedMethods); // otherwise it is not mutable by default + annotatedMethods = new HashSet<>(annotatedMethods); // otherwise it is not mutable by default for (Type c : types) { if (!Class.class.isInstance(c)) @@ -846,7 +846,7 @@ public class InterceptorResolutionServic if (interceptorInfo.getDecorators() != null && !isDelegateInjection.apply(creationalContextImpl)) { List<Decorator<?>> decorators = filterDecorators.apply(instance, interceptorInfo.getDecorators()); - Map<Decorator<?>, Object> instances = new HashMap<Decorator<?>, Object>(); + Map<Decorator<?>, Object> instances = new HashMap<>(); for (int i = decorators.size(); i > 0; i--) { Decorator decorator = decorators.get(i - 1); @@ -1075,7 +1075,7 @@ public class InterceptorResolutionServic public static class LifecycleMethodInfo { - private List<AnnotatedMethod<?>> methods = new ArrayList<AnnotatedMethod<?>>(); + private List<AnnotatedMethod<?>> methods = new ArrayList<>(); private BusinessMethodInterceptorInfo methodInterceptorInfo; public LifecycleMethodInfo(List<AnnotatedMethod<?>> methods, BusinessMethodInterceptorInfo methodInterceptorInfo) Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorUtil.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorUtil.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorUtil.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorUtil.java Sun Jun 18 13:57:08 2017 @@ -49,7 +49,7 @@ public final class InterceptorUtil */ public List<Class> getReverseClassHierarchy(Class clazz) { - List<Class> hierarchy = new ArrayList<Class>(); + List<Class> hierarchy = new ArrayList<>(); while (clazz != null && clazz != Object.class) { hierarchy.add(0, clazz); @@ -62,7 +62,7 @@ public final class InterceptorUtil public List<AnnotatedMethod<?>> getLifecycleMethods(AnnotatedType<?> annotatedType, Class<? extends Annotation> annotation) { - List<AnnotatedMethod<?>> lifecycleMethods = new ArrayList<AnnotatedMethod<?>>(); + List<AnnotatedMethod<?>> lifecycleMethods = new ArrayList<>(); List<Class> classes = getReverseClassHierarchy(annotatedType.getJavaClass()); for (Class clazz : classes) Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorsManager.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorsManager.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorsManager.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorsManager.java Sun Jun 18 13:57:08 2017 @@ -58,28 +58,28 @@ public class InterceptorsManager /** * Interceptor classes which got added via beans.xml */ - private List<Class<?>> configuredInterceptorClasses = new CopyOnWriteArrayList<Class<?>>(); + private List<Class<?>> configuredInterceptorClasses = new CopyOnWriteArrayList<>(); /** * Active CDI-style interceptors. */ - private List<Interceptor<?>> cdiInterceptors = new ArrayList<Interceptor<?>>(); + private List<Interceptor<?>> cdiInterceptors = new ArrayList<>(); /** * EJB-style Interceptor beans. */ - private ConcurrentMap<Class<?>, Interceptor<?>> ejbInterceptors = new ConcurrentHashMap<Class<?>, Interceptor<?>>(); + private ConcurrentMap<Class<?>, Interceptor<?>> ejbInterceptors = new ConcurrentHashMap<>(); /**Additional interceptor class*/ - private List<Class<?>> additionalInterceptorClasses = new ArrayList<Class<?>>(); + private List<Class<?>> additionalInterceptorClasses = new ArrayList<>(); /** * Additional interceptor binding types we got via Extensions */ private Map<Class<? extends Annotation>, Set<Annotation>> additionalInterceptorBindingTypes - = new HashMap<Class<? extends Annotation>, Set<Annotation>>(); + = new HashMap<>(); private final Collection<AnnotatedType<?>> additionalInterceptorBindingTypesAnnotatedTypes - = new ArrayList<AnnotatedType<?>>(); + = new ArrayList<>(); private final PriorityClasses priorityInterceptors = new PriorityClasses(); @@ -136,7 +136,7 @@ public class InterceptorsManager } BeanAttributesImpl<T> beanAttributes = BeanAttributesBuilder.forContext(webBeansContext).newBeanAttibutes(annotatedType).build(); - EjbInterceptorBeanBuilder<T> buildr = new EjbInterceptorBeanBuilder<T>(webBeansContext, annotatedType, beanAttributes); + EjbInterceptorBeanBuilder<T> buildr = new EjbInterceptorBeanBuilder<>(webBeansContext, annotatedType, beanAttributes); buildr.defineEjbInterceptorRules(); Interceptor<T> i = buildr.getBean(); interceptor = (Interceptor<T>) ejbInterceptors.putIfAbsent(interceptorClass, i); @@ -206,7 +206,7 @@ public class InterceptorsManager public List<Interceptor<?>> resolveInterceptors(InterceptionType type, Annotation... interceptorBindings) { - List<Interceptor<?>> interceptorList = new ArrayList<Interceptor<?>>(); + List<Interceptor<?>> interceptorList = new ArrayList<>(); for (Interceptor<?> interceptor : cdiInterceptors) { if (interceptor.intercepts(type) && intercepts(interceptor, interceptorBindings) && isInterceptorClassEnabled(interceptor.getBeanClass())) Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/LifecycleInterceptorInvocationContext.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/LifecycleInterceptorInvocationContext.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/LifecycleInterceptorInvocationContext.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/LifecycleInterceptorInvocationContext.java Sun Jun 18 13:57:08 2017 @@ -40,7 +40,7 @@ public class LifecycleInterceptorInvocat private InterceptionType type; private List<Interceptor<?>> interceptors; private Map<Interceptor<?>, ?> instances; - private Map<String, Object> contextData = new HashMap<String, Object>(); + private Map<String, Object> contextData = new HashMap<>(); private int interceptorIndex; private List<AnnotatedMethod<?>> lifecycleMethods; Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/RequestScopedBeanInterceptorHandler.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/RequestScopedBeanInterceptorHandler.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/RequestScopedBeanInterceptorHandler.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/RequestScopedBeanInterceptorHandler.java Sun Jun 18 13:57:08 2017 @@ -39,7 +39,7 @@ public class RequestScopedBeanIntercepto /** * Cached bean instance for each thread */ - private static ThreadLocal<HashMap<Bean<?>, Object>> cachedInstances = new ThreadLocal<HashMap<Bean<?>, Object>>(); + private static ThreadLocal<HashMap<Bean<?>, Object>> cachedInstances = new ThreadLocal<>(); public static void removeThreadLocals() @@ -65,7 +65,7 @@ public class RequestScopedBeanIntercepto HashMap<Bean<?>, Object> beanMap = cachedInstances.get(); if (beanMap == null) { - beanMap = new HashMap<Bean<?>, Object>(); + beanMap = new HashMap<>(); cachedInstances.set(beanMap); } Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/SessionScopedBeanInterceptorHandler.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/SessionScopedBeanInterceptorHandler.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/SessionScopedBeanInterceptorHandler.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/SessionScopedBeanInterceptorHandler.java Sun Jun 18 13:57:08 2017 @@ -39,7 +39,7 @@ public class SessionScopedBeanIntercepto /** * Cached bean instance for each thread */ - private static ThreadLocal<HashMap<Bean<?>, Object>> cachedInstances = new ThreadLocal<HashMap<Bean<?>, Object>>(); + private static ThreadLocal<HashMap<Bean<?>, Object>> cachedInstances = new ThreadLocal<>(); public static void removeThreadLocals() @@ -65,7 +65,7 @@ public class SessionScopedBeanIntercepto HashMap<Bean<?>, Object> beanMap = cachedInstances.get(); if (beanMap == null) { - beanMap = new HashMap<Bean<?>, Object>(); + beanMap = new HashMap<>(); cachedInstances.set(beanMap); } Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/jms/JMSModel.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/jms/JMSModel.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/jms/JMSModel.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/jms/JMSModel.java Sun Jun 18 13:57:08 2017 @@ -34,7 +34,7 @@ public class JMSModel private String jndiName; private final String mappedName; private boolean isJndiNameDefined; - private final Set<Annotation> bindings = new HashSet<Annotation>(); + private final Set<Annotation> bindings = new HashSet<>(); public JMSModel(JMSType jmsType, String jndiName, String mappedName) Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/test/OpenWebBeansTestMetaDataDiscoveryService.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/test/OpenWebBeansTestMetaDataDiscoveryService.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/test/OpenWebBeansTestMetaDataDiscoveryService.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/test/OpenWebBeansTestMetaDataDiscoveryService.java Sun Jun 18 13:57:08 2017 @@ -61,7 +61,7 @@ public class OpenWebBeansTestMetaDataDis @Override public Set<Class<?>> getBeanClasses() { - return new HashSet<Class<?>>(classes); + return new HashSet<>(classes); } /** Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/plugins/PluginLoader.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/plugins/PluginLoader.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/plugins/PluginLoader.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/plugins/PluginLoader.java Sun Jun 18 13:57:08 2017 @@ -70,7 +70,7 @@ public class PluginLoader if(started.compareAndSet(false, true)) { logger.fine("PluginLoader startUp called."); - ArrayList<OpenWebBeansPlugin> ps = new ArrayList<OpenWebBeansPlugin>(); + ArrayList<OpenWebBeansPlugin> ps = new ArrayList<>(); List<OpenWebBeansPlugin> pluginList = WebBeansContext.getInstance().getLoaderService().load(OpenWebBeansPlugin.class); for (OpenWebBeansPlugin plugin : pluginList) @@ -136,7 +136,7 @@ public class PluginLoader return; } - ArrayList<String> failedShutdown = new ArrayList<String>(); + ArrayList<String> failedShutdown = new ArrayList<>(); for (OpenWebBeansPlugin plugin : plugins) { Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractAnnotatedCallable.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractAnnotatedCallable.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractAnnotatedCallable.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractAnnotatedCallable.java Sun Jun 18 13:57:08 2017 @@ -40,7 +40,7 @@ import javax.enterprise.inject.spi.Annot public abstract class AbstractAnnotatedCallable<X> extends AbstractAnnotatedMember<X> implements AnnotatedCallable<X> { /**Annotated parameters*/ - private List<AnnotatedParameter<X>> annotatedParameters = new ArrayList<AnnotatedParameter<X>>(); + private List<AnnotatedParameter<X>> annotatedParameters = new ArrayList<>(); AbstractAnnotatedCallable(WebBeansContext webBeansContext, Type baseType, Member javaMember, AnnotatedType<X> declaringType) { @@ -53,7 +53,7 @@ public abstract class AbstractAnnotatedC for(Type genericParameter : genericParameterTypes) { - AnnotatedParameterImpl<X> parameterImpl = new AnnotatedParameterImpl<X>(getWebBeansContext(), genericParameter,this,i); + AnnotatedParameterImpl<X> parameterImpl = new AnnotatedParameterImpl<>(getWebBeansContext(), genericParameter, this, i); parameterImpl.setAnnotations(parameterAnnotations[i]); addAnnotatedParameter(parameterImpl); Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractDecoratorInjectionTarget.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractDecoratorInjectionTarget.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractDecoratorInjectionTarget.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractDecoratorInjectionTarget.java Sun Jun 18 13:57:08 2017 @@ -83,8 +83,8 @@ public class AbstractDecoratorInjectionT @Override protected T newInstance(CreationalContextImpl<T> creationalContext) { - return new AbstractDecoratorInjectableConstructor<T>( - getConstructor().parentConstructor, getConstructor().getJavaMember(), this, creationalContext).doInjection(); + return new AbstractDecoratorInjectableConstructor<>( + getConstructor().parentConstructor, getConstructor().getJavaMember(), this, creationalContext).doInjection(); } public static class SubClassAnnotatedConstructorImpl<T> extends AnnotatedConstructorImpl<T> @@ -116,7 +116,7 @@ public class AbstractDecoratorInjectionT @Override protected List<InjectionPoint> getInjectionPoints(Member member) { - List<InjectionPoint> injectionPoints = new ArrayList<InjectionPoint>(); + List<InjectionPoint> injectionPoints = new ArrayList<>(); for (InjectionPoint injectionPoint : owner.getInjectionPoints()) { if (injectionPoint.getMember().equals(parent)) // we don't compare to the runtime subclass constructor Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedConstructorImpl.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedConstructorImpl.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedConstructorImpl.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedConstructorImpl.java Sun Jun 18 13:57:08 2017 @@ -71,7 +71,7 @@ public class AnnotatedConstructorImpl<X> if (javaMember.getParameterTypes().length == 0) { Class<?> clazz = javaMember.getDeclaringClass(); - Map<Class<?>, Annotation> annotations = new HashMap<Class<?>, Annotation>(); + Map<Class<?>, Annotation> annotations = new HashMap<>(); for (Annotation a : javaMember.getDeclaredAnnotations()) { annotations.put(a.annotationType(), a); Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedElementFactory.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedElementFactory.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedElementFactory.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedElementFactory.java Sun Jun 18 13:57:08 2017 @@ -57,29 +57,29 @@ public final class AnnotatedElementFacto * Cache of the initial AnnotatedTypes */ private ConcurrentMap<Class<?>, ConcurrentMap<String, AnnotatedType<?>>> annotatedTypeCache = - new ConcurrentHashMap<Class<?>, ConcurrentMap<String, AnnotatedType<?>>>(); + new ConcurrentHashMap<>(); /** * Cache of modified AnnotatedTypes. */ private ConcurrentMap<Class<?>, ConcurrentMap<String, AnnotatedType<?>>> modifiedAnnotatedTypeCache = - new ConcurrentHashMap<Class<?>, ConcurrentMap<String, AnnotatedType<?>>>(); + new ConcurrentHashMap<>(); //Cache of AnnotatedConstructor private ConcurrentMap<Constructor<?>, AnnotatedConstructor<?>> annotatedConstructorCache = - new ConcurrentHashMap<Constructor<?>, AnnotatedConstructor<?>>(); + new ConcurrentHashMap<>(); //Cache of AnnotatedMethod private ConcurrentMap<Method, AnnotatedMethod<?>> annotatedMethodCache = - new ConcurrentHashMap<Method, AnnotatedMethod<?>>(); + new ConcurrentHashMap<>(); //Cache of AnnotatedField private ConcurrentMap<Field, AnnotatedField<?>> annotatedFieldCache = - new ConcurrentHashMap<Field, AnnotatedField<?>>(); + new ConcurrentHashMap<>(); //Cache of AnnotatedMethod private ConcurrentMap<AnnotatedType<?>, Set<AnnotatedMethod<?>>> annotatedMethodsOfTypeCache = - new ConcurrentHashMap<AnnotatedType<?>, Set<AnnotatedMethod<?>>>(); + new ConcurrentHashMap<>(); private WebBeansContext webBeansContext; @@ -144,7 +144,7 @@ public final class AnnotatedElementFacto ConcurrentMap<String, AnnotatedType<?>> annotatedTypes = modifiedAnnotatedTypeCache.get(type); if (annotatedTypes == null) { - annotatedTypes = new ConcurrentHashMap<String, AnnotatedType<?>>(); + annotatedTypes = new ConcurrentHashMap<>(); } ConcurrentMap<String, AnnotatedType<?>> oldAnnotatedTypes = modifiedAnnotatedTypeCache.putIfAbsent(type, annotatedTypes); if (oldAnnotatedTypes != null) @@ -180,7 +180,7 @@ public final class AnnotatedElementFacto { supertype = newAnnotatedType(annotatedClass.getSuperclass()); } - annotatedType = new AnnotatedTypeImpl<X>(webBeansContext, annotatedClass, supertype); + annotatedType = new AnnotatedTypeImpl<>(webBeansContext, annotatedClass, supertype); AnnotatedType<X> oldType = annotatedTypes.putIfAbsent(OWB_DEFAULT_KEY, annotatedType); if(oldType != null) @@ -238,7 +238,7 @@ public final class AnnotatedElementFacto } else { - annConstructor = new AnnotatedConstructorImpl<X>(webBeansContext, constructor, declaringClass); + annConstructor = new AnnotatedConstructorImpl<>(webBeansContext, constructor, declaringClass); AnnotatedConstructorImpl<X> old = (AnnotatedConstructorImpl<X>)annotatedConstructorCache.putIfAbsent(constructor, annConstructor); if(old != null) { @@ -270,7 +270,7 @@ public final class AnnotatedElementFacto } else { - annotField = new AnnotatedFieldImpl<X>(webBeansContext, field, declaringClass); + annotField = new AnnotatedFieldImpl<>(webBeansContext, field, declaringClass); AnnotatedFieldImpl<X> old = (AnnotatedFieldImpl<X>) annotatedFieldCache.putIfAbsent(field, annotField); if(old != null) { @@ -302,7 +302,7 @@ public final class AnnotatedElementFacto } else { - annotMethod = new AnnotatedMethodImpl<X>(webBeansContext, method, declaringType); + annotMethod = new AnnotatedMethodImpl<>(webBeansContext, method, declaringType); AnnotatedMethodImpl<X> old = (AnnotatedMethodImpl<X>) annotatedMethodCache.putIfAbsent(method, annotMethod); if(old != null) { @@ -328,7 +328,7 @@ public final class AnnotatedElementFacto } methods = Collections.unmodifiableSet(getFilteredMethods(annotatedType.getJavaClass(), (Set)annotatedType.getMethods(), - new HashSet<AnnotatedMethod<?>>())); + new HashSet<>())); Set<AnnotatedMethod<?>> old = annotatedMethodsOfTypeCache.putIfAbsent(annotatedType, methods); if (old != null) { @@ -388,7 +388,7 @@ public final class AnnotatedElementFacto ConcurrentMap<String, AnnotatedType<?>> annotatedTypes = annotatedTypeCache.get(type); if (annotatedTypes == null) { - annotatedTypes = new ConcurrentHashMap<String, AnnotatedType<?>>(); + annotatedTypes = new ConcurrentHashMap<>(); ConcurrentMap<String, AnnotatedType<?>> oldAnnotatedTypes = annotatedTypeCache.putIfAbsent(type, annotatedTypes); if (oldAnnotatedTypes != null) { Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedTypeImpl.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedTypeImpl.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedTypeImpl.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedTypeImpl.java Sun Jun 18 13:57:08 2017 @@ -78,8 +78,8 @@ public class AnnotatedTypeImpl<X> else { BeanManager bm = webBeansContext.getBeanManagerImpl(); - Set<Class<? extends Annotation>> annotationTypes = new HashSet<Class<? extends Annotation>>(); - List<Annotation> annotations = new ArrayList<Annotation>(); + Set<Class<? extends Annotation>> annotationTypes = new HashSet<>(); + List<Annotation> annotations = new ArrayList<>(); boolean hasScope = false; for (Annotation annotation : annotatedClass.getDeclaredAnnotations()) { @@ -227,9 +227,9 @@ public class AnnotatedTypeImpl<X> Constructor<?>[] decCtxs = getWebBeansContext().getSecurityService().doPrivilegedGetDeclaredConstructors(annotatedClass); - Set<AnnotatedConstructor<X>> constructors = new HashSet<AnnotatedConstructor<X>>(); - Set<AnnotatedField<? super X>> fields = new HashSet<AnnotatedField<? super X>>(); - Set<AnnotatedMethod<? super X>> methods = new HashSet<AnnotatedMethod<? super X>>(); + Set<AnnotatedConstructor<X>> constructors = new HashSet<>(); + Set<AnnotatedField<? super X>> fields = new HashSet<>(); + Set<AnnotatedMethod<? super X>> methods = new HashSet<>(); this.constructors = Collections.unmodifiableSet(constructors); this.fields = Collections.unmodifiableSet(fields); @@ -240,8 +240,8 @@ public class AnnotatedTypeImpl<X> if (!ct.isSynthetic()) { AnnotatedConstructor<X> ac = - new AnnotatedConstructorImpl<X>(getWebBeansContext(), (Constructor<X>) ct, - AnnotatedTypeImpl.this); + new AnnotatedConstructorImpl<>(getWebBeansContext(), (Constructor<X>) ct, + AnnotatedTypeImpl.this); constructors.add(ac); } } @@ -253,7 +253,7 @@ public class AnnotatedTypeImpl<X> if (constructor != null) { constructors.add( - new AnnotatedConstructorImpl<X>(getWebBeansContext(), constructor, AnnotatedTypeImpl.this)); + new AnnotatedConstructorImpl<>(getWebBeansContext(), constructor, AnnotatedTypeImpl.this)); } } @@ -264,7 +264,7 @@ public class AnnotatedTypeImpl<X> { if (!f.isSynthetic()) { - AnnotatedField<X> af = new AnnotatedFieldImpl<X>(getWebBeansContext(), f, AnnotatedTypeImpl.this); + AnnotatedField<X> af = new AnnotatedFieldImpl<>(getWebBeansContext(), f, AnnotatedTypeImpl.this); fields.add(af); } } @@ -273,7 +273,7 @@ public class AnnotatedTypeImpl<X> { if (!m.isSynthetic() && !m.isBridge()) { - AnnotatedMethod<X> am = new AnnotatedMethodImpl<X>(getWebBeansContext(), m, AnnotatedTypeImpl.this); + AnnotatedMethod<X> am = new AnnotatedMethodImpl<>(getWebBeansContext(), m, AnnotatedTypeImpl.this); methods.add(am); } } @@ -282,11 +282,11 @@ public class AnnotatedTypeImpl<X> { for (AnnotatedField<? super X> field: supertype.getFields()) { - fields.add(new AnnotatedFieldImpl<X>(getWebBeansContext(), field.getJavaMember(), AnnotatedTypeImpl.this)); + fields.add(new AnnotatedFieldImpl<>(getWebBeansContext(), field.getJavaMember(), AnnotatedTypeImpl.this)); } for (AnnotatedMethod<? super X> method : supertype.getMethods()) { - methods.add(new AnnotatedMethodImpl<X>(getWebBeansContext(), method.getJavaMember(), AnnotatedTypeImpl.this)); + methods.add(new AnnotatedMethodImpl<>(getWebBeansContext(), method.getJavaMember(), AnnotatedTypeImpl.this)); } } Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/BaseProducerProducer.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/BaseProducerProducer.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/BaseProducerProducer.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/BaseProducerProducer.java Sun Jun 18 13:57:08 2017 @@ -118,7 +118,7 @@ public abstract class BaseProducerProduc parentInstance = (P)webBeansContext.getBeanManagerImpl().getReference(owner, owner.getBeanClass(), parentCreationalContext); } - m = new InjectableMethod<T>(disposalMethod, parentInstance, this, (CreationalContextImpl<T>) parentCreationalContext, disposalIPs); + m = new InjectableMethod<>(disposalMethod, parentInstance, this, (CreationalContextImpl<T>) parentCreationalContext, disposalIPs); m.setDisposable(true); m.setProducerMethodInstance(instance); Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/EventProducer.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/EventProducer.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/EventProducer.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/EventProducer.java Sun Jun 18 13:57:08 2017 @@ -56,7 +56,7 @@ public class EventProducer<T> extends Ab } Type type = EventImpl.class.cast(instance).getMetadata().getType(); - ArrayList<Decorator<?>> list = new ArrayList<Decorator<?>>(decorators.size()); + ArrayList<Decorator<?>> list = new ArrayList<>(decorators.size()); for (Decorator<?> original : decorators) { Type event = original.getDelegateType(); @@ -99,7 +99,7 @@ public class EventProducer<T> extends Ab try { - instance = new EventImpl<T>(new EventMetadataImpl(null, eventType, injectionPoint, qualifiers, webBeansContext), webBeansContext); + instance = new EventImpl<>(new EventMetadataImpl(null, eventType, injectionPoint, qualifiers, webBeansContext), webBeansContext); } catch (Exception e) { Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/InjectionTargetImpl.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/InjectionTargetImpl.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/InjectionTargetImpl.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/InjectionTargetImpl.java Sun Jun 18 13:57:08 2017 @@ -156,7 +156,7 @@ public class InjectionTargetImpl<T> exte try { Constructor<T> cons = getConstructor().getJavaMember(); - InjectableConstructor<T> injectableConstructor = new InjectableConstructor<T>(cons, this, creationalContext); + InjectableConstructor<T> injectableConstructor = new InjectableConstructor<>(cons, this, creationalContext); ConstructorInstanceProvider provider = new ConstructorInstanceProvider(); ConstructorInterceptorInvocationContext<T> invocationContext = new ConstructorInterceptorInvocationContext<T>( provider, aroundConstructInterceptors, interceptorInstances, cons, injectableConstructor.createParameters()); @@ -194,7 +194,7 @@ public class InjectionTargetImpl<T> exte protected T newInstance(CreationalContextImpl<T> creationalContext) { - return new InjectableConstructor<T>(getConstructor().getJavaMember(), this, creationalContext).doInjection(); + return new InjectableConstructor<>(getConstructor().getJavaMember(), this, creationalContext).doInjection(); } @Override @@ -224,7 +224,7 @@ public class InjectionTargetImpl<T> exte { if (injectionPoint.getMember() instanceof Field) { - new InjectableField<T>((Field) injectionPoint.getMember(), instance, this, context).doInjection(); + new InjectableField<>((Field) injectionPoint.getMember(), instance, this, context).doInjection(); } } } @@ -232,7 +232,7 @@ public class InjectionTargetImpl<T> exte private void injectMethods(Class<?> type, T instance, CreationalContextImpl<T> context) { - Set<Member> injectedMethods = new HashSet<Member>(); + Set<Member> injectedMethods = new HashSet<>(); for (InjectionPoint injectionPoint : getInjectionPoints()) { if (injectionPoint.getMember().getDeclaringClass().equals(type)) @@ -243,7 +243,7 @@ public class InjectionTargetImpl<T> exte && !isDisposalMethod(injectionPoint) && !isObserverMethod(injectionPoint)) { - new InjectableMethod<T>((Method) injectionPoint.getMember(), instance, this, context).doInjection(); + new InjectableMethod<>((Method) injectionPoint.getMember(), instance, this, context).doInjection(); injectedMethods.add(injectionPoint.getMember()); } } @@ -260,7 +260,7 @@ public class InjectionTargetImpl<T> exte { if (method.getDeclaringType().getJavaClass().equals(declaringType) && method.isAnnotationPresent(Inject.class) && method.getParameters().isEmpty()) { - new InjectableMethod<T>(method.getJavaMember(), instance, this, context).doInjection(); + new InjectableMethod<>(method.getJavaMember(), instance, this, context).doInjection(); } } } @@ -313,8 +313,8 @@ public class InjectionTargetImpl<T> exte return; } - InvocationContext ic = new LifecycleInterceptorInvocationContext<T>(internalInstance, InterceptionType.POST_CONSTRUCT, postConstructInterceptors, - interceptorInstances, postConstructMethods); + InvocationContext ic = new LifecycleInterceptorInvocationContext<>(internalInstance, InterceptionType.POST_CONSTRUCT, postConstructInterceptors, + interceptorInstances, postConstructMethods); try { ic.proceed(); @@ -352,8 +352,8 @@ public class InjectionTargetImpl<T> exte return; } - InvocationContext ic = new LifecycleInterceptorInvocationContext<T>(internalInstance, InterceptionType.PRE_DESTROY, preDestroyInterceptors, - interceptorInstances, preDestroyMethods); + InvocationContext ic = new LifecycleInterceptorInvocationContext<>(internalInstance, InterceptionType.PRE_DESTROY, preDestroyInterceptors, + interceptorInstances, preDestroyMethods); try { ic.proceed(); @@ -393,7 +393,7 @@ public class InjectionTargetImpl<T> exte { throw new WebBeansCreationException("No default constructor for " + annotatedType.getJavaClass().getName()); } - return new AnnotatedConstructorImpl<T>(webBeansContext, defaultConstructor, annotatedType); + return new AnnotatedConstructorImpl<>(webBeansContext, defaultConstructor, annotatedType); } private Constructor<T> getDefaultConstructor() @@ -448,7 +448,7 @@ public class InjectionTargetImpl<T> exte private List<Interceptor<?>> getLifecycleInterceptors(Collection<Interceptor<?>> ejbInterceptors, List<Interceptor<?>> cdiInterceptors, InterceptionType interceptionType) { - List<Interceptor<?>> lifecycleInterceptors = new ArrayList<Interceptor<?>>(); + List<Interceptor<?>> lifecycleInterceptors = new ArrayList<>(); for (Interceptor<?> ejbInterceptor : ejbInterceptors) { Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/InstanceProducer.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/InstanceProducer.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/InstanceProducer.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/InstanceProducer.java Sun Jun 18 13:57:08 2017 @@ -79,7 +79,7 @@ public class InstanceProducer<T> extends type = returnType; } - return new InstanceImpl<T>(type, injectionPoint, webBeansContext, creationalContextImpl, qualifiers.toArray(new Annotation[qualifiers.size()])); + return new InstanceImpl<>(type, injectionPoint, webBeansContext, creationalContextImpl, qualifiers.toArray(new Annotation[qualifiers.size()])); } finally { Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/LazyInterceptorDefinedInjectionTarget.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/LazyInterceptorDefinedInjectionTarget.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/LazyInterceptorDefinedInjectionTarget.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/LazyInterceptorDefinedInjectionTarget.java Sun Jun 18 13:57:08 2017 @@ -59,7 +59,7 @@ public class LazyInterceptorDefinedInjec if (bean == null) // try to find it { BeanManagerImpl bm = webBeansContext.getBeanManagerImpl(); - Set<Annotation> annotations = new HashSet<Annotation>(); + Set<Annotation> annotations = new HashSet<>(); for (Annotation a : annotatedType.getAnnotations()) { if (bm.isQualifier(a.annotationType())) Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProducerMethodProducer.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProducerMethodProducer.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProducerMethodProducer.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProducerMethodProducer.java Sun Jun 18 13:57:08 2017 @@ -84,7 +84,7 @@ public class ProducerMethodProducer<T, P parentInstance = (P)webBeansContext.getBeanManagerImpl().getReference(owner, owner.getBeanClass(), parentCreationalContext); } - m = new InjectableMethod<T>(producerMethod, parentInstance, this, (CreationalContextImpl<T>) creationalContext); + m = new InjectableMethod<>(producerMethod, parentInstance, this, (CreationalContextImpl<T>) creationalContext); return m.doInjection(); Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProviderBasedProducerFactory.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProviderBasedProducerFactory.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProviderBasedProducerFactory.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProviderBasedProducerFactory.java Sun Jun 18 13:57:08 2017 @@ -49,6 +49,6 @@ public class ProviderBasedProducerFactor @Override public <T> Producer<T> createProducer(Bean<T> bean) { - return new ProviderBasedProducer<T>(webBeansContext, (Class<T>)providerType, (Provider<T>)provider, proxy); + return new ProviderBasedProducer<>(webBeansContext, (Class<T>) providerType, (Provider<T>) provider, proxy); } } Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ExtensionLoader.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ExtensionLoader.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ExtensionLoader.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ExtensionLoader.java Sun Jun 18 13:57:08 2017 @@ -45,8 +45,8 @@ import org.apache.webbeans.util.WebBeans public class ExtensionLoader { /**Map of extensions*/ - private final Map<Class<?>, Object> extensions = new ConcurrentHashMap<Class<?>, Object>(); - private final Set<Class<? extends Extension>> extensionClasses = new HashSet<Class<? extends Extension>>(); + private final Map<Class<?>, Object> extensions = new ConcurrentHashMap<>(); + private final Set<Class<? extends Extension>> extensionClasses = new HashSet<>(); private final BeanManagerImpl manager; private final WebBeansContext webBeansContext; Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/ErrorStack.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/ErrorStack.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/ErrorStack.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/ErrorStack.java Sun Jun 18 13:57:08 2017 @@ -34,7 +34,7 @@ public class ErrorStack { private static final Logger logger = WebBeansLoggerFacade.getLogger(ErrorStack.class); - private Stack<Throwable> errorStack = new Stack<Throwable>(); + private Stack<Throwable> errorStack = new Stack<>(); public ErrorStack() { Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/AbstractProxyFactory.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/AbstractProxyFactory.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/AbstractProxyFactory.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/AbstractProxyFactory.java Sun Jun 18 13:57:08 2017 @@ -249,7 +249,7 @@ public abstract class AbstractProxyFacto return null; } - ArrayList<Method> duplicates = new ArrayList<Method>(); + ArrayList<Method> duplicates = new ArrayList<>(); for (Method outer : methods) { @@ -264,7 +264,7 @@ public abstract class AbstractProxyFacto } } - ArrayList<Method> outsorted = new ArrayList<Method>(Arrays.asList(methods)); + ArrayList<Method> outsorted = new ArrayList<>(Arrays.asList(methods)); outsorted.removeAll(duplicates); return outsorted.toArray(new Method[outsorted.size()]); } Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/NormalScopeProxyFactory.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/NormalScopeProxyFactory.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/NormalScopeProxyFactory.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/NormalScopeProxyFactory.java Sun Jun 18 13:57:08 2017 @@ -63,7 +63,7 @@ public class NormalScopeProxyFactory ext * Caches the proxy classes for each bean. * We need this to prevent filling up the ClassLoaders by */ - private ConcurrentMap<Bean<?>, Class<?>> cachedProxyClasses = new ConcurrentHashMap<Bean<?>, Class<?>>(); + private ConcurrentMap<Bean<?>, Class<?>> cachedProxyClasses = new ConcurrentHashMap<>(); public NormalScopeProxyFactory(WebBeansContext webBeansContext) @@ -242,8 +242,8 @@ public class NormalScopeProxyFactory ext } else { - List<Method> methods = new ArrayList<Method>(); - List<Method> protectedMethods = new ArrayList<Method>(); + List<Method> methods = new ArrayList<>(); + List<Method> protectedMethods = new ArrayList<>(); for (Method method : ClassUtil.getNonPrivateMethods(classToProxy, true)) Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/service/DefaultLoaderService.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/service/DefaultLoaderService.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/service/DefaultLoaderService.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/service/DefaultLoaderService.java Sun Jun 18 13:57:08 2017 @@ -50,7 +50,7 @@ public class DefaultLoaderService implem { if(JAVA_6_AVAILABLE) { - List<T> result = new ArrayList<T>(); + List<T> result = new ArrayList<>(); try { ServiceLoader<T> services; @@ -72,7 +72,7 @@ public class DefaultLoaderService implem return result; } - return new ManualImplementationLoaderService<T>(serviceType, classLoader).loadServiceImplementations(); + return new ManualImplementationLoaderService<>(serviceType, classLoader).loadServiceImplementations(); } private static boolean isJava6() Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/service/ManualImplementationLoaderService.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/service/ManualImplementationLoaderService.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/service/ManualImplementationLoaderService.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/service/ManualImplementationLoaderService.java Sun Jun 18 13:57:08 2017 @@ -38,7 +38,7 @@ class ManualImplementationLoaderService< private static final String SERVICE_CONFIG = "META-INF/services/"; private static final String FILE_ENCODING = "UTF-8"; - protected List<Class<?>> foundServiceClasses = new ArrayList<Class<?>>(); + protected List<Class<?>> foundServiceClasses = new ArrayList<>(); private Class<T> serviceType; private ClassLoader currentClassLoader; @@ -57,7 +57,7 @@ class ManualImplementationLoaderService< return Collections.emptyList(); } - List<T> foundServices = new ArrayList<T>(); + List<T> foundServices = new ArrayList<>(); for (Class<?> serviceClass : result) { @@ -79,7 +79,7 @@ class ManualImplementationLoaderService< private List<URL> getConfigFileList() { - List<URL> serviceFiles = new ArrayList<URL>(); + List<URL> serviceFiles = new ArrayList<>(); try { Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/AnnotationUtil.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/AnnotationUtil.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/AnnotationUtil.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/AnnotationUtil.java Sun Jun 18 13:57:08 2017 @@ -394,7 +394,7 @@ public final class AnnotationUtil if (qualifierMethods.length > 0) { - List<Method> bindingMethods = new ArrayList<Method>(); + List<Method> bindingMethods = new ArrayList<>(); for (Method qualifierMethod : qualifierMethods) { @@ -414,7 +414,7 @@ public final class AnnotationUtil private static List<Method> getBindingCdiAnnotationMethods(AnnotatedType<?> at) { - List<Method> bindingMethods = new ArrayList<Method>(); + List<Method> bindingMethods = new ArrayList<>(); for (AnnotatedMethod<?> method : at.getMethods()) { if (method.isAnnotationPresent(Nonbinding.class)) @@ -503,7 +503,7 @@ public final class AnnotationUtil */ public static Annotation[] getMetaAnnotations(Annotation[] anns, Class<? extends Annotation> metaAnnotation) { - List<Annotation> annots = new ArrayList<Annotation>(); + List<Annotation> annots = new ArrayList<>(); Annotation[] result; for (Annotation annot : anns) Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ArrayUtil.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ArrayUtil.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ArrayUtil.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ArrayUtil.java Sun Jun 18 13:57:08 2017 @@ -94,7 +94,7 @@ public final class ArrayUtil public static <T> Set<T> asSet(T... items) { - Set<T> set = new HashSet<T>(items.length); + Set<T> set = new HashSet<>(items.length); Collections.addAll(set, items); return set; Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ClassUtil.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ClassUtil.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ClassUtil.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ClassUtil.java Sun Jun 18 13:57:08 2017 @@ -55,7 +55,7 @@ public final class ClassUtil static { - Map<Class<?>, Class<?>> primitiveToWrappersMap = new HashMap<Class<?>, Class<?>>(); + Map<Class<?>, Class<?>> primitiveToWrappersMap = new HashMap<>(); primitiveToWrappersMap.put(Integer.TYPE,Integer.class); primitiveToWrappersMap.put(Float.TYPE,Float.class); primitiveToWrappersMap.put(Double.TYPE,Double.class); @@ -66,7 +66,7 @@ public final class ClassUtil primitiveToWrappersMap.put(Boolean.TYPE,Boolean.class); primitiveToWrappersMap.put(Void.TYPE,Void.class); PRIMITIVE_TO_WRAPPERS_MAP = Collections.unmodifiableMap(primitiveToWrappersMap); - Map<Class<?>, Object> defaultValuesMap = new HashMap<Class<?>, Object>(); + Map<Class<?>, Object> defaultValuesMap = new HashMap<>(); defaultValuesMap.put(Integer.TYPE, 0); defaultValuesMap.put(Float.TYPE, 0F); defaultValuesMap.put(Double.TYPE, 0D); @@ -242,7 +242,7 @@ public final class ClassUtil if (objectMethodNames == null) { // not much synchronisation needed... - Set<String> list = new HashSet<String>(); + Set<String> list = new HashSet<>(); Class<?> clazz = Object.class; Method[] methods = SecurityUtil.doPrivilegedGetDeclaredMethods(clazz); @@ -275,8 +275,8 @@ public final class ClassUtil */ public static List<Method> getNonPrivateMethods(Class<?> topClass, boolean excludeFinalMethods) { - Map<String, List<Method>> methodMap = new HashMap<String, List<Method>>(); - List<Method> allMethods = new ArrayList<Method>(10); + Map<String, List<Method>> methodMap = new HashMap<>(); + List<Method> allMethods = new ArrayList<>(10); Class<?> clazz = topClass; @@ -304,7 +304,7 @@ public final class ClassUtil Map<String, List<Method>> methodMap, List<Method> allMethods, Class<?> clazz) { - List<Method> temp = new ArrayList<Method>(Arrays.asList(clazz.getMethods())); + List<Method> temp = new ArrayList<>(Arrays.asList(clazz.getMethods())); for (Method method : clazz.getDeclaredMethods()) { if (!temp.contains(method)) @@ -358,7 +358,7 @@ public final class ClassUtil List<Method> methods = methodMap.get(method.getName()); if (methods == null) { - methods = new ArrayList<Method>(); + methods = new ArrayList<>(); methods.add(method); allMethods.add(method); methodMap.put(method.getName(), methods); Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/CollectionUtil.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/CollectionUtil.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/CollectionUtil.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/CollectionUtil.java Sun Jun 18 13:57:08 2017 @@ -28,7 +28,7 @@ public class CollectionUtil public static <T> Set<T> unmodifiableSet(T... entries) { - Set<T> set = new HashSet<T>(Arrays.asList(entries)); + Set<T> set = new HashSet<>(Arrays.asList(entries)); return Collections.unmodifiableSet(set); } } Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/GenericsUtil.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/GenericsUtil.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/GenericsUtil.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/GenericsUtil.java Sun Jun 18 13:57:08 2017 @@ -756,7 +756,7 @@ public final class GenericsUtil public static Set<Type> getDirectTypeClosure(Type type, Type actualType) { - Set<Type> typeClosure = new HashSet<Type>(); + Set<Type> typeClosure = new HashSet<>(); typeClosure.add(Object.class); fillTypeHierarchy(typeClosure, type, actualType); return typeClosure; @@ -783,7 +783,7 @@ public final class GenericsUtil private static Collection<TypeVariable<?>> newSeenList() { - return new ArrayList<TypeVariable<?>>(); + return new ArrayList<>(); } public static boolean hasTypeParameters(Type type) @@ -884,7 +884,7 @@ public final class GenericsUtil private static Class<?>[] getClassTypes(Class<?>[] rawTypes) { - List<Class<?>> classTypes = new ArrayList<Class<?>>(); + List<Class<?>> classTypes = new ArrayList<>(); for (Class<?> rawType : rawTypes) { if (!rawType.isInterface()) Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/PriorityClasses.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/PriorityClasses.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/PriorityClasses.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/PriorityClasses.java Sun Jun 18 13:57:08 2017 @@ -31,7 +31,7 @@ public class PriorityClasses * key: the class * value: the priority. Alternatives from beans.xml have -1 as they are lowest prio. */ - private final List<PriorityClass> raw = new ArrayList<PriorityClass>(); + private final List<PriorityClass> raw = new ArrayList<>(); private List<Class<?>> sorted; public void add(Class<?> clazz, Priority priority) @@ -46,7 +46,7 @@ public class PriorityClasses { Collections.sort(raw); - sorted = new ArrayList<Class<?>>(raw.size()); + sorted = new ArrayList<>(raw.size()); for (PriorityClass priorityAlternative : raw) { Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/SpecializationUtil.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/SpecializationUtil.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/SpecializationUtil.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/SpecializationUtil.java Sun Jun 18 13:57:08 2017 @@ -87,10 +87,10 @@ public class SpecializationUtil // for which case OWB should throw exception that both CarToyota and CarFord are // specialize Car. // see spec section 5.1.3 - Set<Class<?>> superClassList = new HashSet<Class<?>>(); + Set<Class<?>> superClassList = new HashSet<>(); // first let's find all superclasses of Specialized types - Set<Class<?>> disabledClasses = new HashSet<Class<?>>(); + Set<Class<?>> disabledClasses = new HashSet<>(); for(AnnotatedType<?> annotatedType : allAnnotatedTypes) { if(annotatedType.getAnnotation(Specializes.class) != null && isEnabled(annotatedType)) @@ -192,7 +192,7 @@ public class SpecializationUtil private Set<AnnotatedType<?>> getAllAnnotatedTypes( Map<BeanArchiveService.BeanArchiveInformation, Map<AnnotatedType<?>, BeansDeployer.ExtendedBeanAttributes<?>>> beanAttributesPerBda) { - Set<AnnotatedType<?>> allAnnotatedTypes = new HashSet<AnnotatedType<?>>(beanAttributesPerBda.size()*50); + Set<AnnotatedType<?>> allAnnotatedTypes = new HashSet<>(beanAttributesPerBda.size() * 50); for (Map<AnnotatedType<?>, BeansDeployer.ExtendedBeanAttributes<?>> annotatedTypeMap : beanAttributesPerBda.values()) { allAnnotatedTypes.addAll(annotatedTypeMap.keySet()); @@ -213,7 +213,7 @@ public class SpecializationUtil Set<Type> superClassTypes; if (superClassTyped != null) { - superClassTypes = new HashSet<Type>(Arrays.asList(superClassTyped.value())); + superClassTypes = new HashSet<>(Arrays.asList(superClassTyped.value())); } else { @@ -256,7 +256,7 @@ public class SpecializationUtil Set<Annotation> annotations = annotatedType.getAnnotations(); if (annotations != null && !annotations.isEmpty()) { - Set<Class<? extends Annotation>> annotationClasses = new HashSet<Class<? extends Annotation>>(annotations.size()); + Set<Class<? extends Annotation>> annotationClasses = new HashSet<>(annotations.size()); for (Annotation annotation : annotations) { annotationClasses.add(annotation.annotationType()); Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/UrlSet.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/UrlSet.java?rev=1799087&r1=1799086&r2=1799087&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/UrlSet.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/UrlSet.java Sun Jun 18 13:57:08 2017 @@ -31,7 +31,7 @@ import java.util.Set; */ public class UrlSet implements Set<URL> { - private Map<String, URL> urlMap = new HashMap<String, URL>(); + private Map<String, URL> urlMap = new HashMap<>(); @Override
