Author: struberg
Date: Sun Jun 18 13:57:08 2017
New Revision: 1799087
URL: http://svn.apache.org/viewvc?rev=1799087&view=rev
Log:
OWB-1195 use Diamond types where possible
Modified:
openwebbeans/trunk/samples/conversation-sample/src/main/java/org/apache/webbeans/samples/conversation/Products.java
openwebbeans/trunk/samples/conversation-sample/src/main/java/org/apache/webbeans/samples/conversation/ShoppingBean.java
openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/model/conversation/ConversationModel.java
openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/admin/AdminListBean.java
openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/admin/AdminListUser.java
openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/user/UserListBean.java
openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/user/UserReservationBean.java
openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/controller/admin/AdminController.java
openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/controller/user/UserController.java
openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/entity/User.java
openwebbeans/trunk/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/OwbArquillianSingletonService.java
openwebbeans/trunk/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/OwbSWClassLoader.java
openwebbeans/trunk/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/OwbStandaloneContainer.java
openwebbeans/trunk/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/UrlSet.java
openwebbeans/trunk/webbeans-ee/src/main/java/org/apache/webbeans/ee/beans/UserTransactionBean.java
openwebbeans/trunk/webbeans-ee/src/main/java/org/apache/webbeans/ee/beans/ValidatorBean.java
openwebbeans/trunk/webbeans-ee/src/main/java/org/apache/webbeans/ee/beans/ValidatorFactoryBean.java
openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/component/BaseEjbBean.java
openwebbeans/trunk/webbeans-gradle/src/main/java/org/apache/openwebbeans/gradle/shadow/OpenWebBeansPropertiesTransformer.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/AnnotationManager.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/BeanAttributesImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/BeanManagerBean.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/BeanMetadataBean.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/BuiltInOwbBean.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ConversationBean.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/DecoratorBean.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/DecoratorMetadataBean.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/EventBean.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/EventMetadataBean.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ExtensionBean.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ExtensionProducerFactory.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionPointBean.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionTargetBean.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InstanceBean.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InterceptedOrDecoratedBeanMetadataBean.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InterceptorBean.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InterceptorMetadataBean.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/PrincipalBean.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/SelfInterceptorBean.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/BaseProducerFactory.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/BeanAttributesBuilder.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/CdiInterceptorBeanBuilder.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/DecoratorBeanBuilder.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/EjbInterceptorBeanBuilder.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ExtensionBeanBuilder.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/FieldProducerFactory.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/InterceptorBeanBuilder.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ManagedBeanBuilder.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/MethodProducerFactory.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ObserverMethodsBuilder.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerFieldBeansBuilder.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerMethodBeanBuilder.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerMethodBeansBuilder.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ResourceBeanBuilder.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/SelfInterceptorBeanBuilder.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/third/ThirdpartyBeanAttributesImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OpenWebBeansConfiguration.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/PropertyLoader.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContext.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/configurator/BeanAttributesConfiguratorImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/DecoratorInjectionTargetFactory.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionTargetFactoryImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/OwbCDI.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/SerializableBeanVault.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContext.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ApplicationContext.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ConversationContext.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/PassivatingContext.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/RequestContext.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/SessionContext.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/SingletonContext.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextFactory.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/DefaultSingletonService.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/AbstractMetaDataDiscovery.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/xbean/CdiArchive.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultApplicationBoundaryService.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultBDABeansXmlScanner.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultContextsService.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultJndiService.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorsManager.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/StereoTypeManager.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/StereoTypeModel.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/ELContextStore.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/EventImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverMethodImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/exception/helper/ExceptionMessageBuilder.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AbstractInjectable.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AlternativesManager.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableConstructor.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableMethod.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointFactory.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/instance/InstanceImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/AbstractInvocationContext.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/DecoratorHandler.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/DefaultInterceptorHandler.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorResolutionService.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorUtil.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorsManager.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/LifecycleInterceptorInvocationContext.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/RequestScopedBeanInterceptorHandler.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/SessionScopedBeanInterceptorHandler.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/jms/JMSModel.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/test/OpenWebBeansTestMetaDataDiscoveryService.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/plugins/PluginLoader.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractAnnotatedCallable.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractDecoratorInjectionTarget.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedConstructorImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedElementFactory.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedTypeImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/BaseProducerProducer.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/EventProducer.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/InjectionTargetImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/InstanceProducer.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/LazyInterceptorDefinedInjectionTarget.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProducerMethodProducer.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProviderBasedProducerFactory.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ExtensionLoader.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/ErrorStack.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/AbstractProxyFactory.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/NormalScopeProxyFactory.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/service/DefaultLoaderService.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/service/ManualImplementationLoaderService.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/AnnotationUtil.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ArrayUtil.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ClassUtil.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/CollectionUtil.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/GenericsUtil.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/PriorityClasses.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/SpecializationUtil.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/UrlSet.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/DefaultBeanArchiveInformation.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/DefaultBeanArchiveService.java
openwebbeans/trunk/webbeans-jms/src/main/java/org/apache/webbeans/jms/component/JmsComponentFactory.java
openwebbeans/trunk/webbeans-jms/src/main/java/org/apache/webbeans/jms/util/JmsProxyHandler.java
openwebbeans/trunk/webbeans-maven/src/main/java/org/apache/openwebbeans/maven/shade/OpenWebBeansPropertiesTransformer.java
openwebbeans/trunk/webbeans-osgi/src/main/java/org/apache/webbeans/osgi/scanner/OsgiMetaDataScannerService.java
openwebbeans/trunk/webbeans-resource/src/main/java/org/apache/webbeans/resource/spi/se/StandaloneResourceInjectionService.java
openwebbeans/trunk/webbeans-resource/src/main/java/org/apache/webbeans/resource/spi/se/StandaloneResourceProcessor.java
openwebbeans/trunk/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat7/ContextLifecycleListener.java
openwebbeans/trunk/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat7/TomcatInstanceManager.java
openwebbeans/trunk/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat7/TomcatSecurityFilter.java
openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/context/WebContextsService.java
openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/ServletContextBean.java
openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/ServletRequestBean.java
Modified:
openwebbeans/trunk/samples/conversation-sample/src/main/java/org/apache/webbeans/samples/conversation/Products.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/samples/conversation-sample/src/main/java/org/apache/webbeans/samples/conversation/Products.java?rev=1799087&r1=1799086&r2=1799087&view=diff
==============================================================================
---
openwebbeans/trunk/samples/conversation-sample/src/main/java/org/apache/webbeans/samples/conversation/Products.java
(original)
+++
openwebbeans/trunk/samples/conversation-sample/src/main/java/org/apache/webbeans/samples/conversation/Products.java
Sun Jun 18 13:57:08 2017
@@ -33,7 +33,7 @@ public class Products implements Seriali
{
private static final long serialVersionUID = 1L;
- private List<Item> products = new ArrayList<Item>();
+ private List<Item> products = new ArrayList<>();
public Products()
{
Modified:
openwebbeans/trunk/samples/conversation-sample/src/main/java/org/apache/webbeans/samples/conversation/ShoppingBean.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/samples/conversation-sample/src/main/java/org/apache/webbeans/samples/conversation/ShoppingBean.java?rev=1799087&r1=1799086&r2=1799087&view=diff
==============================================================================
---
openwebbeans/trunk/samples/conversation-sample/src/main/java/org/apache/webbeans/samples/conversation/ShoppingBean.java
(original)
+++
openwebbeans/trunk/samples/conversation-sample/src/main/java/org/apache/webbeans/samples/conversation/ShoppingBean.java
Sun Jun 18 13:57:08 2017
@@ -40,7 +40,7 @@ public class ShoppingBean implements Ser
private @Inject Conversation conversation;
- private List<Item> items = new ArrayList<Item>();
+ private List<Item> items = new ArrayList<>();
private UIData uiTable;
Modified:
openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/model/conversation/ConversationModel.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/model/conversation/ConversationModel.java?rev=1799087&r1=1799086&r2=1799087&view=diff
==============================================================================
---
openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/model/conversation/ConversationModel.java
(original)
+++
openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/model/conversation/ConversationModel.java
Sun Jun 18 13:57:08 2017
@@ -31,7 +31,7 @@ public class ConversationModel implement
{
private static final long serialVersionUID = -5042442586067259214L;
- private List<String> list = new ArrayList<String>();
+ private List<String> list = new ArrayList<>();
public void addNewBook(String name)
{
Modified:
openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/admin/AdminListBean.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/admin/AdminListBean.java?rev=1799087&r1=1799086&r2=1799087&view=diff
==============================================================================
---
openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/admin/AdminListBean.java
(original)
+++
openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/admin/AdminListBean.java
Sun Jun 18 13:57:08 2017
@@ -39,7 +39,7 @@ public class AdminListBean implements Se
private static final long serialVersionUID = 2552807646330035889L;
- private List<Hotel> hotels = new ArrayList<Hotel>();
+ private List<Hotel> hotels = new ArrayList<>();
private HtmlDataTable model;
Modified:
openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/admin/AdminListUser.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/admin/AdminListUser.java?rev=1799087&r1=1799086&r2=1799087&view=diff
==============================================================================
---
openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/admin/AdminListUser.java
(original)
+++
openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/admin/AdminListUser.java
Sun Jun 18 13:57:08 2017
@@ -37,13 +37,13 @@ import org.apache.webbeans.reservation.e
@RequestScoped
public class AdminListUser
{
- private List<User> users = new ArrayList<User>();
+ private List<User> users = new ArrayList<>();
private @Inject @Default AdminController controller;
private HtmlDataTable model;
- private List<Hotel> hotels = new ArrayList<Hotel>();
+ private List<Hotel> hotels = new ArrayList<>();
public AdminListUser()
{
Modified:
openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/user/UserListBean.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/user/UserListBean.java?rev=1799087&r1=1799086&r2=1799087&view=diff
==============================================================================
---
openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/user/UserListBean.java
(original)
+++
openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/user/UserListBean.java
Sun Jun 18 13:57:08 2017
@@ -37,7 +37,7 @@ import org.apache.webbeans.reservation.u
public class UserListBean
{
- private List<Reservation> reservations = new ArrayList<Reservation>();
+ private List<Reservation> reservations = new ArrayList<>();
private HtmlDataTable model;
Modified:
openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/user/UserReservationBean.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/user/UserReservationBean.java?rev=1799087&r1=1799086&r2=1799087&view=diff
==============================================================================
---
openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/user/UserReservationBean.java
(original)
+++
openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/user/UserReservationBean.java
Sun Jun 18 13:57:08 2017
@@ -47,11 +47,11 @@ public class UserReservationBean impleme
{
private static final long serialVersionUID = -5860989760497059459L;
- private List<SelectItem> reservations = new ArrayList<SelectItem>();
+ private List<SelectItem> reservations = new ArrayList<>();
private @Inject @Default UserController controller;
- private List<Hotel> hotels = new ArrayList<Hotel>();
+ private List<Hotel> hotels = new ArrayList<>();
private @Inject @Default AdminController adminController;
@@ -65,7 +65,7 @@ public class UserReservationBean impleme
private Integer[] itemSelected = new Integer[0];
- private Map<String, ReservationModel> models = new HashMap<String,
ReservationModel>();
+ private Map<String, ReservationModel> models = new HashMap<>();
public UserReservationBean()
{
Modified:
openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/controller/admin/AdminController.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/controller/admin/AdminController.java?rev=1799087&r1=1799086&r2=1799087&view=diff
==============================================================================
---
openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/controller/admin/AdminController.java
(original)
+++
openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/controller/admin/AdminController.java
Sun Jun 18 13:57:08 2017
@@ -119,7 +119,7 @@ public class AdminController
User user = (User)query.getSingleResult();
- Set<Hotel> hotels = new HashSet<Hotel>();
+ Set<Hotel> hotels = new HashSet<>();
Set<Reservation> reservations = user.getReservations();
Modified:
openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/controller/user/UserController.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/controller/user/UserController.java?rev=1799087&r1=1799086&r2=1799087&view=diff
==============================================================================
---
openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/controller/user/UserController.java
(original)
+++
openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/controller/user/UserController.java
Sun Jun 18 13:57:08 2017
@@ -127,7 +127,7 @@ public class UserController
Set<Reservation> res = user.getReservations();
- List<Reservation> l = new ArrayList<Reservation>();
+ List<Reservation> l = new ArrayList<>();
for(Reservation r : res)
{
l.add(r);
Modified:
openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/entity/User.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/entity/User.java?rev=1799087&r1=1799086&r2=1799087&view=diff
==============================================================================
---
openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/entity/User.java
(original)
+++
openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/entity/User.java
Sun Jun 18 13:57:08 2017
@@ -58,7 +58,7 @@ public class User
private Date registerDate;
@OneToMany(mappedBy = "user", cascade = CascadeType.ALL)
- private Set<Reservation> reservations = new HashSet<Reservation>();
+ private Set<Reservation> reservations = new HashSet<>();
@Version
private int version;
Modified:
openwebbeans/trunk/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/OwbArquillianSingletonService.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/OwbArquillianSingletonService.java?rev=1799087&r1=1799086&r2=1799087&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/OwbArquillianSingletonService.java
(original)
+++
openwebbeans/trunk/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/OwbArquillianSingletonService.java
Sun Jun 18 13:57:08 2017
@@ -53,7 +53,7 @@ public class OwbArquillianSingletonServi
{
ScannerService dummyScannerService = new OwbArquillianScannerService();
- Map<Class<?>, Object> initialServices = new HashMap<Class<?>,
Object>();
+ Map<Class<?>, Object> initialServices = new HashMap<>();
initialServices.put(ScannerService.class, dummyScannerService);
// this is needed because of a dirty hack in the
OpenWebBeansConfiguration
Modified:
openwebbeans/trunk/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/OwbSWClassLoader.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/OwbSWClassLoader.java?rev=1799087&r1=1799086&r2=1799087&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/OwbSWClassLoader.java
(original)
+++
openwebbeans/trunk/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/OwbSWClassLoader.java
Sun Jun 18 13:57:08 2017
@@ -63,7 +63,7 @@ public class OwbSWClassLoader extends UR
}
};
- private final List<InputStream> openedStreams = new
ArrayList<InputStream>();
+ private final List<InputStream> openedStreams = new ArrayList<>();
private final String prefix;
private final boolean useOnlyArchiveResources;
private final Archive<?> archive;
@@ -118,7 +118,7 @@ public class OwbSWClassLoader extends UR
Enumeration<URL> urls = findResources(name);
if (useOnlyArchiveResourcesExcludes.contains(name))
{
- Collection<URL> returnValue = new
ArrayList<URL>(Collections.list(urls));
+ Collection<URL> returnValue = new
ArrayList<>(Collections.list(urls));
returnValue.addAll(Collections.list(super.getResources(name)));
return Collections.enumeration(returnValue);
}
Modified:
openwebbeans/trunk/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/OwbStandaloneContainer.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/OwbStandaloneContainer.java?rev=1799087&r1=1799086&r2=1799087&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/OwbStandaloneContainer.java
(original)
+++
openwebbeans/trunk/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/OwbStandaloneContainer.java
Sun Jun 18 13:57:08 2017
@@ -57,9 +57,9 @@ public class OwbStandaloneContainer impl
private OwbArquillianSingletonService singletonService;
private WebBeansContext webBeansContext;
- private final ThreadLocal<ClassLoader> originalLoader = new
ThreadLocal<ClassLoader>();
+ private final ThreadLocal<ClassLoader> originalLoader = new
ThreadLocal<>();
private boolean useOnlyArchiveResources;
- private Collection<String> useOnlyArchiveResourcesExcludes = new
ArrayList<String>();
+ private Collection<String> useOnlyArchiveResourcesExcludes = new
ArrayList<>();
@Override
public Class<OwbStandaloneConfiguration> getConfigurationClass()
Modified:
openwebbeans/trunk/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/UrlSet.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/UrlSet.java?rev=1799087&r1=1799086&r2=1799087&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/UrlSet.java
(original)
+++
openwebbeans/trunk/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/UrlSet.java
Sun Jun 18 13:57:08 2017
@@ -34,7 +34,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
Modified:
openwebbeans/trunk/webbeans-ee/src/main/java/org/apache/webbeans/ee/beans/UserTransactionBean.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-ee/src/main/java/org/apache/webbeans/ee/beans/UserTransactionBean.java?rev=1799087&r1=1799086&r2=1799087&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-ee/src/main/java/org/apache/webbeans/ee/beans/UserTransactionBean.java
(original)
+++
openwebbeans/trunk/webbeans-ee/src/main/java/org/apache/webbeans/ee/beans/UserTransactionBean.java
Sun Jun 18 13:57:08 2017
@@ -35,8 +35,8 @@ public class UserTransactionBean extends
super(webBeansContext,
WebBeansType.USERTRANSACTION,
UserTransaction.class,
- new SimpleProducerFactory<UserTransaction>(
- new
ProviderBasedProducer<UserTransaction>(webBeansContext, UserTransaction.class,
new UserTransactionProvider(webBeansContext), true)));
+ new SimpleProducerFactory<>(
+ new ProviderBasedProducer<>(webBeansContext,
UserTransaction.class, new UserTransactionProvider(webBeansContext), true)));
}
@Override
Modified:
openwebbeans/trunk/webbeans-ee/src/main/java/org/apache/webbeans/ee/beans/ValidatorBean.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-ee/src/main/java/org/apache/webbeans/ee/beans/ValidatorBean.java?rev=1799087&r1=1799086&r2=1799087&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-ee/src/main/java/org/apache/webbeans/ee/beans/ValidatorBean.java
(original)
+++
openwebbeans/trunk/webbeans-ee/src/main/java/org/apache/webbeans/ee/beans/ValidatorBean.java
Sun Jun 18 13:57:08 2017
@@ -35,7 +35,7 @@ public class ValidatorBean extends Built
super(webBeansContext,
WebBeansType.VALIDATION,
Validator.class,
- new SimpleProducerFactory<Validator>(new
ProviderBasedProducer<Validator>(webBeansContext, Validator.class, new
ValidatorProvider(webBeansContext), true)));
+ new SimpleProducerFactory<>(new
ProviderBasedProducer<>(webBeansContext, Validator.class, new
ValidatorProvider(webBeansContext), true)));
}
@Override
Modified:
openwebbeans/trunk/webbeans-ee/src/main/java/org/apache/webbeans/ee/beans/ValidatorFactoryBean.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-ee/src/main/java/org/apache/webbeans/ee/beans/ValidatorFactoryBean.java?rev=1799087&r1=1799086&r2=1799087&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-ee/src/main/java/org/apache/webbeans/ee/beans/ValidatorFactoryBean.java
(original)
+++
openwebbeans/trunk/webbeans-ee/src/main/java/org/apache/webbeans/ee/beans/ValidatorFactoryBean.java
Sun Jun 18 13:57:08 2017
@@ -35,8 +35,8 @@ public class ValidatorFactoryBean extend
super(webBeansContext,
WebBeansType.VALIDATIONFACT,
ValidatorFactory.class,
- new SimpleProducerFactory<ValidatorFactory>(
- new
ProviderBasedProducer<ValidatorFactory>(webBeansContext,
ValidatorFactory.class, new ValidatorFactoryProvider(webBeansContext), true)));
+ new SimpleProducerFactory<>(
+ new ProviderBasedProducer<>(webBeansContext,
ValidatorFactory.class, new ValidatorFactoryProvider(webBeansContext), true)));
}
@Override
Modified:
openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/component/BaseEjbBean.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/component/BaseEjbBean.java?rev=1799087&r1=1799086&r2=1799087&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/component/BaseEjbBean.java
(original)
+++
openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/component/BaseEjbBean.java
Sun Jun 18 13:57:08 2017
@@ -48,7 +48,7 @@ public abstract class BaseEjbBean<T> ext
protected final SessionBeanType ejbType;
/** Map of proxy instances to the dependent SFSB they've acquired but not
yet removed */
- private Map<Object, Object> dependentSFSBToBeRemoved = new
ConcurrentHashMap<Object, Object>();
+ private Map<Object, Object> dependentSFSBToBeRemoved = new
ConcurrentHashMap<>();
/**
* Creates a new instance of the session bean.
Modified:
openwebbeans/trunk/webbeans-gradle/src/main/java/org/apache/openwebbeans/gradle/shadow/OpenWebBeansPropertiesTransformer.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-gradle/src/main/java/org/apache/openwebbeans/gradle/shadow/OpenWebBeansPropertiesTransformer.java?rev=1799087&r1=1799086&r2=1799087&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-gradle/src/main/java/org/apache/openwebbeans/gradle/shadow/OpenWebBeansPropertiesTransformer.java
(original)
+++
openwebbeans/trunk/webbeans-gradle/src/main/java/org/apache/openwebbeans/gradle/shadow/OpenWebBeansPropertiesTransformer.java
Sun Jun 18 13:57:08 2017
@@ -32,7 +32,7 @@ import java.util.Properties;
// note: it is very important to not bring webbeans-impl in the classpath
there cause of gradle dep mecanism
public class OpenWebBeansPropertiesTransformer implements Transformer
{
- private final List<Properties> configurations = new
ArrayList<Properties>();
+ private final List<Properties> configurations = new ArrayList<>();
private String resource = "META-INF/openwebbeans/openwebbeans.properties";
private String ordinalKey = "configuration.ordinal";
@@ -104,7 +104,7 @@ public class OpenWebBeansPropertiesTrans
private 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/annotation/AnnotationManager.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/AnnotationManager.java?rev=1799087&r1=1799086&r2=1799087&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/AnnotationManager.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/AnnotationManager.java
Sun Jun 18 13:57:08 2017
@@ -68,9 +68,9 @@ import java.util.concurrent.ConcurrentHa
public final class AnnotationManager
{
private Map<Class<? extends Annotation>, Boolean>
checkedQualifierAnnotations =
- new ConcurrentHashMap<Class<? extends Annotation>, Boolean>();
+ new ConcurrentHashMap<>();
private Map<Class<? extends Annotation>, Boolean>
checkedStereotypeAnnotations =
- new ConcurrentHashMap<Class<? extends Annotation>, Boolean>();
+ new ConcurrentHashMap<>();
private final BeanManagerImpl beanManagerImpl;
private final WebBeansContext webBeansContext;
@@ -127,7 +127,7 @@ public final class AnnotationManager
public Set<Annotation> getInterceptorAnnotations(Set<Annotation> typeAnns)
{
// use a map to ensure that every annotation type is present only once
- Map<Class<? extends Annotation>, Annotation> bindings = new
HashMap<Class<? extends Annotation>, Annotation>();
+ Map<Class<? extends Annotation>, Annotation> bindings = new
HashMap<>();
Annotation[] anns = getInterceptorBindingMetaAnnotations(typeAnns);
@@ -146,7 +146,7 @@ public final class AnnotationManager
// check for stereotypes _explicitly_ declared on the bean class (not
inherited)
Annotation[] stereoTypes =
getStereotypeMetaAnnotations(typeAnns.toArray(new Annotation[typeAnns.size()]));
- Map<Class<? extends Annotation>, Annotation> annotationsFromSteretypes
= new HashMap<Class<? extends Annotation>, Annotation>();
+ Map<Class<? extends Annotation>, Annotation> annotationsFromSteretypes
= new HashMap<>();
for (Annotation stereoType : stereoTypes)
{
if
(hasInterceptorBindingMetaAnnotation(stereoType.annotationType().getDeclaredAnnotations()))
@@ -179,7 +179,7 @@ public final class AnnotationManager
}
}
- return new HashSet<Annotation>(bindings.values());
+ return new HashSet<>(bindings.values());
}
/**
@@ -225,7 +225,7 @@ public final class AnnotationManager
public Annotation[] getInterceptorBindingMetaAnnotations(Annotation[] anns)
{
Asserts.assertNotNull(anns, Asserts.PARAM_NAME_ANNOTATION);
- List<Annotation> interAnns = new ArrayList<Annotation>();
+ List<Annotation> interAnns = new ArrayList<>();
for (Annotation ann : anns)
{
@@ -291,7 +291,7 @@ public final class AnnotationManager
Asserts.assertNotNull(annotatedMethod, "annotatedMethod");
Asserts.nullCheckForClass(clazz);
- List<Annotation> list = new ArrayList<Annotation>();
+ List<Annotation> list = new ArrayList<>();
List<AnnotatedParameter<X>> parameters =
annotatedMethod.getParameters();
for(AnnotatedParameter<X> parameter : parameters)
{
@@ -328,7 +328,7 @@ public final class AnnotationManager
Asserts.nullCheckForClass(clazz);
Annotation[][] parameterAnns = method.getParameterAnnotations();
- List<Annotation> list = new ArrayList<Annotation>();
+ List<Annotation> list = new ArrayList<>();
Annotation[] result;
for (Annotation[] parameters : parameterAnns)
@@ -382,7 +382,7 @@ public final class AnnotationManager
return DefaultLiteral.SET;
}
- Set<Annotation> set = new HashSet<Annotation>();
+ Set<Annotation> set = new HashSet<>();
for (Annotation annot : anns)
{
@@ -495,7 +495,7 @@ public final class AnnotationManager
*/
public boolean isStereoTypeAnnotation(Class<? extends Annotation> clazz)
{
- return isStereoTypeAnnotation(clazz, new HashSet<Class<? extends
Annotation>>());
+ return isStereoTypeAnnotation(clazz, new HashSet<>());
}
private boolean isStereoTypeAnnotation(Class<? extends Annotation> clazz,
Set<Class<? extends Annotation>> checkedAnnotations)
@@ -570,7 +570,7 @@ public final class AnnotationManager
public Annotation[] getStereotypeMetaAnnotations(Annotation[] anns)
{
Asserts.assertNotNull(anns, Asserts.PARAM_NAME_ANNOTATION);
- List<Annotation> interAnns = new ArrayList<Annotation>();
+ List<Annotation> interAnns = new ArrayList<>();
for (Annotation ann : anns)
{
@@ -596,7 +596,7 @@ public final class AnnotationManager
public Set<Class<? extends Annotation>>
getStereotypeMetaAnnotations(Set<Class<? extends Annotation>> stereotypes)
{
Asserts.assertNotNull(stereotypes, Asserts.PARAM_NAME_ANNOTATION);
- Set<Class<? extends Annotation>> interAnns = new HashSet<Class<?
extends Annotation>>();
+ Set<Class<? extends Annotation>> interAnns = new HashSet<>();
for (Class<? extends Annotation> ann : stereotypes)
{
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/BeanAttributesImpl.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/BeanAttributesImpl.java?rev=1799087&r1=1799086&r2=1799087&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/BeanAttributesImpl.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/BeanAttributesImpl.java
Sun Jun 18 13:57:08 2017
@@ -98,14 +98,14 @@ public class BeanAttributesImpl<T> imple
Set<Class<? extends Annotation>> stereotypes,
boolean alternative)
{
- this.types = types == null? Collections.<Type>emptySet():
Collections.unmodifiableSet(new HashSet<Type>(types));
- this.qualifiers = qualifiers == null?
Collections.<Annotation>emptySet(): Collections.unmodifiableSet(new
HashSet<Annotation>(qualifiers));
+ this.types = types == null? Collections.<Type>emptySet():
Collections.unmodifiableSet(new HashSet<>(types));
+ this.qualifiers = qualifiers == null?
Collections.<Annotation>emptySet(): Collections.unmodifiableSet(new
HashSet<>(qualifiers));
this.scope = scope;
this.name = name;
this.nullable = nullable;
this.stereotypes = stereotypes == null
? Collections.<Class<? extends Annotation>>emptySet()
- : Collections.unmodifiableSet(new HashSet<Class<? extends
Annotation>>(stereotypes));
+ : Collections.unmodifiableSet(new HashSet<>(stereotypes));
this.alternative = alternative;
}
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/BeanManagerBean.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/BeanManagerBean.java?rev=1799087&r1=1799086&r2=1799087&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/BeanManagerBean.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/BeanManagerBean.java
Sun Jun 18 13:57:08 2017
@@ -33,10 +33,10 @@ public class BeanManagerBean extends Bui
{
super(webBeansContext,
WebBeansType.MANAGER,
- new
BeanAttributesImpl<BeanManager>(CollectionUtil.<Type>unmodifiableSet(BeanManager.class,
Object.class), AnnotationUtil.DEFAULT_AND_ANY_ANNOTATION),
+ new
BeanAttributesImpl<>(CollectionUtil.<Type>unmodifiableSet(BeanManager.class,
Object.class), AnnotationUtil.DEFAULT_AND_ANY_ANNOTATION),
BeanManager.class,
false,
- new SimpleProducerFactory<BeanManager>(new
BeanManagerProducer(webBeansContext)));
+ new SimpleProducerFactory<>(new
BeanManagerProducer(webBeansContext)));
}
/**
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/BeanMetadataBean.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/BeanMetadataBean.java?rev=1799087&r1=1799086&r2=1799087&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/BeanMetadataBean.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/BeanMetadataBean.java
Sun Jun 18 13:57:08 2017
@@ -41,10 +41,10 @@ public class BeanMetadataBean<T> extends
{
super(webBeansContext,
WebBeansType.METADATA,
- new
BeanAttributesImpl<Bean<T>>(CollectionUtil.<Type>unmodifiableSet(Bean.class,
Contextual.class, Object.class)),
+ new
BeanAttributesImpl<>(CollectionUtil.<Type>unmodifiableSet(Bean.class,
Contextual.class, Object.class)),
new TypeLiteral<Bean<T>>(){}.getRawType(),
false,
- new SimpleProducerFactory<Bean<T>>(new
MetadataProducer<Bean<T>>()));
+ new SimpleProducerFactory<>(new MetadataProducer<Bean<T>>()));
}
/* (non-Javadoc)
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/BuiltInOwbBean.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/BuiltInOwbBean.java?rev=1799087&r1=1799086&r2=1799087&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/BuiltInOwbBean.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/BuiltInOwbBean.java
Sun Jun 18 13:57:08 2017
@@ -18,8 +18,6 @@
*/
package org.apache.webbeans.component;
-import java.lang.reflect.Type;
-
import javax.enterprise.inject.spi.Producer;
import org.apache.webbeans.util.Asserts;
@@ -35,7 +33,7 @@ public abstract class BuiltInOwbBean<T>
protected BuiltInOwbBean(WebBeansContext webBeansContext, WebBeansType
webBeansType, Class<T> returnType, ProducerFactory<T> producerFactory)
{
- this(webBeansContext, webBeansType, new
BeanAttributesImpl<T>(CollectionUtil.<Type>unmodifiableSet(returnType,
Object.class)), returnType, false, producerFactory);
+ this(webBeansContext, webBeansType, new
BeanAttributesImpl<>(CollectionUtil.unmodifiableSet(returnType, Object.class)),
returnType, false, producerFactory);
}
protected BuiltInOwbBean(
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ConversationBean.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ConversationBean.java?rev=1799087&r1=1799086&r2=1799087&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ConversationBean.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ConversationBean.java
Sun Jun 18 13:57:08 2017
@@ -46,18 +46,18 @@ public class ConversationBean extends Bu
{
super(webBeansContext,
WebBeansType.CONVERSATION,
- new BeanAttributesImpl<ConversationImpl>(
- CollectionUtil.<Type>unmodifiableSet(Conversation.class,
ConversationImpl.class, Object.class),
- AnnotationUtil.DEFAULT_AND_ANY_ANNOTATION,
- RequestScoped.class,
- "javax.enterprise.context.conversation",
- false,
- Collections.<Class<? extends Annotation>>emptySet(),
- false),
+ new BeanAttributesImpl<>(
+ CollectionUtil.<Type>unmodifiableSet(Conversation.class,
ConversationImpl.class, Object.class),
+ AnnotationUtil.DEFAULT_AND_ANY_ANNOTATION,
+ RequestScoped.class,
+ "javax.enterprise.context.conversation",
+ false,
+ Collections.<Class<? extends Annotation>>emptySet(),
+ false),
ConversationImpl.class,
false,
- new SimpleProducerFactory<ConversationImpl>(
- new
ConversationProducer(webBeansContext.getAnnotatedElementFactory().newAnnotatedType(ConversationImpl.class),
webBeansContext)));
+ new SimpleProducerFactory<>(
+ new
ConversationProducer(webBeansContext.getAnnotatedElementFactory().newAnnotatedType(ConversationImpl.class),
webBeansContext)));
setEnabled(true);
}
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/DecoratorBean.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/DecoratorBean.java?rev=1799087&r1=1799086&r2=1799087&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/DecoratorBean.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/DecoratorBean.java
Sun Jun 18 13:57:08 2017
@@ -55,7 +55,7 @@ public class DecoratorBean<T> extends In
BeanAttributes<T> beanAttributes,
Class<T> beanClass)
{
- super(webBeansContext, webBeansType, annotatedType, beanAttributes,
beanClass, new DecoratorInjectionTargetFactory<T>(annotatedType,
webBeansContext));
+ super(webBeansContext, webBeansType, annotatedType, beanAttributes,
beanClass, new DecoratorInjectionTargetFactory<>(annotatedType,
webBeansContext));
}
public void setDecoratorInfo(Set<Type> decoratedTypes, Type delegateType,
Set<Annotation> delegateQualifiers)
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/DecoratorMetadataBean.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/DecoratorMetadataBean.java?rev=1799087&r1=1799086&r2=1799087&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/DecoratorMetadataBean.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/DecoratorMetadataBean.java
Sun Jun 18 13:57:08 2017
@@ -40,10 +40,10 @@ public class DecoratorMetadataBean<T> ex
{
super(webBeansContext,
WebBeansType.METADATA,
- new
BeanAttributesImpl<Decorator<T>>(CollectionUtil.<Type>unmodifiableSet(Decorator.class,
Object.class)),
+ new
BeanAttributesImpl<>(CollectionUtil.<Type>unmodifiableSet(Decorator.class,
Object.class)),
new TypeLiteral<Decorator<T>>(){}.getRawType(),
false,
- new SimpleProducerFactory<Decorator<T>>(new
MetadataProducer<Decorator<T>>()));
+ new SimpleProducerFactory<>(new
MetadataProducer<Decorator<T>>()));
}
/* (non-Javadoc)
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/EventBean.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/EventBean.java?rev=1799087&r1=1799086&r2=1799087&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/EventBean.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/EventBean.java
Sun Jun 18 13:57:08 2017
@@ -45,10 +45,12 @@ public class EventBean<T> extends BuiltI
{
super(webBeansContext,
WebBeansType.OBSERVABLE,
- new
BeanAttributesImpl<Event<T>>(CollectionUtil.<Type>unmodifiableSet(new
TypeLiteral<Event<T>>() {}.getRawType(), Object.class)),
+ new
BeanAttributesImpl<>(CollectionUtil.<Type>unmodifiableSet(new
TypeLiteral<Event<T>>()
+ {
+ }.getRawType(), Object.class)),
new TypeLiteral<Event<T>>(){}.getRawType(),
false,
- new SimpleProducerFactory<Event<T>>(new
EventProducer<T>(webBeansContext)));
+ new SimpleProducerFactory<>(new
EventProducer<T>(webBeansContext)));
}
/* (non-Javadoc)
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/EventMetadataBean.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/EventMetadataBean.java?rev=1799087&r1=1799086&r2=1799087&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/EventMetadataBean.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/EventMetadataBean.java
Sun Jun 18 13:57:08 2017
@@ -38,10 +38,10 @@ public class EventMetadataBean extends B
{
super(webBeansContext,
WebBeansType.METADATA,
- new
BeanAttributesImpl<EventMetadata>(CollectionUtil.<Type>unmodifiableSet(EventMetadata.class,
Object.class)),
+ new
BeanAttributesImpl<>(CollectionUtil.<Type>unmodifiableSet(EventMetadata.class,
Object.class)),
EventMetadata.class,
false,
- new SimpleProducerFactory<EventMetadata>(new
EventMetadataProducer()));
+ new SimpleProducerFactory<>(new EventMetadataProducer()));
}
/* (non-Javadoc)
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ExtensionBean.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ExtensionBean.java?rev=1799087&r1=1799086&r2=1799087&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ExtensionBean.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ExtensionBean.java
Sun Jun 18 13:57:08 2017
@@ -41,14 +41,14 @@ public class ExtensionBean<T> extends Bu
public ExtensionBean(WebBeansContext webBeansContext, Class<T> returnType)
{
super(webBeansContext,
- WebBeansType.EXTENSION,
- new BeanAttributesImpl<T>(
-
webBeansContext.getAnnotatedElementFactory().getAnnotatedType(returnType).getTypeClosure(),
- AnnotationUtil.DEFAULT_AND_ANY_ANNOTATION,
- ApplicationScoped.class),
- returnType,
- false,
- new
ExtensionProducerFactory<T>(webBeansContext.getAnnotatedElementFactory().getAnnotatedType(returnType),
webBeansContext));
+ WebBeansType.EXTENSION,
+ new BeanAttributesImpl<>(
+
webBeansContext.getAnnotatedElementFactory().getAnnotatedType(returnType).getTypeClosure(),
+ AnnotationUtil.DEFAULT_AND_ANY_ANNOTATION,
+ ApplicationScoped.class),
+ returnType,
+ false,
+ new
ExtensionProducerFactory<>(webBeansContext.getAnnotatedElementFactory().getAnnotatedType(returnType),
webBeansContext));
}
@Override
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ExtensionProducerFactory.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ExtensionProducerFactory.java?rev=1799087&r1=1799086&r2=1799087&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ExtensionProducerFactory.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ExtensionProducerFactory.java
Sun Jun 18 13:57:08 2017
@@ -46,6 +46,6 @@ public class ExtensionProducerFactory<T>
@Override
public <P> Producer<P> createProducer(Bean<P> bean)
{
- return new ExtensionProducer<P>((AnnotatedType<P>)annotatedType, bean,
webBeansContext);
+ return new ExtensionProducer<>((AnnotatedType<P>) annotatedType, bean,
webBeansContext);
}
}
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionPointBean.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionPointBean.java?rev=1799087&r1=1799086&r2=1799087&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionPointBean.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionPointBean.java
Sun Jun 18 13:57:08 2017
@@ -44,10 +44,10 @@ public class InjectionPointBean extends
{
super(webBeansContext,
WebBeansType.INJECTIONPOINT,
- new
BeanAttributesImpl<InjectionPoint>(CollectionUtil.<Type>unmodifiableSet(InjectionPoint.class,
Object.class)),
+ new
BeanAttributesImpl<>(CollectionUtil.<Type>unmodifiableSet(InjectionPoint.class,
Object.class)),
InjectionPoint.class,
false,
- new SimpleProducerFactory<InjectionPoint>(new
InjectionPointProducer()));
+ new SimpleProducerFactory<>(new InjectionPointProducer()));
}
/* (non-Javadoc)
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionTargetBean.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionTargetBean.java?rev=1799087&r1=1799086&r2=1799087&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionTargetBean.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionTargetBean.java
Sun Jun 18 13:57:08 2017
@@ -54,7 +54,7 @@ public class InjectionTargetBean<T> exte
BeanAttributes<T> beanAttributes,
Class<T> beanClass)
{
- this(webBeansContext, webBeansType, annotatedType, beanAttributes,
beanClass, new InjectionTargetFactoryImpl<T>(annotatedType, webBeansContext));
+ this(webBeansContext, webBeansType, annotatedType, beanAttributes,
beanClass, new InjectionTargetFactoryImpl<>(annotatedType, webBeansContext));
}
/**
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InstanceBean.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InstanceBean.java?rev=1799087&r1=1799086&r2=1799087&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InstanceBean.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InstanceBean.java
Sun Jun 18 13:57:08 2017
@@ -37,15 +37,21 @@ public class InstanceBean<T> extends Bui
public InstanceBean(WebBeansContext webBeansContext)
{
super(webBeansContext,
- WebBeansType.INSTANCE,
- new
BeanAttributesImpl<Instance<T>>(CollectionUtil.<Type>unmodifiableSet(
- new TypeLiteral<Instance<T>>(){}.getRawType(),
- new TypeLiteral<Provider<T>>() {}.getRawType(),
- Object.class)),
- new TypeLiteral<Instance<T>>(){}.getRawType(),
- false,
- new SimpleProducerFactory<Instance<T>>(
- new InstanceProducer<T>(new
TypeLiteral<Instance<T>>(){}.getRawType(),
AnnotationUtil.DEFAULT_AND_ANY_ANNOTATION, webBeansContext)));
+ WebBeansType.INSTANCE,
+ new BeanAttributesImpl<>(CollectionUtil.<Type>unmodifiableSet(
+ new TypeLiteral<Instance<T>>()
+ {
+ }.getRawType(),
+ new TypeLiteral<Provider<T>>()
+ {
+ }.getRawType(),
+ Object.class)),
+ new TypeLiteral<Instance<T>>(){}.getRawType(),
+ false,
+ new SimpleProducerFactory<>(
+ new InstanceProducer<>(new TypeLiteral<Instance<T>>()
+ {
+ }.getRawType(), AnnotationUtil.DEFAULT_AND_ANY_ANNOTATION,
webBeansContext)));
}
/* (non-Javadoc)
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InterceptedOrDecoratedBeanMetadataBean.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InterceptedOrDecoratedBeanMetadataBean.java?rev=1799087&r1=1799086&r2=1799087&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InterceptedOrDecoratedBeanMetadataBean.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InterceptedOrDecoratedBeanMetadataBean.java
Sun Jun 18 13:57:08 2017
@@ -44,13 +44,17 @@ public class InterceptedOrDecoratedBeanM
public InterceptedOrDecoratedBeanMetadataBean(WebBeansContext
webBeansContext)
{
super(webBeansContext,
- WebBeansType.METADATA,
- new BeanAttributesImpl<Bean<T>>(
- CollectionUtil.<Type>unmodifiableSet(Bean.class,
Contextual.class, Object.class),
- CollectionUtil.<Annotation>unmodifiableSet(new
AnnotationLiteral<Intercepted>() {}, new AnnotationLiteral<Decorated>() {})),
- new TypeLiteral<Bean<T>>(){}.getRawType(),
- false,
- new SimpleProducerFactory<Bean<T>>(new
BeanMetadataProducer<Bean<T>>()));
+ WebBeansType.METADATA,
+ new BeanAttributesImpl<>(
+ CollectionUtil.<Type>unmodifiableSet(Bean.class,
Contextual.class, Object.class),
+ CollectionUtil.<Annotation>unmodifiableSet(new
AnnotationLiteral<Intercepted>()
+ {
+ }, new AnnotationLiteral<Decorated>()
+ {
+ })),
+ new TypeLiteral<Bean<T>>(){}.getRawType(),
+ false,
+ new SimpleProducerFactory<>(new BeanMetadataProducer<Bean<T>>()));
}
/* (non-Javadoc)
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InterceptorBean.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InterceptorBean.java?rev=1799087&r1=1799086&r2=1799087&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InterceptorBean.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InterceptorBean.java
Sun Jun 18 13:57:08 2017
@@ -58,11 +58,11 @@ public abstract class InterceptorBean<T>
protected Method aroundInvokeMethod;
protected InterceptorBean(WebBeansContext webBeansContext,
- AnnotatedType<T> annotatedType,
- BeanAttributes<T> beanAttributes,
- Class<T> beanClass,
- Map<InterceptionType, Method[]>
interceptionMethods,
- InjectionTargetFactoryImpl<T> factory)
+ AnnotatedType<T> annotatedType,
+ BeanAttributes<T> beanAttributes,
+ Class<T> beanClass,
+ Map<InterceptionType, Method[]>
interceptionMethods,
+ InjectionTargetFactoryImpl<T> factory)
{
super(webBeansContext,
WebBeansType.INTERCEPTOR,
@@ -97,7 +97,7 @@ public abstract class InterceptorBean<T>
Map<InterceptionType, Method[]> interceptionMethods)
{
this(webBeansContext, annotatedType, beanAttributes, beanClass,
interceptionMethods,
- new InterceptorInjectionTargetFactory<T>(annotatedType,
webBeansContext));
+ new InterceptorInjectionTargetFactory<>(annotatedType,
webBeansContext));
}
/**
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InterceptorMetadataBean.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InterceptorMetadataBean.java?rev=1799087&r1=1799086&r2=1799087&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InterceptorMetadataBean.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InterceptorMetadataBean.java
Sun Jun 18 13:57:08 2017
@@ -39,11 +39,11 @@ public class InterceptorMetadataBean<T>
public InterceptorMetadataBean(WebBeansContext webBeansContext)
{
super(webBeansContext,
- WebBeansType.METADATA,
- new
BeanAttributesImpl<Interceptor<T>>(CollectionUtil.<Type>unmodifiableSet(Interceptor.class,
Object.class)),
- new TypeLiteral<Interceptor<T>>(){}.getRawType(),
- false,
- new SimpleProducerFactory<Interceptor<T>>(new
MetadataProducer<Interceptor<T>>()));
+ WebBeansType.METADATA,
+ new
BeanAttributesImpl<>(CollectionUtil.<Type>unmodifiableSet(Interceptor.class,
Object.class)),
+ new TypeLiteral<Interceptor<T>>(){}.getRawType(),
+ false,
+ new SimpleProducerFactory<>(new
MetadataProducer<Interceptor<T>>()));
}
/* (non-Javadoc)
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/PrincipalBean.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/PrincipalBean.java?rev=1799087&r1=1799086&r2=1799087&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/PrincipalBean.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/PrincipalBean.java
Sun Jun 18 13:57:08 2017
@@ -31,7 +31,7 @@ public class PrincipalBean extends Built
super(webBeansContext,
WebBeansType.PRINCIPAL,
Principal.class,
- new SimpleProducerFactory<Principal>(new
ProviderBasedProducer<Principal>(webBeansContext, Principal.class, new
PrincipalProvider(webBeansContext), true)));
+ new SimpleProducerFactory<>(new
ProviderBasedProducer<>(webBeansContext, Principal.class, new
PrincipalProvider(webBeansContext), true)));
}
@Override
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/SelfInterceptorBean.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/SelfInterceptorBean.java?rev=1799087&r1=1799086&r2=1799087&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/SelfInterceptorBean.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/SelfInterceptorBean.java
Sun Jun 18 13:57:08 2017
@@ -49,7 +49,7 @@ public class SelfInterceptorBean<T> exte
Map<InterceptionType, Method[]>
interceptionMethods)
{
super(webBeansContext, annotatedType, beanAttributes, beanClass,
interceptionMethods,
- new InjectionTargetFactoryImpl<T>(annotatedType,
webBeansContext));
+ new InjectionTargetFactoryImpl<>(annotatedType, webBeansContext));
}
public boolean isAroundInvoke()
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/BaseProducerFactory.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/BaseProducerFactory.java?rev=1799087&r1=1799086&r2=1799087&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/BaseProducerFactory.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/BaseProducerFactory.java
Sun Jun 18 13:57:08 2017
@@ -65,7 +65,7 @@ public abstract class BaseProducerFactor
Set<InjectionPoint> disposalIPs = null;
if (disposalMethod != null)
{
- disposalIPs = new
HashSet<InjectionPoint>(webBeansContext.getInjectionPointFactory().buildInjectionPoints(bean,
disposalMethod));
+ disposalIPs = new
HashSet<>(webBeansContext.getInjectionPointFactory().buildInjectionPoints(bean,
disposalMethod));
}
return disposalIPs;
}
@@ -78,7 +78,7 @@ public abstract class BaseProducerFactor
{
producerQualifiers = Collections.emptySet();
}
- Set<Annotation> producerQualifiersWithoutNamed = new
HashSet<Annotation>();
+ Set<Annotation> producerQualifiersWithoutNamed = new HashSet<>();
for (Annotation qualifier: producerQualifiers)
{
if (!qualifier.annotationType().equals(Named.class))
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/BeanAttributesBuilder.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/BeanAttributesBuilder.java?rev=1799087&r1=1799086&r2=1799087&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/BeanAttributesBuilder.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/BeanAttributesBuilder.java
Sun Jun 18 13:57:08 2017
@@ -76,9 +76,9 @@ public abstract class BeanAttributesBuil
protected WebBeansContext webBeansContext;
- protected Set<Type> types = new HashSet<Type>();
+ protected Set<Type> types = new HashSet<>();
- protected Set<Annotation> qualifiers = new HashSet<Annotation>();
+ protected Set<Annotation> qualifiers = new HashSet<>();
protected Class<? extends Annotation> scope;
@@ -129,7 +129,7 @@ public abstract class BeanAttributesBuil
defineQualifiers();
defineNullable();
defineAlternative();
- return new BeanAttributesImpl<T>(types, qualifiers, scope, name,
nullable, stereotypes, alternative);
+ return new BeanAttributesImpl<>(types, qualifiers, scope, name,
nullable, stereotypes, alternative);
}
protected A getAnnotated()
@@ -157,7 +157,7 @@ public abstract class BeanAttributesBuil
Class<?>[] typedTypes = beanTypes.value();
//New api types
- Set<Type> newTypes = new HashSet<Type>();
+ Set<Type> newTypes = new HashSet<>();
for (Class<?> type : typedTypes)
{
Type foundType = null;
@@ -207,7 +207,7 @@ public abstract class BeanAttributesBuil
protected void
defineQualifiers()
{
- HashSet<Class<? extends Annotation>> qualifiedTypes = new
HashSet<Class<? extends Annotation>>();
+ HashSet<Class<? extends Annotation>> qualifiedTypes = new HashSet<>();
if (annotated.isAnnotationPresent(Specializes.class))
{
defineQualifiers(getSuperAnnotated(), qualifiedTypes);
@@ -577,7 +577,7 @@ public abstract class BeanAttributesBuil
{
if (stereos == null)
{
- stereos = new HashSet<Class<? extends Annotation>>();
+ stereos = new HashSet<>();
}
stereos.add(stereo.annotationType());
}
@@ -610,17 +610,17 @@ public abstract class BeanAttributesBuil
public <T> BeanAttributesBuilder<T, AnnotatedType<T>>
newBeanAttibutes(AnnotatedType<T> annotatedType, boolean onlyScopedBeans)
{
- return new AnnotatedTypeBeanAttributesBuilder<T>(webBeansContext,
annotatedType, onlyScopedBeans);
+ return new AnnotatedTypeBeanAttributesBuilder<>(webBeansContext,
annotatedType, onlyScopedBeans);
}
public <T> BeanAttributesBuilder<T, AnnotatedField<T>>
newBeanAttibutes(AnnotatedField<T> annotatedField)
{
- return new AnnotatedFieldBeanAttributesBuilder<T>(webBeansContext,
annotatedField);
+ return new AnnotatedFieldBeanAttributesBuilder<>(webBeansContext,
annotatedField);
}
public <T> BeanAttributesBuilder<T, AnnotatedMethod<T>>
newBeanAttibutes(AnnotatedMethod<T> annotatedMethod)
{
- return new
AnnotatedMethodBeanAttributesBuilder<T>(webBeansContext, annotatedMethod);
+ return new AnnotatedMethodBeanAttributesBuilder<>(webBeansContext,
annotatedMethod);
}
}
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/CdiInterceptorBeanBuilder.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/CdiInterceptorBeanBuilder.java?rev=1799087&r1=1799086&r2=1799087&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/CdiInterceptorBeanBuilder.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/CdiInterceptorBeanBuilder.java
Sun Jun 18 13:57:08 2017
@@ -111,6 +111,6 @@ public class CdiInterceptorBeanBuilder<T
@Override
protected CdiInterceptorBean<T> createBean(Class<T> beanClass, boolean
enabled, Map<InterceptionType, Method[]> interceptionMethods)
{
- return new CdiInterceptorBean<T>(webBeansContext, annotatedType,
beanAttributes, beanClass, interceptorBindings, enabled, interceptionMethods);
+ return new CdiInterceptorBean<>(webBeansContext, annotatedType,
beanAttributes, beanClass, interceptorBindings, enabled, interceptionMethods);
}
}
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/DecoratorBeanBuilder.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/DecoratorBeanBuilder.java?rev=1799087&r1=1799086&r2=1799087&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/DecoratorBeanBuilder.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/DecoratorBeanBuilder.java
Sun Jun 18 13:57:08 2017
@@ -89,7 +89,7 @@ public class DecoratorBeanBuilder<T> ext
this.webBeansContext = webBeansContext;
this.annotatedType = annotatedType;
this.beanAttributes = beanAttributes;
- decoratedTypes = new HashSet<Type>(beanAttributes.getTypes());
+ decoratedTypes = new HashSet<>(beanAttributes.getTypes());
ignoredDecoratorInterfaces = getIgnoredDecoratorInterfaces();
}
@@ -264,7 +264,7 @@ public class DecoratorBeanBuilder<T> ext
public DecoratorBean<T> getBean()
{
- DecoratorBean<T> decorator = new DecoratorBean<T>(webBeansContext,
WebBeansType.MANAGED, annotatedType, beanAttributes,
annotatedType.getJavaClass());
+ DecoratorBean<T> decorator = new DecoratorBean<>(webBeansContext,
WebBeansType.MANAGED, annotatedType, beanAttributes,
annotatedType.getJavaClass());
decorator.setEnabled(webBeansContext.getDecoratorsManager().isDecoratorEnabled(annotatedType.getJavaClass()));
// we can only do this after the bean injection points got scanned
@@ -276,7 +276,7 @@ public class DecoratorBeanBuilder<T> ext
protected List<AnnotatedMethod<?>> getPostConstructMethods()
{
- List<AnnotatedMethod<?>> postConstructMethods = new
ArrayList<AnnotatedMethod<?>>();
+ List<AnnotatedMethod<?>> postConstructMethods = new ArrayList<>();
collectPostConstructMethods(annotatedType.getJavaClass(),
postConstructMethods);
return postConstructMethods;
}
@@ -301,7 +301,7 @@ public class DecoratorBeanBuilder<T> ext
protected List<AnnotatedMethod<?>> getPreDestroyMethods()
{
- List<AnnotatedMethod<?>> preDestroyMethods = new
ArrayList<AnnotatedMethod<?>>();
+ List<AnnotatedMethod<?>> preDestroyMethods = new ArrayList<>();
collectPreDestroyMethods(annotatedType.getJavaClass(),
preDestroyMethods);
return preDestroyMethods;
}
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/EjbInterceptorBeanBuilder.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/EjbInterceptorBeanBuilder.java?rev=1799087&r1=1799086&r2=1799087&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/EjbInterceptorBeanBuilder.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/EjbInterceptorBeanBuilder.java
Sun Jun 18 13:57:08 2017
@@ -70,6 +70,6 @@ public class EjbInterceptorBeanBuilder<T
@Override
protected EjbInterceptorBean<T> createBean(Class<T> beanClass, boolean
enabled, Map<InterceptionType, Method[]> interceptionMethods)
{
- return new EjbInterceptorBean<T>(webBeansContext, annotatedType,
beanAttributes, beanClass, interceptionMethods);
+ return new EjbInterceptorBean<>(webBeansContext, annotatedType,
beanAttributes, beanClass, interceptionMethods);
}
}
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ExtensionBeanBuilder.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ExtensionBeanBuilder.java?rev=1799087&r1=1799086&r2=1799087&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ExtensionBeanBuilder.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ExtensionBeanBuilder.java
Sun Jun 18 13:57:08 2017
@@ -44,6 +44,6 @@ public class ExtensionBeanBuilder<T>
public ExtensionBean<T> getBean()
{
- return new ExtensionBean<T>(webBeansContext,
annotatedType.getJavaClass());
+ return new ExtensionBean<>(webBeansContext,
annotatedType.getJavaClass());
}
}
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/FieldProducerFactory.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/FieldProducerFactory.java?rev=1799087&r1=1799086&r2=1799087&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/FieldProducerFactory.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/FieldProducerFactory.java
Sun Jun 18 13:57:08 2017
@@ -67,7 +67,7 @@ public class FieldProducerFactory<P> ext
public <T> Producer<T> createProducer(Bean<T> bean)
{
Set<InjectionPoint> disposalIPs = getInjectionPoints(bean);
- Producer<T> producer = new ProducerFieldProducer<T, P>(parent,
producerField, disposalMethod, disposalIPs, webBeansContext);
+ Producer<T> producer = new ProducerFieldProducer<>(parent,
producerField, disposalMethod, disposalIPs, webBeansContext);
return
webBeansContext.getWebBeansUtil().fireProcessProducerEvent(producer,
producerField);
}
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/InterceptorBeanBuilder.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/InterceptorBeanBuilder.java?rev=1799087&r1=1799086&r2=1799087&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/InterceptorBeanBuilder.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/InterceptorBeanBuilder.java
Sun Jun 18 13:57:08 2017
@@ -132,14 +132,14 @@ public abstract class InterceptorBeanBui
List<Class> classHierarchy =
webBeansContext.getInterceptorUtil().getReverseClassHierarchy(annotatedType.getJavaClass());
Collection<Method> aroundInvokeMethod = null;
- List<AnnotatedMethod> postConstructMethods = new
ArrayList<AnnotatedMethod>();
- List<AnnotatedMethod> preDestroyMethods = new
ArrayList<AnnotatedMethod>();
- List<AnnotatedMethod> aroundTimeoutMethods = new
ArrayList<AnnotatedMethod>();
- List<AnnotatedMethod> aroundConstructMethods = new
ArrayList<AnnotatedMethod>();
+ List<AnnotatedMethod> postConstructMethods = new ArrayList<>();
+ List<AnnotatedMethod> preDestroyMethods = new ArrayList<>();
+ List<AnnotatedMethod> aroundTimeoutMethods = new ArrayList<>();
+ List<AnnotatedMethod> aroundConstructMethods = new ArrayList<>();
// EJB related interceptors
- List<AnnotatedMethod> prePassivateMethods = new
ArrayList<AnnotatedMethod>();
- List<AnnotatedMethod> postActivateMethods = new
ArrayList<AnnotatedMethod>();
+ List<AnnotatedMethod> prePassivateMethods = new ArrayList<>();
+ List<AnnotatedMethod> postActivateMethods = new ArrayList<>();
boolean interceptorFound = false;
@@ -179,7 +179,7 @@ public abstract class InterceptorBeanBui
checkAroundInvokeConditions(m);
if (aroundInvokeMethod == null)
{
- aroundInvokeMethod = new ArrayList<Method>();
+ aroundInvokeMethod = new ArrayList<>();
}
aroundInvokeMethod.add(m.getJavaMember());
}
@@ -234,7 +234,7 @@ public abstract class InterceptorBeanBui
// and now for setting the bean info
- interceptionMethods = new HashMap<InterceptionType, Method[]>();
+ interceptionMethods = new HashMap<>();
if (aroundInvokeMethod != null)
{
@@ -280,7 +280,7 @@ public abstract class InterceptorBeanBui
private void checkAroundInvokeConditions(AnnotatedMethod method)
{
List<AnnotatedParameter<T>> parameters = method.getParameters();
- List<Class<?>> clazzParameters = new ArrayList<Class<?>>();
+ List<Class<?>> clazzParameters = new ArrayList<>();
for(AnnotatedParameter<T> parameter : parameters)
{
clazzParameters.add(ClassUtil.getClazz(parameter.getBaseType()));
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ManagedBeanBuilder.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ManagedBeanBuilder.java?rev=1799087&r1=1799086&r2=1799087&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ManagedBeanBuilder.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ManagedBeanBuilder.java
Sun Jun 18 13:57:08 2017
@@ -62,7 +62,7 @@ public class ManagedBeanBuilder<T, M ext
*/
public M getBean()
{
- M bean = (M) new ManagedBean<T>(webBeansContext, WebBeansType.MANAGED,
annotatedType, beanAttributes, annotatedType.getJavaClass());
+ M bean = (M) new ManagedBean<>(webBeansContext, WebBeansType.MANAGED,
annotatedType, beanAttributes, annotatedType.getJavaClass());
bean.setEnabled(webBeansContext.getWebBeansUtil().isBeanEnabled(beanAttributes,
annotatedType, bean.getStereotypes()));
webBeansContext.getWebBeansUtil().checkManagedBeanCondition(annotatedType);
WebBeansUtil.checkGenericType(annotatedType.getJavaClass(),
beanAttributes.getScope());
@@ -73,6 +73,6 @@ public class ManagedBeanBuilder<T, M ext
{
return bean;
}
- return (M) new UnproxyableBean<T>(webBeansContext,
WebBeansType.MANAGED, beanAttributes, annotatedType,
annotatedType.getJavaClass(), lazyException);
+ return (M) new UnproxyableBean<>(webBeansContext,
WebBeansType.MANAGED, beanAttributes, annotatedType,
annotatedType.getJavaClass(), lazyException);
}
}
