You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rz...@apache.org on 2026/02/25 18:44:39 UTC
(tomee) branch main updated: Replace explicit type arguments with diamond type
This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/main by this push:
new ce387cbc2c Replace explicit type arguments with diamond type
ce387cbc2c is described below
commit ce387cbc2cb77924fe41c9fe22288b34c93cdeb6
Author: Martin Wiesner <ma...@hs-heilbronn.de>
AuthorDate: Wed Feb 25 15:34:55 2026 +0100
Replace explicit type arguments with diamond type
---
.../openejb/arquillian/common/ArquillianUtil.java | 2 +-
.../deployment/DeploymentExceptionObserver.java | 6 +-
.../common/enrichment/OpenEJBEnricher.java | 2 +-
.../openejb/OpenEJBArchiveProcessor.java | 10 +--
.../arquillian/openejb/OpenEJBConfiguration.java | 2 +-
.../openejb/OpenEJBDeployableContainer.java | 2 +-
.../openejb/arquillian/openejb/SWClassLoader.java | 8 +-
.../cucumber/ArchiveResourceIteratorFactory.java | 2 +-
.../arquillian/common/ConfigurationOverrides.java | 4 +-
.../apache/openejb/arquillian/common/Files.java | 2 +-
.../openejb/arquillian/common/ObjectMap.java | 4 +-
.../arquillian/common/TomEEConfiguration.java | 4 +-
.../openejb/arquillian/common/TomEEContainer.java | 6 +-
.../embedded/EmbeddedTomEEConfiguration.java | 2 +-
.../embedded/EmbeddedTomEEContainer.java | 4 +-
.../java/org/superbiz/moviefun/ActionServlet.java | 2 +-
.../moviefun/setup/ExampleDataProducer.java | 2 +-
.../remote/RemoteTomEEConfiguration.java | 2 +-
.../arquillian/remote/RemoteTomEEContainer.java | 4 +-
.../src/main/java/org/apache/ziplock/Archive.java | 6 +-
.../main/java/org/apache/ziplock/ClassLoaders.java | 6 +-
.../src/main/java/org/apache/ziplock/Files.java | 4 +-
.../src/main/java/org/apache/ziplock/Join.java | 2 +-
.../java/org/apache/ziplock/ResourceFinder.java | 36 ++++-----
.../main/java/org/apache/ziplock/maven/Mvn.java | 4 +-
.../apache/ziplock/maven/PreloadableTestWar.java | 1 -
.../org/apache/ziplock/maven/PreloadableWar.java | 1 -
.../java/org/apache/openejb/ClassLoaderUtil.java | 4 +-
.../main/java/org/apache/openejb/ProxyInfo.java | 2 +-
.../openejb/assembler/classic/Assembler.java | 6 +-
.../openejb/assembler/classic/AssemblerTool.java | 2 +-
.../classic/DeploymentExceptionManager.java | 2 +-
.../openejb/assembler/classic/EjbJarInfo.java | 2 +-
.../java/org/apache/openejb/cdi/CdiBeanInfo.java | 2 +-
.../java/org/apache/openejb/cdi/CdiEjbBean.java | 4 +-
.../org/apache/openejb/cdi/OpenEJBLifecycle.java | 4 +-
.../apache/openejb/cdi/OptimizedLoaderService.java | 2 +-
.../openejb/cdi/ThreadSingletonServiceImpl.java | 4 +-
.../apache/openejb/config/AnnotationDeployer.java | 58 ++++++-------
.../org/apache/openejb/config/AppInfoBuilder.java | 2 +-
.../java/org/apache/openejb/config/AutoConfig.java | 4 +-
.../apache/openejb/config/CmpJpaConversion.java | 2 +-
.../openejb/config/ConfigurationFactory.java | 8 +-
.../org/apache/openejb/config/NameFiltering.java | 2 +-
.../org/apache/openejb/config/RemoteServer.java | 2 +-
.../java/org/apache/openejb/config/TldScanner.java | 6 +-
.../openejb/config/rules/CheckClassLoading.java | 2 +-
.../apache/openejb/config/rules/CheckClasses.java | 2 +-
.../openejb/config/rules/CheckDependsOn.java | 2 +-
.../openejb/config/sys/AdditionalDeployments.java | 2 +-
.../org/apache/openejb/config/sys/JaxbOpenejb.java | 4 +-
.../org/apache/openejb/config/sys/Resource.java | 2 +-
.../apache/openejb/config/sys/WikiGenerator.java | 2 +-
.../openejb/core/EmptyResourcesClassLoader.java | 2 +-
.../org/apache/openejb/core/ServerFederation.java | 2 +-
.../openejb/core/cmp/cmp2/Cmp2Generator.java | 2 +-
.../org/apache/openejb/core/cmp/cmp2/CmrSet.java | 2 +-
.../apache/openejb/core/cmp/cmp2/EjbSelect.java | 2 +-
.../openejb/core/interceptor/InterceptorData.java | 2 +-
.../openejb/core/ivm/EjbHomeProxyHandler.java | 2 +-
.../openejb/core/ivm/EjbObjectProxyHandler.java | 2 +-
.../openejb/core/ivm/IntraVmCopyMonitor.java | 2 +-
.../core/security/AbstractSecurityService.java | 4 +-
.../openejb/core/security/SecurityServiceImpl.java | 2 +-
.../core/security/jacc/BasicJaccProvider.java | 2 +-
.../core/singleton/SingletonInstanceManager.java | 3 +-
.../apache/openejb/core/timer/EJBCronTrigger.java | 6 +-
.../core/webservices/HandlerResolverImpl.java | 2 +-
.../openejb/core/webservices/JaxWsUtils.java | 2 +-
.../openejb/core/webservices/ProviderWrapper.java | 2 +-
.../openejb/core/webservices/ServiceRefData.java | 2 +-
.../org/apache/openejb/log/logger/Log4jLogger.java | 2 +-
.../openejb/monitoring/DynamicMBeanWrapper.java | 2 +-
.../openejb/monitoring/MBeanPojoWrapper.java | 2 +-
.../openejb/persistence/CriteriaLogQuery.java | 4 +-
.../openejb/resource/AutoConnectionTracker.java | 4 +-
.../resource/activemq/ActiveMQ5Factory.java | 2 +-
.../resource/activemq/ActiveMQResourceAdapter.java | 8 +-
.../heroku/HerokuDatabasePropertiesProvider.java | 2 +-
.../openejb/resource/jdbc/DataSourceFactory.java | 2 +-
.../openejb/resource/jdbc/IsolationLevels.java | 2 +-
.../openejb/rest/ThreadLocalContextManager.java | 2 +-
.../main/java/org/apache/openejb/util/Classes.java | 4 +-
.../org/apache/openejb/util/LogStreamAsync.java | 2 +-
.../main/java/org/apache/openejb/util/Logger.java | 2 +-
.../java/org/apache/openejb/util/Messages.java | 4 +-
.../org/apache/openejb/util/OpenEJBScripter.java | 2 +-
.../org/apache/openejb/jee/AbsoluteOrdering.java | 2 +-
.../org/apache/openejb/jee/ActivationConfig.java | 2 +-
.../org/apache/openejb/jee/ActivationSpec.java | 4 +-
.../java/org/apache/openejb/jee/AdminObject.java | 2 +-
.../java/org/apache/openejb/jee/Application.java | 54 ++++++-------
.../org/apache/openejb/jee/ApplicationClient.java | 54 ++++++-------
.../org/apache/openejb/jee/AssemblyDescriptor.java | 18 ++---
.../org/apache/openejb/jee/AuthConstraint.java | 2 +-
.../apache/openejb/jee/ConnectionDefinition.java | 2 +-
.../java/org/apache/openejb/jee/Connector.java | 8 +-
.../java/org/apache/openejb/jee/Connector10.java | 6 +-
.../openejb/jee/ConstructorParameterOrder.java | 2 +-
.../apache/openejb/jee/ContainerConcurrency.java | 2 +-
.../apache/openejb/jee/ContainerTransaction.java | 2 +-
.../org/apache/openejb/jee/ContextService.java | 8 +-
.../java/org/apache/openejb/jee/DataSource.java | 2 +-
.../java/org/apache/openejb/jee/DependsOn.java | 2 +-
.../main/java/org/apache/openejb/jee/EjbJar.java | 8 +-
.../java/org/apache/openejb/jee/EjbLocalRef.java | 2 +-
.../main/java/org/apache/openejb/jee/EjbRef.java | 2 +-
.../java/org/apache/openejb/jee/EjbRelation.java | 2 +-
.../java/org/apache/openejb/jee/EntityBean.java | 58 ++++++-------
.../main/java/org/apache/openejb/jee/EnvEntry.java | 2 +-
.../java/org/apache/openejb/jee/ExcludeList.java | 2 +-
.../apache/openejb/jee/FacesAbsoluteOrdering.java | 2 +-
.../org/apache/openejb/jee/FacesApplication.java | 28 +++----
.../openejb/jee/FacesApplicationExtension.java | 2 +-
.../jee/FacesApplicationResourceBundle.java | 6 +-
.../org/apache/openejb/jee/FacesAttribute.java | 8 +-
.../openejb/jee/FacesAttributeExtension.java | 2 +-
.../java/org/apache/openejb/jee/FacesBehavior.java | 12 +--
.../apache/openejb/jee/FacesBehaviorExtension.java | 2 +-
.../org/apache/openejb/jee/FacesComponent.java | 14 ++--
.../openejb/jee/FacesComponentExtension.java | 2 +-
.../java/org/apache/openejb/jee/FacesConfig.java | 34 ++++----
.../openejb/jee/FacesConfigFlowDefinition.java | 20 ++---
.../FacesConfigFlowDefinitionFacesMethodCall.java | 2 +-
.../jee/FacesConfigFlowDefinitionFlowCall.java | 2 +-
.../jee/FacesConfigFlowDefinitionSwitch.java | 2 +-
.../jee/FacesConfigFlowDefinitionSwitchCase.java | 6 +-
.../jee/FacesConfigNavigationRuleExtension.java | 2 +-
.../openejb/jee/FacesConfigProtectedViews.java | 2 +-
.../org/apache/openejb/jee/FacesConverter.java | 12 +--
.../openejb/jee/FacesConverterExtension.java | 2 +-
.../apache/openejb/jee/FacesDefaultValidators.java | 2 +-
.../org/apache/openejb/jee/FacesExtension.java | 2 +-
.../java/org/apache/openejb/jee/FacesFacet.java | 8 +-
.../apache/openejb/jee/FacesFacetExtension.java | 2 +-
.../java/org/apache/openejb/jee/FacesFactory.java | 22 ++---
.../apache/openejb/jee/FacesFactoryExtension.java | 2 +-
.../org/apache/openejb/jee/FacesLifecycle.java | 4 +-
.../openejb/jee/FacesLifecycleExtension.java | 2 +-
.../org/apache/openejb/jee/FacesListEntries.java | 2 +-
.../org/apache/openejb/jee/FacesLocaleConfig.java | 2 +-
.../org/apache/openejb/jee/FacesManagedBean.java | 10 +--
.../openejb/jee/FacesManagedBeanExtension.java | 2 +-
.../apache/openejb/jee/FacesManagedProperty.java | 6 +-
.../org/apache/openejb/jee/FacesMapEntries.java | 2 +-
.../apache/openejb/jee/FacesNavigationCase.java | 6 +-
.../apache/openejb/jee/FacesNavigationRule.java | 10 +--
.../openejb/jee/FacesNavigationRuleExtension.java | 2 +-
.../apache/openejb/jee/FacesOrderingOrdering.java | 2 +-
.../java/org/apache/openejb/jee/FacesProperty.java | 8 +-
.../apache/openejb/jee/FacesPropertyExtension.java | 2 +-
.../java/org/apache/openejb/jee/FacesRedirect.java | 2 +-
.../apache/openejb/jee/FacesReferencedBean.java | 6 +-
.../org/apache/openejb/jee/FacesRenderKit.java | 12 +--
.../openejb/jee/FacesRenderKitExtension.java | 2 +-
.../java/org/apache/openejb/jee/FacesRenderer.java | 12 +--
.../apache/openejb/jee/FacesRendererExtension.java | 2 +-
.../org/apache/openejb/jee/FacesValidator.java | 12 +--
.../openejb/jee/FacesValidatorExtension.java | 2 +-
.../main/java/org/apache/openejb/jee/Filter.java | 8 +-
.../java/org/apache/openejb/jee/FilterMapping.java | 6 +-
.../main/java/org/apache/openejb/jee/Function.java | 8 +-
.../main/java/org/apache/openejb/jee/Handler.java | 14 ++--
.../java/org/apache/openejb/jee/HandlerChain.java | 4 +-
.../java/org/apache/openejb/jee/HandlerChains.java | 2 +-
.../java/org/apache/openejb/jee/Interceptor.java | 66 +++++++--------
.../org/apache/openejb/jee/InterceptorBinding.java | 2 +-
.../org/apache/openejb/jee/InterceptorOrder.java | 2 +-
.../java/org/apache/openejb/jee/Interceptors.java | 2 +-
.../apache/openejb/jee/JMSConnectionFactory.java | 2 +-
.../org/apache/openejb/jee/JavaWsdlMapping.java | 16 ++--
.../org/apache/openejb/jee/JavaXmlTypeMapping.java | 2 +-
.../java/org/apache/openejb/jee/JaxbJavaee.java | 16 ++--
.../java/org/apache/openejb/jee/JspConfig.java | 4 +-
.../org/apache/openejb/jee/JspPropertyGroup.java | 12 +--
.../org/apache/openejb/jee/KeyedCollection.java | 8 +-
.../main/java/org/apache/openejb/jee/Listener.java | 6 +-
.../openejb/jee/LocaleEncodingMappingList.java | 2 +-
.../org/apache/openejb/jee/MessageAdapter.java | 2 +-
.../org/apache/openejb/jee/MessageDestination.java | 6 +-
.../apache/openejb/jee/MessageDestinationRef.java | 2 +-
.../org/apache/openejb/jee/MessageDrivenBean.java | 60 +++++++-------
.../java/org/apache/openejb/jee/MethodParams.java | 2 +-
.../org/apache/openejb/jee/MethodPermission.java | 4 +-
.../org/apache/openejb/jee/MethodSchedule.java | 2 +-
.../java/org/apache/openejb/jee/ObjectFactory.java | 28 +++----
.../org/apache/openejb/jee/OrderingOrdering.java | 2 +-
.../openejb/jee/OutboundResourceAdapter.java | 4 +-
.../java/org/apache/openejb/jee/Persistence.java | 10 +--
.../apache/openejb/jee/PersistenceContextRef.java | 4 +-
.../org/apache/openejb/jee/PersistenceUnitRef.java | 2 +-
.../java/org/apache/openejb/jee/Relationships.java | 2 +-
.../org/apache/openejb/jee/ResourceAdapter.java | 6 +-
.../org/apache/openejb/jee/ResourceAdapter10.java | 4 +-
.../org/apache/openejb/jee/ResourceEnvRef.java | 2 +-
.../java/org/apache/openejb/jee/ResourceRef.java | 2 +-
.../src/main/java/org/apache/openejb/jee/Scan.java | 4 +-
.../org/apache/openejb/jee/SecurityConstraint.java | 4 +-
.../jee/ServiceEndpointInterfaceMapping.java | 2 +-
.../openejb/jee/ServiceEndpointMethodMapping.java | 2 +-
.../openejb/jee/ServiceInterfaceMapping.java | 2 +-
.../java/org/apache/openejb/jee/ServiceRef.java | 12 +--
.../main/java/org/apache/openejb/jee/Servlet.java | 10 +--
.../org/apache/openejb/jee/ServletMapping.java | 2 +-
.../java/org/apache/openejb/jee/SessionBean.java | 86 ++++++++++----------
.../java/org/apache/openejb/jee/SessionConfig.java | 2 +-
.../src/main/java/org/apache/openejb/jee/Tag.java | 12 +--
.../main/java/org/apache/openejb/jee/TagFile.java | 8 +-
.../main/java/org/apache/openejb/jee/TextMap.java | 4 +-
.../java/org/apache/openejb/jee/TldExtension.java | 2 +-
.../java/org/apache/openejb/jee/TldTaglib.java | 16 ++--
.../java/org/apache/openejb/jee/Validator.java | 2 +-
.../main/java/org/apache/openejb/jee/WebApp.java | 92 ++++++++++-----------
.../java/org/apache/openejb/jee/WebFragment.java | 86 ++++++++++----------
.../apache/openejb/jee/WebResourceCollection.java | 6 +-
.../apache/openejb/jee/WebserviceDescription.java | 4 +-
.../java/org/apache/openejb/jee/Webservices.java | 10 +--
.../org/apache/openejb/jee/WelcomeFileList.java | 2 +-
.../apache/openejb/jee/bval/AnnotationType.java | 2 +-
.../java/org/apache/openejb/jee/bval/BeanType.java | 8 +-
.../org/apache/openejb/jee/bval/ClassType.java | 2 +-
.../openejb/jee/bval/ConstraintMappingsType.java | 4 +-
.../apache/openejb/jee/bval/ConstraintType.java | 2 +-
.../apache/openejb/jee/bval/ConstructorType.java | 2 +-
.../openejb/jee/bval/CrossParameterType.java | 2 +-
.../bval/DefaultValidatedExecutableTypesType.java | 2 +-
.../org/apache/openejb/jee/bval/ElementType.java | 2 +-
.../org/apache/openejb/jee/bval/FieldType.java | 4 +-
.../org/apache/openejb/jee/bval/GetterType.java | 4 +-
.../apache/openejb/jee/bval/GroupSequenceType.java | 2 +-
.../org/apache/openejb/jee/bval/GroupsType.java | 2 +-
.../org/apache/openejb/jee/bval/MethodType.java | 2 +-
.../org/apache/openejb/jee/bval/ObjectFactory.java | 8 +-
.../org/apache/openejb/jee/bval/ParameterType.java | 4 +-
.../org/apache/openejb/jee/bval/PayloadType.java | 2 +-
.../apache/openejb/jee/bval/ReturnValueType.java | 4 +-
.../apache/openejb/jee/bval/ValidatedByType.java | 2 +-
.../openejb/jee/bval/ValidationConfigType.java | 6 +-
.../apache/openejb/jee/jba/ActivationConfig.java | 2 +-
.../apache/openejb/jee/jba/AssemblyDescriptor.java | 4 +-
.../main/java/org/apache/openejb/jee/jba/Bean.java | 2 +-
.../openejb/jee/jba/CachePolicyConfOther.java | 2 +-
.../openejb/jee/jba/ContainerConfiguration.java | 2 +-
.../openejb/jee/jba/ContainerConfigurations.java | 2 +-
.../openejb/jee/jba/ContainerInterceptors.java | 2 +-
.../openejb/jee/jba/EndpointInterceptors.java | 2 +-
.../apache/openejb/jee/jba/EnterpriseBeans.java | 2 +-
.../java/org/apache/openejb/jee/jba/Entity.java | 14 ++--
.../main/java/org/apache/openejb/jee/jba/Home.java | 2 +-
.../org/apache/openejb/jee/jba/Interceptor.java | 2 +-
.../java/org/apache/openejb/jee/jba/Invoker.java | 2 +-
.../apache/openejb/jee/jba/InvokerBindings.java | 2 +-
.../openejb/jee/jba/InvokerProxyBindings.java | 2 +-
.../org/apache/openejb/jee/jba/ListEntity.java | 2 +-
.../org/apache/openejb/jee/jba/MessageDriven.java | 14 ++--
.../apache/openejb/jee/jba/MethodAttributes.java | 2 +-
.../apache/openejb/jee/jba/ResourceManager.java | 2 +-
.../apache/openejb/jee/jba/ResourceManagers.java | 2 +-
.../org/apache/openejb/jee/jba/ResourceRef.java | 2 +-
.../org/apache/openejb/jee/jba/RetryHandlers.java | 2 +-
.../org/apache/openejb/jee/jba/SecurityRole.java | 2 +-
.../java/org/apache/openejb/jee/jba/Session.java | 16 ++--
.../org/apache/openejb/jee/jba/cmp/CmpField.java | 2 +-
.../openejb/jee/jba/cmp/DependentValueClass.java | 2 +-
.../openejb/jee/jba/cmp/DependentValueClasses.java | 2 +-
.../apache/openejb/jee/jba/cmp/EjbRelation.java | 2 +-
.../openejb/jee/jba/cmp/EnterpriseBeans.java | 2 +-
.../org/apache/openejb/jee/jba/cmp/Entity.java | 4 +-
.../apache/openejb/jee/jba/cmp/EntityCommand.java | 2 +-
.../apache/openejb/jee/jba/cmp/EntityCommands.java | 2 +-
.../org/apache/openejb/jee/jba/cmp/KeyField.java | 2 +-
.../org/apache/openejb/jee/jba/cmp/KeyFields.java | 2 +-
.../apache/openejb/jee/jba/cmp/LazyLoadGroups.java | 2 +-
.../org/apache/openejb/jee/jba/cmp/LeftJoin.java | 2 +-
.../org/apache/openejb/jee/jba/cmp/LoadGroup.java | 2 +-
.../org/apache/openejb/jee/jba/cmp/LoadGroups.java | 2 +-
.../apache/openejb/jee/jba/cmp/MethodParams.java | 2 +-
.../openejb/jee/jba/cmp/PostTableCreate.java | 2 +-
.../org/apache/openejb/jee/jba/cmp/ReadAhead.java | 2 +-
.../apache/openejb/jee/jba/cmp/Relationships.java | 2 +-
.../apache/openejb/jee/jba/cmp/ReservedWords.java | 2 +-
.../apache/openejb/jee/jba/cmp/TypeMapping.java | 4 +-
.../apache/openejb/jee/jba/cmp/TypeMappings.java | 2 +-
.../openejb/jee/jba/cmp/UserTypeMappings.java | 2 +-
.../openejb/jee/jpa/AssociationOverride.java | 2 +-
.../org/apache/openejb/jee/jpa/Attributes.java | 22 ++---
.../apache/openejb/jee/jpa/CollectionTable.java | 4 +-
.../apache/openejb/jee/jpa/ElementCollection.java | 8 +-
.../openejb/jee/jpa/EmbeddableAttributes.java | 16 ++--
.../java/org/apache/openejb/jee/jpa/Embedded.java | 4 +-
.../org/apache/openejb/jee/jpa/EmbeddedId.java | 2 +-
.../java/org/apache/openejb/jee/jpa/Entity.java | 14 ++--
.../apache/openejb/jee/jpa/EntityListeners.java | 2 +-
.../org/apache/openejb/jee/jpa/EntityMappings.java | 16 ++--
.../org/apache/openejb/jee/jpa/EntityResult.java | 2 +-
.../java/org/apache/openejb/jee/jpa/JoinTable.java | 6 +-
.../org/apache/openejb/jee/jpa/ManyToMany.java | 4 +-
.../java/org/apache/openejb/jee/jpa/ManyToOne.java | 2 +-
.../apache/openejb/jee/jpa/NamedNativeQuery.java | 2 +-
.../org/apache/openejb/jee/jpa/NamedQuery.java | 2 +-
.../java/org/apache/openejb/jee/jpa/OneToMany.java | 6 +-
.../java/org/apache/openejb/jee/jpa/OneToOne.java | 4 +-
.../org/apache/openejb/jee/jpa/SecondaryTable.java | 4 +-
.../openejb/jee/jpa/SqlResultSetMapping.java | 4 +-
.../java/org/apache/openejb/jee/jpa/Table.java | 2 +-
.../org/apache/openejb/jee/jpa/TableGenerator.java | 2 +-
.../apache/openejb/jee/jpa/UniqueConstraint.java | 2 +-
.../jee/jpa/fragment/PersistenceFragment.java | 2 +-
.../jee/jpa/fragment/PersistenceUnitFragment.java | 6 +-
.../apache/openejb/jee/jpa/unit/Persistence.java | 2 +-
.../openejb/jee/jpa/unit/PersistenceUnit.java | 6 +-
.../apache/openejb/jee/jpa/unit/Properties.java | 2 +-
.../openejb/jee/oejb2/ActivationConfigType.java | 4 +-
.../apache/openejb/jee/oejb2/ApplicationType.java | 6 +-
.../apache/openejb/jee/oejb2/ClassFilterType.java | 2 +-
.../openejb/jee/oejb2/DatabaseGeneratedType.java | 2 +-
.../apache/openejb/jee/oejb2/DependenciesType.java | 2 +-
.../apache/openejb/jee/oejb2/EjbRelationType.java | 2 +-
.../openejb/jee/oejb2/EjbRelationshipRoleType.java | 2 +-
.../apache/openejb/jee/oejb2/EntityBeanType.java | 32 ++++----
.../apache/openejb/jee/oejb2/EnvironmentType.java | 10 +--
.../org/apache/openejb/jee/oejb2/GbeanRefType.java | 4 +-
.../org/apache/openejb/jee/oejb2/GbeanType.java | 2 +-
.../openejb/jee/oejb2/GeronimoEjbJarType.java | 26 +++---
.../org/apache/openejb/jee/oejb2/GroupType.java | 4 +-
.../apache/openejb/jee/oejb2/JaxbOpenejbJar2.java | 2 +-
.../openejb/jee/oejb2/MessageDrivenBeanType.java | 16 ++--
.../apache/openejb/jee/oejb2/NamespaceFilter.java | 6 +-
.../apache/openejb/jee/oejb2/ObjectFactory.java | 68 ++++++++--------
.../apache/openejb/jee/oejb2/OpenejbJarType.java | 10 +--
.../jee/oejb2/PersistenceContextRefType.java | 2 +-
.../org/apache/openejb/jee/oejb2/QueryType.java | 2 +-
.../apache/openejb/jee/oejb2/ReferencesType.java | 2 +-
.../openejb/jee/oejb2/ServiceCompletionType.java | 2 +-
.../openejb/jee/oejb2/ServiceModuleType.java | 2 +-
.../apache/openejb/jee/oejb2/ServiceRefType.java | 2 +-
.../apache/openejb/jee/oejb2/SessionBeanType.java | 24 +++---
.../org/apache/openejb/jee/oejb2/TssLinkType.java | 2 +-
.../openejb/jee/oejb2/WebServiceBindingType.java | 4 +-
.../openejb/jee/oejb2/WebServiceSecurityType.java | 2 +-
.../apache/openejb/jee/oejb3/EjbDeployment.java | 14 ++--
.../org/apache/openejb/jee/oejb3/MethodParams.java | 2 +-
.../apache/openejb/jee/oejb3/ObjectFactory.java | 8 +-
.../org/apache/openejb/jee/oejb3/OpenejbJar.java | 8 +-
.../openejb/jee/oejb3/PropertiesAdapter.java | 1 -
.../apache/openejb/jee/sun/ActivationConfig.java | 2 +-
.../java/org/apache/openejb/jee/sun/Cache.java | 6 +-
.../org/apache/openejb/jee/sun/CacheHelper.java | 2 +-
.../org/apache/openejb/jee/sun/CacheMapping.java | 4 +-
.../jee/sun/CheckVersionOfAccessedInstances.java | 2 +-
.../openejb/jee/sun/CheckpointAtEndOfMethod.java | 2 +-
.../org/apache/openejb/jee/sun/ClassLoader.java | 2 +-
.../apache/openejb/jee/sun/CmpFieldMapping.java | 2 +-
.../org/apache/openejb/jee/sun/CmpResource.java | 2 +-
.../apache/openejb/jee/sun/CmrFieldMapping.java | 2 +-
.../org/apache/openejb/jee/sun/ColumnPair.java | 2 +-
.../org/apache/openejb/jee/sun/Consistency.java | 2 +-
.../apache/openejb/jee/sun/ConstraintField.java | 2 +-
.../apache/openejb/jee/sun/CookieProperties.java | 2 +-
.../org/apache/openejb/jee/sun/DefaultHelper.java | 2 +-
.../main/java/org/apache/openejb/jee/sun/Ejb.java | 14 ++--
.../apache/openejb/jee/sun/EnterpriseBeans.java | 8 +-
.../org/apache/openejb/jee/sun/EntityMapping.java | 6 +-
.../org/apache/openejb/jee/sun/FetchedWith.java | 2 +-
.../apache/openejb/jee/sun/FlushAtEndOfMethod.java | 2 +-
.../java/org/apache/openejb/jee/sun/JspConfig.java | 2 +-
.../apache/openejb/jee/sun/LocaleCharsetInfo.java | 2 +-
.../apache/openejb/jee/sun/ManagerProperties.java | 2 +-
.../java/org/apache/openejb/jee/sun/Message.java | 2 +-
.../apache/openejb/jee/sun/MessageSecurity.java | 2 +-
.../openejb/jee/sun/MessageSecurityBinding.java | 2 +-
.../org/apache/openejb/jee/sun/MethodParams.java | 2 +-
.../org/apache/openejb/jee/sun/OneOneFinders.java | 2 +-
.../org/apache/openejb/jee/sun/PmDescriptors.java | 2 +-
.../java/org/apache/openejb/jee/sun/PortInfo.java | 4 +-
.../apache/openejb/jee/sun/PrefetchDisabled.java | 2 +-
.../openejb/jee/sun/SchemaGeneratorProperties.java | 2 +-
.../org/apache/openejb/jee/sun/SecondaryTable.java | 2 +-
.../openejb/jee/sun/SecurityRoleMapping.java | 2 +-
.../org/apache/openejb/jee/sun/ServiceRef.java | 4 +-
.../java/org/apache/openejb/jee/sun/Servlet.java | 4 +-
.../apache/openejb/jee/sun/SessionProperties.java | 2 +-
.../apache/openejb/jee/sun/StoreProperties.java | 2 +-
.../org/apache/openejb/jee/sun/SunApplication.java | 16 ++--
.../openejb/jee/sun/SunApplicationClient.java | 12 +--
.../org/apache/openejb/jee/sun/SunCmpMapping.java | 2 +-
.../org/apache/openejb/jee/sun/SunCmpMappings.java | 2 +-
.../java/org/apache/openejb/jee/sun/SunEjbJar.java | 2 +-
.../java/org/apache/openejb/jee/sun/SunWebApp.java | 22 ++---
.../apache/openejb/jee/sun/WebserviceEndpoint.java | 2 +-
.../openejb/jee/was/v6/common/Description.java | 2 +-
.../jee/was/v6/common/DescriptionGroup.java | 8 +-
.../openejb/jee/was/v6/common/DisplayName.java | 2 +-
.../apache/openejb/jee/was/v6/common/EjbRef.java | 4 +-
.../apache/openejb/jee/was/v6/common/EnvEntry.java | 4 +-
.../apache/openejb/jee/was/v6/common/IconType.java | 2 +-
.../apache/openejb/jee/was/v6/common/Identity.java | 4 +-
.../jee/was/v6/common/JNDIEnvRefsGroup.java | 14 ++--
.../apache/openejb/jee/was/v6/common/Listener.java | 2 +-
.../jee/was/v6/common/MessageDestinationRef.java | 4 +-
.../openejb/jee/was/v6/common/ObjectFactory.java | 94 +++++++++++-----------
.../openejb/jee/was/v6/common/ParamValue.java | 4 +-
.../apache/openejb/jee/was/v6/common/QName.java | 2 +-
.../openejb/jee/was/v6/common/ResourceEnvRef.java | 6 +-
.../openejb/jee/was/v6/common/ResourceRef.java | 4 +-
.../jee/was/v6/common/RunAsSpecifiedIdentity.java | 2 +-
.../jee/was/v6/common/SecurityIdentity.java | 4 +-
.../openejb/jee/was/v6/common/SecurityRole.java | 4 +-
.../openejb/jee/was/v6/common/SecurityRoleRef.java | 4 +-
.../jee/was/v6/commonbnd/AbstractAuthData.java | 2 +-
.../jee/was/v6/commonbnd/EjbRefBinding.java | 4 +-
.../v6/commonbnd/MessageDestinationRefBinding.java | 4 +-
.../jee/was/v6/commonbnd/ObjectFactory.java | 32 ++++----
.../openejb/jee/was/v6/commonbnd/Property.java | 2 +-
.../was/v6/commonbnd/ResourceEnvRefBinding.java | 4 +-
.../jee/was/v6/commonbnd/ResourceRefBinding.java | 8 +-
.../openejb/jee/was/v6/ecore/EAnnotation.java | 6 +-
.../apache/openejb/jee/was/v6/ecore/EClass.java | 6 +-
.../org/apache/openejb/jee/was/v6/ecore/EEnum.java | 2 +-
.../openejb/jee/was/v6/ecore/EModelElement.java | 2 +-
.../apache/openejb/jee/was/v6/ecore/EObject.java | 2 +-
.../openejb/jee/was/v6/ecore/EOperation.java | 4 +-
.../apache/openejb/jee/was/v6/ecore/EPackage.java | 4 +-
.../openejb/jee/was/v6/ecore/EReference.java | 2 +-
.../jee/was/v6/ecore/EStringToStringMapEntry.java | 2 +-
.../openejb/jee/was/v6/ecore/ETypedElement.java | 2 +-
.../openejb/jee/was/v6/ecore/ObjectFactory.java | 70 ++++++++--------
.../openejb/jee/was/v6/ejb/ActivationConfig.java | 6 +-
.../jee/was/v6/ejb/ActivationConfigProperty.java | 2 +-
.../openejb/jee/was/v6/ejb/AssemblyDescriptor.java | 12 +--
.../openejb/jee/was/v6/ejb/CMPAttribute.java | 2 +-
.../apache/openejb/jee/was/v6/ejb/CMRField.java | 2 +-
.../jee/was/v6/ejb/ContainerManagedEntity.java | 10 +--
.../org/apache/openejb/jee/was/v6/ejb/EJBJar.java | 6 +-
.../openejb/jee/was/v6/ejb/EJBMethodCategory.java | 2 +-
.../apache/openejb/jee/was/v6/ejb/EJBRelation.java | 6 +-
.../jee/was/v6/ejb/EJBRelationshipRole.java | 8 +-
.../openejb/jee/was/v6/ejb/EnterpriseBean.java | 14 ++--
.../org/apache/openejb/jee/was/v6/ejb/Entity.java | 2 +-
.../apache/openejb/jee/was/v6/ejb/ExcludeList.java | 6 +-
.../openejb/jee/was/v6/ejb/MessageDriven.java | 8 +-
.../jee/was/v6/ejb/MessageDrivenDestination.java | 2 +-
.../openejb/jee/was/v6/ejb/MethodElement.java | 6 +-
.../openejb/jee/was/v6/ejb/MethodPermission.java | 8 +-
.../openejb/jee/was/v6/ejb/MethodTransaction.java | 6 +-
.../openejb/jee/was/v6/ejb/ObjectFactory.java | 92 ++++++++++-----------
.../org/apache/openejb/jee/was/v6/ejb/Query.java | 6 +-
.../openejb/jee/was/v6/ejb/Relationships.java | 6 +-
.../apache/openejb/jee/was/v6/ejb/RoleSource.java | 6 +-
.../org/apache/openejb/jee/was/v6/ejb/Session.java | 2 +-
.../was/v6/ejbbnd/CMPConnectionFactoryBinding.java | 4 +-
.../openejb/jee/was/v6/ejbbnd/EJBJarBinding.java | 10 +--
.../jee/was/v6/ejbbnd/EnterpriseBeanBinding.java | 18 ++---
.../openejb/jee/was/v6/ejbbnd/ObjectFactory.java | 22 ++---
.../apache/openejb/jee/was/v6/java/ArrayType.java | 2 +-
.../org/apache/openejb/jee/was/v6/java/Block.java | 4 +-
.../org/apache/openejb/jee/was/v6/java/Field.java | 2 +-
.../openejb/jee/was/v6/java/Initializer.java | 4 +-
.../apache/openejb/jee/was/v6/java/JavaClass.java | 18 ++---
.../org/apache/openejb/jee/was/v6/java/Method.java | 6 +-
.../openejb/jee/was/v6/java/ObjectFactory.java | 42 +++++-----
.../was/v6/webservice/clientbnd/ObjectFactory.java | 4 +-
.../v6/webservice/clientbnd/ServiceRefBinding.java | 4 +-
.../jee/was/v6/wsclient/ComponentScopedRefs.java | 4 +-
.../openejb/jee/was/v6/wsclient/Handler.java | 10 +--
.../openejb/jee/was/v6/wsclient/ObjectFactory.java | 20 ++---
.../jee/was/v6/wsclient/PortComponentRef.java | 4 +-
.../openejb/jee/was/v6/wsclient/ServiceRef.java | 8 +-
.../jee/was/v6/wsclient/WebServicesClient.java | 6 +-
.../org/apache/openejb/jee/was/v6/xmi/Add.java | 2 +-
.../org/apache/openejb/jee/was/v6/xmi/Any.java | 4 +-
.../apache/openejb/jee/was/v6/xmi/Difference.java | 14 ++--
.../openejb/jee/was/v6/xmi/Documentation.java | 14 ++--
.../apache/openejb/jee/was/v6/xmi/Extension.java | 2 +-
.../openejb/jee/was/v6/xmi/ObjectFactory.java | 34 ++++----
.../openejb/jee/was/v6/xmi/PackageReference.java | 4 +-
.../org/apache/openejb/jee/was/v6/xmi/Replace.java | 2 +-
.../org/apache/openejb/jee/was/v6/xmi/XMI.java | 2 +-
.../org/apache/openejb/jee/wls/CachingElement.java | 2 +-
.../openejb/jee/wls/ContextRequestClass.java | 2 +-
.../org/apache/openejb/jee/wls/FieldGroup.java | 2 +-
.../apache/openejb/jee/wls/IdempotentMethods.java | 2 +-
.../java/org/apache/openejb/jee/wls/JaxbWls.java | 6 +-
.../org/apache/openejb/jee/wls/MethodParams.java | 2 +-
.../org/apache/openejb/jee/wls/ObjectFactory.java | 14 ++--
.../java/org/apache/openejb/jee/wls/PortInfo.java | 4 +-
.../openejb/jee/wls/ReferenceDescriptor.java | 8 +-
.../openejb/jee/wls/RelationshipCaching.java | 2 +-
.../openejb/jee/wls/RelationshipRoleMap.java | 2 +-
.../openejb/jee/wls/RetryMethodsOnRollback.java | 2 +-
.../openejb/jee/wls/SecurityRoleAssignment.java | 2 +-
.../jee/wls/ServiceReferenceDescription.java | 4 +-
.../java/org/apache/openejb/jee/wls/SqlQuery.java | 2 +-
.../java/org/apache/openejb/jee/wls/SqlShape.java | 4 +-
.../java/org/apache/openejb/jee/wls/Table.java | 2 +-
.../java/org/apache/openejb/jee/wls/TableMap.java | 2 +-
.../openejb/jee/wls/TransactionIsolation.java | 2 +-
.../org/apache/openejb/jee/wls/WeblogicEjbJar.java | 16 ++--
.../openejb/jee/wls/WeblogicEnterpriseBean.java | 8 +-
.../apache/openejb/jee/wls/WeblogicRdbmsBean.java | 10 +--
.../apache/openejb/jee/wls/WeblogicRdbmsJar.java | 4 +-
.../openejb/jee/wls/WeblogicRdbmsRelation.java | 2 +-
.../openejb/jpa/integration/JPAThreadContext.java | 2 +-
.../eclipselink/PrefixSessionCustomizer.java | 2 +-
.../org/apache/openejb/junit/JUnit4Runner.java | 2 +-
.../org/apache/openejb/junit/context/Util.java | 2 +-
.../openejb/junit/jee/EJBContainerRunner.java | 2 +-
.../main/java/org/superbiz/async/JobProcessor.java | 2 +-
.../main/java/org/superbiz/asyncpost/Executor.java | 2 +-
.../ConstraintViolationExceptionMapper.java | 4 +-
.../ConstraintViolationExceptionMapper.java | 4 +-
.../main/java/org/superbiz/cdi/basic/Faculty.java | 2 +-
.../BookForAShowOldStyleInterceptorBinding.java | 2 +-
.../beans/BookForAShowOneInterceptorApplied.java | 2 +-
.../beans/BookForAShowTwoInterceptorsApplied.java | 2 +-
...kShowInterceptorBindingInheritanceExplored.java | 2 +-
.../bookshow/tracker/InterceptionOrderTracker.java | 4 +-
.../connector/adapter/SampleManagedConnection.java | 2 +-
.../connector/adapter/SampleResourceAdapter.java | 2 +-
.../org/superbiz/application/MessagesReceived.java | 2 +-
.../connector/adapter/SampleManagedConnection.java | 2 +-
.../connector/adapter/SampleResourceAdapter.java | 2 +-
.../connector/application/MessagesReceived.java | 2 +-
.../dynamicdatasourcerouting/DeterminedRouter.java | 4 +-
.../dynamic/mbean/DynamicMBeanHandler.java | 4 +-
.../java/org/superbiz/servlet/JndiServlet.java | 2 +-
.../main/java/org/superbiz/injection/Movies.java | 2 +-
.../interceptors/FullyInterceptedBean.java | 4 +-
.../MethodLevelInterceptorOnlySLSBean.java | 2 +-
.../SecondStatelessInterceptedBean.java | 2 +-
.../org/superbiz/interceptors/ThirdSLSBean.java | 4 +-
.../main/java/org/superbiz/interceptors/Utils.java | 2 +-
.../superbiz/moviefun/rest/ApplicationConfig.java | 2 +-
.../openapi/moviefun/rest/ApplicationConfig.java | 2 +-
.../src/main/java/org/superbiz/rest/BookBean.java | 2 +-
.../rest/application/ApplicationConfig.java | 2 +-
.../main/java/org/superbiz/rest/model/Post.java | 2 +-
.../main/java/org/superbiz/rest/UserService.java | 2 +-
.../org/superbiz/cdi/bookshow/beans/BookShow.java | 2 +-
.../org/superbiz/registry/ComponentRegistry.java | 2 +-
.../org/superbiz/counter/ExecutionChannel.java | 2 +-
.../superbiz/stateless/basic/ExecutionChannel.java | 2 +-
.../java/org/superbiz/telephone/TelephoneBean.java | 2 +-
.../tomee/gradle/embedded/TomEEEmbeddedPlugin.java | 2 +-
.../org/apache/openejb/server/control/Context.java | 2 +-
.../openejb/server/control/StandaloneServer.java | 8 +-
.../apache/openejb/test/beans/TimerSyncBean.java | 2 +-
.../test/entity/bmp/AllowedOperationsBmpBean.java | 2 +-
.../test/entity/cmp/AllowedOperationsCmp2Bean.java | 2 +-
.../test/entity/cmp/AllowedOperationsCmpBean.java | 2 +-
.../openejb/test/entity/cmp/BasicCmp2Bean.java | 2 +-
.../openejb/test/entity/cmp/BasicCmp2PojoBean.java | 2 +-
.../openejb/test/entity/cmp/BasicCmpBean.java | 2 +-
.../openejb/test/entity/cmp/ComplexCmp2Bean.java | 2 +-
.../openejb/test/entity/cmp/ComplexCmpBean.java | 2 +-
.../openejb/test/entity/cmp/UnknownCmp2Bean.java | 2 +-
.../openejb/test/entity/cmp/UnknownCmpBean.java | 2 +-
.../openejb/test/interceptor/Interceptor.java | 6 +-
.../org/apache/openejb/test/mdb/BasicMdbBean.java | 2 +-
.../org/apache/openejb/test/mdb/MdbInvoker.java | 4 +-
.../java/org/apache/openejb/test/mdb/MdbProxy.java | 2 +-
.../singleton/BasicSingletonInterceptedBean.java | 2 +-
.../stateful/BasicStatefulInterceptedBean.java | 2 +-
.../stateless/BasicStatelessInterceptedBean.java | 2 +-
.../org/apache/openejb/test/FilteredTestSuite.java | 2 +-
.../java/org/apache/openejb/test/TestClient.java | 2 +-
.../test/entity/cmp/ComplexHomeIntfcTests.java | 4 +-
.../test/entity/cmp/UnknownHomeIntfcTests.java | 4 +-
.../test/entity/cmp2/Complex2HomeIntfcTests.java | 4 +-
.../openejb/test/entity/cmp2/EjbqlLocalTest.java | 4 +-
.../test/entity/cmp2/Unknown2HomeIntfcTests.java | 4 +-
.../openejb/test/entity/cmr/CmrMappingTests.java | 6 +-
.../test/entity/cmr/ManyToManyComplexPkTests.java | 10 +--
.../openejb/test/entity/cmr/ManyToManyTests.java | 10 +--
.../test/entity/cmr/OneToManyComplexPkTests.java | 8 +-
.../openejb/test/entity/cmr/OneToManyTests.java | 8 +-
.../test/mdb/MdbConnectionFactoryTests.java | 2 +-
.../stateful/SecondStatefulInterceptedBean.java | 2 +-
.../test/stateful/StatefulInterceptedBean.java | 2 +-
.../stateful/ThirdStatefulInterceptedBean.java | 2 +-
.../stateless/SecondStatelessInterceptedBean.java | 2 +-
.../test/stateless/StatelessInterceptedBean.java | 2 +-
.../stateless/ThirdStatelessInterceptedBean.java | 2 +-
.../apache/openejb/test/servlet/JndiServlet.java | 2 +-
.../org/apache/tomee/server/composer/Pipe.java | 2 +-
.../org/apache/tomee/server/composer/Ports.java | 2 +-
.../openejb/maven/plugin/AbstractTomEEMojo.java | 2 +-
.../org/apache/openejb/maven/plugin/Synch.java | 2 +-
.../openejb/maven/plugin/Synchronization.java | 2 +-
.../openejb/maven/plugin/UpdatableTomEEMojo.java | 4 +-
.../apache/bval/jsr/job/ConstraintValidators.java | 2 +-
.../openejb/client/AbstractConnectionStrategy.java | 2 +-
.../java/org/apache/openejb/client/Client.java | 8 +-
.../openejb/client/ClientHandlerResolverImpl.java | 26 +++---
.../openejb/client/ClientInjectionProcessor.java | 12 +--
.../org/apache/openejb/client/ClientInstance.java | 2 +-
.../org/apache/openejb/client/ClientSecurity.java | 2 +-
.../org/apache/openejb/client/CommandParser.java | 10 +--
.../java/org/apache/openejb/client/Context.java | 2 +-
.../org/apache/openejb/client/EJBHomeHandle.java | 2 +-
.../apache/openejb/client/EJBHomeProxyHandle.java | 4 +-
.../openejb/client/EJBInvocationHandler.java | 6 +-
.../org/apache/openejb/client/EJBMetaDataImpl.java | 4 +-
.../org/apache/openejb/client/EJBObjectHandle.java | 2 +-
.../apache/openejb/client/EJBObjectHandler.java | 2 +-
.../openejb/client/EJBObjectProxyHandle.java | 4 +-
.../openejb/client/FailoverConnectionFactory.java | 2 +-
.../openejb/client/HandlerChainMetaData.java | 4 +-
.../org/apache/openejb/client/HandlerMetaData.java | 4 +-
.../apache/openejb/client/HeartbeatMonitor.java | 2 +-
.../apache/openejb/client/InjectionMetaData.java | 2 +-
.../org/apache/openejb/client/JNDIContext.java | 6 +-
.../openejb/client/JaxWsProviderWrapper.java | 4 +-
.../main/java/org/apache/openejb/client/Main.java | 2 +-
.../openejb/client/MulticastConnectionFactory.java | 8 +-
.../openejb/client/MulticastPulseClient.java | 16 ++--
.../openejb/client/NameClassPairEnumeration.java | 2 +-
.../java/org/apache/openejb/client/Observers.java | 4 +-
.../java/org/apache/openejb/client/Options.java | 2 +-
.../org/apache/openejb/client/PortRefMetaData.java | 2 +-
.../openejb/client/RandomConnectionStrategy.java | 2 +-
.../java/org/apache/openejb/client/Registry.java | 6 +-
.../apache/openejb/client/RequestMethodCode.java | 2 +-
.../org/apache/openejb/client/RequestType.java | 2 +-
.../org/apache/openejb/client/ResourceFinder.java | 38 ++++-----
.../client/RoundRobinConnectionStrategy.java | 2 +-
.../openejb/client/SocketConnectionFactory.java | 4 +-
.../apache/openejb/client/ThrowableArtifact.java | 2 +-
.../java/org/apache/openejb/client/WsMetaData.java | 4 +-
.../openejb/client/proxy/Jdk13ProxyFactory.java | 2 +-
.../org/apache/openejb/server/cli/CliRunnable.java | 2 +-
.../openejb/server/cxf/rs/AutoJAXRSInvoker.java | 2 +-
.../apache/openejb/server/cxf/rs/CxfRSService.java | 4 +-
.../openejb/server/cxf/rs/CxfRsHttpListener.java | 2 +-
.../openejb/server/cxf/rs/OpenEJBEJBInvoker.java | 2 +-
.../transport/util/CxfContainerClassLoader.java | 2 +-
.../openejb/server/cxf/ConfigureCxfSecurity.java | 14 ++--
.../org/apache/openejb/server/cxf/CxfService.java | 2 +-
.../server/cxf/WSSPassThroughInterceptor.java | 2 +-
.../cxf/config/WSS4JInterceptorFactoryBase.java | 2 +-
.../openejb/server/cxf/ejb/EjbMethodInvoker.java | 2 +-
.../openejb/server/cxf/ejb/EjbWsContainer.java | 4 +-
.../openejb/server/cxf/pojo/PojoEndpoint.java | 2 +-
.../openejb/server/cxf/pojo/PojoWsContainer.java | 4 +-
.../apache/openejb/server/ejbd/CallContext.java | 2 +-
.../openejb/server/ejbd/ClientObjectFactory.java | 2 +-
.../openejb/server/ejbd/ClusterRequestHandler.java | 2 +-
.../openejb/server/ejbd/KeepAliveServer.java | 2 +-
.../apache/openejb/server/hsql/HsqlService.java | 2 +-
.../openejb/server/httpd/HttpListenerRegistry.java | 2 +-
.../openejb/server/httpd/HttpSessionImpl.java | 2 +-
.../openejb/server/httpd/OpenEJBHttpRegistry.java | 4 +-
.../server/httpd/WebBeansListenerHelper.java | 2 +-
.../server/discovery/MulticastPulseAgent.java | 4 +-
.../openejb/server/discovery/MultipointServer.java | 7 +-
.../openejb/server/rest/InternalApplication.java | 4 +-
.../apache/openejb/server/rest/RsRegistryImpl.java | 2 +-
.../org/apache/openejb/server/ServicePool.java | 2 +-
.../ssh/OpenEJBJaasPasswordAuthenticator.java | 4 +-
.../server/webservices/saaj/SaajFactoryFinder.java | 2 +-
.../java/org/apache/tomee/bootstrap/Ports.java | 2 +-
.../tomee/catalina/TomEEContainerListener.java | 2 +-
.../apache/tomee/catalina/TomcatWebAppBuilder.java | 4 +-
.../apache/tomee/catalina/environment/Hosts.java | 4 +-
.../apache/tomee/catalina/realm/LowTypedRealm.java | 2 +-
.../org/apache/tomee/catalina/routing/Route.java | 4 +-
.../tomee/catalina/routing/SimpleRouter.java | 2 +-
.../tomee/catalina/security/HTTPMethods.java | 6 +-
...rityConstaintsToJaccPermissionsTransformer.java | 4 +-
.../apache/tomee/catalina/security/URLPattern.java | 2 +-
.../java/org/apache/tomee/common/NamingUtil.java | 4 +-
.../java/org/apache/tomee/embedded/Container.java | 2 +-
.../tomee/embedded/EmbeddedTomEEContainer.java | 2 +-
.../tomee/myfaces/TomEEAnnotationProvider.java | 4 +-
.../myfaces/TomEEMyFacesContainerInitializer.java | 2 +-
.../apache/tomee/util/QuickServerXmlParser.java | 2 +-
.../tomee/log4j2/CaptureLog4j2ShutdownHooks.java | 2 +-
.../org/apache/openejb/mockito/MockRegistry.java | 4 +-
.../apache/openejb/mockito/MockitoExtension.java | 6 +-
679 files changed, 1968 insertions(+), 1971 deletions(-)
diff --git a/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/ArquillianUtil.java b/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/ArquillianUtil.java
index 4c90ea087c..e8bd2a43a9 100644
--- a/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/ArquillianUtil.java
+++ b/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/ArquillianUtil.java
@@ -52,7 +52,7 @@ public final class ArquillianUtil {
}
public static Collection<Archive<?>> toDeploy(final Properties properties) {
- final Collection<Archive<?>> list = new ArrayList<Archive<?>>();
+ final Collection<Archive<?>> list = new ArrayList<>();
if (properties.containsKey(ArquillianUtil.PREDEPLOYING_KEY)) {
final String toSplit = properties.getProperty(PREDEPLOYING_KEY).trim();
final ClassLoader loader = Thread.currentThread().getContextClassLoader();
diff --git a/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/deployment/DeploymentExceptionObserver.java b/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/deployment/DeploymentExceptionObserver.java
index cfed64ca26..f77408f6ef 100644
--- a/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/deployment/DeploymentExceptionObserver.java
+++ b/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/deployment/DeploymentExceptionObserver.java
@@ -26,8 +26,8 @@ import java.util.Map;
import java.util.Set;
public class DeploymentExceptionObserver {
- private static final Map<Class<?>, Exception> EXCEPTIONS = new HashMap<Class<?>, Exception>();
- private static final Map<Class<?>, Exception> PARENT_EXCEPTIONS = new HashMap<Class<?>, Exception>();
+ private static final Map<Class<?>, Exception> EXCEPTIONS = new HashMap<>();
+ private static final Map<Class<?>, Exception> PARENT_EXCEPTIONS = new HashMap<>();
public void observes(@Observes final DeploymentException t) throws Exception {
EXCEPTIONS.put(t.getClass(), t);
@@ -54,7 +54,7 @@ public class DeploymentExceptionObserver {
}
public static Set<Class<?>> availableExceptionTypes() {
- final Set<Class<?>> set = new HashSet<Class<?>>(EXCEPTIONS.keySet());
+ final Set<Class<?>> set = new HashSet<>(EXCEPTIONS.keySet());
set.addAll(PARENT_EXCEPTIONS.keySet());
return set;
}
diff --git a/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/enrichment/OpenEJBEnricher.java b/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/enrichment/OpenEJBEnricher.java
index 5b4c5f24bc..4a14f0055b 100644
--- a/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/enrichment/OpenEJBEnricher.java
+++ b/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/enrichment/OpenEJBEnricher.java
@@ -270,7 +270,7 @@ public final class OpenEJBEnricher {
types.add(getBaseType());
types.add(Object.class);
- annotations = new HashSet<Annotation>(asList(method.getParameterAnnotations()[position]));
+ annotations = new HashSet<>(asList(method.getParameterAnnotations()[position]));
}
@Override
diff --git a/arquillian/arquillian-openejb-embedded/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBArchiveProcessor.java b/arquillian/arquillian-openejb-embedded/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBArchiveProcessor.java
index aef71d196b..caee1ed397 100644
--- a/arquillian/arquillian-openejb-embedded/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBArchiveProcessor.java
+++ b/arquillian/arquillian-openejb-embedded/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBArchiveProcessor.java
@@ -180,8 +180,8 @@ public class OpenEJBArchiveProcessor {
final List<URL> webappAdditionalPaths = new LinkedList<>();
final CompositeBeans webAppBeansXml = new CompositeBeans();
- final List<Archive> webAppArchives = new LinkedList<Archive>();
- final Map<URL, List<String>> webAppClassesByUrl = new HashMap<URL, List<String>>();
+ final List<Archive> webAppArchives = new LinkedList<>();
+ final Map<URL, List<String>> webAppClassesByUrl = new HashMap<>();
final CompositeArchive webAppArchive = analyzeLibs(parent,
webappAdditionalPaths, webAppClassesByUrl,
webAppArchives, webAppBeansXml,
@@ -216,7 +216,7 @@ public class OpenEJBArchiveProcessor {
addPersistenceXml(archive, WEB_INF, appModule);
addOpenEJbJarXml(archive, WEB_INF, ejbModule);
- addValidationXml(archive, WEB_INF, new HashMap<String, Object>(), ejbModule);
+ addValidationXml(archive, WEB_INF, new HashMap<>(), ejbModule);
addResourcesXml(archive, WEB_INF, ejbModule);
addEnvEntries(archive, WEB_INF, appModule, ejbModule);
}
@@ -384,7 +384,7 @@ public class OpenEJBArchiveProcessor {
} if (UrlAsset.class.isInstance(asset) || FileAsset.class.isInstance(asset)) {
try {
final URL url = UrlAsset.class.isInstance(asset) ? get(URL.class, "url", asset) : get(File.class, "file", asset).toURI().toURL();
- final List<String> classes = new ArrayList<String>();
+ final List<String> classes = new ArrayList<>();
archives.add(new FilteredArchive(
new JarArchive(parent, url),
new WebappAggregatedArchive.ScanXmlSaverFilter(false, null, classes, null)));
@@ -596,7 +596,7 @@ public class OpenEJBArchiveProcessor {
private final Map<URL, List<String>> classesMap;
public SimpleWebappAggregatedArchive(final ClassLoader cl, final CompositeArchive archive, final Map<URL, List<String>> map) {
- super(cl, new HashMap<String, Object>(), new ArrayList<URL>());
+ super(cl, new HashMap<>(), new ArrayList<>());
delegate = archive;
classesMap = map;
diff --git a/arquillian/arquillian-openejb-embedded/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBConfiguration.java b/arquillian/arquillian-openejb-embedded/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBConfiguration.java
index 093cacad8d..691979e7e8 100644
--- a/arquillian/arquillian-openejb-embedded/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBConfiguration.java
+++ b/arquillian/arquillian-openejb-embedded/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBConfiguration.java
@@ -68,6 +68,6 @@ public class OpenEJBConfiguration implements ContainerConfiguration {
public void setSingleDeploymentByArchiveName(final String singleDeploymentByArchiveName) {
this.singleDeploymentByArchiveName = singleDeploymentByArchiveName == null || singleDeploymentByArchiveName.trim().isEmpty() ?
- Collections.<String>emptyList() : new HashSet<String>(asList(singleDeploymentByArchiveName.split(" *, *")));
+ Collections.<String>emptyList() : new HashSet<>(asList(singleDeploymentByArchiveName.split(" *, *")));
}
}
diff --git a/arquillian/arquillian-openejb-embedded/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBDeployableContainer.java b/arquillian/arquillian-openejb-embedded/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBDeployableContainer.java
index b026607da6..15a855e4c5 100644
--- a/arquillian/arquillian-openejb-embedded/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBDeployableContainer.java
+++ b/arquillian/arquillian-openejb-embedded/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBDeployableContainer.java
@@ -98,7 +98,7 @@ public class OpenEJBDeployableContainer implements DeployableContainer<OpenEJBCo
}
}
- private static final ConcurrentMap<String, DeploymentInfo> DEPLOYMENT_INFO = new ConcurrentHashMap<String, DeploymentInfo>();
+ private static final ConcurrentMap<String, DeploymentInfo> DEPLOYMENT_INFO = new ConcurrentHashMap<>();
public static final AppContext NO_APP_CTX = new AppContext(null, SystemInstance.get(), null, null, null, false);
// config
diff --git a/arquillian/arquillian-openejb-embedded/src/main/java/org/apache/openejb/arquillian/openejb/SWClassLoader.java b/arquillian/arquillian-openejb-embedded/src/main/java/org/apache/openejb/arquillian/openejb/SWClassLoader.java
index 894cb7a94a..5d2f05c170 100644
--- a/arquillian/arquillian-openejb-embedded/src/main/java/org/apache/openejb/arquillian/openejb/SWClassLoader.java
+++ b/arquillian/arquillian-openejb-embedded/src/main/java/org/apache/openejb/arquillian/openejb/SWClassLoader.java
@@ -67,7 +67,7 @@ public class SWClassLoader extends ClassLoader implements Closeable {
}
private final Collection<Archive<?>> archives;
- private final Collection<Closeable> closeables = new ArrayList<Closeable>();
+ private final Collection<Closeable> closeables = new ArrayList<>();
public SWClassLoader(final ClassLoader parent, final Archive<?>... ar) {
super(parent);
@@ -115,7 +115,7 @@ public class SWClassLoader extends ClassLoader implements Closeable {
if ("true".equalsIgnoreCase(SystemInstance.get().getProperty("openejb.arquillian.cdi.extension.skip-externals", "false"))) {
return enumerator(Collections.<URL>emptyList());
}
- return enumerator(addContainerExtensions(name, new ArrayList<URL>(2)));
+ return enumerator(addContainerExtensions(name, new ArrayList<>(2)));
}
}
return super.getResources(name);
@@ -193,8 +193,8 @@ public class SWClassLoader extends ClassLoader implements Closeable {
}
private static class ArchiveStreamHandler extends URLStreamHandler {
- public static final Map<String, Archive<?>> archives = new HashMap<String, Archive<?>>();
- public static final Map<String, Collection<Closeable>> closeables = new HashMap<String, Collection<Closeable>>();
+ public static final Map<String, Archive<?>> archives = new HashMap<>();
+ public static final Map<String, Collection<Closeable>> closeables = new HashMap<>();
public static void set(final Archive<?> ar, final Collection<Closeable> c) {
final String archiveName = ar.getName();
diff --git a/arquillian/arquillian-openejb-embedded/src/main/java/org/apache/openejb/arquillian/openejb/cucumber/ArchiveResourceIteratorFactory.java b/arquillian/arquillian-openejb-embedded/src/main/java/org/apache/openejb/arquillian/openejb/cucumber/ArchiveResourceIteratorFactory.java
index 44f86e4858..7421b3d184 100644
--- a/arquillian/arquillian-openejb-embedded/src/main/java/org/apache/openejb/arquillian/openejb/cucumber/ArchiveResourceIteratorFactory.java
+++ b/arquillian/arquillian-openejb-embedded/src/main/java/org/apache/openejb/arquillian/openejb/cucumber/ArchiveResourceIteratorFactory.java
@@ -45,7 +45,7 @@ public class ArchiveResourceIteratorFactory implements ResourceIteratorFactory {
private Collection<Resource> findResources(final String path, final String suffix) {
final ClassLoader loader = Thread.currentThread().getContextClassLoader();
- final Collection<Resource> resources = new ArrayList<Resource>();
+ final Collection<Resource> resources = new ArrayList<>();
if (SWClassLoader.class.isInstance(loader)) {
final Collection<Archive<?>> archives = SWClassLoader.class.cast(loader).getArchives();
final ClassLoader parent = loader.getParent();
diff --git a/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/ConfigurationOverrides.java b/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/ConfigurationOverrides.java
index 2af4ec2005..0681b369ae 100644
--- a/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/ConfigurationOverrides.java
+++ b/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/ConfigurationOverrides.java
@@ -83,7 +83,7 @@ public class ConfigurationOverrides {
}
private static List<Properties> read(final List<URL> urls) {
- final List<Properties> propertiesList = new ArrayList<Properties>();
+ final List<Properties> propertiesList = new ArrayList<>();
for (final URL url : urls) {
try {
propertiesList.add(IO.readProperties(url));
@@ -95,7 +95,7 @@ public class ConfigurationOverrides {
}
public static List<URL> findPropertiesFiles(final String name, final String... prefixes) {
- final List<URL> urls = new ArrayList<URL>();
+ final List<URL> urls = new ArrayList<>();
final ClassLoader loader = Thread.currentThread().getContextClassLoader();
diff --git a/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Files.java b/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Files.java
index e244dc1ae1..ca72586b7d 100644
--- a/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Files.java
+++ b/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Files.java
@@ -76,7 +76,7 @@ public final class Files {
}
// Shutdown hook for recursive delete on tmp directories
- static final List<String> delete = new ArrayList<String>();
+ static final List<String> delete = new ArrayList<>();
private static volatile boolean shutdown;
diff --git a/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/ObjectMap.java b/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/ObjectMap.java
index fd3b8063db..8b686639c2 100644
--- a/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/ObjectMap.java
+++ b/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/ObjectMap.java
@@ -46,7 +46,7 @@ public class ObjectMap extends AbstractMap<String, Object> {
public ObjectMap(final Class<?> clazz, final Object object) {
this.object = object;
- attributes = new HashMap<String, Entry<String, Object>>();
+ attributes = new HashMap<>();
for (final Field field : clazz.getFields()) {
final FieldEntry entry = new FieldEntry(field);
@@ -74,7 +74,7 @@ public class ObjectMap extends AbstractMap<String, Object> {
}
}
- entries = Collections.unmodifiableSet(new HashSet<Entry<String, Object>>(attributes.values()));
+ entries = Collections.unmodifiableSet(new HashSet<>(attributes.values()));
}
@Override
diff --git a/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEConfiguration.java b/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEConfiguration.java
index 1a3b2f325c..e84204e7d6 100644
--- a/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEConfiguration.java
+++ b/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEConfiguration.java
@@ -176,7 +176,7 @@ public class TomEEConfiguration implements ContainerConfiguration {
}
public int[] portsAlreadySet() {
- final List<Integer> value = new ArrayList<Integer>();
+ final List<Integer> value = new ArrayList<>();
if (stopPort > 0) {
value.add(stopPort);
}
@@ -251,7 +251,7 @@ public class TomEEConfiguration implements ContainerConfiguration {
public void setSingleDeploymentByArchiveName(final String singleDeploymentByArchiveName) {
this.singleDeploymentByArchiveName = singleDeploymentByArchiveName == null || singleDeploymentByArchiveName.trim().isEmpty() ?
- Collections.<String>emptyList() : new HashSet<String>(asList(singleDeploymentByArchiveName.split(" *, *")));
+ Collections.<String>emptyList() : new HashSet<>(asList(singleDeploymentByArchiveName.split(" *, *")));
this.singleDumpByArchiveName = true; // implied otherwise what would be the sense?
}
}
diff --git a/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java b/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java
index c0764d4d13..f803d9923d 100644
--- a/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java
+++ b/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java
@@ -64,7 +64,7 @@ public abstract class TomEEContainer<Configuration extends TomEEConfiguration> i
protected static final Logger LOGGER = Logger.getLogger(TomEEContainer.class.getName());
protected Configuration configuration;
- protected Map<String, DeployedApp> moduleIds = new HashMap<String, DeployedApp>();
+ protected Map<String, DeployedApp> moduleIds = new HashMap<>();
private final Options options;
@Inject
@@ -164,7 +164,7 @@ public abstract class TomEEContainer<Configuration extends TomEEConfiguration> i
//
// Set ports if they are unspecified
//
- final Collection<Integer> randomPorts = new ArrayList<Integer>();
+ final Collection<Integer> randomPorts = new ArrayList<>();
for (final int i : configuration.portsAlreadySet()) { // ensure we don't use already initialized port (fixed ones)
randomPorts.add(i);
}
@@ -425,7 +425,7 @@ public abstract class TomEEContainer<Configuration extends TomEEConfiguration> i
}
private Collection<String> apps() {
- final Collection<String> paths = new ArrayList<String>();
+ final Collection<String> paths = new ArrayList<>();
try {
final Collection<AppInfo> appInfos = getDeployedApps();
for (final AppInfo info : appInfos) {
diff --git a/arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEConfiguration.java b/arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEConfiguration.java
index 5b4f1e3524..153e59c967 100644
--- a/arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEConfiguration.java
+++ b/arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEConfiguration.java
@@ -185,7 +185,7 @@ public class EmbeddedTomEEConfiguration extends TomEEConfiguration {
@Override
public int[] portsAlreadySet() {
- final List<Integer> value = new ArrayList<Integer>();
+ final List<Integer> value = new ArrayList<>();
if (getStopPort() > 0) {
value.add(getStopPort());
}
diff --git a/arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainer.java b/arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainer.java
index b26f5d918e..eb01869f0a 100644
--- a/arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainer.java
+++ b/arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainer.java
@@ -51,9 +51,9 @@ import java.util.concurrent.ConcurrentHashMap;
public class EmbeddedTomEEContainer extends TomEEContainer<EmbeddedTomEEConfiguration> {
- private static final Map<Archive<?>, File> ARCHIVES = new ConcurrentHashMap<Archive<?>, File>();
+ private static final Map<Archive<?>, File> ARCHIVES = new ConcurrentHashMap<>();
- private static final Map<String, MockHttpSession> SESSIONS = new ConcurrentHashMap<String, MockHttpSession>();
+ private static final Map<String, MockHttpSession> SESSIONS = new ConcurrentHashMap<>();
private Container container;
diff --git a/arquillian/arquillian-tomee-moviefun-example/src/main/java/org/superbiz/moviefun/ActionServlet.java b/arquillian/arquillian-tomee-moviefun-example/src/main/java/org/superbiz/moviefun/ActionServlet.java
index 39d487d082..c4c8620f1c 100644
--- a/arquillian/arquillian-tomee-moviefun-example/src/main/java/org/superbiz/moviefun/ActionServlet.java
+++ b/arquillian/arquillian-tomee-moviefun-example/src/main/java/org/superbiz/moviefun/ActionServlet.java
@@ -117,7 +117,7 @@ public class ActionServlet extends HttpServlet {
session.setAttribute("movies.collection", movies);
session.setAttribute("movies.iterator", listIterator);
- final List<Movie> moviesToShow = new ArrayList<Movie>();
+ final List<Movie> moviesToShow = new ArrayList<>();
final boolean hasPrevious = listIterator.hasPrevious();
diff --git a/arquillian/arquillian-tomee-moviefun-example/src/main/java/org/superbiz/moviefun/setup/ExampleDataProducer.java b/arquillian/arquillian-tomee-moviefun-example/src/main/java/org/superbiz/moviefun/setup/ExampleDataProducer.java
index bc2a36c30f..07bacbd4c5 100644
--- a/arquillian/arquillian-tomee-moviefun-example/src/main/java/org/superbiz/moviefun/setup/ExampleDataProducer.java
+++ b/arquillian/arquillian-tomee-moviefun-example/src/main/java/org/superbiz/moviefun/setup/ExampleDataProducer.java
@@ -28,7 +28,7 @@ public class ExampleDataProducer {
@Produces
@Examples
public List<Movie> createSampleMovies() {
- final List<Movie> sampleMovies = new ArrayList<Movie>();
+ final List<Movie> sampleMovies = new ArrayList<>();
sampleMovies.add(new Movie("Wedding Crashers", "David Dobkin", "Comedy", 7, 2005));
sampleMovies.add(new Movie("Starsky & Hutch", "Todd Phillips", "Action", 6, 2004));
sampleMovies.add(new Movie("Shanghai Knights", "David Dobkin", "Action", 6, 2003));
diff --git a/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEConfiguration.java b/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEConfiguration.java
index 61c10fc2d5..15d94ada15 100644
--- a/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEConfiguration.java
+++ b/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEConfiguration.java
@@ -192,7 +192,7 @@ public class RemoteTomEEConfiguration extends TomEEConfiguration {
@Override
public int[] portsAlreadySet() {
- final List<Integer> value = new ArrayList<Integer>();
+ final List<Integer> value = new ArrayList<>();
if (getStopPort() > 0) {
value.add(getStopPort());
}
diff --git a/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java b/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java
index 72bc000d4f..58850fb718 100644
--- a/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java
+++ b/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java
@@ -176,7 +176,7 @@ public class RemoteTomEEContainer extends TomEEContainer<RemoteTomEEConfiguratio
);
}
- final List<String> splitOnSpace = new ArrayList<String>();
+ final List<String> splitOnSpace = new ArrayList<>();
final Iterator<String> it = new ArgsIterator(opts);
while (it.hasNext()) {
@@ -282,7 +282,7 @@ public class RemoteTomEEContainer extends TomEEContainer<RemoteTomEEConfiguratio
}
if (logger.isLoggable(Level.FINE)) {
- final Map<Object, Object> map = new TreeMap<Object, Object>(System.getProperties());
+ final Map<Object, Object> map = new TreeMap<>(System.getProperties());
for (final Map.Entry<Object, Object> entry : map.entrySet()) {
logger.log(Level.FINE, String.format("%s = %s\n", entry.getKey(), entry.getValue()));
}
diff --git a/arquillian/ziplock/src/main/java/org/apache/ziplock/Archive.java b/arquillian/ziplock/src/main/java/org/apache/ziplock/Archive.java
index 0f65597d10..f5e2f373ed 100644
--- a/arquillian/ziplock/src/main/java/org/apache/ziplock/Archive.java
+++ b/arquillian/ziplock/src/main/java/org/apache/ziplock/Archive.java
@@ -35,8 +35,8 @@ import java.util.zip.ZipOutputStream;
*/
public class Archive {
- final Map<String, String> manifest = new HashMap<String, String>();
- final Map<String, byte[]> entries = new HashMap<String, byte[]>();
+ final Map<String, String> manifest = new HashMap<>();
+ final Map<String, byte[]> entries = new HashMap<>();
public static Archive archive() {
return new Archive();
@@ -175,7 +175,7 @@ public class Archive {
}
private HashMap<String, byte[]> entries() {
- final HashMap<String, byte[]> entries = new HashMap<String, byte[]>(this.entries);
+ final HashMap<String, byte[]> entries = new HashMap<>(this.entries);
entries.put("META-INF/MANIFEST.MF", buildManifest().getBytes());
return entries;
}
diff --git a/arquillian/ziplock/src/main/java/org/apache/ziplock/ClassLoaders.java b/arquillian/ziplock/src/main/java/org/apache/ziplock/ClassLoaders.java
index d04d4cd800..b9fcfc3133 100644
--- a/arquillian/ziplock/src/main/java/org/apache/ziplock/ClassLoaders.java
+++ b/arquillian/ziplock/src/main/java/org/apache/ziplock/ClassLoaders.java
@@ -39,7 +39,7 @@ public final class ClassLoaders {
return Collections.emptySet();
}
- final Set<URL> urls = new HashSet<URL>();
+ final Set<URL> urls = new HashSet<>();
if (URLClassLoader.class.isInstance(classLoader) && !DONT_USE_GET_URLS) {
if (!isSurefire(classLoader)) {
@@ -156,7 +156,7 @@ public final class ClassLoaders {
private static Collection<URL> fromClassPath() {
final String[] cp = System.getProperty("java.class.path").split(System.getProperty("path.separator", ":"));
- final Set<URL> urls = new HashSet<URL>();
+ final Set<URL> urls = new HashSet<>();
for (final String path : cp) {
try {
urls.add(new File(path).toURI().toURL()); // don't build the url in plain String since it is not portable
@@ -168,7 +168,7 @@ public final class ClassLoaders {
}
public static Set<URL> findUrlFromResources(final ClassLoader classLoader) throws IOException {
- final Set<URL> set = new HashSet<URL>();
+ final Set<URL> set = new HashSet<>();
for (final URL url : Collections.list(classLoader.getResources("META-INF"))) {
final String externalForm = url.toExternalForm();
set.add(new URL(externalForm.substring(0, externalForm.lastIndexOf("META-INF"))));
diff --git a/arquillian/ziplock/src/main/java/org/apache/ziplock/Files.java b/arquillian/ziplock/src/main/java/org/apache/ziplock/Files.java
index aeb811cb9c..58c8fbd9b3 100644
--- a/arquillian/ziplock/src/main/java/org/apache/ziplock/Files.java
+++ b/arquillian/ziplock/src/main/java/org/apache/ziplock/Files.java
@@ -38,7 +38,7 @@ public class Files {
public static List<File> collect(final File dir, final FileFilter filter) {
- final List<File> accepted = new ArrayList<File>();
+ final List<File> accepted = new ArrayList<>();
if (filter.accept(dir)) {
accepted.add(dir);
}
@@ -115,7 +115,7 @@ public class Files {
}
// Shutdown hook for recursive delete on tmp directories
- static final List<String> delete = new ArrayList<String>();
+ static final List<String> delete = new ArrayList<>();
static {
final ClassLoader loader = Thread.currentThread().getContextClassLoader();
diff --git a/arquillian/ziplock/src/main/java/org/apache/ziplock/Join.java b/arquillian/ziplock/src/main/java/org/apache/ziplock/Join.java
index 17ce2d6ec2..2fa55f7937 100644
--- a/arquillian/ziplock/src/main/java/org/apache/ziplock/Join.java
+++ b/arquillian/ziplock/src/main/java/org/apache/ziplock/Join.java
@@ -73,7 +73,7 @@ public class Join {
}
public static <T> List<String> strings(final Collection<T> collection, final NameCallback<T> callback) {
- final List<String> list = new ArrayList<String>();
+ final List<String> list = new ArrayList<>();
for (final T t : collection) {
final String name = callback.getName(t);
diff --git a/arquillian/ziplock/src/main/java/org/apache/ziplock/ResourceFinder.java b/arquillian/ziplock/src/main/java/org/apache/ziplock/ResourceFinder.java
index 21acd4af50..4c8ca808b8 100644
--- a/arquillian/ziplock/src/main/java/org/apache/ziplock/ResourceFinder.java
+++ b/arquillian/ziplock/src/main/java/org/apache/ziplock/ResourceFinder.java
@@ -47,7 +47,7 @@ public class ResourceFinder {
private final URL[] urls;
private final String path;
private final ClassLoader classLoader;
- private final List<String> resourcesNotLoaded = new ArrayList<String>();
+ private final List<String> resourcesNotLoaded = new ArrayList<>();
public ResourceFinder(final URL... urls) {
this(null, Thread.currentThread().getContextClassLoader(), urls);
@@ -179,7 +179,7 @@ public class ResourceFinder {
public List<String> findAllStrings(final String uri) throws IOException {
final String fulluri = path + uri;
- final List<String> strings = new ArrayList<String>();
+ final List<String> strings = new ArrayList<>();
final Enumeration<URL> resources = getResources(fulluri);
while (resources.hasMoreElements()) {
@@ -203,7 +203,7 @@ public class ResourceFinder {
resourcesNotLoaded.clear();
final String fulluri = path + uri;
- final List<String> strings = new ArrayList<String>();
+ final List<String> strings = new ArrayList<>();
final Enumeration<URL> resources = getResources(fulluri);
while (resources.hasMoreElements()) {
@@ -243,7 +243,7 @@ public class ResourceFinder {
* @throws IOException if any of the urls cannot be read
*/
public Map<String, String> mapAllStrings(final String uri) throws IOException {
- final Map<String, String> strings = new HashMap<String, String>();
+ final Map<String, String> strings = new HashMap<>();
final Map<String, URL> resourcesMap = getResourcesMap(uri);
for (final Iterator iterator = resourcesMap.entrySet().iterator(); iterator.hasNext(); ) {
final Map.Entry entry = (Map.Entry) iterator.next();
@@ -282,7 +282,7 @@ public class ResourceFinder {
*/
public Map<String, String> mapAvailableStrings(final String uri) throws IOException {
resourcesNotLoaded.clear();
- final Map<String, String> strings = new HashMap<String, String>();
+ final Map<String, String> strings = new HashMap<>();
final Map<String, URL> resourcesMap = getResourcesMap(uri);
for (final Iterator iterator = resourcesMap.entrySet().iterator(); iterator.hasNext(); ) {
final Map.Entry entry = (Map.Entry) iterator.next();
@@ -330,7 +330,7 @@ public class ResourceFinder {
* @throws ClassNotFoundException
*/
public List<Class<?>> findAllClasses(final String uri) throws IOException, ClassNotFoundException {
- final List<Class<?>> classes = new ArrayList<Class<?>>();
+ final List<Class<?>> classes = new ArrayList<>();
final List<String> strings = findAllStrings(uri);
for (final String className : strings) {
final Class<?> clazz = classLoader.loadClass(className);
@@ -352,7 +352,7 @@ public class ResourceFinder {
*/
public List<Class<?>> findAvailableClasses(final String uri) throws IOException {
resourcesNotLoaded.clear();
- final List<Class<?>> classes = new ArrayList<Class<?>>();
+ final List<Class<?>> classes = new ArrayList<>();
final List<String> strings = findAvailableStrings(uri);
for (final String className : strings) {
try {
@@ -389,7 +389,7 @@ public class ResourceFinder {
* @throws ClassNotFoundException
*/
public Map<String, Class<?>> mapAllClasses(final String uri) throws IOException, ClassNotFoundException {
- final Map<String, Class<?>> classes = new HashMap<String, Class<?>>();
+ final Map<String, Class<?>> classes = new HashMap<>();
final Map<String, String> map = mapAllStrings(uri);
for (final Map.Entry<String, String> entry : map.entrySet()) {
final String string = entry.getKey();
@@ -425,7 +425,7 @@ public class ResourceFinder {
*/
public Map<String, Class<?>> mapAvailableClasses(final String uri) throws IOException {
resourcesNotLoaded.clear();
- final Map<String, Class<?>> classes = new HashMap<String, Class<?>>();
+ final Map<String, Class<?>> classes = new HashMap<>();
final Map<String, String> map = mapAvailableStrings(uri);
for (final Map.Entry<String, String> entry : map.entrySet()) {
final String string = entry.getKey();
@@ -502,7 +502,7 @@ public class ResourceFinder {
* @throws ClassCastException if the class found is not assignable to the specified superclass or interface
*/
public <T> List<Class<? extends T>> findAllImplementations(final Class<T> interfase) throws IOException, ClassNotFoundException {
- final List<Class<? extends T>> implementations = new ArrayList<Class<? extends T>>();
+ final List<Class<? extends T>> implementations = new ArrayList<>();
final List<String> strings = findAllStrings(interfase.getName());
for (final String className : strings) {
final Class<? extends T> impl = classLoader.loadClass(className).asSubclass(interfase);
@@ -536,7 +536,7 @@ public class ResourceFinder {
*/
public <T> List<Class<? extends T>> findAvailableImplementations(final Class<T> interfase) throws IOException {
resourcesNotLoaded.clear();
- final List<Class<? extends T>> implementations = new ArrayList<Class<? extends T>>();
+ final List<Class<? extends T>> implementations = new ArrayList<>();
final List<String> strings = findAvailableStrings(interfase.getName());
for (final String className : strings) {
try {
@@ -579,7 +579,7 @@ public class ResourceFinder {
* @throws ClassCastException if the class found is not assignable to the specified superclass or interface
*/
public <T> Map<String, Class<? extends T>> mapAllImplementations(final Class<T> interfase) throws IOException, ClassNotFoundException {
- final Map<String, Class<? extends T>> implementations = new HashMap<String, Class<? extends T>>();
+ final Map<String, Class<? extends T>> implementations = new HashMap<>();
final Map<String, String> map = mapAllStrings(interfase.getName());
for (final Map.Entry<String, String> entry : map.entrySet()) {
final String string = entry.getKey();
@@ -615,7 +615,7 @@ public class ResourceFinder {
*/
public <T> Map<String, Class<? extends T>> mapAvailableImplementations(final Class<T> interfase) throws IOException {
resourcesNotLoaded.clear();
- final Map<String, Class<? extends T>> implementations = new HashMap<String, Class<? extends T>>();
+ final Map<String, Class<? extends T>> implementations = new HashMap<>();
final Map<String, String> map = mapAvailableStrings(interfase.getName());
for (final Map.Entry<String, String> entry : map.entrySet()) {
final String string = entry.getKey();
@@ -686,7 +686,7 @@ public class ResourceFinder {
public List<Properties> findAllProperties(final String uri) throws IOException {
final String fulluri = path + uri;
- final List<Properties> properties = new ArrayList<Properties>();
+ final List<Properties> properties = new ArrayList<>();
final Enumeration<URL> resources = getResources(fulluri);
while (resources.hasMoreElements()) {
@@ -720,7 +720,7 @@ public class ResourceFinder {
resourcesNotLoaded.clear();
final String fulluri = path + uri;
- final List<Properties> properties = new ArrayList<Properties>();
+ final List<Properties> properties = new ArrayList<>();
final Enumeration<URL> resources = getResources(fulluri);
while (resources.hasMoreElements()) {
@@ -757,7 +757,7 @@ public class ResourceFinder {
* @throws IOException if the URL cannot be read or is not in properties file format
*/
public Map<String, Properties> mapAllProperties(final String uri) throws IOException {
- final Map<String, Properties> propertiesMap = new HashMap<String, Properties>();
+ final Map<String, Properties> propertiesMap = new HashMap<>();
final Map<String, URL> map = getResourcesMap(uri);
for (final Iterator iterator = map.entrySet().iterator(); iterator.hasNext(); ) {
final Map.Entry entry = (Map.Entry) iterator.next();
@@ -793,7 +793,7 @@ public class ResourceFinder {
*/
public Map<String, Properties> mapAvailableProperties(final String uri) throws IOException {
resourcesNotLoaded.clear();
- final Map<String, Properties> propertiesMap = new HashMap<String, Properties>();
+ final Map<String, Properties> propertiesMap = new HashMap<>();
final Map<String, URL> map = getResourcesMap(uri);
for (final Iterator iterator = map.entrySet().iterator(); iterator.hasNext(); ) {
final Map.Entry entry = (Map.Entry) iterator.next();
@@ -818,7 +818,7 @@ public class ResourceFinder {
public Map<String, URL> getResourcesMap(final String uri) throws IOException {
String basePath = path + uri;
- final Map<String, URL> resources = new HashMap<String, URL>();
+ final Map<String, URL> resources = new HashMap<>();
if (!basePath.endsWith("/")) {
basePath += "/";
}
diff --git a/arquillian/ziplock/src/main/java/org/apache/ziplock/maven/Mvn.java b/arquillian/ziplock/src/main/java/org/apache/ziplock/maven/Mvn.java
index 0874185fe4..9a021420a3 100644
--- a/arquillian/ziplock/src/main/java/org/apache/ziplock/maven/Mvn.java
+++ b/arquillian/ziplock/src/main/java/org/apache/ziplock/maven/Mvn.java
@@ -49,7 +49,7 @@ public final class Mvn {
private File classes;
private String basePackage;
private String name = "test.war";
- private Map<File, String> additionalResources = new HashMap<File, String>();
+ private Map<File, String> additionalResources = new HashMap<>();
private ScopeType[] scopes = { ScopeType.COMPILE, ScopeType.RUNTIME };
private Filter<ArchivePath> filter = Filters.includeAll();
@@ -219,7 +219,7 @@ public final class Mvn {
public static class KnownResourcesFilter implements Filter<ArchivePath> {
private final File base;
private final String prefix;
- private final Map<ArchivePath, Asset> paths = new HashMap<ArchivePath, Asset>();
+ private final Map<ArchivePath, Asset> paths = new HashMap<>();
private final Filter<ArchivePath> delegate;
public KnownResourcesFilter(final File base, final String prefix, final Filter<ArchivePath> filter) {
diff --git a/arquillian/ziplock/src/main/java/org/apache/ziplock/maven/PreloadableTestWar.java b/arquillian/ziplock/src/main/java/org/apache/ziplock/maven/PreloadableTestWar.java
index aa8386d5d7..98c191b9ee 100644
--- a/arquillian/ziplock/src/main/java/org/apache/ziplock/maven/PreloadableTestWar.java
+++ b/arquillian/ziplock/src/main/java/org/apache/ziplock/maven/PreloadableTestWar.java
@@ -18,7 +18,6 @@ package org.apache.ziplock.maven;
import org.jboss.shrinkwrap.api.Archive;
-import java.util.concurrent.Callable;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
diff --git a/arquillian/ziplock/src/main/java/org/apache/ziplock/maven/PreloadableWar.java b/arquillian/ziplock/src/main/java/org/apache/ziplock/maven/PreloadableWar.java
index f26553a79c..cc2b527029 100644
--- a/arquillian/ziplock/src/main/java/org/apache/ziplock/maven/PreloadableWar.java
+++ b/arquillian/ziplock/src/main/java/org/apache/ziplock/maven/PreloadableWar.java
@@ -18,7 +18,6 @@ package org.apache.ziplock.maven;
import org.jboss.shrinkwrap.api.Archive;
-import java.util.concurrent.Callable;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/ClassLoaderUtil.java b/container/openejb-core/src/main/java/org/apache/openejb/ClassLoaderUtil.java
index f0f05a61b0..5073c0857e 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/ClassLoaderUtil.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/ClassLoaderUtil.java
@@ -62,8 +62,8 @@ import java.util.zip.ZipFile;
public class ClassLoaderUtil {
private static final Logger logger = Logger.getInstance(LogCategory.OPENEJB, ClassLoaderUtil.class);
- private static final Map<String, List<ClassLoader>> classLoadersByApp = new HashMap<String, List<ClassLoader>>();
- private static final Map<ClassLoader, Set<String>> appsByClassLoader = new HashMap<ClassLoader, Set<String>>();
+ private static final Map<String, List<ClassLoader>> classLoadersByApp = new HashMap<>();
+ private static final Map<ClassLoader, Set<String>> appsByClassLoader = new HashMap<>();
private static final UrlCache localUrlCache = new UrlCache();
private static final AtomicBoolean skipClearSunJarFile = new AtomicBoolean();
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/ProxyInfo.java b/container/openejb-core/src/main/java/org/apache/openejb/ProxyInfo.java
index 4dbaea3faa..2e8a01d2a8 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/ProxyInfo.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/ProxyInfo.java
@@ -51,7 +51,7 @@ public class ProxyInfo {
* @param pk
*/
public ProxyInfo(final BeanContext depInfo, final Object pk) {
- this(depInfo, pk, new ArrayList<Class>(), InterfaceType.UNKNOWN, null);
+ this(depInfo, pk, new ArrayList<>(), InterfaceType.UNKNOWN, null);
}
public InterfaceType getInterfaceType() {
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
index 2ef1ede7dd..0cdb7f6e21 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
@@ -477,7 +477,7 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A
}
}
- private static final ThreadLocal<Map<String, Object>> context = new ThreadLocal<Map<String, Object>>();
+ private static final ThreadLocal<Map<String, Object>> context = new ThreadLocal<>();
public static void setContext(final Map<String, Object> map) {
context.set(map);
@@ -1864,7 +1864,7 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A
// Sort all the beans with references to the back of the list. Beans
// without references to ther beans will be deployed first.
- deployments = References.sort(deployments, new References.Visitor<BeanContext>() {
+ deployments = References.sort(deployments, new References.Visitor<>() {
@Override
public String getName(final BeanContext t) {
return (String) t.getDeploymentID();
@@ -1995,7 +1995,7 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A
}
}
- resources.sort(new Comparator<DestroyingResource>() { // end by destroying RA after having closed CF pool (for jms for instance)
+ resources.sort(new Comparator<>() { // end by destroying RA after having closed CF pool (for jms for instance)
@Override
public int compare(final DestroyingResource o1, final DestroyingResource o2) {
final boolean ra1 = isRa(o1.instance);
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/AssemblerTool.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/AssemblerTool.java
index 29e3ee6ee8..2109c58a71 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/AssemblerTool.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/AssemblerTool.java
@@ -35,7 +35,7 @@ import java.util.Properties;
public class AssemblerTool {
- public static final Map<String, Class> serviceInterfaces = new HashMap<String, Class>();
+ public static final Map<String, Class> serviceInterfaces = new HashMap<>();
static {
serviceInterfaces.put("ProxyFactory", ProxyFactory.class);
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/DeploymentExceptionManager.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/DeploymentExceptionManager.java
index 00c5dbe1b1..8aee10dd42 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/DeploymentExceptionManager.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/DeploymentExceptionManager.java
@@ -29,7 +29,7 @@ import java.util.Map;
*/
public class DeploymentExceptionManager {
private static final int MAX_SIZE = SystemInstance.get().getOptions().get("tomee.deployement-exception-max-size", 10);
- private final Map<AppInfo, Exception> deploymentException = new LinkedHashMap<AppInfo, Exception>() {
+ private final Map<AppInfo, Exception> deploymentException = new LinkedHashMap<>() {
@Override // just to avoid potential memory leak
protected boolean removeEldestEntry(final Map.Entry<AppInfo, Exception> eldest) {
return size() > MAX_SIZE;
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbJarInfo.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbJarInfo.java
index a77584cb69..85a0dbb6b1 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbJarInfo.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbJarInfo.java
@@ -43,7 +43,7 @@ public class EjbJarInfo extends CommonInfoObject {
@XmlElement(name = "message-driven", type = MessageDrivenBeanInfo.class),
@XmlElement(name = "managed-bean", type = ManagedBeanInfo.class)
})
- public final List<EnterpriseBeanInfo> enterpriseBeans = new ArrayList<EnterpriseBeanInfo>();
+ public final List<EnterpriseBeanInfo> enterpriseBeans = new ArrayList<>();
public final List<SecurityRoleInfo> securityRoles = new ArrayList<>();
public final List<MethodPermissionInfo> methodPermissions = new ArrayList<>();
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiBeanInfo.java b/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiBeanInfo.java
index d43040994f..784f3be0ff 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiBeanInfo.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiBeanInfo.java
@@ -333,7 +333,7 @@ public class CdiBeanInfo implements JndiConsumer {
@Override
public Map<String, ContextService> getContextServiceMap() {
if (contextService == null) {
- contextService = new KeyedCollection<String, ContextService>();
+ contextService = new KeyedCollection<>();
}
return this.contextService.toMap();
}
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiEjbBean.java b/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiEjbBean.java
index dc283de15d..6713fb2ceb 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiEjbBean.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiEjbBean.java
@@ -84,14 +84,14 @@ public class CdiEjbBean<T> extends BaseEjbBean<T> implements InterceptedMarker,
public CdiEjbBean(final BeanContext beanContext, final WebBeansContext webBeansContext, final AnnotatedType<T> at,
final BeanAttributes<T> attributes) {
- this(beanContext, webBeansContext, beanContext.getManagedClass(), at, new EjbInjectionTargetFactory<T>(beanContext, at, webBeansContext), attributes);
+ this(beanContext, webBeansContext, beanContext.getManagedClass(), at, new EjbInjectionTargetFactory<>(beanContext, at, webBeansContext), attributes);
EjbInjectionTargetImpl.class.cast(getInjectionTarget()).setCdiEjbBean(this);
}
public CdiEjbBean(final BeanContext bc, final WebBeansContext webBeansContext, final Class beanClass, final AnnotatedType<T> at,
final InjectionTargetFactoryImpl<T> factory, final BeanAttributes<T> attributes) {
super(webBeansContext, toSessionType(bc.getComponentType()), at,
- new EJBBeanAttributesImpl<T>(bc, attributes),
+ new EJBBeanAttributesImpl<>(bc, attributes),
beanClass, factory);
this.beanContext = bc;
bc.set(Bean.class, this);
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBLifecycle.java b/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBLifecycle.java
index da3c9a8d9e..3f4073a463 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBLifecycle.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBLifecycle.java
@@ -78,7 +78,7 @@ import java.util.Set;
* @version $Rev:$ $Date:$
*/
public class OpenEJBLifecycle implements ContainerLifecycle {
- public static final ThreadLocal<AppInfo> CURRENT_APP_INFO = new ThreadLocal<AppInfo>();
+ public static final ThreadLocal<AppInfo> CURRENT_APP_INFO = new ThreadLocal<>();
//Logger instance
private static final Logger logger = Logger.getInstance(LogCategory.OPENEJB_CDI, OpenEJBLifecycle.class);
@@ -452,7 +452,7 @@ public class OpenEJBLifecycle implements ContainerLifecycle {
protected InternalBean(final WebBeansContext webBeansContext, final Class<T> api, final Class<?> type) {
super(webBeansContext, WebBeansType.MANAGED, api,
- new SimpleProducerFactory<T>(
+ new SimpleProducerFactory<>(
new ProviderBasedProducer<>(webBeansContext, type, new OpenEJBComponentProvider(webBeansContext, type), false)));
this.id = "openejb#container#" + api.getName();
}
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/cdi/OptimizedLoaderService.java b/container/openejb-core/src/main/java/org/apache/openejb/cdi/OptimizedLoaderService.java
index a8c00aa074..ce528b557a 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/cdi/OptimizedLoaderService.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/cdi/OptimizedLoaderService.java
@@ -139,7 +139,7 @@ public class OptimizedLoaderService implements LoaderService {
if ("true".equals(OptimizedLoaderService.this.config.getProperty("openejb.cdi.extensions.sorted",
SystemInstance.get().getProperty("openejb.cdi.extensions.sorted")))) {
- list.sort(new Comparator<Extension>() {
+ list.sort(new Comparator<>() {
@Override
public int compare(final Extension o1, final Extension o2) {
final int val1 = getVal(o1);
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/cdi/ThreadSingletonServiceImpl.java b/container/openejb-core/src/main/java/org/apache/openejb/cdi/ThreadSingletonServiceImpl.java
index 1a35fe0afe..9c31a9cd8f 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/cdi/ThreadSingletonServiceImpl.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/cdi/ThreadSingletonServiceImpl.java
@@ -79,8 +79,8 @@ public class ThreadSingletonServiceImpl implements ThreadSingletonService {
private volatile boolean cachedSessionScoped;
//this needs to be static because OWB won't tell us what the existing SingletonService is and you can't set it twice.
- private static final ThreadLocal<WebBeansContext> contexts = new ThreadLocal<WebBeansContext>();
- private static final Map<ClassLoader, WebBeansContext> contextByClassLoader = new ConcurrentHashMap<ClassLoader, WebBeansContext>();
+ private static final ThreadLocal<WebBeansContext> contexts = new ThreadLocal<>();
+ private static final Map<ClassLoader, WebBeansContext> contextByClassLoader = new ConcurrentHashMap<>();
private OWBContextThreadListener contextThreadListener;
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java b/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
index 75bee3d3e5..76aee49eec 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
@@ -289,8 +289,8 @@ public class AnnotationDeployer implements DynamicDeployer {
public static final String OPENEJB_JPA_AUTO_SCAN = "openejb.jpa.auto-scan";
public static final String OPENEJB_JPA_AUTO_SCAN_PACKAGE = "openejb.jpa.auto-scan.package";
- private static final ThreadLocal<DeploymentModule> currentModule = new ThreadLocal<DeploymentModule>();
- private static final Set<String> lookupMissing = new HashSet<String>(2);
+ private static final ThreadLocal<DeploymentModule> currentModule = new ThreadLocal<>();
+ private static final Set<String> lookupMissing = new HashSet<>(2);
private static final String[] JSF_CLASSES = new String[]{
"jakarta.faces.application.ResourceDependencies",
"jakarta.faces.application.ResourceDependency",
@@ -321,39 +321,39 @@ public class AnnotationDeployer implements DynamicDeployer {
"jakarta.websocket.Endpoint"
};
- private static final Collection<String> API_CLASSES = new ArrayList<String>(WEB_CLASSES.length + JSF_CLASSES.length);
+ private static final Collection<String> API_CLASSES = new ArrayList<>(WEB_CLASSES.length + JSF_CLASSES.length);
static {
API_CLASSES.addAll(Arrays.asList(JSF_CLASSES));
API_CLASSES.addAll(Arrays.asList(WEB_CLASSES));
}
- public static final Set<String> knownResourceEnvTypes = new TreeSet<String>(Arrays.asList(
- "jakarta.ejb.EJBContext",
- "jakarta.ejb.SessionContext",
- "jakarta.ejb.EntityContext",
- "jakarta.ejb.MessageDrivenContext",
- "jakarta.transaction.UserTransaction",
- "jakarta.jms.Queue",
- "jakarta.jms.Topic",
- "jakarta.xml.ws.WebServiceContext",
- "jakarta.ejb.TimerService",
- "jakarta.enterprise.inject.spi.BeanManager",
- "jakarta.validation.Validator",
- "jakarta.validation.ValidatorFactory"
+ public static final Set<String> knownResourceEnvTypes = new TreeSet<>(Arrays.asList(
+ "jakarta.ejb.EJBContext",
+ "jakarta.ejb.SessionContext",
+ "jakarta.ejb.EntityContext",
+ "jakarta.ejb.MessageDrivenContext",
+ "jakarta.transaction.UserTransaction",
+ "jakarta.jms.Queue",
+ "jakarta.jms.Topic",
+ "jakarta.xml.ws.WebServiceContext",
+ "jakarta.ejb.TimerService",
+ "jakarta.enterprise.inject.spi.BeanManager",
+ "jakarta.validation.Validator",
+ "jakarta.validation.ValidatorFactory"
));
- public static final Set<String> knownEnvironmentEntries = new TreeSet<String>(Arrays.asList(
- "boolean", "java.lang.Boolean",
- "char", "java.lang.Character",
- "byte", "java.lang.Byte",
- "short", "java.lang.Short",
- "int", "java.lang.Integer",
- "long", "java.lang.Long",
- "float", "java.lang.Float",
- "double", "java.lang.Double",
- "java.lang.String",
- "java.lang.Class"
+ public static final Set<String> knownEnvironmentEntries = new TreeSet<>(Arrays.asList(
+ "boolean", "java.lang.Boolean",
+ "char", "java.lang.Character",
+ "byte", "java.lang.Byte",
+ "short", "java.lang.Short",
+ "int", "java.lang.Integer",
+ "long", "java.lang.Long",
+ "float", "java.lang.Float",
+ "double", "java.lang.Double",
+ "java.lang.String",
+ "java.lang.Class"
));
private final DiscoverAnnotatedBeans discoverAnnotatedBeans;
@@ -5310,7 +5310,7 @@ public class AnnotationDeployer implements DynamicDeployer {
public LockHandler(final AssemblyDescriptor assemblyDescriptor,
final SessionBean bean) {
- this(assemblyDescriptor, bean, new HashMap<Object, ContainerConcurrency>());
+ this(assemblyDescriptor, bean, new HashMap<>());
}
public LockHandler(final AssemblyDescriptor assemblyDescriptor,
@@ -5349,7 +5349,7 @@ public class AnnotationDeployer implements DynamicDeployer {
public AccessTimeoutHandler(final AssemblyDescriptor assemblyDescriptor,
final SessionBean bean) {
- this(assemblyDescriptor, bean, new HashMap<Object, ContainerConcurrency>());
+ this(assemblyDescriptor, bean, new HashMap<>());
}
public AccessTimeoutHandler(final AssemblyDescriptor assemblyDescriptor,
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java b/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java
index f8bf3a7098..4c7abbc816 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java
@@ -274,7 +274,7 @@ class AppInfoBuilder {
// Check for circular references in Singleton @DependsOn
try {
- References.sort(beans, new References.Visitor<EnterpriseBeanInfo>() {
+ References.sort(beans, new References.Visitor<>() {
@Override
public String getName(final EnterpriseBeanInfo bean) {
return bean.ejbDeploymentId;
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java b/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
index 5af4423705..6e8a9f66ba 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
@@ -117,7 +117,7 @@ public class AutoConfig implements DynamicDeployer, JndiConstants {
private static final int MAX_IMPLICIT_POOL_SIZE = 5;
- private static final Set<String> ignoredReferenceTypes = new TreeSet<String>();
+ private static final Set<String> ignoredReferenceTypes = new TreeSet<>();
public static final String AUTOCREATE_JTA_DATASOURCE_FROM_NON_JTA_ONE_KEY = "openejb.autocreate.jta-datasource-from-non-jta-one";
static {
@@ -2318,7 +2318,7 @@ public class AutoConfig implements DynamicDeployer, JndiConstants {
}
private String getContainerIds(final Collection<ContainerInfo> containerInfos) {
- final Set<String> containerIds = new HashSet<String>();
+ final Set<String> containerIds = new HashSet<>();
for (final ContainerInfo containerInfo : containerInfos) {
containerIds.add(containerInfo.id);
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/CmpJpaConversion.java b/container/openejb-core/src/main/java/org/apache/openejb/config/CmpJpaConversion.java
index 300b6db75d..bd97306bfb 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/CmpJpaConversion.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/CmpJpaConversion.java
@@ -91,7 +91,7 @@ class CmpJpaConversion implements DynamicDeployer {
private static final String CMP_PERSISTENCE_UNIT_NAME = "cmp";
// A specific set of fields that get marked as transient in the superclass mappings
- private static final Set<String> ENHANCED_FIELDS = Collections.unmodifiableSet(new TreeSet<String>(Arrays.asList(
+ private static final Set<String> ENHANCED_FIELDS = Collections.unmodifiableSet(new TreeSet<>(Arrays.asList(
"pcInheritedFieldCount",
"pcFieldNames",
"pcFieldTypes",
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java b/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
index 14c294de97..f4273f70b2 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
@@ -1075,9 +1075,9 @@ public class ConfigurationFactory implements OpenEjbConfigurationFactory {
}
}
- private static final Map<Class<? extends ServiceInfo>, DefaultService> defaultProviders = new HashMap<Class<? extends ServiceInfo>, DefaultService>();
+ private static final Map<Class<? extends ServiceInfo>, DefaultService> defaultProviders = new HashMap<>();
- private static final Map<Class<? extends ServiceInfo>, Class<? extends org.apache.openejb.config.Service>> types = new HashMap<Class<? extends ServiceInfo>, Class<? extends org.apache.openejb.config.Service>>();
+ private static final Map<Class<? extends ServiceInfo>, Class<? extends org.apache.openejb.config.Service>> types = new HashMap<>();
/**
* This is the magic that allows people to be really vague in their openejb.xml and not specify
@@ -1582,7 +1582,7 @@ public class ConfigurationFactory implements OpenEjbConfigurationFactory {
return overrides;
}
- private static final Map<String, Class<? extends ContainerInfo>> containerTypes = new HashMap<String, Class<? extends ContainerInfo>>();
+ private static final Map<String, Class<? extends ContainerInfo>> containerTypes = new HashMap<>();
static {
containerTypes.put(BeanTypes.SINGLETON, SingletonSessionContainerInfo.class);
@@ -1760,7 +1760,7 @@ public class ConfigurationFactory implements OpenEjbConfigurationFactory {
public static List<ResourceInfo> sort(final List<ResourceInfo> infos, final String prefix) {
final Collection<String> ids = new HashSet<>();
- return References.sort(infos, new References.Visitor<ResourceInfo>() {
+ return References.sort(infos, new References.Visitor<>() {
@Override // called first so we can rely on it to ensure we have ids full before any getReferences call
public String getName(final ResourceInfo resourceInfo) {
final String name = prefix != null && resourceInfo.id.startsWith(prefix) ? resourceInfo.id.substring(prefix.length()) : resourceInfo.id;
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/NameFiltering.java b/container/openejb-core/src/main/java/org/apache/openejb/config/NameFiltering.java
index 3ca44000f5..105cd1017d 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/NameFiltering.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/NameFiltering.java
@@ -21,7 +21,7 @@ import java.util.ArrayList;
import java.util.List;
final class NameFiltering {
- private static final List<String> INVALID = new ArrayList<String>();
+ private static final List<String> INVALID = new ArrayList<>();
static { // for compatibility keep it
INVALID.add("classes");
INVALID.add("test-classes");
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java b/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java
index 1a2552b3b1..e515c7656b 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java
@@ -698,7 +698,7 @@ public class RemoteServer {
}
// Shutdown hook for processes
- private static final List<Process> kill = new ArrayList<Process>();
+ private static final List<Process> kill = new ArrayList<>();
static {
Runtime.getRuntime().addShutdownHook(new CleanUpThread());
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/TldScanner.java b/container/openejb-core/src/main/java/org/apache/openejb/config/TldScanner.java
index e5e06bcae3..f393b5f115 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/TldScanner.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/TldScanner.java
@@ -25,7 +25,6 @@ import org.apache.xbean.finder.UrlSet;
import org.apache.xbean.finder.filter.Filters;
import java.io.File;
-import java.io.FilenameFilter;
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
@@ -39,7 +38,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.WeakHashMap;
-import java.util.concurrent.Callable;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
@@ -66,11 +64,11 @@ import static org.apache.openejb.util.URLs.toFile;
public class TldScanner {
// first cache, it is the faster one but not relevant between temp and runtime phases
- private static final Map<ClassLoader, Set<URL>> cache = new WeakHashMap<ClassLoader, Set<URL>>();
+ private static final Map<ClassLoader, Set<URL>> cache = new WeakHashMap<>();
// tld by classloader identified by hash on urls (same hash for temp and runtime classloaders)
// a bit longer to compute but let scanning be reused over temp and runtime classloaders
- private static final Map<Integer, Set<URL>> cacheByhashCode = new WeakHashMap<Integer, Set<URL>>();
+ private static final Map<Integer, Set<URL>> cacheByhashCode = new WeakHashMap<>();
public static Set<URL> scan(final ClassLoader classLoader) throws OpenEJBException {
if (skip()) {
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckClassLoading.java b/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckClassLoading.java
index ff48487ce6..f8ed8c23ba 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckClassLoading.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckClassLoading.java
@@ -253,7 +253,7 @@ public class CheckClassLoading extends ValidationBase {
public static class DiffItemComparator implements Comparator<DiffItem> {
private static final DiffItemComparator INSTANCE = new DiffItemComparator();
- private static final Map<Class<?>, Integer> ORDER = new HashMap<Class<?>, Integer>();
+ private static final Map<Class<?>, Integer> ORDER = new HashMap<>();
static {
ORDER.put(SameItem.class, 0);
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckClasses.java b/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckClasses.java
index 96fd4f04dc..9727597535 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckClasses.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckClasses.java
@@ -68,7 +68,7 @@ import static java.lang.reflect.Modifier.isAbstract;
*/
public class CheckClasses extends ValidationBase {
- private static final List<Class<? extends Annotation>> beanOnlyAnnotations = new ArrayList<Class<? extends Annotation>>();
+ private static final List<Class<? extends Annotation>> beanOnlyAnnotations = new ArrayList<>();
static {
beanOnlyAnnotations.add(PostConstruct.class);
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckDependsOn.java b/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckDependsOn.java
index 5f10a2e64c..90444c9186 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckDependsOn.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckDependsOn.java
@@ -80,7 +80,7 @@ public class CheckDependsOn extends ValidationBase {
}
try {
- References.sort(new ArrayList<Bean>(app.values()), new References.Visitor<Bean>() {
+ References.sort(new ArrayList<>(app.values()), new References.Visitor<>() {
public String getName(final Bean t) {
return t.getId();
}
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/sys/AdditionalDeployments.java b/container/openejb-core/src/main/java/org/apache/openejb/config/sys/AdditionalDeployments.java
index c72160f2fa..d895f2af8b 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/sys/AdditionalDeployments.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/sys/AdditionalDeployments.java
@@ -30,7 +30,7 @@ import java.util.List;
@XmlRootElement(name = "additional-deployments")
public class AdditionalDeployments {
@XmlElement(name = "deployments")
- protected List<Deployments> deployments = new ArrayList<Deployments>();
+ protected List<Deployments> deployments = new ArrayList<>();
public List<Deployments> getDeployments() {
return deployments;
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/sys/JaxbOpenejb.java b/container/openejb-core/src/main/java/org/apache/openejb/config/sys/JaxbOpenejb.java
index f65cc788c2..6c9470835d 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/sys/JaxbOpenejb.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/sys/JaxbOpenejb.java
@@ -274,9 +274,9 @@ public abstract class JaxbOpenejb {
return new Messages("org.apache.openejb.util.resources");
}
- public static final ThreadLocal<Set<String>> currentPublicId = new ThreadLocal<Set<String>>();
+ public static final ThreadLocal<Set<String>> currentPublicId = new ThreadLocal<>();
- private static final Map<Class, JAXBContext> jaxbContexts = new HashMap<Class, JAXBContext>();
+ private static final Map<Class, JAXBContext> jaxbContexts = new HashMap<>();
public static <T> String marshal(final Class<T> type, final Object object) throws JAXBException {
final ByteArrayOutputStream baos = new ByteArrayOutputStream();
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Resource.java b/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Resource.java
index 916dafbff3..809bc5494d 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Resource.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Resource.java
@@ -61,7 +61,7 @@ public class Resource extends AbstractService {
@XmlAttribute(name = "aliases")
@XmlJavaTypeAdapter(ListAdapter.class)
- protected List<String> aliases = new ArrayList<String>();
+ protected List<String> aliases = new ArrayList<>();
@XmlAttribute(name = "depends-on")
@XmlJavaTypeAdapter(ListAdapter.class)
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/sys/WikiGenerator.java b/container/openejb-core/src/main/java/org/apache/openejb/config/sys/WikiGenerator.java
index 73f887f485..33fbaddf1b 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/sys/WikiGenerator.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/sys/WikiGenerator.java
@@ -59,7 +59,7 @@ public class WikiGenerator {
// generate containers
final List<ServiceProvider> serviceProvider = servicesJar.getServiceProvider();
- serviceProvider.sort(new Comparator<ServiceProvider>() {
+ serviceProvider.sort(new Comparator<>() {
@Override
public int compare(final ServiceProvider o1, final ServiceProvider o2) {
return grade(o2) - grade(o1);
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/EmptyResourcesClassLoader.java b/container/openejb-core/src/main/java/org/apache/openejb/core/EmptyResourcesClassLoader.java
index da668c0be0..1f47105a50 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/EmptyResourcesClassLoader.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/EmptyResourcesClassLoader.java
@@ -33,7 +33,7 @@ public class EmptyResourcesClassLoader extends ClassLoader {
@Override
public Enumeration<URL> getResources(final String name) throws IOException {
- return new Enumeration<URL>() {
+ return new Enumeration<>() {
@Override
public boolean hasMoreElements() {
return false;
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/ServerFederation.java b/container/openejb-core/src/main/java/org/apache/openejb/core/ServerFederation.java
index 7d8b88cb73..df87f520f3 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/ServerFederation.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/ServerFederation.java
@@ -30,7 +30,7 @@ import jakarta.ejb.HomeHandle;
public class ServerFederation implements ApplicationServer {
private static final IntraVmServer localServer = new IntraVmServer();
- private static final ThreadLocal<ApplicationServer> applicationServer = new ThreadLocal<ApplicationServer>();
+ private static final ThreadLocal<ApplicationServer> applicationServer = new ThreadLocal<>();
public Handle getHandle(final ProxyInfo proxyInfo) {
return getApplicationServer().getHandle(proxyInfo);
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp2Generator.java b/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp2Generator.java
index b50e01634e..4afb4143bd 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp2Generator.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp2Generator.java
@@ -1157,7 +1157,7 @@ public class Cmp2Generator implements Opcodes {
}
}
- private static final Map<Class, Convert> conversionsByPrimitive = new HashMap<Class, Convert>();
+ private static final Map<Class, Convert> conversionsByPrimitive = new HashMap<>();
public static Convert getConversion(final Class primitive) {
if (!primitive.isPrimitive()) {
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmrSet.java b/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmrSet.java
index c96a7bc406..0fd9f3bc97 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmrSet.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmrSet.java
@@ -159,7 +159,7 @@ public class CmrSet<Bean extends EntityBean, Proxy extends EJBLocalObject> exten
}
public Iterator<Proxy> iterator() {
- return new Iterator<Proxy>() {
+ return new Iterator<>() {
private Bean currentEntity;
private final Iterator<Bean> iterator = getRelatedBeans(true, false).iterator();
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/EjbSelect.java b/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/EjbSelect.java
index 9f5ae3a112..990a6903ec 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/EjbSelect.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/EjbSelect.java
@@ -37,7 +37,7 @@ import java.util.HashMap;
*/
public class EjbSelect {
// our table of select methods for quick lookup
- private static final HashMap<Class<?>, Method> selectMethods = new HashMap<Class<?>, Method>();
+ private static final HashMap<Class<?>, Method> selectMethods = new HashMap<>();
static {
try {
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/interceptor/InterceptorData.java b/container/openejb-core/src/main/java/org/apache/openejb/core/interceptor/InterceptorData.java
index 35d73595e6..b0802b861f 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/interceptor/InterceptorData.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/interceptor/InterceptorData.java
@@ -50,7 +50,7 @@ import static java.util.Arrays.asList;
* @version $Rev$ $Date$
*/
public class InterceptorData {
- private static final Map<Class<?>, InterceptorData> CACHE = new ConcurrentHashMap<Class<?>, InterceptorData>();
+ private static final Map<Class<?>, InterceptorData> CACHE = new ConcurrentHashMap<>();
private final Class clazz;
private final CdiInterceptorBean cdiInterceptorBean;
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbHomeProxyHandler.java b/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbHomeProxyHandler.java
index 478b5a777b..724bc79a80 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbHomeProxyHandler.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbHomeProxyHandler.java
@@ -308,7 +308,7 @@ public abstract class EjbHomeProxyHandler extends BaseEjbProxyHandler {
return beanContext.getModuleContext()
.getAppContext()
.getAsynchronousPool()
- .invoke(new CUCallable<Object>((Callable<Object>) () -> {
+ .invoke(new CUCallable<>((Callable<Object>) () -> {
try {
return homeMethodInvoke(interfce, method, args);
} catch (final ApplicationException ae) {
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbObjectProxyHandler.java b/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbObjectProxyHandler.java
index 07ceed9d16..d3155211f1 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbObjectProxyHandler.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbObjectProxyHandler.java
@@ -245,7 +245,7 @@ public abstract class EjbObjectProxyHandler extends BaseEjbProxyHandler {
return beanContext.getModuleContext()
.getAppContext()
.getAsynchronousPool()
- .invoke(new CUCallable<Object>((Callable<Object>) () -> {
+ .invoke(new CUCallable<>((Callable<Object>) () -> {
try {
return synchronizedBusinessMethod(interfce, method, args);
} catch (final ApplicationException ae) {
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/IntraVmCopyMonitor.java b/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/IntraVmCopyMonitor.java
index 72c3aea65b..6a57e3531e 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/IntraVmCopyMonitor.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/IntraVmCopyMonitor.java
@@ -36,7 +36,7 @@ public final class IntraVmCopyMonitor {
}
}
- private static final ThreadLocal<IntraVmCopyMonitor> threadMonitor = new ThreadLocal<IntraVmCopyMonitor>();
+ private static final ThreadLocal<IntraVmCopyMonitor> threadMonitor = new ThreadLocal<>();
private State state = State.NONE;
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/security/AbstractSecurityService.java b/container/openejb-core/src/main/java/org/apache/openejb/core/security/AbstractSecurityService.java
index 8dda5be069..5664a14a71 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/security/AbstractSecurityService.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/security/AbstractSecurityService.java
@@ -78,8 +78,8 @@ public abstract class AbstractSecurityService implements DestroyableResource, Se
protected static final String KEY_REQUEST = "jakarta.servlet.http.HttpServletRequest";
protected static final Set<String> KEYS = new HashSet<>(asList(KEY_REQUEST, KEY_SUBJECT));
- private static final Map<Object, Identity> identities = new ConcurrentHashMap<Object, Identity>();
- protected static final ThreadLocal<Identity> clientIdentity = new ThreadLocal<Identity>();
+ private static final Map<Object, Identity> identities = new ConcurrentHashMap<>();
+ protected static final ThreadLocal<Identity> clientIdentity = new ThreadLocal<>();
protected String defaultUser = "guest";
private String realmName = "PropertiesLogin";
protected Subject defaultSubject;
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/security/SecurityServiceImpl.java b/container/openejb-core/src/main/java/org/apache/openejb/core/security/SecurityServiceImpl.java
index 4f91480794..527c7788a0 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/security/SecurityServiceImpl.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/security/SecurityServiceImpl.java
@@ -36,7 +36,7 @@ import java.util.concurrent.ConcurrentHashMap;
*/
public class SecurityServiceImpl extends AbstractSecurityService {
- private static final Map<Object, LoginContext> contexts = new ConcurrentHashMap<Object, LoginContext>();
+ private static final Map<Object, LoginContext> contexts = new ConcurrentHashMap<>();
public SecurityServiceImpl() {
this(autoJaccProvider());
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/security/jacc/BasicJaccProvider.java b/container/openejb-core/src/main/java/org/apache/openejb/core/security/jacc/BasicJaccProvider.java
index 6a2f77811b..7d61a36ed6 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/security/jacc/BasicJaccProvider.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/security/jacc/BasicJaccProvider.java
@@ -44,7 +44,7 @@ import java.util.Set;
*/
public class BasicJaccProvider extends JaccProvider {
- private static final Set<Class> JACC_PERMISSIONS = new HashSet<Class>() {
+ private static final Set<Class> JACC_PERMISSIONS = new HashSet<>() {
{
add(EJBMethodPermission.class);
add(EJBRoleRefPermission.class);
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/singleton/SingletonInstanceManager.java b/container/openejb-core/src/main/java/org/apache/openejb/core/singleton/SingletonInstanceManager.java
index c0c05e390d..c949dfae11 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/singleton/SingletonInstanceManager.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/singleton/SingletonInstanceManager.java
@@ -55,7 +55,6 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Set;
-import java.util.concurrent.Callable;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
import java.util.concurrent.FutureTask;
@@ -115,7 +114,7 @@ public class SingletonInstanceManager {
// The singleton has not been created nor is being created
// We will construct this FutureTask and compete with the
// other threads for the right to create the singleton
- final FutureTask<Instance> task = new FutureTask<Instance>(() -> createInstance(callContext, beanContext));
+ final FutureTask<Instance> task = new FutureTask<>(() -> createInstance(callContext, beanContext));
do {
// If our FutureTask was the one to win the slot
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EJBCronTrigger.java b/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EJBCronTrigger.java
index b20454eb49..b351bcdce2 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EJBCronTrigger.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EJBCronTrigger.java
@@ -68,9 +68,9 @@ public class EJBCronTrigger extends CronTriggerImpl {
private static final String LAST_IDENTIFIER = "LAST";
- private static final Map<String, Integer> WEEKDAYS_MAP = new HashMap<String, Integer>();
+ private static final Map<String, Integer> WEEKDAYS_MAP = new HashMap<>();
- private static final Map<String, Integer> MONTHS_MAP = new HashMap<String, Integer>();
+ private static final Map<String, Integer> MONTHS_MAP = new HashMap<>();
static {
int i = 0;
@@ -87,7 +87,7 @@ public class EJBCronTrigger extends CronTriggerImpl {
private static final int[] ORDERED_CALENDAR_FIELDS = {Calendar.YEAR, Calendar.MONTH, Calendar.DAY_OF_MONTH, Calendar.HOUR_OF_DAY, Calendar.MINUTE, Calendar.SECOND};
- private static final Map<Integer, Integer> CALENDAR_FIELD_TYPE_ORDERED_INDEX_MAP = new LinkedHashMap<Integer, Integer>();
+ private static final Map<Integer, Integer> CALENDAR_FIELD_TYPE_ORDERED_INDEX_MAP = new LinkedHashMap<>();
static {
//Initialize a calendar field -> ordered array index map
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/HandlerResolverImpl.java b/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/HandlerResolverImpl.java
index b02f2cdfd3..bb206f6f3e 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/HandlerResolverImpl.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/HandlerResolverImpl.java
@@ -101,7 +101,7 @@ public class HandlerResolverImpl implements HandlerResolver {
// hack for destroyHandlers()
handlers.add(instance);
- handlerInstances.add(new InjectionProcessor<Handler>(instance, Collections.<Injection>emptySet(), null) {
+ handlerInstances.add(new InjectionProcessor<>(instance, Collections.<Injection>emptySet(), null) {
@Override
public void preDestroy() {
if (!normalScoped) {
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/JaxWsUtils.java b/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/JaxWsUtils.java
index 84f37dc13c..ca6d86244c 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/JaxWsUtils.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/JaxWsUtils.java
@@ -31,7 +31,7 @@ import java.util.StringTokenizer;
public final class JaxWsUtils {
- private static final Map<String, String> BINDING_MAP = new HashMap<String, String>();
+ private static final Map<String, String> BINDING_MAP = new HashMap<>();
static {
BINDING_MAP.put("##SOAP11_HTTP", "http://schemas.xmlsoap.org/wsdl/soap/http");
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/ProviderWrapper.java b/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/ProviderWrapper.java
index af5df711e4..a15b8b6391 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/ProviderWrapper.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/ProviderWrapper.java
@@ -67,7 +67,7 @@ public class ProviderWrapper extends Provider {
// Magic to get our provider wrapper installed with the PortRefData
//
- private static final ThreadLocal<ProviderWrapperData> threadPortRefs = new ThreadLocal<ProviderWrapperData>();
+ private static final ThreadLocal<ProviderWrapperData> threadPortRefs = new ThreadLocal<>();
public static void beforeCreate(final List<PortRefData> portRefData, final JaxWsServiceReference.WebServiceClientCustomizer customizer, final Properties properties) {
// Axis JAXWS api is non compliant and checks system property before classloader
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/ServiceRefData.java b/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/ServiceRefData.java
index e56cd819d7..9027208702 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/ServiceRefData.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/ServiceRefData.java
@@ -25,7 +25,7 @@ import java.util.List;
import java.util.WeakHashMap;
public class ServiceRefData {
- private static final WeakHashMap<Object, ServiceRefData> registry = new WeakHashMap<Object, ServiceRefData>();
+ private static final WeakHashMap<Object, ServiceRefData> registry = new WeakHashMap<>();
public static ServiceRefData getServiceRefData(final Object key) {
return registry.get(key);
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/log/logger/Log4jLogger.java b/container/openejb-core/src/main/java/org/apache/openejb/log/logger/Log4jLogger.java
index df06689705..3204cac3c3 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/log/logger/Log4jLogger.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/log/logger/Log4jLogger.java
@@ -45,7 +45,7 @@ import java.util.logging.LogRecord;
* @author gnodet
*/
public class Log4jLogger extends AbstractDelegatingLogger {
- private static final Map<Level, org.apache.log4j.Level> TO_LOG4J = new HashMap<Level, org.apache.log4j.Level>();
+ private static final Map<Level, org.apache.log4j.Level> TO_LOG4J = new HashMap<>();
private static final org.apache.log4j.Level TRACE;
private final Logger log;
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/monitoring/DynamicMBeanWrapper.java b/container/openejb-core/src/main/java/org/apache/openejb/monitoring/DynamicMBeanWrapper.java
index eb696d5d8e..cbae038386 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/monitoring/DynamicMBeanWrapper.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/monitoring/DynamicMBeanWrapper.java
@@ -62,7 +62,7 @@ import javax.management.ReflectionException;
public class DynamicMBeanWrapper implements DynamicMBean, MBeanRegistration {
public static final Logger logger = Logger.getInstance(LogCategory.OPENEJB_DEPLOY, DynamicMBeanWrapper.class);
- private static final Map<Class<?>, CacheInfo> CACHE = new HashMap<Class<?>, CacheInfo>();
+ private static final Map<Class<?>, CacheInfo> CACHE = new HashMap<>();
private static final Map<Class<?>, Class<? extends Annotation>> OPENEJB_API_TO_JAVAX = new HashMap<>();
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/monitoring/MBeanPojoWrapper.java b/container/openejb-core/src/main/java/org/apache/openejb/monitoring/MBeanPojoWrapper.java
index a41829af6b..1be52e0259 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/monitoring/MBeanPojoWrapper.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/monitoring/MBeanPojoWrapper.java
@@ -56,7 +56,7 @@ public class MBeanPojoWrapper implements DynamicMBean {
private MBeanInfo info;
private final Map<String, PropertyDescriptor> attributeMap = new HashMap<>();
- private static final Set<Class<?>> SUPPORTED_PROPERTY_TYPES = new HashSet<Class<?>>() {
+ private static final Set<Class<?>> SUPPORTED_PROPERTY_TYPES = new HashSet<>() {
{
add(Integer.class);
add(Boolean.class);
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/persistence/CriteriaLogQuery.java b/container/openejb-core/src/main/java/org/apache/openejb/persistence/CriteriaLogQuery.java
index b6ea5d7076..701f421b7b 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/persistence/CriteriaLogQuery.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/persistence/CriteriaLogQuery.java
@@ -37,8 +37,8 @@ import java.util.concurrent.ConcurrentHashMap;
public class CriteriaLogQuery<T> implements TypedQuery<T> {
private static final Logger LOGGER = Logger.getInstance(LogCategory.OPENEJB_JPA, CriteriaLogQuery.class);
- private static final Map<Class<?>, Method> methodsCache = new ConcurrentHashMap<Class<?>, Method>();
- private static final Map<Class<?>, Class<?>> unwrapCache = new ConcurrentHashMap<Class<?>, Class<?>>();
+ private static final Map<Class<?>, Method> methodsCache = new ConcurrentHashMap<>();
+ private static final Map<Class<?>, Class<?>> unwrapCache = new ConcurrentHashMap<>();
private static final String GET_QUERY_STRING_MTD = "getQueryString";
private final TypedQuery<T> delegate;
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/resource/AutoConnectionTracker.java b/container/openejb-core/src/main/java/org/apache/openejb/resource/AutoConnectionTracker.java
index 1864465a78..b6cd8301e3 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/resource/AutoConnectionTracker.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/resource/AutoConnectionTracker.java
@@ -115,13 +115,13 @@ public class AutoConnectionTracker implements ConnectionTracker {
Map<ManagedConnectionInfo, Map<ConnectionInfo, Object>> txConnections = (Map<ManagedConnectionInfo, Map<ConnectionInfo, Object>>) registry
.getResource(KEY);
if (txConnections == null) {
- txConnections = new HashMap<ManagedConnectionInfo, Map<ConnectionInfo, Object>>();
+ txConnections = new HashMap<>();
registry.putResource(KEY, txConnections);
}
Map<ConnectionInfo, Object> connectionObjects = txConnections.get(connectionInfo.getManagedConnectionInfo());
if (connectionObjects == null) {
- connectionObjects = new HashMap<ConnectionInfo, Object>();
+ connectionObjects = new HashMap<>();
txConnections.put(connectionInfo.getManagedConnectionInfo(), connectionObjects);
}
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQ5Factory.java b/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQ5Factory.java
index 2743df6d8a..4818353f58 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQ5Factory.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQ5Factory.java
@@ -63,7 +63,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
public class ActiveMQ5Factory implements BrokerFactoryHandler {
private static Properties properties;
- protected static final Map<URI, BrokerService> brokers = new HashMap<URI, BrokerService>();
+ protected static final Map<URI, BrokerService> brokers = new HashMap<>();
private static Throwable throwable;
private static final AtomicBoolean started = new AtomicBoolean(false);
private static PropertyEditorRegistry propertyEditorRegistry = new PropertyEditorRegistry().registerDefaults();
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQResourceAdapter.java b/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQResourceAdapter.java
index 569c28982c..0575f0d9cb 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQResourceAdapter.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQResourceAdapter.java
@@ -70,9 +70,11 @@ public class ActiveMQResourceAdapter extends org.apache.activemq.ra.ActiveMQReso
private String startupTimeout = "60000";
private BootstrapContext bootstrapContext;
private final Map<BeanContext, ObjectName> mbeanNames = new ConcurrentHashMap<>();
- private static final Map<String,String> PREVENT_CREATION_PARAMS = new HashMap<String, String>() { {
- put("create", "false");
- }};
+ private static final Map<String,String> PREVENT_CREATION_PARAMS = new HashMap<>() {
+ {
+ put("create", "false");
+ }
+ };
private static final Logger LOGGER = Logger.getInstance(LogCategory.ACTIVEMQ, ActiveMQ5Factory.class);
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/resource/heroku/HerokuDatabasePropertiesProvider.java b/container/openejb-core/src/main/java/org/apache/openejb/resource/heroku/HerokuDatabasePropertiesProvider.java
index aa9482deea..c2167e9e20 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/resource/heroku/HerokuDatabasePropertiesProvider.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/resource/heroku/HerokuDatabasePropertiesProvider.java
@@ -28,7 +28,7 @@ import java.util.Properties;
// kind of php to java
public class HerokuDatabasePropertiesProvider implements PropertiesResourceProvider {
- private final Map<String, String> jdbcMapping = new HashMap<String, String>() {{
+ private final Map<String, String> jdbcMapping = new HashMap<>() {{
put("postgres", "postgresql");
put("hsql", "hsqldb:hsql");
}};
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/DataSourceFactory.java b/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/DataSourceFactory.java
index fd904042a1..04f50ed6a4 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/DataSourceFactory.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/DataSourceFactory.java
@@ -85,7 +85,7 @@ public class DataSourceFactory {
private static final Map<CommonDataSource, AlternativeDriver> driverByDataSource = new HashMap<>();
private static final Map<CommonDataSource, DataSourceCreator> creatorByDataSource = new HashMap<>();
- private static final Map<String, String> KNOWN_CREATORS = new TreeMap<String, String>(String.CASE_INSENSITIVE_ORDER) {{
+ private static final Map<String, String> KNOWN_CREATORS = new TreeMap<>(String.CASE_INSENSITIVE_ORDER) {{
put("simple", "org.apache.openejb.resource.jdbc.SimpleDataSourceCreator"); // use user provided DS, pooling not supported
put("dbcp", "org.apache.openejb.resource.jdbc.pool.DefaultDataSourceCreator"); // the original one
put("dbcp-alternative", "org.apache.openejb.resource.jdbc.dbcp.DbcpDataSourceCreator"); // dbcp for the ds pool only
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/IsolationLevels.java b/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/IsolationLevels.java
index 4de879cb1a..c650a7cd11 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/IsolationLevels.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/IsolationLevels.java
@@ -27,7 +27,7 @@ import java.util.Map;
*/
public class IsolationLevels {
- private static final Map<String, Integer> isolation = new HashMap<String, Integer>();
+ private static final Map<String, Integer> isolation = new HashMap<>();
static {
isolation.put("NONE", 0);
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/rest/ThreadLocalContextManager.java b/container/openejb-core/src/main/java/org/apache/openejb/rest/ThreadLocalContextManager.java
index 4bfb391b8e..40964436dc 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/rest/ThreadLocalContextManager.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/rest/ThreadLocalContextManager.java
@@ -50,7 +50,7 @@ public class ThreadLocalContextManager {
public static final ThreadLocalConfiguration CONFIGURATION = new ThreadLocalConfiguration();
public static final ThreadLocalResourceInfo RESOURCE_INFO = new ThreadLocalResourceInfo();
public static final ThreadLocalResourceContext RESOURCE_CONTEXT = new ThreadLocalResourceContext();
- public static final ThreadLocal<Map<String, Object>> OTHERS = new ThreadLocal<Map<String, Object>>();
+ public static final ThreadLocal<Map<String, Object>> OTHERS = new ThreadLocal<>();
public static void reset() {
REQUEST.remove();
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/Classes.java b/container/openejb-core/src/main/java/org/apache/openejb/util/Classes.java
index ab68bf3e25..b60ce0bb29 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/util/Classes.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/util/Classes.java
@@ -28,8 +28,8 @@ import java.util.Map;
*/
public class Classes {
- private static final Map<Class<?>, Class<?>> primitiveWrappers = new HashMap<Class<?>, Class<?>>();
- private static final HashMap<String, Class> primitives = new HashMap<String, Class>();
+ private static final Map<Class<?>, Class<?>> primitiveWrappers = new HashMap<>();
+ private static final HashMap<String, Class> primitives = new HashMap<>();
static {
primitives.put("boolean", boolean.class);
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/LogStreamAsync.java b/container/openejb-core/src/main/java/org/apache/openejb/util/LogStreamAsync.java
index 6d50e62e7d..d71d715bcc 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/util/LogStreamAsync.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/util/LogStreamAsync.java
@@ -24,7 +24,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
public class LogStreamAsync implements LogStream, Closeable {
- private static final LinkedBlockingQueue<Message> log = new LinkedBlockingQueue<Message>();
+ private static final LinkedBlockingQueue<Message> log = new LinkedBlockingQueue<>();
private static final Thread t = new Thread(new Consumer(LogStreamAsync.log), "LogStreamAsync.Thread");
private static final AtomicBoolean started = new AtomicBoolean(false);
private final LogStream ls;
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java b/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java
index e47de10c8d..a0cdd4f82d 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java
@@ -239,7 +239,7 @@ public class Logger {
/**
* Builds a Logger object and returns it
*/
- private static final Computable<LoggerKey, Logger> loggerResolver = new Computable<LoggerKey, Logger>() {
+ private static final Computable<LoggerKey, Logger> loggerResolver = new Computable<>() {
@Override
public Logger compute(final LoggerKey args) throws InterruptedException {
return new Logger(args.category, logStreamFactory.createLogStream(args.category), args.baseName);
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/Messages.java b/container/openejb-core/src/main/java/org/apache/openejb/util/Messages.java
index ef7f8351b9..27efa7eab2 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/util/Messages.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/util/Messages.java
@@ -28,8 +28,8 @@ import java.util.ResourceBundle;
import java.util.concurrent.ConcurrentHashMap;
public class Messages {
- private static Map<String, ResourceBundle> _rbBundles = new ConcurrentHashMap<String, ResourceBundle>();
- private static Map<String, Map<String, MessageFormat>> _rbFormats = new ConcurrentHashMap<String, Map<String, MessageFormat>>();
+ private static Map<String, ResourceBundle> _rbBundles = new ConcurrentHashMap<>();
+ private static Map<String, Map<String, MessageFormat>> _rbFormats = new ConcurrentHashMap<>();
private static Locale _globalLocale;
private ResourceBundle messages;
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/OpenEJBScripter.java b/container/openejb-core/src/main/java/org/apache/openejb/util/OpenEJBScripter.java
index df66f6ac22..bd7a628d70 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/util/OpenEJBScripter.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/util/OpenEJBScripter.java
@@ -37,7 +37,7 @@ import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
public class OpenEJBScripter {
- private static final Map<String, ScriptEngineFactory> ENGINE_FACTORIES = new ConcurrentHashMap<String, ScriptEngineFactory>();
+ private static final Map<String, ScriptEngineFactory> ENGINE_FACTORIES = new ConcurrentHashMap<>();
private static final ThreadLocal<Map<String, ScriptEngine>> ENGINES = ThreadLocal.withInitial(HashMap::new);
static {
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/AbsoluteOrdering.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/AbsoluteOrdering.java
index a6271a19cd..941d52057d 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/AbsoluteOrdering.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/AbsoluteOrdering.java
@@ -55,7 +55,7 @@ public class AbsoluteOrdering {
public List<Object> getNameOrOthers() {
if (nameOrOthers == null) {
- nameOrOthers = new ArrayList<Object>();
+ nameOrOthers = new ArrayList<>();
}
return this.nameOrOthers;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/ActivationConfig.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/ActivationConfig.java
index 864499955e..fb2590e1ca 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/ActivationConfig.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/ActivationConfig.java
@@ -88,7 +88,7 @@ public class ActivationConfig {
public List<ActivationConfigProperty> getActivationConfigProperty() {
if (activationConfigProperty == null) {
- activationConfigProperty = new ArrayList<ActivationConfigProperty>();
+ activationConfigProperty = new ArrayList<>();
}
return this.activationConfigProperty;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/ActivationSpec.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/ActivationSpec.java
index 05069b8ff9..efe3d4e941 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/ActivationSpec.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/ActivationSpec.java
@@ -92,7 +92,7 @@ public class ActivationSpec {
public List<RequiredConfigProperty> getRequiredConfigProperty() {
if (requiredConfigProperty == null) {
- requiredConfigProperty = new ArrayList<RequiredConfigProperty>();
+ requiredConfigProperty = new ArrayList<>();
}
return this.requiredConfigProperty;
}
@@ -105,7 +105,7 @@ public class ActivationSpec {
public List<ConfigProperty> getConfigProperty() {
if (configProperty == null) {
- configProperty = new ArrayList<ConfigProperty>();
+ configProperty = new ArrayList<>();
}
return configProperty;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/AdminObject.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/AdminObject.java
index 2fbfb191e2..198daecff5 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/AdminObject.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/AdminObject.java
@@ -87,7 +87,7 @@ public class AdminObject {
public List<ConfigProperty> getConfigProperty() {
if (configProperty == null) {
- configProperty = new ArrayList<ConfigProperty>();
+ configProperty = new ArrayList<>();
}
return this.configProperty;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/Application.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/Application.java
index 933135e5e7..a2e847f2e8 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/Application.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/Application.java
@@ -110,7 +110,7 @@ public class Application implements JndiConsumer, NamedModule {
@XmlTransient
protected TextMap displayName = new TextMap();
@XmlElement(name = "icon", required = true)
- protected LocalCollection<Icon> icon = new LocalCollection<Icon>();
+ protected LocalCollection<Icon> icon = new LocalCollection<>();
@XmlElement(name = "initialize-in-order")
protected Boolean initializeInOrder;
@@ -216,14 +216,14 @@ public class Application implements JndiConsumer, NamedModule {
public Collection<Icon> getIcons() {
if (icon == null) {
- icon = new LocalCollection<Icon>();
+ icon = new LocalCollection<>();
}
return icon;
}
public Map<String, Icon> getIconMap() {
if (icon == null) {
- icon = new LocalCollection<Icon>();
+ icon = new LocalCollection<>();
}
return icon.toMap();
}
@@ -242,14 +242,14 @@ public class Application implements JndiConsumer, NamedModule {
public List<Module> getModule() {
if (module == null) {
- module = new ArrayList<Module>();
+ module = new ArrayList<>();
}
return this.module;
}
public List<SecurityRole> getSecurityRole() {
if (securityRole == null) {
- securityRole = new ArrayList<SecurityRole>();
+ securityRole = new ArrayList<>();
}
return this.securityRole;
}
@@ -269,147 +269,147 @@ public class Application implements JndiConsumer, NamedModule {
public Collection<EnvEntry> getEnvEntry() {
if (envEntry == null) {
- envEntry = new KeyedCollection<String, EnvEntry>();
+ envEntry = new KeyedCollection<>();
}
return this.envEntry;
}
public Map<String, EnvEntry> getEnvEntryMap() {
if (envEntry == null) {
- envEntry = new KeyedCollection<String, EnvEntry>();
+ envEntry = new KeyedCollection<>();
}
return this.envEntry.toMap();
}
public Collection<EjbRef> getEjbRef() {
if (ejbRef == null) {
- ejbRef = new KeyedCollection<String, EjbRef>();
+ ejbRef = new KeyedCollection<>();
}
return this.ejbRef;
}
public Map<String, EjbRef> getEjbRefMap() {
if (ejbRef == null) {
- ejbRef = new KeyedCollection<String, EjbRef>();
+ ejbRef = new KeyedCollection<>();
}
return this.ejbRef.toMap();
}
public Collection<EjbLocalRef> getEjbLocalRef() {
if (ejbLocalRef == null) {
- ejbLocalRef = new KeyedCollection<String, EjbLocalRef>();
+ ejbLocalRef = new KeyedCollection<>();
}
return this.ejbLocalRef;
}
public Map<String, EjbLocalRef> getEjbLocalRefMap() {
if (ejbLocalRef == null) {
- ejbLocalRef = new KeyedCollection<String, EjbLocalRef>();
+ ejbLocalRef = new KeyedCollection<>();
}
return this.ejbLocalRef.toMap();
}
public Collection<ServiceRef> getServiceRef() {
if (serviceRef == null) {
- serviceRef = new KeyedCollection<String, ServiceRef>();
+ serviceRef = new KeyedCollection<>();
}
return this.serviceRef;
}
public Map<String, ServiceRef> getServiceRefMap() {
if (serviceRef == null) {
- serviceRef = new KeyedCollection<String, ServiceRef>();
+ serviceRef = new KeyedCollection<>();
}
return this.serviceRef.toMap();
}
public Collection<ResourceRef> getResourceRef() {
if (resourceRef == null) {
- resourceRef = new KeyedCollection<String, ResourceRef>();
+ resourceRef = new KeyedCollection<>();
}
return this.resourceRef;
}
public Map<String, ResourceRef> getResourceRefMap() {
if (resourceRef == null) {
- resourceRef = new KeyedCollection<String, ResourceRef>();
+ resourceRef = new KeyedCollection<>();
}
return this.resourceRef.toMap();
}
public Collection<ResourceEnvRef> getResourceEnvRef() {
if (resourceEnvRef == null) {
- resourceEnvRef = new KeyedCollection<String, ResourceEnvRef>();
+ resourceEnvRef = new KeyedCollection<>();
}
return this.resourceEnvRef;
}
public Map<String, ResourceEnvRef> getResourceEnvRefMap() {
if (resourceEnvRef == null) {
- resourceEnvRef = new KeyedCollection<String, ResourceEnvRef>();
+ resourceEnvRef = new KeyedCollection<>();
}
return this.resourceEnvRef.toMap();
}
public Collection<MessageDestinationRef> getMessageDestinationRef() {
if (messageDestinationRef == null) {
- messageDestinationRef = new KeyedCollection<String, MessageDestinationRef>();
+ messageDestinationRef = new KeyedCollection<>();
}
return this.messageDestinationRef;
}
public Map<String, MessageDestinationRef> getMessageDestinationRefMap() {
if (messageDestinationRef == null) {
- messageDestinationRef = new KeyedCollection<String, MessageDestinationRef>();
+ messageDestinationRef = new KeyedCollection<>();
}
return this.messageDestinationRef.toMap();
}
public Collection<PersistenceContextRef> getPersistenceContextRef() {
if (persistenceContextRef == null) {
- persistenceContextRef = new KeyedCollection<String, PersistenceContextRef>();
+ persistenceContextRef = new KeyedCollection<>();
}
return this.persistenceContextRef;
}
public Map<String, PersistenceContextRef> getPersistenceContextRefMap() {
if (persistenceContextRef == null) {
- persistenceContextRef = new KeyedCollection<String, PersistenceContextRef>();
+ persistenceContextRef = new KeyedCollection<>();
}
return this.persistenceContextRef.toMap();
}
public Collection<PersistenceUnitRef> getPersistenceUnitRef() {
if (persistenceUnitRef == null) {
- persistenceUnitRef = new KeyedCollection<String, PersistenceUnitRef>();
+ persistenceUnitRef = new KeyedCollection<>();
}
return this.persistenceUnitRef;
}
public Map<String, PersistenceUnitRef> getPersistenceUnitRefMap() {
if (persistenceUnitRef == null) {
- persistenceUnitRef = new KeyedCollection<String, PersistenceUnitRef>();
+ persistenceUnitRef = new KeyedCollection<>();
}
return this.persistenceUnitRef.toMap();
}
public Collection<MessageDestination> getMessageDestination() {
if (messageDestination == null) {
- messageDestination = new KeyedCollection<String, MessageDestination>();
+ messageDestination = new KeyedCollection<>();
}
return this.messageDestination;
}
public Collection<DataSource> getDataSource() {
if (dataSource == null) {
- dataSource = new KeyedCollection<String, DataSource>();
+ dataSource = new KeyedCollection<>();
}
return this.dataSource;
}
public Map<String, DataSource> getDataSourceMap() {
if (dataSource == null) {
- dataSource = new KeyedCollection<String, DataSource>();
+ dataSource = new KeyedCollection<>();
}
return this.dataSource.toMap();
}
@@ -457,7 +457,7 @@ public class Application implements JndiConsumer, NamedModule {
@Override
public Map<String, ContextService> getContextServiceMap() {
if (contextService == null) {
- contextService = new KeyedCollection<String, ContextService>();
+ contextService = new KeyedCollection<>();
}
return this.contextService.toMap();
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/ApplicationClient.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/ApplicationClient.java
index 89b53eb6e2..220cef8e01 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/ApplicationClient.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/ApplicationClient.java
@@ -104,7 +104,7 @@ public class ApplicationClient implements JndiConsumer, Lifecycle, NamedModule {
@XmlTransient
protected TextMap displayName = new TextMap();
@XmlElement(name = "icon", required = true)
- protected LocalCollection<Icon> icon = new LocalCollection<Icon>();
+ protected LocalCollection<Icon> icon = new LocalCollection<>();
@XmlElement(name = "env-entry", required = true)
protected KeyedCollection<String, EnvEntry> envEntry;
@@ -208,14 +208,14 @@ public class ApplicationClient implements JndiConsumer, Lifecycle, NamedModule {
public Collection<Icon> getIcons() {
if (icon == null) {
- icon = new LocalCollection<Icon>();
+ icon = new LocalCollection<>();
}
return icon;
}
public Map<String, Icon> getIconMap() {
if (icon == null) {
- icon = new LocalCollection<Icon>();
+ icon = new LocalCollection<>();
}
return icon.toMap();
}
@@ -226,154 +226,154 @@ public class ApplicationClient implements JndiConsumer, Lifecycle, NamedModule {
public Collection<EnvEntry> getEnvEntry() {
if (envEntry == null) {
- envEntry = new KeyedCollection<String, EnvEntry>();
+ envEntry = new KeyedCollection<>();
}
return this.envEntry;
}
public Map<String, EnvEntry> getEnvEntryMap() {
if (envEntry == null) {
- envEntry = new KeyedCollection<String, EnvEntry>();
+ envEntry = new KeyedCollection<>();
}
return this.envEntry.toMap();
}
public Collection<EjbRef> getEjbRef() {
if (ejbRef == null) {
- ejbRef = new KeyedCollection<String, EjbRef>();
+ ejbRef = new KeyedCollection<>();
}
return this.ejbRef;
}
public Map<String, EjbRef> getEjbRefMap() {
if (ejbRef == null) {
- ejbRef = new KeyedCollection<String, EjbRef>();
+ ejbRef = new KeyedCollection<>();
}
return this.ejbRef.toMap();
}
public Collection<EjbLocalRef> getEjbLocalRef() {
if (ejbLocalRef == null) {
- ejbLocalRef = new KeyedCollection<String, EjbLocalRef>();
+ ejbLocalRef = new KeyedCollection<>();
}
return this.ejbLocalRef;
}
public Map<String, EjbLocalRef> getEjbLocalRefMap() {
if (ejbLocalRef == null) {
- ejbLocalRef = new KeyedCollection<String, EjbLocalRef>();
+ ejbLocalRef = new KeyedCollection<>();
}
return this.ejbLocalRef.toMap();
}
public Collection<ServiceRef> getServiceRef() {
if (serviceRef == null) {
- serviceRef = new KeyedCollection<String, ServiceRef>();
+ serviceRef = new KeyedCollection<>();
}
return this.serviceRef;
}
public Map<String, ServiceRef> getServiceRefMap() {
if (serviceRef == null) {
- serviceRef = new KeyedCollection<String, ServiceRef>();
+ serviceRef = new KeyedCollection<>();
}
return this.serviceRef.toMap();
}
public Collection<ResourceRef> getResourceRef() {
if (resourceRef == null) {
- resourceRef = new KeyedCollection<String, ResourceRef>();
+ resourceRef = new KeyedCollection<>();
}
return this.resourceRef;
}
public Map<String, ResourceRef> getResourceRefMap() {
if (resourceRef == null) {
- resourceRef = new KeyedCollection<String, ResourceRef>();
+ resourceRef = new KeyedCollection<>();
}
return this.resourceRef.toMap();
}
public Collection<ResourceEnvRef> getResourceEnvRef() {
if (resourceEnvRef == null) {
- resourceEnvRef = new KeyedCollection<String, ResourceEnvRef>();
+ resourceEnvRef = new KeyedCollection<>();
}
return this.resourceEnvRef;
}
public Map<String, ResourceEnvRef> getResourceEnvRefMap() {
if (resourceEnvRef == null) {
- resourceEnvRef = new KeyedCollection<String, ResourceEnvRef>();
+ resourceEnvRef = new KeyedCollection<>();
}
return this.resourceEnvRef.toMap();
}
public Collection<MessageDestinationRef> getMessageDestinationRef() {
if (messageDestinationRef == null) {
- messageDestinationRef = new KeyedCollection<String, MessageDestinationRef>();
+ messageDestinationRef = new KeyedCollection<>();
}
return this.messageDestinationRef;
}
public Map<String, MessageDestinationRef> getMessageDestinationRefMap() {
if (messageDestinationRef == null) {
- messageDestinationRef = new KeyedCollection<String, MessageDestinationRef>();
+ messageDestinationRef = new KeyedCollection<>();
}
return this.messageDestinationRef.toMap();
}
public Collection<PersistenceContextRef> getPersistenceContextRef() {
if (persistenceContextRef == null) {
- persistenceContextRef = new KeyedCollection<String, PersistenceContextRef>();
+ persistenceContextRef = new KeyedCollection<>();
}
return this.persistenceContextRef;
}
public Map<String, PersistenceContextRef> getPersistenceContextRefMap() {
if (persistenceContextRef == null) {
- persistenceContextRef = new KeyedCollection<String, PersistenceContextRef>();
+ persistenceContextRef = new KeyedCollection<>();
}
return this.persistenceContextRef.toMap();
}
public Collection<PersistenceUnitRef> getPersistenceUnitRef() {
if (persistenceUnitRef == null) {
- persistenceUnitRef = new KeyedCollection<String, PersistenceUnitRef>();
+ persistenceUnitRef = new KeyedCollection<>();
}
return this.persistenceUnitRef;
}
public Map<String, PersistenceUnitRef> getPersistenceUnitRefMap() {
if (persistenceUnitRef == null) {
- persistenceUnitRef = new KeyedCollection<String, PersistenceUnitRef>();
+ persistenceUnitRef = new KeyedCollection<>();
}
return this.persistenceUnitRef.toMap();
}
public Collection<DataSource> getDataSource() {
if (dataSource == null) {
- dataSource = new KeyedCollection<String, DataSource>();
+ dataSource = new KeyedCollection<>();
}
return this.dataSource;
}
public Map<String, DataSource> getDataSourceMap() {
if (dataSource == null) {
- dataSource = new KeyedCollection<String, DataSource>();
+ dataSource = new KeyedCollection<>();
}
return this.dataSource.toMap();
}
public List<LifecycleCallback> getPostConstruct() {
if (postConstruct == null) {
- postConstruct = new ArrayList<LifecycleCallback>();
+ postConstruct = new ArrayList<>();
}
return this.postConstruct;
}
public List<LifecycleCallback> getPreDestroy() {
if (preDestroy == null) {
- preDestroy = new ArrayList<LifecycleCallback>();
+ preDestroy = new ArrayList<>();
}
return this.preDestroy;
}
@@ -398,7 +398,7 @@ public class ApplicationClient implements JndiConsumer, Lifecycle, NamedModule {
public Collection<MessageDestination> getMessageDestination() {
if (messageDestination == null) {
- messageDestination = new KeyedCollection<String, MessageDestination>();
+ messageDestination = new KeyedCollection<>();
}
return this.messageDestination;
}
@@ -462,7 +462,7 @@ public class ApplicationClient implements JndiConsumer, Lifecycle, NamedModule {
@Override
public Map<String, ContextService> getContextServiceMap() {
if (contextService == null) {
- contextService = new KeyedCollection<String, ContextService>();
+ contextService = new KeyedCollection<>();
}
return this.contextService.toMap();
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/AssemblyDescriptor.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/AssemblyDescriptor.java
index 8e28bddc91..d342eda302 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/AssemblyDescriptor.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/AssemblyDescriptor.java
@@ -99,21 +99,21 @@ public class AssemblyDescriptor {
public List<SecurityRole> getSecurityRole() {
if (securityRole == null) {
- securityRole = new ArrayList<SecurityRole>();
+ securityRole = new ArrayList<>();
}
return this.securityRole;
}
public List<MethodPermission> getMethodPermission() {
if (methodPermission == null) {
- methodPermission = new ArrayList<MethodPermission>();
+ methodPermission = new ArrayList<>();
}
return this.methodPermission;
}
public List<ContainerTransaction> getContainerTransaction() {
if (containerTransaction == null) {
- containerTransaction = new ArrayList<ContainerTransaction>();
+ containerTransaction = new ArrayList<>();
}
return this.containerTransaction;
}
@@ -126,7 +126,7 @@ public class AssemblyDescriptor {
public List<ContainerConcurrency> getContainerConcurrency() {
if (containerConcurrency == null) {
- containerConcurrency = new ArrayList<ContainerConcurrency>();
+ containerConcurrency = new ArrayList<>();
}
return this.containerConcurrency;
}
@@ -138,14 +138,14 @@ public class AssemblyDescriptor {
private Map<String, List<MethodAttribute>> getMethodAttributes(final String ejbName, final List<? extends AttributeBinding> bindings) {
- final Map<String, List<MethodAttribute>> methods = new LinkedHashMap<String, List<MethodAttribute>>();
+ final Map<String, List<MethodAttribute>> methods = new LinkedHashMap<>();
for (final AttributeBinding<?> binding : bindings) {
for (final Method method : binding.getMethod()) {
if (method.getEjbName().equals(ejbName)) {
final String methodName = method.getMethodName();
- List<MethodAttribute> list = methods.computeIfAbsent(methodName, k -> new ArrayList<MethodAttribute>());
+ List<MethodAttribute> list = methods.computeIfAbsent(methodName, k -> new ArrayList<>());
list.add(new MethodAttribute(binding.getAttribute(), method));
}
}
@@ -155,7 +155,7 @@ public class AssemblyDescriptor {
public List<InterceptorBinding> getInterceptorBinding() {
if (interceptorBinding == null) {
- interceptorBinding = new ArrayList<InterceptorBinding>();
+ interceptorBinding = new ArrayList<>();
}
return this.interceptorBinding;
}
@@ -167,7 +167,7 @@ public class AssemblyDescriptor {
public List<MessageDestination> getMessageDestination() {
if (messageDestination == null) {
- messageDestination = new ArrayList<MessageDestination>();
+ messageDestination = new ArrayList<>();
}
return this.messageDestination;
}
@@ -185,7 +185,7 @@ public class AssemblyDescriptor {
public Collection<ApplicationException> getApplicationException() {
if (applicationException == null) {
- applicationException = new KeyedCollection<String, ApplicationException>();
+ applicationException = new KeyedCollection<>();
}
return this.applicationException;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/AuthConstraint.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/AuthConstraint.java
index 306d125017..645335f54f 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/AuthConstraint.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/AuthConstraint.java
@@ -81,7 +81,7 @@ public class AuthConstraint {
public List<String> getRoleName() {
if (roleName == null) {
- roleName = new ArrayList<String>();
+ roleName = new ArrayList<>();
}
return this.roleName;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/ConnectionDefinition.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/ConnectionDefinition.java
index be3e8255ce..279f370617 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/ConnectionDefinition.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/ConnectionDefinition.java
@@ -90,7 +90,7 @@ public class ConnectionDefinition {
public List<ConfigProperty> getConfigProperty() {
if (configProperty == null) {
- configProperty = new ArrayList<ConfigProperty>();
+ configProperty = new ArrayList<>();
}
return this.configProperty;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/Connector.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/Connector.java
index db6adbbb36..e0e1797ff2 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/Connector.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/Connector.java
@@ -83,7 +83,7 @@ public class Connector implements NamedModule {
@XmlTransient
protected TextMap displayName = new TextMap();
@XmlElement(name = "icon", required = true)
- protected LocalCollection<Icon> icon = new LocalCollection<Icon>();
+ protected LocalCollection<Icon> icon = new LocalCollection<>();
@XmlElement(name = "vendor-name")
protected String vendorName = "";
@@ -164,14 +164,14 @@ public class Connector implements NamedModule {
public Collection<Icon> getIcons() {
if (icon == null) {
- icon = new LocalCollection<Icon>();
+ icon = new LocalCollection<>();
}
return icon;
}
public Map<String, Icon> getIconMap() {
if (icon == null) {
- icon = new LocalCollection<Icon>();
+ icon = new LocalCollection<>();
}
return icon.toMap();
}
@@ -222,7 +222,7 @@ public class Connector implements NamedModule {
public List<String> getRequiredWorkContext() {
if (requiredWorkContext == null) {
- requiredWorkContext = new ArrayList<String>();
+ requiredWorkContext = new ArrayList<>();
}
return requiredWorkContext;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/Connector10.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/Connector10.java
index d35aa44256..2c50278fe8 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/Connector10.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/Connector10.java
@@ -44,7 +44,7 @@ public class Connector10 {
@XmlTransient
protected TextMap displayName = new TextMap();
@XmlElement(name = "icon", required = true)
- protected LocalCollection<Icon> icon = new LocalCollection<Icon>();
+ protected LocalCollection<Icon> icon = new LocalCollection<>();
@XmlElement(name = "vendor-name")
protected String vendorName = "";
@@ -93,14 +93,14 @@ public class Connector10 {
public Collection<Icon> getIcons() {
if (icon == null) {
- icon = new LocalCollection<Icon>();
+ icon = new LocalCollection<>();
}
return icon;
}
public Map<String, Icon> getIconMap() {
if (icon == null) {
- icon = new LocalCollection<Icon>();
+ icon = new LocalCollection<>();
}
return icon.toMap();
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/ConstructorParameterOrder.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/ConstructorParameterOrder.java
index 9fb4415f90..bcfdbdb657 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/ConstructorParameterOrder.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/ConstructorParameterOrder.java
@@ -39,7 +39,7 @@ public class ConstructorParameterOrder {
public List<String> getElementName() {
if (elementName == null) {
- elementName = new ArrayList<String>();
+ elementName = new ArrayList<>();
}
return this.elementName;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/ContainerConcurrency.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/ContainerConcurrency.java
index a5f257db13..800a7b8706 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/ContainerConcurrency.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/ContainerConcurrency.java
@@ -83,7 +83,7 @@ public class ContainerConcurrency implements AttributeBinding<ConcurrentLockType
public List<Method> getMethod() {
if (method == null) {
- method = new ArrayList<Method>();
+ method = new ArrayList<>();
}
return this.method;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/ContainerTransaction.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/ContainerTransaction.java
index c6d183d9e8..4e361e4a69 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/ContainerTransaction.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/ContainerTransaction.java
@@ -104,7 +104,7 @@ public class ContainerTransaction implements AttributeBinding<TransAttribute> {
public List<Method> getMethod() {
if (method == null) {
- method = new ArrayList<Method>();
+ method = new ArrayList<>();
}
return this.method;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/ContextService.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/ContextService.java
index 7bc9b10672..6df8c37abe 100755
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/ContextService.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/ContextService.java
@@ -162,7 +162,7 @@ public class ContextService implements Keyable<String>{
*/
public List<String> getCleared() {
if (cleared == null) {
- cleared = new ArrayList<String>();
+ cleared = new ArrayList<>();
}
return this.cleared;
}
@@ -191,7 +191,7 @@ public class ContextService implements Keyable<String>{
*/
public List<String> getPropagated() {
if (propagated == null) {
- propagated = new ArrayList<String>();
+ propagated = new ArrayList<>();
}
return this.propagated;
}
@@ -220,7 +220,7 @@ public class ContextService implements Keyable<String>{
*/
public List<String> getUnchanged() {
if (unchanged == null) {
- unchanged = new ArrayList<String>();
+ unchanged = new ArrayList<>();
}
return this.unchanged;
}
@@ -249,7 +249,7 @@ public class ContextService implements Keyable<String>{
*/
public List<Property> getProperty() {
if (property == null) {
- property = new ArrayList<Property>();
+ property = new ArrayList<>();
}
return this.property;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/DataSource.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/DataSource.java
index 627889045a..68107b35fc 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/DataSource.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/DataSource.java
@@ -304,7 +304,7 @@ public class DataSource implements Keyable<String> {
public List<Property> getProperty() {
if (property == null) {
- property = new ArrayList<Property>();
+ property = new ArrayList<>();
}
return this.property;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/DependsOn.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/DependsOn.java
index ea6406c97c..e58c2fe938 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/DependsOn.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/DependsOn.java
@@ -66,7 +66,7 @@ public class DependsOn {
public List<String> getEjbName() {
if (ejbName == null) {
- ejbName = new ArrayList<String>();
+ ejbName = new ArrayList<>();
}
return this.ejbName;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbJar.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbJar.java
index ef86dec612..dd9e8ff7ea 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbJar.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbJar.java
@@ -84,9 +84,9 @@ public class EjbJar implements NamedModule {
@XmlTransient
protected TextMap displayName = new TextMap();
@XmlElement(name = "icon", required = true)
- protected LocalCollection<Icon> icon = new LocalCollection<Icon>();
+ protected LocalCollection<Icon> icon = new LocalCollection<>();
@XmlTransient
- protected Map<String, EnterpriseBean> enterpriseBeans = new LinkedHashMap<String, EnterpriseBean>();
+ protected Map<String, EnterpriseBean> enterpriseBeans = new LinkedHashMap<>();
protected Interceptors interceptors;
protected Relationships relationships;
@@ -147,14 +147,14 @@ public class EjbJar implements NamedModule {
public Collection<Icon> getIcons() {
if (icon == null) {
- icon = new LocalCollection<Icon>();
+ icon = new LocalCollection<>();
}
return icon;
}
public Map<String, Icon> getIconMap() {
if (icon == null) {
- icon = new LocalCollection<Icon>();
+ icon = new LocalCollection<>();
}
return icon.toMap();
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbLocalRef.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbLocalRef.java
index bb72e08190..2a99d321f3 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbLocalRef.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbLocalRef.java
@@ -311,7 +311,7 @@ public class EjbLocalRef implements EjbReference {
public Set<InjectionTarget> getInjectionTarget() {
if (injectionTarget == null) {
- injectionTarget = new HashSet<InjectionTarget>();
+ injectionTarget = new HashSet<>();
}
return this.injectionTarget;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbRef.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbRef.java
index d28e06cf0d..f2acdd8886 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbRef.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbRef.java
@@ -258,7 +258,7 @@ public class EjbRef implements EjbReference {
public Set<InjectionTarget> getInjectionTarget() {
if (injectionTarget == null) {
- injectionTarget = new HashSet<InjectionTarget>();
+ injectionTarget = new HashSet<>();
}
return this.injectionTarget;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbRelation.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbRelation.java
index ffdb591269..52abdbd832 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbRelation.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbRelation.java
@@ -97,7 +97,7 @@ public class EjbRelation {
public List<EjbRelationshipRole> getEjbRelationshipRole() {
if (ejbRelationshipRole == null) {
- ejbRelationshipRole = new ArrayList<EjbRelationshipRole>();
+ ejbRelationshipRole = new ArrayList<>();
}
return ejbRelationshipRole;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/EntityBean.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/EntityBean.java
index 56d83ddaa9..1ef5c9e675 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/EntityBean.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/EntityBean.java
@@ -121,7 +121,7 @@ public class EntityBean implements RemoteBean {
@XmlTransient
protected TextMap displayName = new TextMap();
@XmlElement(name = "icon", required = true)
- protected LocalCollection<Icon> icon = new LocalCollection<Icon>();
+ protected LocalCollection<Icon> icon = new LocalCollection<>();
@XmlElement(name = "ejb-name", required = true)
protected String ejbName;
@@ -250,14 +250,14 @@ public class EntityBean implements RemoteBean {
public Collection<Icon> getIcons() {
if (icon == null) {
- icon = new LocalCollection<Icon>();
+ icon = new LocalCollection<>();
}
return icon;
}
public Map<String, Icon> getIconMap() {
if (icon == null) {
- icon = new LocalCollection<Icon>();
+ icon = new LocalCollection<>();
}
return icon.toMap();
}
@@ -387,7 +387,7 @@ public class EntityBean implements RemoteBean {
public List<CmpField> getCmpField() {
if (cmpField == null) {
- cmpField = new ArrayList<CmpField>();
+ cmpField = new ArrayList<>();
}
return this.cmpField;
}
@@ -412,133 +412,133 @@ public class EntityBean implements RemoteBean {
public Collection<EnvEntry> getEnvEntry() {
if (envEntry == null) {
- envEntry = new KeyedCollection<String, EnvEntry>();
+ envEntry = new KeyedCollection<>();
}
return this.envEntry;
}
public Map<String, EnvEntry> getEnvEntryMap() {
if (envEntry == null) {
- envEntry = new KeyedCollection<String, EnvEntry>();
+ envEntry = new KeyedCollection<>();
}
return this.envEntry.toMap();
}
public Collection<EjbRef> getEjbRef() {
if (ejbRef == null) {
- ejbRef = new KeyedCollection<String, EjbRef>();
+ ejbRef = new KeyedCollection<>();
}
return this.ejbRef;
}
public Map<String, EjbRef> getEjbRefMap() {
if (ejbRef == null) {
- ejbRef = new KeyedCollection<String, EjbRef>();
+ ejbRef = new KeyedCollection<>();
}
return this.ejbRef.toMap();
}
public Collection<EjbLocalRef> getEjbLocalRef() {
if (ejbLocalRef == null) {
- ejbLocalRef = new KeyedCollection<String, EjbLocalRef>();
+ ejbLocalRef = new KeyedCollection<>();
}
return this.ejbLocalRef;
}
public Map<String, EjbLocalRef> getEjbLocalRefMap() {
if (ejbLocalRef == null) {
- ejbLocalRef = new KeyedCollection<String, EjbLocalRef>();
+ ejbLocalRef = new KeyedCollection<>();
}
return this.ejbLocalRef.toMap();
}
public Collection<ServiceRef> getServiceRef() {
if (serviceRef == null) {
- serviceRef = new KeyedCollection<String, ServiceRef>();
+ serviceRef = new KeyedCollection<>();
}
return this.serviceRef;
}
public Map<String, ServiceRef> getServiceRefMap() {
if (serviceRef == null) {
- serviceRef = new KeyedCollection<String, ServiceRef>();
+ serviceRef = new KeyedCollection<>();
}
return this.serviceRef.toMap();
}
public Collection<ResourceRef> getResourceRef() {
if (resourceRef == null) {
- resourceRef = new KeyedCollection<String, ResourceRef>();
+ resourceRef = new KeyedCollection<>();
}
return this.resourceRef;
}
public Map<String, ResourceRef> getResourceRefMap() {
if (resourceRef == null) {
- resourceRef = new KeyedCollection<String, ResourceRef>();
+ resourceRef = new KeyedCollection<>();
}
return this.resourceRef.toMap();
}
public Collection<ResourceEnvRef> getResourceEnvRef() {
if (resourceEnvRef == null) {
- resourceEnvRef = new KeyedCollection<String, ResourceEnvRef>();
+ resourceEnvRef = new KeyedCollection<>();
}
return this.resourceEnvRef;
}
public Map<String, ResourceEnvRef> getResourceEnvRefMap() {
if (resourceEnvRef == null) {
- resourceEnvRef = new KeyedCollection<String, ResourceEnvRef>();
+ resourceEnvRef = new KeyedCollection<>();
}
return this.resourceEnvRef.toMap();
}
public Collection<MessageDestinationRef> getMessageDestinationRef() {
if (messageDestinationRef == null) {
- messageDestinationRef = new KeyedCollection<String, MessageDestinationRef>();
+ messageDestinationRef = new KeyedCollection<>();
}
return this.messageDestinationRef;
}
public Map<String, MessageDestinationRef> getMessageDestinationRefMap() {
if (messageDestinationRef == null) {
- messageDestinationRef = new KeyedCollection<String, MessageDestinationRef>();
+ messageDestinationRef = new KeyedCollection<>();
}
return this.messageDestinationRef.toMap();
}
public Collection<PersistenceContextRef> getPersistenceContextRef() {
if (persistenceContextRef == null) {
- persistenceContextRef = new KeyedCollection<String, PersistenceContextRef>();
+ persistenceContextRef = new KeyedCollection<>();
}
return this.persistenceContextRef;
}
public Map<String, PersistenceContextRef> getPersistenceContextRefMap() {
if (persistenceContextRef == null) {
- persistenceContextRef = new KeyedCollection<String, PersistenceContextRef>();
+ persistenceContextRef = new KeyedCollection<>();
}
return this.persistenceContextRef.toMap();
}
public Collection<PersistenceUnitRef> getPersistenceUnitRef() {
if (persistenceUnitRef == null) {
- persistenceUnitRef = new KeyedCollection<String, PersistenceUnitRef>();
+ persistenceUnitRef = new KeyedCollection<>();
}
return this.persistenceUnitRef;
}
public Map<String, PersistenceUnitRef> getPersistenceUnitRefMap() {
if (persistenceUnitRef == null) {
- persistenceUnitRef = new KeyedCollection<String, PersistenceUnitRef>();
+ persistenceUnitRef = new KeyedCollection<>();
}
return this.persistenceUnitRef.toMap();
}
public List<LifecycleCallback> getPostConstruct() {
if (postConstruct == null) {
- postConstruct = new ArrayList<LifecycleCallback>();
+ postConstruct = new ArrayList<>();
}
return this.postConstruct;
}
@@ -550,7 +550,7 @@ public class EntityBean implements RemoteBean {
public List<LifecycleCallback> getPreDestroy() {
if (preDestroy == null) {
- preDestroy = new ArrayList<LifecycleCallback>();
+ preDestroy = new ArrayList<>();
}
return this.preDestroy;
}
@@ -562,21 +562,21 @@ public class EntityBean implements RemoteBean {
public Collection<DataSource> getDataSource() {
if (dataSource == null) {
- dataSource = new KeyedCollection<String, DataSource>();
+ dataSource = new KeyedCollection<>();
}
return this.dataSource;
}
public Map<String, DataSource> getDataSourceMap() {
if (dataSource == null) {
- dataSource = new KeyedCollection<String, DataSource>();
+ dataSource = new KeyedCollection<>();
}
return this.dataSource.toMap();
}
public List<SecurityRoleRef> getSecurityRoleRef() {
if (securityRoleRef == null) {
- securityRoleRef = new ArrayList<SecurityRoleRef>();
+ securityRoleRef = new ArrayList<>();
}
return this.securityRoleRef;
}
@@ -599,7 +599,7 @@ public class EntityBean implements RemoteBean {
public List<Query> getQuery() {
if (query == null) {
- query = new ArrayList<Query>();
+ query = new ArrayList<>();
}
return this.query;
}
@@ -642,7 +642,7 @@ public class EntityBean implements RemoteBean {
@Override
public Map<String, ContextService> getContextServiceMap() {
if (contextService == null) {
- contextService = new KeyedCollection<String, ContextService>();
+ contextService = new KeyedCollection<>();
}
return this.contextService.toMap();
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/EnvEntry.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/EnvEntry.java
index 30eaab87cd..dc176a2282 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/EnvEntry.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/EnvEntry.java
@@ -227,7 +227,7 @@ public class EnvEntry implements JndiReference {
public Set<InjectionTarget> getInjectionTarget() {
if (injectionTarget == null) {
- injectionTarget = new HashSet<InjectionTarget>();
+ injectionTarget = new HashSet<>();
}
return this.injectionTarget;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/ExcludeList.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/ExcludeList.java
index 7837c301a4..1b97f1422e 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/ExcludeList.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/ExcludeList.java
@@ -83,7 +83,7 @@ public class ExcludeList {
public List<Method> getMethod() {
if (method == null) {
- method = new ArrayList<Method>();
+ method = new ArrayList<>();
}
return this.method;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesAbsoluteOrdering.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesAbsoluteOrdering.java
index 671948c256..1b5981be02 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesAbsoluteOrdering.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesAbsoluteOrdering.java
@@ -85,7 +85,7 @@ public class FacesAbsoluteOrdering {
*/
public List<Object> getNameOrOthers() {
if (nameOrOthers == null) {
- nameOrOthers = new ArrayList<Object>();
+ nameOrOthers = new ArrayList<>();
}
return this.nameOrOthers;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesApplication.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesApplication.java
index ff5c328750..79917edd98 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesApplication.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesApplication.java
@@ -146,7 +146,7 @@ public class FacesApplication {
*/
public List<java.lang.String> getActionListener() {
if (actionListener == null) {
- actionListener = new ArrayList<java.lang.String>();
+ actionListener = new ArrayList<>();
}
return this.actionListener;
}
@@ -173,7 +173,7 @@ public class FacesApplication {
*/
public List<java.lang.String> getDefaultRenderKitId() {
if (defaultRenderKitId == null) {
- defaultRenderKitId = new ArrayList<java.lang.String>();
+ defaultRenderKitId = new ArrayList<>();
}
return this.defaultRenderKitId;
}
@@ -200,7 +200,7 @@ public class FacesApplication {
*/
public List<java.lang.String> getMessageBundle() {
if (messageBundle == null) {
- messageBundle = new ArrayList<java.lang.String>();
+ messageBundle = new ArrayList<>();
}
return this.messageBundle;
}
@@ -227,7 +227,7 @@ public class FacesApplication {
*/
public List<java.lang.String> getNavigationHandler() {
if (navigationHandler == null) {
- navigationHandler = new ArrayList<java.lang.String>();
+ navigationHandler = new ArrayList<>();
}
return this.navigationHandler;
}
@@ -254,7 +254,7 @@ public class FacesApplication {
*/
public List<java.lang.String> getViewHandler() {
if (viewHandler == null) {
- viewHandler = new ArrayList<java.lang.String>();
+ viewHandler = new ArrayList<>();
}
return this.viewHandler;
}
@@ -281,7 +281,7 @@ public class FacesApplication {
*/
public List<java.lang.String> getStateManager() {
if (stateManager == null) {
- stateManager = new ArrayList<java.lang.String>();
+ stateManager = new ArrayList<>();
}
return this.stateManager;
}
@@ -308,7 +308,7 @@ public class FacesApplication {
*/
public List<java.lang.String> getElResolver() {
if (elResolver == null) {
- elResolver = new ArrayList<java.lang.String>();
+ elResolver = new ArrayList<>();
}
return this.elResolver;
}
@@ -335,7 +335,7 @@ public class FacesApplication {
*/
public List<java.lang.String> getPropertyResolver() {
if (propertyResolver == null) {
- propertyResolver = new ArrayList<java.lang.String>();
+ propertyResolver = new ArrayList<>();
}
return this.propertyResolver;
}
@@ -362,7 +362,7 @@ public class FacesApplication {
*/
public List<java.lang.String> getVariableResolver() {
if (variableResolver == null) {
- variableResolver = new ArrayList<java.lang.String>();
+ variableResolver = new ArrayList<>();
}
return this.variableResolver;
}
@@ -370,14 +370,14 @@ public class FacesApplication {
public List<String> getResourceHandler() {
if (resourceHandler == null) {
- resourceHandler = new ArrayList<String>();
+ resourceHandler = new ArrayList<>();
}
return resourceHandler;
}
public List<FacesSystemEventListener> getSystemEventListener() {
if (systemEventListener == null) {
- systemEventListener = new ArrayList<FacesSystemEventListener>();
+ systemEventListener = new ArrayList<>();
}
return systemEventListener;
}
@@ -404,7 +404,7 @@ public class FacesApplication {
*/
public List<FacesLocaleConfig> getLocaleConfig() {
if (localeConfig == null) {
- localeConfig = new ArrayList<FacesLocaleConfig>();
+ localeConfig = new ArrayList<>();
}
return this.localeConfig;
}
@@ -451,14 +451,14 @@ public class FacesApplication {
*/
public List<FacesApplicationExtension> getApplicationExtension() {
if (applicationExtension == null) {
- applicationExtension = new ArrayList<FacesApplicationExtension>();
+ applicationExtension = new ArrayList<>();
}
return this.applicationExtension;
}
public List<FacesValidator> getDefaultValidators() {
if (defaultValidators == null) {
- defaultValidators = new ArrayList<FacesValidator>();
+ defaultValidators = new ArrayList<>();
}
return defaultValidators;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesApplicationExtension.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesApplicationExtension.java
index 9505ecc6cd..a615aca023 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesApplicationExtension.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesApplicationExtension.java
@@ -88,7 +88,7 @@ public class FacesApplicationExtension {
*/
public List<Object> getAny() {
if (any == null) {
- any = new ArrayList<Object>();
+ any = new ArrayList<>();
}
return this.any;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesApplicationResourceBundle.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesApplicationResourceBundle.java
index 309af09c01..7948e65e4e 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesApplicationResourceBundle.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesApplicationResourceBundle.java
@@ -67,7 +67,7 @@ public class FacesApplicationResourceBundle {
@XmlTransient
protected TextMap displayName = new TextMap();
@XmlElement(name = "icon", required = true)
- protected LocalCollection<Icon> icon = new LocalCollection<Icon>();
+ protected LocalCollection<Icon> icon = new LocalCollection<>();
@XmlElement(name = "base-name", required = true)
protected java.lang.String baseName;
@XmlElement(required = true)
@@ -106,14 +106,14 @@ public class FacesApplicationResourceBundle {
public Collection<Icon> getIcons() {
if (icon == null) {
- icon = new LocalCollection<Icon>();
+ icon = new LocalCollection<>();
}
return icon;
}
public Map<String, Icon> getIconMap() {
if (icon == null) {
- icon = new LocalCollection<Icon>();
+ icon = new LocalCollection<>();
}
return icon.toMap();
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesAttribute.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesAttribute.java
index 22a32324c0..ff0781e874 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesAttribute.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesAttribute.java
@@ -75,7 +75,7 @@ public class FacesAttribute {
@XmlTransient
protected TextMap displayName = new TextMap();
@XmlElement(name = "icon", required = true)
- protected LocalCollection<Icon> icon = new LocalCollection<Icon>();
+ protected LocalCollection<Icon> icon = new LocalCollection<>();
@XmlElement(name = "attribute-name", required = true)
protected java.lang.String attributeName;
@XmlElement(name = "attribute-class", required = true)
@@ -120,14 +120,14 @@ public class FacesAttribute {
public Collection<Icon> getIcons() {
if (icon == null) {
- icon = new LocalCollection<Icon>();
+ icon = new LocalCollection<>();
}
return icon;
}
public Map<String, Icon> getIconMap() {
if (icon == null) {
- icon = new LocalCollection<Icon>();
+ icon = new LocalCollection<>();
}
return icon.toMap();
}
@@ -238,7 +238,7 @@ public class FacesAttribute {
*/
public List<FacesAttributeExtension> getAttributeExtension() {
if (attributeExtension == null) {
- attributeExtension = new ArrayList<FacesAttributeExtension>();
+ attributeExtension = new ArrayList<>();
}
return this.attributeExtension;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesAttributeExtension.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesAttributeExtension.java
index fa3d71b6f2..5fa55f9259 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesAttributeExtension.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesAttributeExtension.java
@@ -88,7 +88,7 @@ public class FacesAttributeExtension {
*/
public List<Object> getAny() {
if (any == null) {
- any = new ArrayList<Object>();
+ any = new ArrayList<>();
}
return this.any;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesBehavior.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesBehavior.java
index 0dd8870666..d0d50867b2 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesBehavior.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesBehavior.java
@@ -71,7 +71,7 @@ public class FacesBehavior {
@XmlTransient
protected TextMap displayName = new TextMap();
@XmlElement(name = "icon", required = true)
- protected LocalCollection<Icon> icon = new LocalCollection<Icon>();
+ protected LocalCollection<Icon> icon = new LocalCollection<>();
@XmlElement(name = "behavior-id", required = true)
protected String behaviorId;
@XmlElement(name = "behavior-class", required = true)
@@ -112,14 +112,14 @@ public class FacesBehavior {
public Collection<Icon> getIcons() {
if (icon == null) {
- icon = new LocalCollection<Icon>();
+ icon = new LocalCollection<>();
}
return icon;
}
public Map<String, Icon> getIconMap() {
if (icon == null) {
- icon = new LocalCollection<Icon>();
+ icon = new LocalCollection<>();
}
return icon.toMap();
}
@@ -190,7 +190,7 @@ public class FacesBehavior {
*/
public List<FacesAttribute> getAttribute() {
if (attribute == null) {
- attribute = new ArrayList<FacesAttribute>();
+ attribute = new ArrayList<>();
}
return this.attribute;
}
@@ -217,7 +217,7 @@ public class FacesBehavior {
*/
public List<FacesProperty> getProperty() {
if (property == null) {
- property = new ArrayList<FacesProperty>();
+ property = new ArrayList<>();
}
return this.property;
}
@@ -244,7 +244,7 @@ public class FacesBehavior {
*/
public List<FacesBehaviorExtension> getBehaviorExtension() {
if (behaviorExtension == null) {
- behaviorExtension = new ArrayList<FacesBehaviorExtension>();
+ behaviorExtension = new ArrayList<>();
}
return this.behaviorExtension;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesBehaviorExtension.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesBehaviorExtension.java
index 41b5d8dff5..6cefcbd276 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesBehaviorExtension.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesBehaviorExtension.java
@@ -88,7 +88,7 @@ public class FacesBehaviorExtension {
*/
public List<Object> getAny() {
if (any == null) {
- any = new ArrayList<Object>();
+ any = new ArrayList<>();
}
return this.any;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesComponent.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesComponent.java
index 5460624642..e0321b7462 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesComponent.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesComponent.java
@@ -79,7 +79,7 @@ public class FacesComponent {
@XmlTransient
protected TextMap displayName = new TextMap();
@XmlElement(name = "icon", required = true)
- protected LocalCollection<Icon> icon = new LocalCollection<Icon>();
+ protected LocalCollection<Icon> icon = new LocalCollection<>();
@XmlElement(name = "component-type", required = true)
protected java.lang.String componentType;
@XmlElement(name = "component-class", required = true)
@@ -126,14 +126,14 @@ public class FacesComponent {
public Collection<Icon> getIcons() {
if (icon == null) {
- icon = new LocalCollection<Icon>();
+ icon = new LocalCollection<>();
}
return icon;
}
public Map<String, Icon> getIconMap() {
if (icon == null) {
- icon = new LocalCollection<Icon>();
+ icon = new LocalCollection<>();
}
return icon.toMap();
}
@@ -204,7 +204,7 @@ public class FacesComponent {
*/
public List<FacesFacet> getFacet() {
if (facet == null) {
- facet = new ArrayList<FacesFacet>();
+ facet = new ArrayList<>();
}
return this.facet;
}
@@ -231,7 +231,7 @@ public class FacesComponent {
*/
public List<FacesAttribute> getAttribute() {
if (attribute == null) {
- attribute = new ArrayList<FacesAttribute>();
+ attribute = new ArrayList<>();
}
return this.attribute;
}
@@ -258,7 +258,7 @@ public class FacesComponent {
*/
public List<FacesProperty> getProperty() {
if (property == null) {
- property = new ArrayList<FacesProperty>();
+ property = new ArrayList<>();
}
return this.property;
}
@@ -285,7 +285,7 @@ public class FacesComponent {
*/
public List<FacesComponentExtension> getComponentExtension() {
if (componentExtension == null) {
- componentExtension = new ArrayList<FacesComponentExtension>();
+ componentExtension = new ArrayList<>();
}
return this.componentExtension;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesComponentExtension.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesComponentExtension.java
index 537d01f5d2..92895bdbe8 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesComponentExtension.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesComponentExtension.java
@@ -88,7 +88,7 @@ public class FacesComponentExtension {
*/
public List<Object> getAny() {
if (any == null) {
- any = new ArrayList<Object>();
+ any = new ArrayList<>();
}
return this.any;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfig.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfig.java
index b9d4515eba..52d44f2170 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfig.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfig.java
@@ -153,35 +153,35 @@ public class FacesConfig {
*/
public List<FacesApplication> getApplication() {
if (application == null) {
- application = new ArrayList<FacesApplication>();
+ application = new ArrayList<>();
}
return this.application;
}
public List<FacesConfigFlowDefinition> getFlowDefinitions() {
if (flowDefinitions == null) {
- flowDefinitions = new ArrayList<FacesConfigFlowDefinition>();
+ flowDefinitions = new ArrayList<>();
}
return flowDefinitions;
}
public List<FacesConfigProtectedViews> getProtectedViews() {
if (protectedViews == null) {
- protectedViews = new ArrayList<FacesConfigProtectedViews>();
+ protectedViews = new ArrayList<>();
}
return protectedViews;
}
public List<FacesOrdering> getOrdering() {
if (ordering == null) {
- ordering = new ArrayList<FacesOrdering>();
+ ordering = new ArrayList<>();
}
return ordering;
}
public List<FacesAbsoluteOrdering> getAbsoluteOrdering() {
if (absoluteOrdering == null) {
- absoluteOrdering = new ArrayList<FacesAbsoluteOrdering>();
+ absoluteOrdering = new ArrayList<>();
}
return absoluteOrdering;
}
@@ -208,7 +208,7 @@ public class FacesConfig {
*/
public List<FacesFactory> getFactory() {
if (factory == null) {
- factory = new ArrayList<FacesFactory>();
+ factory = new ArrayList<>();
}
return this.factory;
}
@@ -235,7 +235,7 @@ public class FacesConfig {
*/
public List<FacesComponent> getComponent() {
if (component == null) {
- component = new ArrayList<FacesComponent>();
+ component = new ArrayList<>();
}
return this.component;
}
@@ -262,7 +262,7 @@ public class FacesConfig {
*/
public List<FacesConverter> getConverter() {
if (converter == null) {
- converter = new ArrayList<FacesConverter>();
+ converter = new ArrayList<>();
}
return this.converter;
}
@@ -289,14 +289,14 @@ public class FacesConfig {
*/
public List<FacesManagedBean> getManagedBean() {
if (managedBean == null) {
- managedBean = new ArrayList<FacesManagedBean>();
+ managedBean = new ArrayList<>();
}
return this.managedBean;
}
public List<String> getName() {
if (name == null) {
- name = new ArrayList<String>();
+ name = new ArrayList<>();
}
return name;
}
@@ -323,7 +323,7 @@ public class FacesConfig {
*/
public List<FacesNavigationRule> getNavigationRule() {
if (navigationRule == null) {
- navigationRule = new ArrayList<FacesNavigationRule>();
+ navigationRule = new ArrayList<>();
}
return this.navigationRule;
}
@@ -350,7 +350,7 @@ public class FacesConfig {
*/
public List<FacesReferencedBean> getReferencedBean() {
if (referencedBean == null) {
- referencedBean = new ArrayList<FacesReferencedBean>();
+ referencedBean = new ArrayList<>();
}
return this.referencedBean;
}
@@ -377,7 +377,7 @@ public class FacesConfig {
*/
public List<FacesRenderKit> getRenderKit() {
if (renderKit == null) {
- renderKit = new ArrayList<FacesRenderKit>();
+ renderKit = new ArrayList<>();
}
return this.renderKit;
}
@@ -404,7 +404,7 @@ public class FacesConfig {
*/
public List<FacesLifecycle> getLifecycle() {
if (lifecycle == null) {
- lifecycle = new ArrayList<FacesLifecycle>();
+ lifecycle = new ArrayList<>();
}
return this.lifecycle;
}
@@ -431,14 +431,14 @@ public class FacesConfig {
*/
public List<FacesValidator> getValidator() {
if (validator == null) {
- validator = new ArrayList<FacesValidator>();
+ validator = new ArrayList<>();
}
return this.validator;
}
public List<FacesBehavior> getBehavior() {
if (behavior == null) {
- behavior = new ArrayList<FacesBehavior>();
+ behavior = new ArrayList<>();
}
return behavior;
}
@@ -465,7 +465,7 @@ public class FacesConfig {
*/
public List<FacesExtension> getFacesConfigExtension() {
if (facesConfigExtension == null) {
- facesConfigExtension = new ArrayList<FacesExtension>();
+ facesConfigExtension = new ArrayList<>();
}
return this.facesConfigExtension;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigFlowDefinition.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigFlowDefinition.java
index 86c3313aa2..74944d8d78 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigFlowDefinition.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigFlowDefinition.java
@@ -137,7 +137,7 @@ public class FacesConfigFlowDefinition {
*/
public List<Description> getDescription() {
if (description == null) {
- description = new ArrayList<Description>();
+ description = new ArrayList<>();
}
return this.description;
}
@@ -164,7 +164,7 @@ public class FacesConfigFlowDefinition {
*/
public List<DisplayName> getDisplayName() {
if (displayName == null) {
- displayName = new ArrayList<DisplayName>();
+ displayName = new ArrayList<>();
}
return this.displayName;
}
@@ -191,7 +191,7 @@ public class FacesConfigFlowDefinition {
*/
public List<Icon> getIcon() {
if (icon == null) {
- icon = new ArrayList<Icon>();
+ icon = new ArrayList<>();
}
return this.icon;
}
@@ -238,7 +238,7 @@ public class FacesConfigFlowDefinition {
*/
public List<FacesConfigFlowDefinitionView> getView() {
if (view == null) {
- view = new ArrayList<FacesConfigFlowDefinitionView>();
+ view = new ArrayList<>();
}
return this.view;
}
@@ -265,7 +265,7 @@ public class FacesConfigFlowDefinition {
*/
public List<FacesConfigFlowDefinitionSwitch> getSwitch() {
if (_switch == null) {
- _switch = new ArrayList<FacesConfigFlowDefinitionSwitch>();
+ _switch = new ArrayList<>();
}
return this._switch;
}
@@ -292,7 +292,7 @@ public class FacesConfigFlowDefinition {
*/
public List<FacesConfigFlowDefinitionFlowReturn> getFlowReturn() {
if (flowReturn == null) {
- flowReturn = new ArrayList<FacesConfigFlowDefinitionFlowReturn>();
+ flowReturn = new ArrayList<>();
}
return this.flowReturn;
}
@@ -319,7 +319,7 @@ public class FacesConfigFlowDefinition {
*/
public List<FacesNavigationRule> getNavigationRule() {
if (navigationRule == null) {
- navigationRule = new ArrayList<FacesNavigationRule>();
+ navigationRule = new ArrayList<>();
}
return this.navigationRule;
}
@@ -346,7 +346,7 @@ public class FacesConfigFlowDefinition {
*/
public List<FacesConfigFlowDefinitionFlowCall> getFlowCall() {
if (flowCall == null) {
- flowCall = new ArrayList<FacesConfigFlowDefinitionFlowCall>();
+ flowCall = new ArrayList<>();
}
return this.flowCall;
}
@@ -373,7 +373,7 @@ public class FacesConfigFlowDefinition {
*/
public List<FacesConfigFlowDefinitionFacesMethodCall> getMethodCall() {
if (methodCall == null) {
- methodCall = new ArrayList<FacesConfigFlowDefinitionFacesMethodCall>();
+ methodCall = new ArrayList<>();
}
return this.methodCall;
}
@@ -440,7 +440,7 @@ public class FacesConfigFlowDefinition {
*/
public List<FacesConfigFlowDefinitionInboundParameter> getInboundParameter() {
if (inboundParameter == null) {
- inboundParameter = new ArrayList<FacesConfigFlowDefinitionInboundParameter>();
+ inboundParameter = new ArrayList<>();
}
return this.inboundParameter;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigFlowDefinitionFacesMethodCall.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigFlowDefinitionFacesMethodCall.java
index bc3120451e..a7ab370b30 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigFlowDefinitionFacesMethodCall.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigFlowDefinitionFacesMethodCall.java
@@ -126,7 +126,7 @@ public class FacesConfigFlowDefinitionFacesMethodCall {
*/
public List<FacesConfigFlowDefinitionFlowCallParameter> getParameter() {
if (parameter == null) {
- parameter = new ArrayList<FacesConfigFlowDefinitionFlowCallParameter>();
+ parameter = new ArrayList<>();
}
return this.parameter;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigFlowDefinitionFlowCall.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigFlowDefinitionFlowCall.java
index cb93b0bb1f..cdbaebea58 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigFlowDefinitionFlowCall.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigFlowDefinitionFlowCall.java
@@ -119,7 +119,7 @@ public class FacesConfigFlowDefinitionFlowCall {
*/
public List<FacesConfigFlowDefinitionFlowCallOutboundParameter> getOutboundParameter() {
if (outboundParameter == null) {
- outboundParameter = new ArrayList<FacesConfigFlowDefinitionFlowCallOutboundParameter>();
+ outboundParameter = new ArrayList<>();
}
return this.outboundParameter;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigFlowDefinitionSwitch.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigFlowDefinitionSwitch.java
index 6defae6b9e..6de27bbd6b 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigFlowDefinitionSwitch.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigFlowDefinitionSwitch.java
@@ -104,7 +104,7 @@ public class FacesConfigFlowDefinitionSwitch {
*/
public List<FacesConfigFlowDefinitionSwitchCase> getCase() {
if (_case == null) {
- _case = new ArrayList<FacesConfigFlowDefinitionSwitchCase>();
+ _case = new ArrayList<>();
}
return this._case;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigFlowDefinitionSwitchCase.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigFlowDefinitionSwitchCase.java
index 3a6fab698d..48ee94fd0e 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigFlowDefinitionSwitchCase.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigFlowDefinitionSwitchCase.java
@@ -101,7 +101,7 @@ public class FacesConfigFlowDefinitionSwitchCase {
*/
public List<Description> getDescription() {
if (description == null) {
- description = new ArrayList<Description>();
+ description = new ArrayList<>();
}
return this.description;
}
@@ -128,7 +128,7 @@ public class FacesConfigFlowDefinitionSwitchCase {
*/
public List<DisplayName> getDisplayName() {
if (displayName == null) {
- displayName = new ArrayList<DisplayName>();
+ displayName = new ArrayList<>();
}
return this.displayName;
}
@@ -155,7 +155,7 @@ public class FacesConfigFlowDefinitionSwitchCase {
*/
public List<Icon> getIcon() {
if (icon == null) {
- icon = new ArrayList<Icon>();
+ icon = new ArrayList<>();
}
return this.icon;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigNavigationRuleExtension.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigNavigationRuleExtension.java
index 042570e077..8fe2268131 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigNavigationRuleExtension.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigNavigationRuleExtension.java
@@ -89,7 +89,7 @@ public class FacesConfigNavigationRuleExtension {
*/
public List<Object> getAny() {
if (any == null) {
- any = new ArrayList<Object>();
+ any = new ArrayList<>();
}
return this.any;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigProtectedViews.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigProtectedViews.java
index 51db75f638..be93c9281e 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigProtectedViews.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigProtectedViews.java
@@ -81,7 +81,7 @@ public class FacesConfigProtectedViews {
*/
public List<UrlPattern> getUrlPattern() {
if (urlPattern == null) {
- urlPattern = new ArrayList<UrlPattern>();
+ urlPattern = new ArrayList<>();
}
return this.urlPattern;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConverter.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConverter.java
index 4ee9aea478..33fcf50957 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConverter.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConverter.java
@@ -81,7 +81,7 @@ public class FacesConverter {
@XmlTransient
protected TextMap displayName = new TextMap();
@XmlElement(name = "icon", required = true)
- protected LocalCollection<Icon> icon = new LocalCollection<Icon>();
+ protected LocalCollection<Icon> icon = new LocalCollection<>();
@XmlElement(name = "converter-id")
protected java.lang.String converterId;
@XmlElement(name = "converter-for-class")
@@ -129,14 +129,14 @@ public class FacesConverter {
public Collection<Icon> getIcons() {
if (icon == null) {
- icon = new LocalCollection<Icon>();
+ icon = new LocalCollection<>();
}
return icon;
}
public Map<String, Icon> getIconMap() {
if (icon == null) {
- icon = new LocalCollection<Icon>();
+ icon = new LocalCollection<>();
}
return icon.toMap();
}
@@ -227,7 +227,7 @@ public class FacesConverter {
*/
public List<FacesAttribute> getAttribute() {
if (attribute == null) {
- attribute = new ArrayList<FacesAttribute>();
+ attribute = new ArrayList<>();
}
return this.attribute;
}
@@ -254,7 +254,7 @@ public class FacesConverter {
*/
public List<FacesProperty> getProperty() {
if (property == null) {
- property = new ArrayList<FacesProperty>();
+ property = new ArrayList<>();
}
return this.property;
}
@@ -281,7 +281,7 @@ public class FacesConverter {
*/
public List<FacesConverterExtension> getConverterExtension() {
if (converterExtension == null) {
- converterExtension = new ArrayList<FacesConverterExtension>();
+ converterExtension = new ArrayList<>();
}
return this.converterExtension;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConverterExtension.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConverterExtension.java
index bdb15b7ba9..134ce386fa 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConverterExtension.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConverterExtension.java
@@ -88,7 +88,7 @@ public class FacesConverterExtension {
*/
public List<Object> getAny() {
if (any == null) {
- any = new ArrayList<Object>();
+ any = new ArrayList<>();
}
return this.any;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesDefaultValidators.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesDefaultValidators.java
index be741e5a95..8fdbcfce1e 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesDefaultValidators.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesDefaultValidators.java
@@ -85,7 +85,7 @@ public class FacesDefaultValidators {
*/
public List<String> getValidatorId() {
if (validatorId == null) {
- validatorId = new ArrayList<String>();
+ validatorId = new ArrayList<>();
}
return this.validatorId;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesExtension.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesExtension.java
index 656ab35cce..eddf056b9d 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesExtension.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesExtension.java
@@ -88,7 +88,7 @@ public class FacesExtension {
*/
public List<Object> getAny() {
if (any == null) {
- any = new ArrayList<Object>();
+ any = new ArrayList<>();
}
return this.any;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesFacet.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesFacet.java
index 7afa47eda6..a768254ca3 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesFacet.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesFacet.java
@@ -69,7 +69,7 @@ public class FacesFacet {
@XmlTransient
protected TextMap displayName = new TextMap();
@XmlElement(name = "icon", required = true)
- protected LocalCollection<Icon> icon = new LocalCollection<Icon>();
+ protected LocalCollection<Icon> icon = new LocalCollection<>();
@XmlElement(name = "facet-name", required = true)
protected java.lang.String facetName;
@XmlElement(name = "facet-extension")
@@ -108,14 +108,14 @@ public class FacesFacet {
public Collection<Icon> getIcons() {
if (icon == null) {
- icon = new LocalCollection<Icon>();
+ icon = new LocalCollection<>();
}
return icon;
}
public Map<String, Icon> getIconMap() {
if (icon == null) {
- icon = new LocalCollection<Icon>();
+ icon = new LocalCollection<>();
}
return icon.toMap();
}
@@ -166,7 +166,7 @@ public class FacesFacet {
*/
public List<FacesFacetExtension> getFacetExtension() {
if (facetExtension == null) {
- facetExtension = new ArrayList<FacesFacetExtension>();
+ facetExtension = new ArrayList<>();
}
return this.facetExtension;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesFacetExtension.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesFacetExtension.java
index 17e549689f..c9b3a528ab 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesFacetExtension.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesFacetExtension.java
@@ -88,7 +88,7 @@ public class FacesFacetExtension {
*/
public List<Object> getAny() {
if (any == null) {
- any = new ArrayList<Object>();
+ any = new ArrayList<>();
}
return this.any;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesFactory.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesFactory.java
index 0f005af5d8..5313255408 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesFactory.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesFactory.java
@@ -131,21 +131,21 @@ public class FacesFactory {
*/
public List<java.lang.String> getApplicationFactory() {
if (applicationFactory == null) {
- applicationFactory = new ArrayList<java.lang.String>();
+ applicationFactory = new ArrayList<>();
}
return this.applicationFactory;
}
public List<String> getExceptionHandlerFactory() {
if (exceptionHandlerFactory == null) {
- exceptionHandlerFactory = new ArrayList<String>();
+ exceptionHandlerFactory = new ArrayList<>();
}
return exceptionHandlerFactory;
}
public List<String> getExternalContextFactory() {
if (externalContextFactory == null) {
- externalContextFactory = new ArrayList<String>();
+ externalContextFactory = new ArrayList<>();
}
return externalContextFactory;
}
@@ -172,7 +172,7 @@ public class FacesFactory {
*/
public List<java.lang.String> getFacesContextFactory() {
if (facesContextFactory == null) {
- facesContextFactory = new ArrayList<java.lang.String>();
+ facesContextFactory = new ArrayList<>();
}
return this.facesContextFactory;
}
@@ -199,28 +199,28 @@ public class FacesFactory {
*/
public List<java.lang.String> getLifecycleFactory() {
if (lifecycleFactory == null) {
- lifecycleFactory = new ArrayList<java.lang.String>();
+ lifecycleFactory = new ArrayList<>();
}
return this.lifecycleFactory;
}
public List<String> getViewDeclarationLanguageFactory() {
if (viewDeclarationLanguageFactory == null) {
- viewDeclarationLanguageFactory = new ArrayList<String>();
+ viewDeclarationLanguageFactory = new ArrayList<>();
}
return viewDeclarationLanguageFactory;
}
public List<String> getPartialViewContextFactory() {
if (partialViewContextFactory == null) {
- partialViewContextFactory = new ArrayList<String>();
+ partialViewContextFactory = new ArrayList<>();
}
return partialViewContextFactory;
}
public List<String> getTagHandlerDelegateFactory() {
if (tagHandlerDelegateFactory == null) {
- tagHandlerDelegateFactory = new ArrayList<String>();
+ tagHandlerDelegateFactory = new ArrayList<>();
}
return tagHandlerDelegateFactory;
}
@@ -247,14 +247,14 @@ public class FacesFactory {
*/
public List<java.lang.String> getRenderKitFactory() {
if (renderKitFactory == null) {
- renderKitFactory = new ArrayList<java.lang.String>();
+ renderKitFactory = new ArrayList<>();
}
return this.renderKitFactory;
}
public List<String> getVisitContextFactory() {
if (visitContextFactory == null) {
- visitContextFactory = new ArrayList<String>();
+ visitContextFactory = new ArrayList<>();
}
return visitContextFactory;
}
@@ -281,7 +281,7 @@ public class FacesFactory {
*/
public List<FacesFactoryExtension> getFactoryExtension() {
if (factoryExtension == null) {
- factoryExtension = new ArrayList<FacesFactoryExtension>();
+ factoryExtension = new ArrayList<>();
}
return this.factoryExtension;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesFactoryExtension.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesFactoryExtension.java
index efbebe7fc2..7b0eb70e4f 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesFactoryExtension.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesFactoryExtension.java
@@ -88,7 +88,7 @@ public class FacesFactoryExtension {
*/
public List<Object> getAny() {
if (any == null) {
- any = new ArrayList<Object>();
+ any = new ArrayList<>();
}
return this.any;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesLifecycle.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesLifecycle.java
index d8f6f9bf7b..7c6a414ef7 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesLifecycle.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesLifecycle.java
@@ -94,7 +94,7 @@ public class FacesLifecycle {
*/
public List<java.lang.String> getPhaseListener() {
if (phaseListener == null) {
- phaseListener = new ArrayList<java.lang.String>();
+ phaseListener = new ArrayList<>();
}
return this.phaseListener;
}
@@ -121,7 +121,7 @@ public class FacesLifecycle {
*/
public List<FacesLifecycleExtension> getLifecycleExtension() {
if (lifecycleExtension == null) {
- lifecycleExtension = new ArrayList<FacesLifecycleExtension>();
+ lifecycleExtension = new ArrayList<>();
}
return this.lifecycleExtension;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesLifecycleExtension.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesLifecycleExtension.java
index a804a6bd01..e24d5b8ac5 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesLifecycleExtension.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesLifecycleExtension.java
@@ -88,7 +88,7 @@ public class FacesLifecycleExtension {
*/
public List<Object> getAny() {
if (any == null) {
- any = new ArrayList<Object>();
+ any = new ArrayList<>();
}
return this.any;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesListEntries.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesListEntries.java
index 6418de6250..dfff29f496 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesListEntries.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesListEntries.java
@@ -117,7 +117,7 @@ public class FacesListEntries {
*/
public List<Object> getNullValueOrValue() {
if (nullValueOrValue == null) {
- nullValueOrValue = new ArrayList<Object>();
+ nullValueOrValue = new ArrayList<>();
}
return this.nullValueOrValue;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesLocaleConfig.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesLocaleConfig.java
index 4726f75a93..a821e847db 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesLocaleConfig.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesLocaleConfig.java
@@ -109,7 +109,7 @@ public class FacesLocaleConfig {
*/
public List<FacesSupportedLocale> getSupportedLocale() {
if (supportedLocale == null) {
- supportedLocale = new ArrayList<FacesSupportedLocale>();
+ supportedLocale = new ArrayList<>();
}
return this.supportedLocale;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesManagedBean.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesManagedBean.java
index 637a4b758a..0bc00ca602 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesManagedBean.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesManagedBean.java
@@ -81,7 +81,7 @@ public class FacesManagedBean {
@XmlTransient
protected TextMap displayName = new TextMap();
@XmlElement(name = "icon", required = true)
- protected LocalCollection<Icon> icon = new LocalCollection<Icon>();
+ protected LocalCollection<Icon> icon = new LocalCollection<>();
@XmlElement(name = "managed-bean-name", required = true)
protected java.lang.String managedBeanName;
@XmlElement(name = "managed-bean-class", required = true)
@@ -130,14 +130,14 @@ public class FacesManagedBean {
public Collection<Icon> getIcons() {
if (icon == null) {
- icon = new LocalCollection<Icon>();
+ icon = new LocalCollection<>();
}
return icon;
}
public Map<String, Icon> getIconMap() {
if (icon == null) {
- icon = new LocalCollection<Icon>();
+ icon = new LocalCollection<>();
}
return icon.toMap();
}
@@ -228,7 +228,7 @@ public class FacesManagedBean {
*/
public List<FacesManagedProperty> getManagedProperty() {
if (managedProperty == null) {
- managedProperty = new ArrayList<FacesManagedProperty>();
+ managedProperty = new ArrayList<>();
}
return this.managedProperty;
}
@@ -295,7 +295,7 @@ public class FacesManagedBean {
*/
public List<FacesManagedBeanExtension> getManagedBeanExtension() {
if (managedBeanExtension == null) {
- managedBeanExtension = new ArrayList<FacesManagedBeanExtension>();
+ managedBeanExtension = new ArrayList<>();
}
return this.managedBeanExtension;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesManagedBeanExtension.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesManagedBeanExtension.java
index 8919f5cc02..5b1c2b5a0c 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesManagedBeanExtension.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesManagedBeanExtension.java
@@ -88,7 +88,7 @@ public class FacesManagedBeanExtension {
*/
public List<Object> getAny() {
if (any == null) {
- any = new ArrayList<Object>();
+ any = new ArrayList<>();
}
return this.any;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesManagedProperty.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesManagedProperty.java
index e1c55cb3d9..ec72b780fe 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesManagedProperty.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesManagedProperty.java
@@ -77,7 +77,7 @@ public class FacesManagedProperty {
@XmlTransient
protected TextMap displayName = new TextMap();
@XmlElement(name = "icon", required = true)
- protected LocalCollection<Icon> icon = new LocalCollection<Icon>();
+ protected LocalCollection<Icon> icon = new LocalCollection<>();
@XmlElement(name = "property-name", required = true)
protected java.lang.String propertyName;
@XmlElement(name = "property-class")
@@ -123,14 +123,14 @@ public class FacesManagedProperty {
public Collection<Icon> getIcons() {
if (icon == null) {
- icon = new LocalCollection<Icon>();
+ icon = new LocalCollection<>();
}
return icon;
}
public Map<String, Icon> getIconMap() {
if (icon == null) {
- icon = new LocalCollection<Icon>();
+ icon = new LocalCollection<>();
}
return icon.toMap();
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesMapEntries.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesMapEntries.java
index 5e0cd3ef64..278b0d5ce8 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesMapEntries.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesMapEntries.java
@@ -133,7 +133,7 @@ public class FacesMapEntries {
*/
public List<FacesMapEntry> getMapEntry() {
if (mapEntry == null) {
- mapEntry = new ArrayList<FacesMapEntry>();
+ mapEntry = new ArrayList<>();
}
return this.mapEntry;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesNavigationCase.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesNavigationCase.java
index eb57675dcc..4dcc139cff 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesNavigationCase.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesNavigationCase.java
@@ -74,7 +74,7 @@ public class FacesNavigationCase {
@XmlTransient
protected TextMap displayName = new TextMap();
@XmlElement(name = "icon", required = true)
- protected LocalCollection<Icon> icon = new LocalCollection<Icon>();
+ protected LocalCollection<Icon> icon = new LocalCollection<>();
@XmlElement(name = "from-action")
protected FacesFromAction fromAction;
@XmlElement(name = "from-outcome")
@@ -119,14 +119,14 @@ public class FacesNavigationCase {
public Collection<Icon> getIcons() {
if (icon == null) {
- icon = new LocalCollection<Icon>();
+ icon = new LocalCollection<>();
}
return icon;
}
public Map<String, Icon> getIconMap() {
if (icon == null) {
- icon = new LocalCollection<Icon>();
+ icon = new LocalCollection<>();
}
return icon.toMap();
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesNavigationRule.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesNavigationRule.java
index 6a41997e3d..61099799f1 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesNavigationRule.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesNavigationRule.java
@@ -73,7 +73,7 @@ public class FacesNavigationRule {
@XmlTransient
protected TextMap displayName = new TextMap();
@XmlElement(name = "icon", required = true)
- protected LocalCollection<Icon> icon = new LocalCollection<Icon>();
+ protected LocalCollection<Icon> icon = new LocalCollection<>();
@XmlElement(name = "from-view-id")
protected java.lang.String fromViewId;
@XmlElement(name = "navigation-case")
@@ -117,14 +117,14 @@ public class FacesNavigationRule {
public Collection<Icon> getIcons() {
if (icon == null) {
- icon = new LocalCollection<Icon>();
+ icon = new LocalCollection<>();
}
return icon;
}
public Map<String, Icon> getIconMap() {
if (icon == null) {
- icon = new LocalCollection<Icon>();
+ icon = new LocalCollection<>();
}
return icon.toMap();
}
@@ -175,7 +175,7 @@ public class FacesNavigationRule {
*/
public List<FacesNavigationCase> getNavigationCase() {
if (navigationCase == null) {
- navigationCase = new ArrayList<FacesNavigationCase>();
+ navigationCase = new ArrayList<>();
}
return this.navigationCase;
}
@@ -202,7 +202,7 @@ public class FacesNavigationRule {
*/
public List<FacesNavigationRuleExtension> getNavigationRuleExtension() {
if (navigationRuleExtension == null) {
- navigationRuleExtension = new ArrayList<FacesNavigationRuleExtension>();
+ navigationRuleExtension = new ArrayList<>();
}
return this.navigationRuleExtension;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesNavigationRuleExtension.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesNavigationRuleExtension.java
index 4726b61e05..45daa67bfb 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesNavigationRuleExtension.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesNavigationRuleExtension.java
@@ -88,7 +88,7 @@ public class FacesNavigationRuleExtension {
*/
public List<Object> getAny() {
if (any == null) {
- any = new ArrayList<Object>();
+ any = new ArrayList<>();
}
return this.any;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesOrderingOrdering.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesOrderingOrdering.java
index 2a38dd37b6..ece1b08d1f 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesOrderingOrdering.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesOrderingOrdering.java
@@ -75,7 +75,7 @@ public class FacesOrderingOrdering {
*/
public List<String> getName() {
if (name == null) {
- name = new ArrayList<String>();
+ name = new ArrayList<>();
}
return this.name;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesProperty.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesProperty.java
index de97b9f38c..a065b8344a 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesProperty.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesProperty.java
@@ -75,7 +75,7 @@ public class FacesProperty {
@XmlTransient
protected TextMap displayName = new TextMap();
@XmlElement(name = "icon", required = true)
- protected LocalCollection<Icon> icon = new LocalCollection<Icon>();
+ protected LocalCollection<Icon> icon = new LocalCollection<>();
@XmlElement(name = "property-name", required = true)
protected java.lang.String propertyName;
@XmlElement(name = "property-class", required = true)
@@ -120,14 +120,14 @@ public class FacesProperty {
public Collection<Icon> getIcons() {
if (icon == null) {
- icon = new LocalCollection<Icon>();
+ icon = new LocalCollection<>();
}
return icon;
}
public Map<String, Icon> getIconMap() {
if (icon == null) {
- icon = new LocalCollection<Icon>();
+ icon = new LocalCollection<>();
}
return icon.toMap();
}
@@ -238,7 +238,7 @@ public class FacesProperty {
*/
public List<FacesPropertyExtension> getPropertyExtension() {
if (propertyExtension == null) {
- propertyExtension = new ArrayList<FacesPropertyExtension>();
+ propertyExtension = new ArrayList<>();
}
return this.propertyExtension;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesPropertyExtension.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesPropertyExtension.java
index dafb50e165..ac391b259b 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesPropertyExtension.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesPropertyExtension.java
@@ -88,7 +88,7 @@ public class FacesPropertyExtension {
*/
public List<Object> getAny() {
if (any == null) {
- any = new ArrayList<Object>();
+ any = new ArrayList<>();
}
return this.any;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesRedirect.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesRedirect.java
index d07261552b..8c701d9bb0 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesRedirect.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesRedirect.java
@@ -88,7 +88,7 @@ public class FacesRedirect {
*/
public List<FacesRedirectViewParam> getViewParam() {
if (viewParam == null) {
- viewParam = new ArrayList<FacesRedirectViewParam>();
+ viewParam = new ArrayList<>();
}
return this.viewParam;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesReferencedBean.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesReferencedBean.java
index 970a4edf0b..c6ff6efd25 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesReferencedBean.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesReferencedBean.java
@@ -70,7 +70,7 @@ public class FacesReferencedBean {
@XmlTransient
protected TextMap displayName = new TextMap();
@XmlElement(name = "icon", required = true)
- protected LocalCollection<Icon> icon = new LocalCollection<Icon>();
+ protected LocalCollection<Icon> icon = new LocalCollection<>();
@XmlElement(name = "referenced-bean-name", required = true)
protected java.lang.String referencedBeanName;
@XmlElement(name = "referenced-bean-class", required = true)
@@ -112,14 +112,14 @@ public class FacesReferencedBean {
public Collection<Icon> getIcons() {
if (icon == null) {
- icon = new LocalCollection<Icon>();
+ icon = new LocalCollection<>();
}
return icon;
}
public Map<String, Icon> getIconMap() {
if (icon == null) {
- icon = new LocalCollection<Icon>();
+ icon = new LocalCollection<>();
}
return icon.toMap();
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesRenderKit.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesRenderKit.java
index a72187ac24..a58b0e3395 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesRenderKit.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesRenderKit.java
@@ -77,7 +77,7 @@ public class FacesRenderKit {
@XmlTransient
protected TextMap displayName = new TextMap();
@XmlElement(name = "icon", required = true)
- protected LocalCollection<Icon> icon = new LocalCollection<Icon>();
+ protected LocalCollection<Icon> icon = new LocalCollection<>();
@XmlElement(name = "render-kit-id")
protected java.lang.String renderKitId;
@XmlElement(name = "render-kit-class")
@@ -125,14 +125,14 @@ public class FacesRenderKit {
public Collection<Icon> getIcons() {
if (icon == null) {
- icon = new LocalCollection<Icon>();
+ icon = new LocalCollection<>();
}
return icon;
}
public Map<String, Icon> getIconMap() {
if (icon == null) {
- icon = new LocalCollection<Icon>();
+ icon = new LocalCollection<>();
}
return icon.toMap();
}
@@ -203,14 +203,14 @@ public class FacesRenderKit {
*/
public List<FacesRenderer> getRenderer() {
if (renderer == null) {
- renderer = new ArrayList<FacesRenderer>();
+ renderer = new ArrayList<>();
}
return this.renderer;
}
public List<FacesClientBehaviorRenderer> getClientBehaviorRenderer() {
if (clientBehaviorRenderer == null) {
- clientBehaviorRenderer = new ArrayList<FacesClientBehaviorRenderer>();
+ clientBehaviorRenderer = new ArrayList<>();
}
return this.clientBehaviorRenderer;
}
@@ -237,7 +237,7 @@ public class FacesRenderKit {
*/
public List<FacesRenderKitExtension> getRenderKitExtension() {
if (renderKitExtension == null) {
- renderKitExtension = new ArrayList<FacesRenderKitExtension>();
+ renderKitExtension = new ArrayList<>();
}
return this.renderKitExtension;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesRenderKitExtension.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesRenderKitExtension.java
index 9211d12ecb..a110147f2a 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesRenderKitExtension.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesRenderKitExtension.java
@@ -88,7 +88,7 @@ public class FacesRenderKitExtension {
*/
public List<Object> getAny() {
if (any == null) {
- any = new ArrayList<Object>();
+ any = new ArrayList<>();
}
return this.any;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesRenderer.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesRenderer.java
index 8cfaa4ce81..3f61ae59d0 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesRenderer.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesRenderer.java
@@ -77,7 +77,7 @@ public class FacesRenderer {
@XmlTransient
protected TextMap displayName = new TextMap();
@XmlElement(name = "icon", required = true)
- protected LocalCollection<Icon> icon = new LocalCollection<Icon>();
+ protected LocalCollection<Icon> icon = new LocalCollection<>();
@XmlElement(name = "component-family", required = true)
protected java.lang.String componentFamily;
@XmlElement(name = "renderer-type", required = true)
@@ -122,14 +122,14 @@ public class FacesRenderer {
public Collection<Icon> getIcons() {
if (icon == null) {
- icon = new LocalCollection<Icon>();
+ icon = new LocalCollection<>();
}
return icon;
}
public Map<String, Icon> getIconMap() {
if (icon == null) {
- icon = new LocalCollection<Icon>();
+ icon = new LocalCollection<>();
}
return icon.toMap();
}
@@ -220,7 +220,7 @@ public class FacesRenderer {
*/
public List<FacesFacet> getFacet() {
if (facet == null) {
- facet = new ArrayList<FacesFacet>();
+ facet = new ArrayList<>();
}
return this.facet;
}
@@ -247,7 +247,7 @@ public class FacesRenderer {
*/
public List<FacesAttribute> getAttribute() {
if (attribute == null) {
- attribute = new ArrayList<FacesAttribute>();
+ attribute = new ArrayList<>();
}
return this.attribute;
}
@@ -274,7 +274,7 @@ public class FacesRenderer {
*/
public List<FacesRendererExtension> getRendererExtension() {
if (rendererExtension == null) {
- rendererExtension = new ArrayList<FacesRendererExtension>();
+ rendererExtension = new ArrayList<>();
}
return this.rendererExtension;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesRendererExtension.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesRendererExtension.java
index 9b7df5af01..efe4e04032 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesRendererExtension.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesRendererExtension.java
@@ -88,7 +88,7 @@ public class FacesRendererExtension {
*/
public List<Object> getAny() {
if (any == null) {
- any = new ArrayList<Object>();
+ any = new ArrayList<>();
}
return this.any;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesValidator.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesValidator.java
index 31fea5b12a..e96f949589 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesValidator.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesValidator.java
@@ -77,7 +77,7 @@ public class FacesValidator {
@XmlTransient
protected TextMap displayName = new TextMap();
@XmlElement(name = "icon", required = true)
- protected LocalCollection<Icon> icon = new LocalCollection<Icon>();
+ protected LocalCollection<Icon> icon = new LocalCollection<>();
@XmlElement(name = "validator-id", required = true)
protected java.lang.String validatorId;
@XmlElement(name = "validator-class", required = true)
@@ -123,14 +123,14 @@ public class FacesValidator {
public Collection<Icon> getIcons() {
if (icon == null) {
- icon = new LocalCollection<Icon>();
+ icon = new LocalCollection<>();
}
return icon;
}
public Map<String, Icon> getIconMap() {
if (icon == null) {
- icon = new LocalCollection<Icon>();
+ icon = new LocalCollection<>();
}
return icon.toMap();
}
@@ -201,7 +201,7 @@ public class FacesValidator {
*/
public List<FacesAttribute> getAttribute() {
if (attribute == null) {
- attribute = new ArrayList<FacesAttribute>();
+ attribute = new ArrayList<>();
}
return this.attribute;
}
@@ -228,7 +228,7 @@ public class FacesValidator {
*/
public List<FacesProperty> getProperty() {
if (property == null) {
- property = new ArrayList<FacesProperty>();
+ property = new ArrayList<>();
}
return this.property;
}
@@ -255,7 +255,7 @@ public class FacesValidator {
*/
public List<FacesValidatorExtension> getValidatorExtension() {
if (validatorExtension == null) {
- validatorExtension = new ArrayList<FacesValidatorExtension>();
+ validatorExtension = new ArrayList<>();
}
return this.validatorExtension;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesValidatorExtension.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesValidatorExtension.java
index 475bb20dfd..793781c3cb 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesValidatorExtension.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesValidatorExtension.java
@@ -88,7 +88,7 @@ public class FacesValidatorExtension {
*/
public List<Object> getAny() {
if (any == null) {
- any = new ArrayList<Object>();
+ any = new ArrayList<>();
}
return this.any;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/Filter.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/Filter.java
index d35c1e86a1..3736677e28 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/Filter.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/Filter.java
@@ -73,7 +73,7 @@ public class Filter {
@XmlTransient
protected TextMap displayName = new TextMap();
@XmlElement(name = "icon", required = true)
- protected LocalCollection<Icon> icon = new LocalCollection<Icon>();
+ protected LocalCollection<Icon> icon = new LocalCollection<>();
@XmlElement(name = "filter-name", required = true)
protected String filterName;
@@ -124,14 +124,14 @@ public class Filter {
public Collection<Icon> getIcons() {
if (icon == null) {
- icon = new LocalCollection<Icon>();
+ icon = new LocalCollection<>();
}
return icon;
}
public Map<String, Icon> getIconMap() {
if (icon == null) {
- icon = new LocalCollection<Icon>();
+ icon = new LocalCollection<>();
}
return icon.toMap();
}
@@ -166,7 +166,7 @@ public class Filter {
public List<ParamValue> getInitParam() {
if (initParam == null) {
- initParam = new ArrayList<ParamValue>();
+ initParam = new ArrayList<>();
}
return this.initParam;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FilterMapping.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FilterMapping.java
index 34994c1edf..ce836103cb 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FilterMapping.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FilterMapping.java
@@ -85,21 +85,21 @@ public class FilterMapping {
public List<String> getUrlPattern() {
if (urlPattern == null) {
- urlPattern = new ArrayList<String>();
+ urlPattern = new ArrayList<>();
}
return this.urlPattern;
}
public List<String> getServletName() {
if (servletName == null) {
- servletName = new ArrayList<String>();
+ servletName = new ArrayList<>();
}
return this.servletName;
}
public List<Dispatcher> getDispatcher() {
if (dispatcher == null) {
- dispatcher = new ArrayList<Dispatcher>();
+ dispatcher = new ArrayList<>();
}
return this.dispatcher;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/Function.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/Function.java
index 1242bbc6de..dac39e1bd5 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/Function.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/Function.java
@@ -73,7 +73,7 @@ public class Function {
@XmlTransient
protected TextMap displayName = new TextMap();
@XmlElement(name = "icon", required = true)
- protected LocalCollection<Icon> icon = new LocalCollection<Icon>();
+ protected LocalCollection<Icon> icon = new LocalCollection<>();
@XmlElement(required = true)
protected String name;
@@ -117,14 +117,14 @@ public class Function {
public Collection<Icon> getIcons() {
if (icon == null) {
- icon = new LocalCollection<Icon>();
+ icon = new LocalCollection<>();
}
return icon;
}
public Map<String, Icon> getIconMap() {
if (icon == null) {
- icon = new LocalCollection<Icon>();
+ icon = new LocalCollection<>();
}
return icon.toMap();
}
@@ -167,7 +167,7 @@ public class Function {
public List<TldExtension> getFunctionExtension() {
if (functionExtension == null) {
- functionExtension = new ArrayList<TldExtension>();
+ functionExtension = new ArrayList<>();
}
return this.functionExtension;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/Handler.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/Handler.java
index c65bb58c82..e2f84e329b 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/Handler.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/Handler.java
@@ -76,7 +76,7 @@ public class Handler {
@XmlTransient
protected TextMap displayName = new TextMap();
@XmlElement(name = "icon")
- protected LocalCollection<Icon> icon = new LocalCollection<Icon>();
+ protected LocalCollection<Icon> icon = new LocalCollection<>();
@XmlElement(name = "handler-name", required = true)
protected String handlerName;
@XmlElement(name = "handler-class", required = true)
@@ -123,14 +123,14 @@ public class Handler {
public Collection<Icon> getIcons() {
if (icon == null) {
- icon = new LocalCollection<Icon>();
+ icon = new LocalCollection<>();
}
return icon;
}
public Map<String, Icon> getIconMap() {
if (icon == null) {
- icon = new LocalCollection<Icon>();
+ icon = new LocalCollection<>();
}
return icon.toMap();
}
@@ -157,28 +157,28 @@ public class Handler {
public List<ParamValue> getInitParam() {
if (initParam == null) {
- initParam = new ArrayList<ParamValue>();
+ initParam = new ArrayList<>();
}
return this.initParam;
}
public List<QName> getSoapHeader() {
if (soapHeader == null) {
- soapHeader = new ArrayList<QName>();
+ soapHeader = new ArrayList<>();
}
return this.soapHeader;
}
public List<String> getSoapRole() {
if (soapRole == null) {
- soapRole = new ArrayList<String>();
+ soapRole = new ArrayList<>();
}
return this.soapRole;
}
public List<String> getPortName() {
if (portName == null) {
- portName = new ArrayList<String>();
+ portName = new ArrayList<>();
}
return this.portName;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/HandlerChain.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/HandlerChain.java
index 2ec170f946..03b3721156 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/HandlerChain.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/HandlerChain.java
@@ -97,14 +97,14 @@ public class HandlerChain {
public List<String> getProtocolBindings() {
if (protocolBindings == null) {
- protocolBindings = new ArrayList<String>();
+ protocolBindings = new ArrayList<>();
}
return this.protocolBindings;
}
public List<Handler> getHandler() {
if (handler == null) {
- handler = new ArrayList<Handler>();
+ handler = new ArrayList<>();
}
return this.handler;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/HandlerChains.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/HandlerChains.java
index ce1bed3d11..185a3642d9 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/HandlerChains.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/HandlerChains.java
@@ -62,7 +62,7 @@ public class HandlerChains {
public List<HandlerChain> getHandlerChain() {
if (handlerChain == null) {
- handlerChain = new ArrayList<HandlerChain>();
+ handlerChain = new ArrayList<>();
}
return this.handlerChain;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/Interceptor.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/Interceptor.java
index bc8a3dfed9..e5b9a5a67b 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/Interceptor.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/Interceptor.java
@@ -194,7 +194,7 @@ public class Interceptor implements JndiConsumer, Session {
public List<AroundInvoke> getAroundInvoke() {
if (aroundInvoke == null) {
- aroundInvoke = new ArrayList<AroundInvoke>();
+ aroundInvoke = new ArrayList<>();
}
return this.aroundInvoke;
}
@@ -206,133 +206,133 @@ public class Interceptor implements JndiConsumer, Session {
public List<AroundTimeout> getAroundTimeout() {
if (aroundTimeout == null) {
- aroundTimeout = new ArrayList<AroundTimeout>();
+ aroundTimeout = new ArrayList<>();
}
return this.aroundTimeout;
}
public Collection<EnvEntry> getEnvEntry() {
if (envEntry == null) {
- envEntry = new KeyedCollection<String, EnvEntry>();
+ envEntry = new KeyedCollection<>();
}
return this.envEntry;
}
public Map<String, EnvEntry> getEnvEntryMap() {
if (envEntry == null) {
- envEntry = new KeyedCollection<String, EnvEntry>();
+ envEntry = new KeyedCollection<>();
}
return this.envEntry.toMap();
}
public Collection<EjbRef> getEjbRef() {
if (ejbRef == null) {
- ejbRef = new KeyedCollection<String, EjbRef>();
+ ejbRef = new KeyedCollection<>();
}
return this.ejbRef;
}
public Map<String, EjbRef> getEjbRefMap() {
if (ejbRef == null) {
- ejbRef = new KeyedCollection<String, EjbRef>();
+ ejbRef = new KeyedCollection<>();
}
return this.ejbRef.toMap();
}
public Collection<EjbLocalRef> getEjbLocalRef() {
if (ejbLocalRef == null) {
- ejbLocalRef = new KeyedCollection<String, EjbLocalRef>();
+ ejbLocalRef = new KeyedCollection<>();
}
return this.ejbLocalRef;
}
public Map<String, EjbLocalRef> getEjbLocalRefMap() {
if (ejbLocalRef == null) {
- ejbLocalRef = new KeyedCollection<String, EjbLocalRef>();
+ ejbLocalRef = new KeyedCollection<>();
}
return this.ejbLocalRef.toMap();
}
public Collection<ServiceRef> getServiceRef() {
if (serviceRef == null) {
- serviceRef = new KeyedCollection<String, ServiceRef>();
+ serviceRef = new KeyedCollection<>();
}
return this.serviceRef;
}
public Map<String, ServiceRef> getServiceRefMap() {
if (serviceRef == null) {
- serviceRef = new KeyedCollection<String, ServiceRef>();
+ serviceRef = new KeyedCollection<>();
}
return this.serviceRef.toMap();
}
public Collection<ResourceRef> getResourceRef() {
if (resourceRef == null) {
- resourceRef = new KeyedCollection<String, ResourceRef>();
+ resourceRef = new KeyedCollection<>();
}
return this.resourceRef;
}
public Map<String, ResourceRef> getResourceRefMap() {
if (resourceRef == null) {
- resourceRef = new KeyedCollection<String, ResourceRef>();
+ resourceRef = new KeyedCollection<>();
}
return this.resourceRef.toMap();
}
public Collection<ResourceEnvRef> getResourceEnvRef() {
if (resourceEnvRef == null) {
- resourceEnvRef = new KeyedCollection<String, ResourceEnvRef>();
+ resourceEnvRef = new KeyedCollection<>();
}
return this.resourceEnvRef;
}
public Map<String, ResourceEnvRef> getResourceEnvRefMap() {
if (resourceEnvRef == null) {
- resourceEnvRef = new KeyedCollection<String, ResourceEnvRef>();
+ resourceEnvRef = new KeyedCollection<>();
}
return this.resourceEnvRef.toMap();
}
public Collection<MessageDestinationRef> getMessageDestinationRef() {
if (messageDestinationRef == null) {
- messageDestinationRef = new KeyedCollection<String, MessageDestinationRef>();
+ messageDestinationRef = new KeyedCollection<>();
}
return this.messageDestinationRef;
}
public Map<String, MessageDestinationRef> getMessageDestinationRefMap() {
if (messageDestinationRef == null) {
- messageDestinationRef = new KeyedCollection<String, MessageDestinationRef>();
+ messageDestinationRef = new KeyedCollection<>();
}
return this.messageDestinationRef.toMap();
}
public Collection<PersistenceContextRef> getPersistenceContextRef() {
if (persistenceContextRef == null) {
- persistenceContextRef = new KeyedCollection<String, PersistenceContextRef>();
+ persistenceContextRef = new KeyedCollection<>();
}
return this.persistenceContextRef;
}
public Map<String, PersistenceContextRef> getPersistenceContextRefMap() {
if (persistenceContextRef == null) {
- persistenceContextRef = new KeyedCollection<String, PersistenceContextRef>();
+ persistenceContextRef = new KeyedCollection<>();
}
return this.persistenceContextRef.toMap();
}
public Collection<PersistenceUnitRef> getPersistenceUnitRef() {
if (persistenceUnitRef == null) {
- persistenceUnitRef = new KeyedCollection<String, PersistenceUnitRef>();
+ persistenceUnitRef = new KeyedCollection<>();
}
return this.persistenceUnitRef;
}
public Map<String, PersistenceUnitRef> getPersistenceUnitRefMap() {
if (persistenceUnitRef == null) {
- persistenceUnitRef = new KeyedCollection<String, PersistenceUnitRef>();
+ persistenceUnitRef = new KeyedCollection<>();
}
return this.persistenceUnitRef.toMap();
}
@@ -340,7 +340,7 @@ public class Interceptor implements JndiConsumer, Session {
@Override
public Collection<DataSource> getDataSource() {
if (dataSource == null) {
- dataSource = new KeyedCollection<String, DataSource>();
+ dataSource = new KeyedCollection<>();
}
return this.dataSource;
}
@@ -348,21 +348,21 @@ public class Interceptor implements JndiConsumer, Session {
@Override
public Map<String, DataSource> getDataSourceMap() {
if (dataSource == null) {
- dataSource = new KeyedCollection<String, DataSource>();
+ dataSource = new KeyedCollection<>();
}
return this.dataSource.toMap();
}
public List<LifecycleCallback> getAroundConstruct() {
if (aroundConstruct == null) {
- aroundConstruct = new ArrayList<LifecycleCallback>();
+ aroundConstruct = new ArrayList<>();
}
return this.aroundConstruct;
}
public List<LifecycleCallback> getPostConstruct() {
if (postConstruct == null) {
- postConstruct = new ArrayList<LifecycleCallback>();
+ postConstruct = new ArrayList<>();
}
return this.postConstruct;
}
@@ -374,7 +374,7 @@ public class Interceptor implements JndiConsumer, Session {
public List<LifecycleCallback> getPreDestroy() {
if (preDestroy == null) {
- preDestroy = new ArrayList<LifecycleCallback>();
+ preDestroy = new ArrayList<>();
}
return this.preDestroy;
}
@@ -386,7 +386,7 @@ public class Interceptor implements JndiConsumer, Session {
public List<LifecycleCallback> getPostActivate() {
if (postActivate == null) {
- postActivate = new ArrayList<LifecycleCallback>();
+ postActivate = new ArrayList<>();
}
return this.postActivate;
}
@@ -398,7 +398,7 @@ public class Interceptor implements JndiConsumer, Session {
public List<LifecycleCallback> getPrePassivate() {
if (prePassivate == null) {
- prePassivate = new ArrayList<LifecycleCallback>();
+ prePassivate = new ArrayList<>();
}
return this.prePassivate;
}
@@ -425,31 +425,31 @@ public class Interceptor implements JndiConsumer, Session {
public List<LifecycleCallback> getAfterBegin() {
if (afterBegin == null) {
- afterBegin = new ArrayList<LifecycleCallback>();
+ afterBegin = new ArrayList<>();
}
return this.afterBegin;
}
public List<LifecycleCallback> getAfterCompletion() {
if (afterCompletion == null) {
- afterCompletion = new ArrayList<LifecycleCallback>();
+ afterCompletion = new ArrayList<>();
}
return this.afterCompletion;
}
public List<LifecycleCallback> getBeforeCompletion() {
if (beforeCompletion == null) {
- beforeCompletion = new ArrayList<LifecycleCallback>();
+ beforeCompletion = new ArrayList<>();
}
return this.beforeCompletion;
}
public List<InitMethod> getInitMethod() {
- return new ArrayList<InitMethod>();
+ return new ArrayList<>();
}
public List<RemoveMethod> getRemoveMethod() {
- return new ArrayList<RemoveMethod>();
+ return new ArrayList<>();
}
public String getId() {
@@ -488,7 +488,7 @@ public class Interceptor implements JndiConsumer, Session {
@Override
public Map<String, ContextService> getContextServiceMap() {
if (contextService == null) {
- contextService = new KeyedCollection<String, ContextService>();
+ contextService = new KeyedCollection<>();
}
return this.contextService.toMap();
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/InterceptorBinding.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/InterceptorBinding.java
index d1b42f1b44..1dea0a8e3b 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/InterceptorBinding.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/InterceptorBinding.java
@@ -141,7 +141,7 @@ public class InterceptorBinding {
public List<String> getInterceptorClass() {
if (interceptorClass == null) {
- interceptorClass = new ArrayList<String>();
+ interceptorClass = new ArrayList<>();
}
return this.interceptorClass;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/InterceptorOrder.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/InterceptorOrder.java
index 7747e6483f..73afa009e3 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/InterceptorOrder.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/InterceptorOrder.java
@@ -65,7 +65,7 @@ public class InterceptorOrder {
public List<String> getInterceptorClass() {
if (interceptorClass == null) {
- interceptorClass = new ArrayList<String>();
+ interceptorClass = new ArrayList<>();
}
return this.interceptorClass;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/Interceptors.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/Interceptors.java
index eec4423c5a..e8e957dd9d 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/Interceptors.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/Interceptors.java
@@ -58,7 +58,7 @@ public class Interceptors {
protected TextMap description = new TextMap();
@XmlTransient
- protected Map<String, Interceptor> interceptors = new LinkedHashMap<String, Interceptor>();
+ protected Map<String, Interceptor> interceptors = new LinkedHashMap<>();
@XmlAttribute
@XmlJavaTypeAdapter(CollapsedStringAdapter.class)
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/JMSConnectionFactory.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/JMSConnectionFactory.java
index e470c8b990..3cd6507988 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/JMSConnectionFactory.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/JMSConnectionFactory.java
@@ -142,7 +142,7 @@ public class JMSConnectionFactory implements Keyable<String> {
public List<Property> getProperty() {
if (property == null) {
- property = new ArrayList<Property>();
+ property = new ArrayList<>();
}
return this.property;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/JavaWsdlMapping.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/JavaWsdlMapping.java
index 529ace7c49..d93ddd8228 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/JavaWsdlMapping.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/JavaWsdlMapping.java
@@ -60,56 +60,56 @@ public class JavaWsdlMapping {
public Collection<PackageMapping> getPackageMapping() {
if (packageMapping == null) {
- packageMapping = new KeyedCollection<String, PackageMapping>();
+ packageMapping = new KeyedCollection<>();
}
return this.packageMapping;
}
public Map<String, PackageMapping> getPackageMappingMap() {
if (packageMapping == null) {
- packageMapping = new KeyedCollection<String, PackageMapping>();
+ packageMapping = new KeyedCollection<>();
}
return this.packageMapping.toMap();
}
public List<JavaXmlTypeMapping> getJavaXmlTypeMapping() {
if (javaXmlTypeMapping == null) {
- javaXmlTypeMapping = new ArrayList<JavaXmlTypeMapping>();
+ javaXmlTypeMapping = new ArrayList<>();
}
return this.javaXmlTypeMapping;
}
public Collection<ExceptionMapping> getExceptionMapping() {
if (exceptionMapping == null) {
- exceptionMapping = new KeyedCollection<QName, ExceptionMapping>();
+ exceptionMapping = new KeyedCollection<>();
}
return this.exceptionMapping;
}
public Map<QName, ExceptionMapping> getExceptionMappingMap() {
if (exceptionMapping == null) {
- exceptionMapping = new KeyedCollection<QName, ExceptionMapping>();
+ exceptionMapping = new KeyedCollection<>();
}
return this.exceptionMapping.toMap();
}
public List<ServiceInterfaceMapping> getServiceInterfaceMapping() {
if (serviceInterfaceMapping == null) {
- serviceInterfaceMapping = new ArrayList<ServiceInterfaceMapping>();
+ serviceInterfaceMapping = new ArrayList<>();
}
return this.serviceInterfaceMapping;
}
public Collection<ServiceEndpointInterfaceMapping> getServiceEndpointInterfaceMapping() {
if (serviceEndpointInterfaceMapping == null) {
- serviceEndpointInterfaceMapping = new KeyedCollection<String, ServiceEndpointInterfaceMapping>();
+ serviceEndpointInterfaceMapping = new KeyedCollection<>();
}
return this.serviceEndpointInterfaceMapping;
}
public Map<String, ServiceEndpointInterfaceMapping> getServiceEndpointInterfaceMappingMap() {
if (serviceEndpointInterfaceMapping == null) {
- serviceEndpointInterfaceMapping = new KeyedCollection<String, ServiceEndpointInterfaceMapping>();
+ serviceEndpointInterfaceMapping = new KeyedCollection<>();
}
return this.serviceEndpointInterfaceMapping.toMap();
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/JavaXmlTypeMapping.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/JavaXmlTypeMapping.java
index 6f4b856ce9..525d546a2d 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/JavaXmlTypeMapping.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/JavaXmlTypeMapping.java
@@ -94,7 +94,7 @@ public class JavaXmlTypeMapping {
public List<VariableMapping> getVariableMapping() {
if (variableMapping == null) {
- variableMapping = new ArrayList<VariableMapping>();
+ variableMapping = new ArrayList<>();
}
return this.variableMapping;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/JaxbJavaee.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/JaxbJavaee.java
index 59842bb686..d1b1ff3515 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/JaxbJavaee.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/JaxbJavaee.java
@@ -61,9 +61,9 @@ import org.xml.sax.helpers.XMLFilterImpl;
* @version $Rev$ $Date$
*/
public class JaxbJavaee {
- public static final ThreadLocal<Set<String>> currentPublicId = new ThreadLocal<Set<String>>();
+ public static final ThreadLocal<Set<String>> currentPublicId = new ThreadLocal<>();
- private static final Map<Class<?>, JAXBContext> jaxbContexts = new HashMap<Class<?>, JAXBContext>();
+ private static final Map<Class<?>, JAXBContext> jaxbContexts = new HashMap<>();
public static <T> String marshal(final Class<T> type, final Object object) throws JAXBException {
final ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -120,7 +120,7 @@ public class JaxbJavaee {
}
- currentPublicId.set(new TreeSet<String>());
+ currentPublicId.set(new TreeSet<>());
try {
final JAXBElement<T> element = unmarshaller.unmarshal(source, type);
return element.getValue();
@@ -192,7 +192,7 @@ public class JaxbJavaee {
final SAXSource source = new SAXSource(xmlFilter, inputSource);
- currentPublicId.set(new TreeSet<String>());
+ currentPublicId.set(new TreeSet<>());
try {
return unmarshaller.unmarshal(source);
} finally {
@@ -232,7 +232,7 @@ public class JaxbJavaee {
final SAXSource source = new SAXSource(xmlFilter, inputSource);
- currentPublicId.set(new TreeSet<String>());
+ currentPublicId.set(new TreeSet<>());
try {
return unmarshaller.unmarshal(source);
} finally {
@@ -272,7 +272,7 @@ public class JaxbJavaee {
final SAXSource source = new SAXSource(xmlFilter, inputSource);
- currentPublicId.set(new TreeSet<String>());
+ currentPublicId.set(new TreeSet<>());
try {
return unmarshaller.unmarshal(source);
} finally {
@@ -374,7 +374,7 @@ public class JaxbJavaee {
private static final InputSource EMPTY_INPUT_SOURCE = new InputSource(new ByteArrayInputStream(new byte[0]));
- private final Stack<Map.Entry<String, String>> effectiveNamespaces = new Stack<Map.Entry<String, String>>();
+ private final Stack<Map.Entry<String, String>> effectiveNamespaces = new Stack<>();
public HandlerChainsNamespaceFilter(final XMLReader xmlReader) {
super(xmlReader);
@@ -407,7 +407,7 @@ public class JaxbJavaee {
@Override
public void startPrefixMapping(final String prefix, final String uri) throws SAXException {
- effectiveNamespaces.push(new AbstractMap.SimpleEntry<String, String>(prefix, uri));
+ effectiveNamespaces.push(new AbstractMap.SimpleEntry<>(prefix, uri));
super.startPrefixMapping(prefix, uri);
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/JspConfig.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/JspConfig.java
index b180fb8d38..8dae0f836b 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/JspConfig.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/JspConfig.java
@@ -67,14 +67,14 @@ public class JspConfig {
public List<Taglib> getTaglib() {
if (taglib == null) {
- taglib = new ArrayList<Taglib>();
+ taglib = new ArrayList<>();
}
return this.taglib;
}
public List<JspPropertyGroup> getJspPropertyGroup() {
if (jspPropertyGroup == null) {
- jspPropertyGroup = new ArrayList<JspPropertyGroup>();
+ jspPropertyGroup = new ArrayList<>();
}
return this.jspPropertyGroup;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/JspPropertyGroup.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/JspPropertyGroup.java
index a39108fee9..f692ffb440 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/JspPropertyGroup.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/JspPropertyGroup.java
@@ -89,7 +89,7 @@ public class JspPropertyGroup {
@XmlTransient
protected TextMap displayName = new TextMap();
@XmlElement(name = "icon", required = true)
- protected LocalCollection<Icon> icon = new LocalCollection<Icon>();
+ protected LocalCollection<Icon> icon = new LocalCollection<>();
@XmlElement(name = "url-pattern", required = true)
@XmlJavaTypeAdapter(TrimStringAdapter.class)
@@ -148,14 +148,14 @@ public class JspPropertyGroup {
public Collection<Icon> getIcons() {
if (icon == null) {
- icon = new LocalCollection<Icon>();
+ icon = new LocalCollection<>();
}
return icon;
}
public Map<String, Icon> getIconMap() {
if (icon == null) {
- icon = new LocalCollection<Icon>();
+ icon = new LocalCollection<>();
}
return icon.toMap();
}
@@ -166,7 +166,7 @@ public class JspPropertyGroup {
public List<String> getUrlPattern() {
if (urlPattern == null) {
- urlPattern = new ArrayList<String>();
+ urlPattern = new ArrayList<>();
}
return this.urlPattern;
}
@@ -205,14 +205,14 @@ public class JspPropertyGroup {
public List<String> getIncludePrelude() {
if (includePrelude == null) {
- includePrelude = new ArrayList<String>();
+ includePrelude = new ArrayList<>();
}
return this.includePrelude;
}
public List<String> getIncludeCoda() {
if (includeCoda == null) {
- includeCoda = new ArrayList<String>();
+ includeCoda = new ArrayList<>();
}
return this.includeCoda;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/KeyedCollection.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/KeyedCollection.java
index 55b60c04b5..026ffce3a9 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/KeyedCollection.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/KeyedCollection.java
@@ -43,12 +43,12 @@ public class KeyedCollection<K, V> extends AbstractCollection<V> {
public KeyedCollection() {
// NOTE: V must implement Keyable or class cast exception will be thrown on add
keyExtractor = null;
- map = new LinkedHashMap<K, V>();
+ map = new LinkedHashMap<>();
}
public KeyedCollection(final KeyExtractor<? extends K, ? super V> keyExtractor) {
this.keyExtractor = keyExtractor;
- map = new LinkedHashMap<K, V>();
+ map = new LinkedHashMap<>();
}
@SuppressWarnings({"unchecked"})
@@ -60,7 +60,7 @@ public class KeyedCollection<K, V> extends AbstractCollection<V> {
// NOTE: V must implement Keyable or class cast exception will be thrown on add
keyExtractor = null;
}
- map = new LinkedHashMap<K, V>();
+ map = new LinkedHashMap<>();
addAll(c);
}
@@ -68,7 +68,7 @@ public class KeyedCollection<K, V> extends AbstractCollection<V> {
public KeyedCollection(final int initialCapacity) {
// NOTE: V must implement Keyable or class cast exception will be thrown on add
keyExtractor = null;
- map = new LinkedHashMap<K, V>(initialCapacity);
+ map = new LinkedHashMap<>(initialCapacity);
}
/**
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/Listener.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/Listener.java
index 42be35a926..ce0d3703d6 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/Listener.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/Listener.java
@@ -67,7 +67,7 @@ public class Listener {
@XmlTransient
protected TextMap displayName = new TextMap();
@XmlElement(name = "icon", required = true)
- protected LocalCollection<Icon> icon = new LocalCollection<Icon>();
+ protected LocalCollection<Icon> icon = new LocalCollection<>();
@XmlElement(name = "listener-class", required = true)
protected String listenerClass;
@XmlAttribute
@@ -111,14 +111,14 @@ public class Listener {
public Collection<Icon> getIcons() {
if (icon == null) {
- icon = new LocalCollection<Icon>();
+ icon = new LocalCollection<>();
}
return icon;
}
public Map<String, Icon> getIconMap() {
if (icon == null) {
- icon = new LocalCollection<Icon>();
+ icon = new LocalCollection<>();
}
return icon.toMap();
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/LocaleEncodingMappingList.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/LocaleEncodingMappingList.java
index 7599e95340..cdcdd25969 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/LocaleEncodingMappingList.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/LocaleEncodingMappingList.java
@@ -64,7 +64,7 @@ public class LocaleEncodingMappingList {
public List<LocaleEncodingMapping> getLocaleEncodingMapping() {
if (localeEncodingMapping == null) {
- localeEncodingMapping = new ArrayList<LocaleEncodingMapping>();
+ localeEncodingMapping = new ArrayList<>();
}
return this.localeEncodingMapping;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/MessageAdapter.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/MessageAdapter.java
index fb8349f79a..018ac123a7 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/MessageAdapter.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/MessageAdapter.java
@@ -63,7 +63,7 @@ public class MessageAdapter {
public List<MessageListener> getMessageListener() {
if (messageListener == null) {
- messageListener = new ArrayList<MessageListener>();
+ messageListener = new ArrayList<>();
}
return this.messageListener;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/MessageDestination.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/MessageDestination.java
index 3cc1c94b14..026261d6e2 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/MessageDestination.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/MessageDestination.java
@@ -71,7 +71,7 @@ public class MessageDestination implements Keyable<String> {
@XmlTransient
protected TextMap displayName = new TextMap();
@XmlElement(name = "icon", required = true)
- protected LocalCollection<Icon> icon = new LocalCollection<Icon>();
+ protected LocalCollection<Icon> icon = new LocalCollection<>();
@XmlElement(name = "message-destination-name", required = true)
protected String messageDestinationName;
@XmlElement(name = "mapped-name")
@@ -111,14 +111,14 @@ public class MessageDestination implements Keyable<String> {
public Collection<Icon> getIcons() {
if (icon == null) {
- icon = new LocalCollection<Icon>();
+ icon = new LocalCollection<>();
}
return icon;
}
public Map<String, Icon> getIconMap() {
if (icon == null) {
- icon = new LocalCollection<Icon>();
+ icon = new LocalCollection<>();
}
return icon.toMap();
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/MessageDestinationRef.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/MessageDestinationRef.java
index 9ce3c9a48e..d795b0f232 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/MessageDestinationRef.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/MessageDestinationRef.java
@@ -239,7 +239,7 @@ public class MessageDestinationRef implements JndiReference {
public Set<InjectionTarget> getInjectionTarget() {
if (injectionTarget == null) {
- injectionTarget = new HashSet<InjectionTarget>();
+ injectionTarget = new HashSet<>();
}
return this.injectionTarget;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/MessageDrivenBean.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/MessageDrivenBean.java
index b6cb3f05a8..fe8a3db980 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/MessageDrivenBean.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/MessageDrivenBean.java
@@ -116,7 +116,7 @@ public class MessageDrivenBean implements EnterpriseBean, TimerConsumer, Invokab
@XmlTransient
protected TextMap displayName = new TextMap();
@XmlElement(name = "icon", required = true)
- protected LocalCollection<Icon> icon = new LocalCollection<Icon>();
+ protected LocalCollection<Icon> icon = new LocalCollection<>();
@XmlElement(name = "ejb-name", required = true)
protected String ejbName;
@@ -238,14 +238,14 @@ public class MessageDrivenBean implements EnterpriseBean, TimerConsumer, Invokab
public Collection<Icon> getIcons() {
if (icon == null) {
- icon = new LocalCollection<Icon>();
+ icon = new LocalCollection<>();
}
return icon;
}
public Map<String, Icon> getIconMap() {
if (icon == null) {
- icon = new LocalCollection<Icon>();
+ icon = new LocalCollection<>();
}
return icon.toMap();
}
@@ -323,7 +323,7 @@ public class MessageDrivenBean implements EnterpriseBean, TimerConsumer, Invokab
public List<Timer> getTimer() {
if (timer == null) {
- timer = new ArrayList<Timer>();
+ timer = new ArrayList<>();
}
return this.timer;
}
@@ -420,7 +420,7 @@ public class MessageDrivenBean implements EnterpriseBean, TimerConsumer, Invokab
public List<AroundInvoke> getAroundInvoke() {
if (aroundInvoke == null) {
- aroundInvoke = new ArrayList<AroundInvoke>();
+ aroundInvoke = new ArrayList<>();
}
return this.aroundInvoke;
}
@@ -432,133 +432,133 @@ public class MessageDrivenBean implements EnterpriseBean, TimerConsumer, Invokab
public List<AroundTimeout> getAroundTimeout() {
if (aroundTimeout == null) {
- aroundTimeout = new ArrayList<AroundTimeout>();
+ aroundTimeout = new ArrayList<>();
}
return this.aroundTimeout;
}
public Collection<EnvEntry> getEnvEntry() {
if (envEntry == null) {
- envEntry = new KeyedCollection<String, EnvEntry>();
+ envEntry = new KeyedCollection<>();
}
return this.envEntry;
}
public Map<String, EnvEntry> getEnvEntryMap() {
if (envEntry == null) {
- envEntry = new KeyedCollection<String, EnvEntry>();
+ envEntry = new KeyedCollection<>();
}
return this.envEntry.toMap();
}
public Collection<EjbRef> getEjbRef() {
if (ejbRef == null) {
- ejbRef = new KeyedCollection<String, EjbRef>();
+ ejbRef = new KeyedCollection<>();
}
return this.ejbRef;
}
public Map<String, EjbRef> getEjbRefMap() {
if (ejbRef == null) {
- ejbRef = new KeyedCollection<String, EjbRef>();
+ ejbRef = new KeyedCollection<>();
}
return this.ejbRef.toMap();
}
public Collection<EjbLocalRef> getEjbLocalRef() {
if (ejbLocalRef == null) {
- ejbLocalRef = new KeyedCollection<String, EjbLocalRef>();
+ ejbLocalRef = new KeyedCollection<>();
}
return this.ejbLocalRef;
}
public Map<String, EjbLocalRef> getEjbLocalRefMap() {
if (ejbLocalRef == null) {
- ejbLocalRef = new KeyedCollection<String, EjbLocalRef>();
+ ejbLocalRef = new KeyedCollection<>();
}
return this.ejbLocalRef.toMap();
}
public Collection<ServiceRef> getServiceRef() {
if (serviceRef == null) {
- serviceRef = new KeyedCollection<String, ServiceRef>();
+ serviceRef = new KeyedCollection<>();
}
return this.serviceRef;
}
public Map<String, ServiceRef> getServiceRefMap() {
if (serviceRef == null) {
- serviceRef = new KeyedCollection<String, ServiceRef>();
+ serviceRef = new KeyedCollection<>();
}
return this.serviceRef.toMap();
}
public Collection<ResourceRef> getResourceRef() {
if (resourceRef == null) {
- resourceRef = new KeyedCollection<String, ResourceRef>();
+ resourceRef = new KeyedCollection<>();
}
return this.resourceRef;
}
public Map<String, ResourceRef> getResourceRefMap() {
if (resourceRef == null) {
- resourceRef = new KeyedCollection<String, ResourceRef>();
+ resourceRef = new KeyedCollection<>();
}
return this.resourceRef.toMap();
}
public Collection<ResourceEnvRef> getResourceEnvRef() {
if (resourceEnvRef == null) {
- resourceEnvRef = new KeyedCollection<String, ResourceEnvRef>();
+ resourceEnvRef = new KeyedCollection<>();
}
return this.resourceEnvRef;
}
public Map<String, ResourceEnvRef> getResourceEnvRefMap() {
if (resourceEnvRef == null) {
- resourceEnvRef = new KeyedCollection<String, ResourceEnvRef>();
+ resourceEnvRef = new KeyedCollection<>();
}
return this.resourceEnvRef.toMap();
}
public Collection<MessageDestinationRef> getMessageDestinationRef() {
if (messageDestinationRef == null) {
- messageDestinationRef = new KeyedCollection<String, MessageDestinationRef>();
+ messageDestinationRef = new KeyedCollection<>();
}
return this.messageDestinationRef;
}
public Map<String, MessageDestinationRef> getMessageDestinationRefMap() {
if (messageDestinationRef == null) {
- messageDestinationRef = new KeyedCollection<String, MessageDestinationRef>();
+ messageDestinationRef = new KeyedCollection<>();
}
return this.messageDestinationRef.toMap();
}
public Collection<PersistenceContextRef> getPersistenceContextRef() {
if (persistenceContextRef == null) {
- persistenceContextRef = new KeyedCollection<String, PersistenceContextRef>();
+ persistenceContextRef = new KeyedCollection<>();
}
return this.persistenceContextRef;
}
public Map<String, PersistenceContextRef> getPersistenceContextRefMap() {
if (persistenceContextRef == null) {
- persistenceContextRef = new KeyedCollection<String, PersistenceContextRef>();
+ persistenceContextRef = new KeyedCollection<>();
}
return this.persistenceContextRef.toMap();
}
public Collection<PersistenceUnitRef> getPersistenceUnitRef() {
if (persistenceUnitRef == null) {
- persistenceUnitRef = new KeyedCollection<String, PersistenceUnitRef>();
+ persistenceUnitRef = new KeyedCollection<>();
}
return this.persistenceUnitRef;
}
public Map<String, PersistenceUnitRef> getPersistenceUnitRefMap() {
if (persistenceUnitRef == null) {
- persistenceUnitRef = new KeyedCollection<String, PersistenceUnitRef>();
+ persistenceUnitRef = new KeyedCollection<>();
}
return this.persistenceUnitRef.toMap();
}
@@ -566,14 +566,14 @@ public class MessageDrivenBean implements EnterpriseBean, TimerConsumer, Invokab
public Collection<DataSource> getDataSource() {
if (dataSource == null) {
- dataSource = new KeyedCollection<String, DataSource>();
+ dataSource = new KeyedCollection<>();
}
return this.dataSource;
}
public Map<String, DataSource> getDataSourceMap() {
if (dataSource == null) {
- dataSource = new KeyedCollection<String, DataSource>();
+ dataSource = new KeyedCollection<>();
}
return this.dataSource.toMap();
}
@@ -601,7 +601,7 @@ public class MessageDrivenBean implements EnterpriseBean, TimerConsumer, Invokab
public List<LifecycleCallback> getPostConstruct() {
if (postConstruct == null) {
- postConstruct = new ArrayList<LifecycleCallback>();
+ postConstruct = new ArrayList<>();
}
return this.postConstruct;
}
@@ -613,7 +613,7 @@ public class MessageDrivenBean implements EnterpriseBean, TimerConsumer, Invokab
public List<LifecycleCallback> getPreDestroy() {
if (preDestroy == null) {
- preDestroy = new ArrayList<LifecycleCallback>();
+ preDestroy = new ArrayList<>();
}
return this.preDestroy;
}
@@ -625,7 +625,7 @@ public class MessageDrivenBean implements EnterpriseBean, TimerConsumer, Invokab
public List<SecurityRoleRef> getSecurityRoleRef() {
if (securityRoleRef == null) {
- securityRoleRef = new ArrayList<SecurityRoleRef>();
+ securityRoleRef = new ArrayList<>();
}
return this.securityRoleRef;
}
@@ -659,7 +659,7 @@ public class MessageDrivenBean implements EnterpriseBean, TimerConsumer, Invokab
@Override
public Map<String, ContextService> getContextServiceMap() {
if (contextService == null) {
- contextService = new KeyedCollection<String, ContextService>();
+ contextService = new KeyedCollection<>();
}
return this.contextService.toMap();
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/MethodParams.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/MethodParams.java
index 8d3b9487b5..a531d06f20 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/MethodParams.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/MethodParams.java
@@ -78,7 +78,7 @@ public class MethodParams {
public List<String> getMethodParam() {
if (methodParam == null) {
- methodParam = new ArrayList<String>();
+ methodParam = new ArrayList<>();
}
return this.methodParam;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/MethodPermission.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/MethodPermission.java
index d7015c3dbd..78f5bd2351 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/MethodPermission.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/MethodPermission.java
@@ -117,7 +117,7 @@ public class MethodPermission {
public List<String> getRoleName() {
if (roleName == null) {
- roleName = new ArrayList<String>();
+ roleName = new ArrayList<>();
}
return this.roleName;
}
@@ -132,7 +132,7 @@ public class MethodPermission {
public List<Method> getMethod() {
if (method == null) {
- method = new ArrayList<Method>();
+ method = new ArrayList<>();
}
return this.method;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/MethodSchedule.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/MethodSchedule.java
index d7c9b2925a..6dd79b9e27 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/MethodSchedule.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/MethodSchedule.java
@@ -89,7 +89,7 @@ public class MethodSchedule {
public List<TimerSchedule> getSchedule() {
if (schedule == null) {
- schedule = new ArrayList<TimerSchedule>();
+ schedule = new ArrayList<>();
}
return this.schedule;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/ObjectFactory.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/ObjectFactory.java
index d7a82ae5a0..0ee7c65282 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/ObjectFactory.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/ObjectFactory.java
@@ -68,7 +68,7 @@ public class ObjectFactory {
*/
@XmlElementDecl(namespace = "http://java.sun.com/xml/ns/javaee", name = "application")
public JAXBElement<Application> createApplication(final Application value) {
- return new JAXBElement<Application>(_Application_QNAME, Application.class, null, value);
+ return new JAXBElement<>(_Application_QNAME, Application.class, null, value);
}
/**
@@ -76,7 +76,7 @@ public class ObjectFactory {
*/
@XmlElementDecl(namespace = "http://java.sun.com/xml/ns/javaee", name = "application-client")
public JAXBElement<ApplicationClient> createApplicationClient(final ApplicationClient value) {
- return new JAXBElement<ApplicationClient>(_ApplicationClient_QNAME, ApplicationClient.class, null, value);
+ return new JAXBElement<>(_ApplicationClient_QNAME, ApplicationClient.class, null, value);
}
/**
@@ -84,7 +84,7 @@ public class ObjectFactory {
*/
@XmlElementDecl(namespace = "http://java.sun.com/xml/ns/javaee", name = "ejb-jar")
public JAXBElement<EjbJar> createEjbJar(final EjbJar value) {
- return new JAXBElement<EjbJar>(_EjbJar_QNAME, EjbJar.class, null, value);
+ return new JAXBElement<>(_EjbJar_QNAME, EjbJar.class, null, value);
}
/**
@@ -92,7 +92,7 @@ public class ObjectFactory {
*/
@XmlElementDecl(namespace = "http://java.sun.com/xml/ns/javaee", name = "ejb-relation-name", scope = EjbRelation.class)
public JAXBElement<String> createEjbRelationTypeEjbRelationName(final String value) {
- return new JAXBElement<String>(_EjbRelationTypeEjbRelationName_QNAME, String.class, EjbRelation.class, value);
+ return new JAXBElement<>(_EjbRelationTypeEjbRelationName_QNAME, String.class, EjbRelation.class, value);
}
/**
@@ -100,7 +100,7 @@ public class ObjectFactory {
*/
@XmlElementDecl(namespace = "http://java.sun.com/xml/ns/javaee", name = "ejb-relationship-role", scope = EjbRelation.class)
public JAXBElement<EjbRelationshipRole> createEjbRelationTypeEjbRelationshipRole(final EjbRelationshipRole value) {
- return new JAXBElement<EjbRelationshipRole>(_EjbRelationTypeEjbRelationshipRole_QNAME, EjbRelationshipRole.class, EjbRelation.class, value);
+ return new JAXBElement<>(_EjbRelationTypeEjbRelationshipRole_QNAME, EjbRelationshipRole.class, EjbRelation.class, value);
}
/**
@@ -108,7 +108,7 @@ public class ObjectFactory {
*/
@XmlElementDecl(namespace = "http://java.sun.com/xml/ns/javaee", name = "description", scope = EjbRelation.class)
public JAXBElement<Text> createEjbRelationTypeDescription(final Text value) {
- return new JAXBElement<Text>(_EjbRelationTypeDescription_QNAME, Text.class, EjbRelation.class, value);
+ return new JAXBElement<>(_EjbRelationTypeDescription_QNAME, Text.class, EjbRelation.class, value);
}
/**
@@ -117,7 +117,7 @@ public class ObjectFactory {
@XmlElementDecl(namespace = "http://java.sun.com/xml/ns/javaee", name = "http-method", scope = WebResourceCollection.class)
@XmlJavaTypeAdapter(CollapsedStringAdapter.class)
public JAXBElement<String> createWebResourceCollectionTypeHttpMethod(final String value) {
- return new JAXBElement<String>(_WebResourceCollectionTypeHttpMethod_QNAME, String.class, WebResourceCollection.class, value);
+ return new JAXBElement<>(_WebResourceCollectionTypeHttpMethod_QNAME, String.class, WebResourceCollection.class, value);
}
/**
@@ -125,7 +125,7 @@ public class ObjectFactory {
*/
@XmlElementDecl(namespace = "http://java.sun.com/xml/ns/javaee", name = "web-app")
public JAXBElement<WebApp> createWebApp(final WebApp value) {
- return new JAXBElement<WebApp>(_WebApp_QNAME, WebApp.class, null, value);
+ return new JAXBElement<>(_WebApp_QNAME, WebApp.class, null, value);
}
/**
@@ -133,7 +133,7 @@ public class ObjectFactory {
*/
@XmlElementDecl(namespace = "http://java.sun.com/xml/ns/javaee", name = "taglib")
public JAXBElement<TldTaglib> createTldTaglib(final TldTaglib value) {
- return new JAXBElement<TldTaglib>(_TldTaglib_QNAME, TldTaglib.class, null, value);
+ return new JAXBElement<>(_TldTaglib_QNAME, TldTaglib.class, null, value);
}
/**
@@ -141,7 +141,7 @@ public class ObjectFactory {
*/
@XmlElementDecl(namespace = "http://java.sun.com/xml/ns/j2ee", name = "connector")
public JAXBElement<Connector> createConnector(final Connector value) {
- return new JAXBElement<Connector>(_Connector_QNAME, Connector.class, null, value);
+ return new JAXBElement<>(_Connector_QNAME, Connector.class, null, value);
}
/**
@@ -149,7 +149,7 @@ public class ObjectFactory {
*/
@XmlElementDecl(namespace = "http://java.sun.com/xml/ns/j2ee", name = "java-wsdl-mapping")
public JAXBElement<JavaWsdlMapping> createConnector(final JavaWsdlMapping value) {
- return new JAXBElement<JavaWsdlMapping>(_JavaWsdlMapping_QNAME, JavaWsdlMapping.class, null, value);
+ return new JAXBElement<>(_JavaWsdlMapping_QNAME, JavaWsdlMapping.class, null, value);
}
/**
@@ -157,7 +157,7 @@ public class ObjectFactory {
*/
@XmlElementDecl(namespace = "http://java.sun.com/xml/ns/javaee", name = "webservices")
public JAXBElement<Webservices> createConnector(final Webservices value) {
- return new JAXBElement<Webservices>(_Webservices_QNAME, Webservices.class, null, value);
+ return new JAXBElement<>(_Webservices_QNAME, Webservices.class, null, value);
}
/**
@@ -165,7 +165,7 @@ public class ObjectFactory {
*/
@XmlElementDecl(namespace = "http://java.sun.com/xml/ns/javaee", name = "faces-config")
public JAXBElement<FacesConfig> createFacesConfig(final FacesConfig value) {
- return new JAXBElement<FacesConfig>(_FacesConfig_QNAME, FacesConfig.class, null, value);
+ return new JAXBElement<>(_FacesConfig_QNAME, FacesConfig.class, null, value);
}
/**
@@ -173,6 +173,6 @@ public class ObjectFactory {
*/
@XmlElementDecl(namespace = "http://java.sun.com/xml/ns/javaee", name = "web-fragment")
public JAXBElement<WebFragment> createWebFragment(final WebFragment value) {
- return new JAXBElement<WebFragment>(_WebFragment_QNAME, WebFragment.class, null, value);
+ return new JAXBElement<>(_WebFragment_QNAME, WebFragment.class, null, value);
}
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/OrderingOrdering.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/OrderingOrdering.java
index 63ec5f764c..1936944812 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/OrderingOrdering.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/OrderingOrdering.java
@@ -55,7 +55,7 @@ public class OrderingOrdering {
public List<String> getName() {
if (name == null) {
- name = new ArrayList<String>();
+ name = new ArrayList<>();
}
return this.name;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/OutboundResourceAdapter.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/OutboundResourceAdapter.java
index 139b332fcd..9d250093a6 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/OutboundResourceAdapter.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/OutboundResourceAdapter.java
@@ -74,7 +74,7 @@ public class OutboundResourceAdapter {
public List<ConnectionDefinition> getConnectionDefinition() {
if (connectionDefinition == null) {
- connectionDefinition = new ArrayList<ConnectionDefinition>();
+ connectionDefinition = new ArrayList<>();
}
return this.connectionDefinition;
}
@@ -89,7 +89,7 @@ public class OutboundResourceAdapter {
public List<AuthenticationMechanism> getAuthenticationMechanism() {
if (authenticationMechanism == null) {
- authenticationMechanism = new ArrayList<AuthenticationMechanism>();
+ authenticationMechanism = new ArrayList<>();
}
return this.authenticationMechanism;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/Persistence.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/Persistence.java
index 91f28f196e..994d749835 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/Persistence.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/Persistence.java
@@ -122,7 +122,7 @@ public class Persistence {
*/
public List<Persistence.PersistenceUnit> getPersistenceUnit() {
if (persistenceUnit == null) {
- persistenceUnit = new ArrayList<Persistence.PersistenceUnit>();
+ persistenceUnit = new ArrayList<>();
}
return this.persistenceUnit;
}
@@ -348,7 +348,7 @@ public class Persistence {
*/
public List<java.lang.String> getMappingFile() {
if (mappingFile == null) {
- mappingFile = new ArrayList<java.lang.String>();
+ mappingFile = new ArrayList<>();
}
return this.mappingFile;
}
@@ -375,7 +375,7 @@ public class Persistence {
*/
public List<java.lang.String> getJarFile() {
if (jarFile == null) {
- jarFile = new ArrayList<java.lang.String>();
+ jarFile = new ArrayList<>();
}
return this.jarFile;
}
@@ -401,7 +401,7 @@ public class Persistence {
*/
public List<java.lang.String> getClazz() {
if (clazz == null) {
- clazz = new ArrayList<java.lang.String>();
+ clazz = new ArrayList<>();
}
return this.clazz;
}
@@ -584,7 +584,7 @@ public class Persistence {
*/
public List<Persistence.PersistenceUnit.Properties.Property> getProperty() {
if (property == null) {
- property = new ArrayList<Persistence.PersistenceUnit.Properties.Property>();
+ property = new ArrayList<>();
}
return this.property;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/PersistenceContextRef.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/PersistenceContextRef.java
index 9d6dbde915..123fee9b63 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/PersistenceContextRef.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/PersistenceContextRef.java
@@ -225,7 +225,7 @@ public class PersistenceContextRef implements JndiReference, PersistenceRef {
public List<Property> getPersistenceProperty() {
if (persistenceProperty == null) {
- persistenceProperty = new ArrayList<Property>();
+ persistenceProperty = new ArrayList<>();
}
return this.persistenceProperty;
}
@@ -248,7 +248,7 @@ public class PersistenceContextRef implements JndiReference, PersistenceRef {
public Set<InjectionTarget> getInjectionTarget() {
if (injectionTarget == null) {
- injectionTarget = new HashSet<InjectionTarget>();
+ injectionTarget = new HashSet<>();
}
return this.injectionTarget;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/PersistenceUnitRef.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/PersistenceUnitRef.java
index 595bba418d..9a2482d166 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/PersistenceUnitRef.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/PersistenceUnitRef.java
@@ -196,7 +196,7 @@ public class PersistenceUnitRef implements JndiReference, PersistenceRef {
public Set<InjectionTarget> getInjectionTarget() {
if (injectionTarget == null) {
- injectionTarget = new HashSet<InjectionTarget>();
+ injectionTarget = new HashSet<>();
}
return this.injectionTarget;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/Relationships.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/Relationships.java
index a49a9cb302..b2d54e607d 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/Relationships.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/Relationships.java
@@ -83,7 +83,7 @@ public class Relationships {
public List<EjbRelation> getEjbRelation() {
if (ejbRelation == null) {
- ejbRelation = new ArrayList<EjbRelation>();
+ ejbRelation = new ArrayList<>();
}
return this.ejbRelation;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceAdapter.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceAdapter.java
index e111d988f6..c94a1e016e 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceAdapter.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceAdapter.java
@@ -109,7 +109,7 @@ public class ResourceAdapter {
public List<ConfigProperty> getConfigProperty() {
if (configProperty == null) {
- configProperty = new ArrayList<ConfigProperty>();
+ configProperty = new ArrayList<>();
}
return this.configProperty;
}
@@ -134,14 +134,14 @@ public class ResourceAdapter {
public List<AdminObject> getAdminObject() {
if (adminObject == null) {
- adminObject = new ArrayList<AdminObject>();
+ adminObject = new ArrayList<>();
}
return this.adminObject;
}
public List<SecurityPermission> getSecurityPermission() {
if (securityPermission == null) {
- securityPermission = new ArrayList<SecurityPermission>();
+ securityPermission = new ArrayList<>();
}
return this.securityPermission;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceAdapter10.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceAdapter10.java
index 2906195144..9ebbe0ffb7 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceAdapter10.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceAdapter10.java
@@ -123,7 +123,7 @@ public class ResourceAdapter10 {
// @XmlElement(name = "authentication-mechanism")
public List<AuthenticationMechanism> getAuthenticationMechanism() {
if (authenticationMechanism == null) {
- authenticationMechanism = new ArrayList<AuthenticationMechanism>();
+ authenticationMechanism = new ArrayList<>();
}
return this.authenticationMechanism;
}
@@ -141,7 +141,7 @@ public class ResourceAdapter10 {
// @XmlElement(name = "security-permission")
public List<SecurityPermission> getSecurityPermission() {
if (securityPermission == null) {
- securityPermission = new ArrayList<SecurityPermission>();
+ securityPermission = new ArrayList<>();
}
return this.securityPermission;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceEnvRef.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceEnvRef.java
index c83b3cfd97..d5a2374b92 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceEnvRef.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceEnvRef.java
@@ -204,7 +204,7 @@ public class ResourceEnvRef implements JndiReference {
public Set<InjectionTarget> getInjectionTarget() {
if (injectionTarget == null) {
- injectionTarget = new HashSet<InjectionTarget>();
+ injectionTarget = new HashSet<>();
}
return this.injectionTarget;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceRef.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceRef.java
index 8ccab8a32e..d88a60b98d 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceRef.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceRef.java
@@ -237,7 +237,7 @@ public class ResourceRef implements JndiReference {
public Set<InjectionTarget> getInjectionTarget() {
if (injectionTarget == null) {
- injectionTarget = new HashSet<InjectionTarget>();
+ injectionTarget = new HashSet<>();
}
return this.injectionTarget;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/Scan.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/Scan.java
index ebd3fce549..b87ec1766f 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/Scan.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/Scan.java
@@ -123,7 +123,7 @@ public class Scan {
*/
public List<Scan.Exclude> getExclude() {
if (exclude == null) {
- exclude = new ArrayList<Scan.Exclude>();
+ exclude = new ArrayList<>();
}
return this.exclude;
}
@@ -223,7 +223,7 @@ public class Scan {
*/
public List<Object> getIfClassAvailableOrIfClassNotAvailableOrIfSystemProperty() {
if (ifClassAvailableOrIfClassNotAvailableOrIfSystemProperty == null) {
- ifClassAvailableOrIfClassNotAvailableOrIfSystemProperty = new ArrayList<Object>();
+ ifClassAvailableOrIfClassNotAvailableOrIfSystemProperty = new ArrayList<>();
}
return this.ifClassAvailableOrIfClassNotAvailableOrIfSystemProperty;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/SecurityConstraint.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/SecurityConstraint.java
index 46479e6c1c..c08c5824d6 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/SecurityConstraint.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/SecurityConstraint.java
@@ -76,14 +76,14 @@ public class SecurityConstraint {
public List<String> getDisplayName() {
if (displayName == null) {
- displayName = new ArrayList<String>();
+ displayName = new ArrayList<>();
}
return this.displayName;
}
public List<WebResourceCollection> getWebResourceCollection() {
if (webResourceCollection == null) {
- webResourceCollection = new ArrayList<WebResourceCollection>();
+ webResourceCollection = new ArrayList<>();
}
return this.webResourceCollection;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/ServiceEndpointInterfaceMapping.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/ServiceEndpointInterfaceMapping.java
index 9800ff919a..42bea51042 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/ServiceEndpointInterfaceMapping.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/ServiceEndpointInterfaceMapping.java
@@ -89,7 +89,7 @@ public class ServiceEndpointInterfaceMapping implements Keyable<String> {
public List<ServiceEndpointMethodMapping> getServiceEndpointMethodMapping() {
if (serviceEndpointMethodMapping == null) {
- serviceEndpointMethodMapping = new ArrayList<ServiceEndpointMethodMapping>();
+ serviceEndpointMethodMapping = new ArrayList<>();
}
return this.serviceEndpointMethodMapping;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/ServiceEndpointMethodMapping.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/ServiceEndpointMethodMapping.java
index bc8ff70f5c..e8d82b84be 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/ServiceEndpointMethodMapping.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/ServiceEndpointMethodMapping.java
@@ -92,7 +92,7 @@ public class ServiceEndpointMethodMapping {
public List<MethodParamPartsMapping> getMethodParamPartsMapping() {
if (methodParamPartsMapping == null) {
- methodParamPartsMapping = new ArrayList<MethodParamPartsMapping>();
+ methodParamPartsMapping = new ArrayList<>();
}
return this.methodParamPartsMapping;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/ServiceInterfaceMapping.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/ServiceInterfaceMapping.java
index 816939e9f4..1dda15041d 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/ServiceInterfaceMapping.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/ServiceInterfaceMapping.java
@@ -70,7 +70,7 @@ public class ServiceInterfaceMapping {
public List<PortMapping> getPortMapping() {
if (portMapping == null) {
- portMapping = new ArrayList<PortMapping>();
+ portMapping = new ArrayList<>();
}
return this.portMapping;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/ServiceRef.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/ServiceRef.java
index 4b9d31110d..5da91b9693 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/ServiceRef.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/ServiceRef.java
@@ -93,7 +93,7 @@ public class ServiceRef implements JndiReference {
@XmlTransient
protected TextMap displayName = new TextMap();
@XmlElement(name = "icon", required = true)
- protected LocalCollection<Icon> icon = new LocalCollection<Icon>();
+ protected LocalCollection<Icon> icon = new LocalCollection<>();
@XmlElement(name = "service-ref-name", required = true)
protected String serviceRefName;
@XmlElement(name = "service-interface", required = true)
@@ -226,14 +226,14 @@ public class ServiceRef implements JndiReference {
public Collection<Icon> getIcons() {
if (icon == null) {
- icon = new LocalCollection<Icon>();
+ icon = new LocalCollection<>();
}
return icon;
}
public Map<String, Icon> getIconMap() {
if (icon == null) {
- icon = new LocalCollection<Icon>();
+ icon = new LocalCollection<>();
}
return icon.toMap();
}
@@ -298,7 +298,7 @@ public class ServiceRef implements JndiReference {
public List<PortComponentRef> getPortComponentRef() {
if (portComponentRef == null) {
- portComponentRef = new ArrayList<PortComponentRef>();
+ portComponentRef = new ArrayList<>();
}
return this.portComponentRef;
}
@@ -313,7 +313,7 @@ public class ServiceRef implements JndiReference {
public List<Handler> getHandler() {
if (handler == null) {
- handler = new ArrayList<Handler>();
+ handler = new ArrayList<>();
}
return this.handler;
}
@@ -349,7 +349,7 @@ public class ServiceRef implements JndiReference {
public Set<InjectionTarget> getInjectionTarget() {
if (injectionTarget == null) {
- injectionTarget = new HashSet<InjectionTarget>();
+ injectionTarget = new HashSet<>();
}
return this.injectionTarget;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/Servlet.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/Servlet.java
index dc419312a4..8307cd1b62 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/Servlet.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/Servlet.java
@@ -87,7 +87,7 @@ public class Servlet {
@XmlTransient
protected TextMap displayName = new TextMap();
@XmlElement(name = "icon", required = true)
- protected LocalCollection<Icon> icon = new LocalCollection<Icon>();
+ protected LocalCollection<Icon> icon = new LocalCollection<>();
@XmlElement(name = "servlet-name", required = true)
protected String servletName;
@@ -150,14 +150,14 @@ public class Servlet {
public Collection<Icon> getIcons() {
if (icon == null) {
- icon = new LocalCollection<Icon>();
+ icon = new LocalCollection<>();
}
return icon;
}
public Map<String, Icon> getIconMap() {
if (icon == null) {
- icon = new LocalCollection<Icon>();
+ icon = new LocalCollection<>();
}
return icon.toMap();
}
@@ -192,7 +192,7 @@ public class Servlet {
public List<ParamValue> getInitParam() {
if (initParam == null) {
- initParam = new ArrayList<ParamValue>();
+ initParam = new ArrayList<>();
}
return this.initParam;
}
@@ -231,7 +231,7 @@ public class Servlet {
public List<SecurityRoleRef> getSecurityRoleRef() {
if (securityRoleRef == null) {
- securityRoleRef = new ArrayList<SecurityRoleRef>();
+ securityRoleRef = new ArrayList<>();
}
return this.securityRoleRef;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/ServletMapping.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/ServletMapping.java
index d1cb0bb6d6..d95edda76e 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/ServletMapping.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/ServletMapping.java
@@ -77,7 +77,7 @@ public class ServletMapping {
public List<String> getUrlPattern() {
if (urlPattern == null) {
- urlPattern = new ArrayList<String>();
+ urlPattern = new ArrayList<>();
}
return this.urlPattern;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/SessionBean.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/SessionBean.java
index 4f8a99cc55..a412529736 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/SessionBean.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/SessionBean.java
@@ -157,7 +157,7 @@ public class SessionBean implements RemoteBean, Session, TimerConsumer {
@XmlTransient
protected TextMap displayName = new TextMap();
@XmlElement(name = "icon", required = true)
- protected LocalCollection<Icon> icon = new LocalCollection<Icon>();
+ protected LocalCollection<Icon> icon = new LocalCollection<>();
@XmlElement(name = "ejb-name", required = true)
protected String ejbName;
@@ -273,7 +273,7 @@ public class SessionBean implements RemoteBean, Session, TimerConsumer {
private String proxy;
@XmlTransient
- private final Collection<String> parents = new ArrayList<String>(); // always needed so initialize it early
+ private final Collection<String> parents = new ArrayList<>(); // always needed so initialize it early
@XmlElement(name="context-service")
protected KeyedCollection<String, ContextService> contextService;
@XmlElement(name="managed-executor")
@@ -324,14 +324,14 @@ public class SessionBean implements RemoteBean, Session, TimerConsumer {
public Collection<Icon> getIcons() {
if (icon == null) {
- icon = new LocalCollection<Icon>();
+ icon = new LocalCollection<>();
}
return icon;
}
public Map<String, Icon> getIconMap() {
if (icon == null) {
- icon = new LocalCollection<Icon>();
+ icon = new LocalCollection<>();
}
return icon.toMap();
}
@@ -429,7 +429,7 @@ public class SessionBean implements RemoteBean, Session, TimerConsumer {
public Collection<String> getBusinessLocal() {
if (businessLocal == null) {
- businessLocal = new LinkedHashSet<String>();
+ businessLocal = new LinkedHashSet<>();
}
return businessLocal;
}
@@ -445,7 +445,7 @@ public class SessionBean implements RemoteBean, Session, TimerConsumer {
public Collection<String> getBusinessRemote() {
if (businessRemote == null) {
- businessRemote = new LinkedHashSet<String>();
+ businessRemote = new LinkedHashSet<>();
}
return businessRemote;
}
@@ -505,14 +505,14 @@ public class SessionBean implements RemoteBean, Session, TimerConsumer {
public List<InitMethod> getInitMethod() {
if (initMethod == null) {
- initMethod = new ArrayList<InitMethod>();
+ initMethod = new ArrayList<>();
}
return this.initMethod;
}
public List<RemoveMethod> getRemoveMethod() {
if (removeMethod == null) {
- removeMethod = new ArrayList<RemoveMethod>();
+ removeMethod = new ArrayList<>();
}
return this.removeMethod;
}
@@ -568,7 +568,7 @@ public class SessionBean implements RemoteBean, Session, TimerConsumer {
public List<AroundInvoke> getAroundInvoke() {
if (aroundInvoke == null) {
- aroundInvoke = new ArrayList<AroundInvoke>();
+ aroundInvoke = new ArrayList<>();
}
return this.aroundInvoke;
}
@@ -580,133 +580,133 @@ public class SessionBean implements RemoteBean, Session, TimerConsumer {
public Collection<EnvEntry> getEnvEntry() {
if (envEntry == null) {
- envEntry = new KeyedCollection<String, EnvEntry>();
+ envEntry = new KeyedCollection<>();
}
return this.envEntry;
}
public Map<String, EnvEntry> getEnvEntryMap() {
if (envEntry == null) {
- envEntry = new KeyedCollection<String, EnvEntry>();
+ envEntry = new KeyedCollection<>();
}
return this.envEntry.toMap();
}
public Collection<EjbRef> getEjbRef() {
if (ejbRef == null) {
- ejbRef = new KeyedCollection<String, EjbRef>();
+ ejbRef = new KeyedCollection<>();
}
return this.ejbRef;
}
public Map<String, EjbRef> getEjbRefMap() {
if (ejbRef == null) {
- ejbRef = new KeyedCollection<String, EjbRef>();
+ ejbRef = new KeyedCollection<>();
}
return this.ejbRef.toMap();
}
public Collection<EjbLocalRef> getEjbLocalRef() {
if (ejbLocalRef == null) {
- ejbLocalRef = new KeyedCollection<String, EjbLocalRef>();
+ ejbLocalRef = new KeyedCollection<>();
}
return this.ejbLocalRef;
}
public Map<String, EjbLocalRef> getEjbLocalRefMap() {
if (ejbLocalRef == null) {
- ejbLocalRef = new KeyedCollection<String, EjbLocalRef>();
+ ejbLocalRef = new KeyedCollection<>();
}
return this.ejbLocalRef.toMap();
}
public Collection<ServiceRef> getServiceRef() {
if (serviceRef == null) {
- serviceRef = new KeyedCollection<String, ServiceRef>();
+ serviceRef = new KeyedCollection<>();
}
return this.serviceRef;
}
public Map<String, ServiceRef> getServiceRefMap() {
if (serviceRef == null) {
- serviceRef = new KeyedCollection<String, ServiceRef>();
+ serviceRef = new KeyedCollection<>();
}
return this.serviceRef.toMap();
}
public Collection<ResourceRef> getResourceRef() {
if (resourceRef == null) {
- resourceRef = new KeyedCollection<String, ResourceRef>();
+ resourceRef = new KeyedCollection<>();
}
return this.resourceRef;
}
public Map<String, ResourceRef> getResourceRefMap() {
if (resourceRef == null) {
- resourceRef = new KeyedCollection<String, ResourceRef>();
+ resourceRef = new KeyedCollection<>();
}
return this.resourceRef.toMap();
}
public Collection<ResourceEnvRef> getResourceEnvRef() {
if (resourceEnvRef == null) {
- resourceEnvRef = new KeyedCollection<String, ResourceEnvRef>();
+ resourceEnvRef = new KeyedCollection<>();
}
return this.resourceEnvRef;
}
public Map<String, ResourceEnvRef> getResourceEnvRefMap() {
if (resourceEnvRef == null) {
- resourceEnvRef = new KeyedCollection<String, ResourceEnvRef>();
+ resourceEnvRef = new KeyedCollection<>();
}
return this.resourceEnvRef.toMap();
}
public Collection<MessageDestinationRef> getMessageDestinationRef() {
if (messageDestinationRef == null) {
- messageDestinationRef = new KeyedCollection<String, MessageDestinationRef>();
+ messageDestinationRef = new KeyedCollection<>();
}
return this.messageDestinationRef;
}
public Map<String, MessageDestinationRef> getMessageDestinationRefMap() {
if (messageDestinationRef == null) {
- messageDestinationRef = new KeyedCollection<String, MessageDestinationRef>();
+ messageDestinationRef = new KeyedCollection<>();
}
return this.messageDestinationRef.toMap();
}
public Collection<PersistenceContextRef> getPersistenceContextRef() {
if (persistenceContextRef == null) {
- persistenceContextRef = new KeyedCollection<String, PersistenceContextRef>();
+ persistenceContextRef = new KeyedCollection<>();
}
return this.persistenceContextRef;
}
public Map<String, PersistenceContextRef> getPersistenceContextRefMap() {
if (persistenceContextRef == null) {
- persistenceContextRef = new KeyedCollection<String, PersistenceContextRef>();
+ persistenceContextRef = new KeyedCollection<>();
}
return this.persistenceContextRef.toMap();
}
public Collection<PersistenceUnitRef> getPersistenceUnitRef() {
if (persistenceUnitRef == null) {
- persistenceUnitRef = new KeyedCollection<String, PersistenceUnitRef>();
+ persistenceUnitRef = new KeyedCollection<>();
}
return this.persistenceUnitRef;
}
public Map<String, PersistenceUnitRef> getPersistenceUnitRefMap() {
if (persistenceUnitRef == null) {
- persistenceUnitRef = new KeyedCollection<String, PersistenceUnitRef>();
+ persistenceUnitRef = new KeyedCollection<>();
}
return this.persistenceUnitRef.toMap();
}
public List<LifecycleCallback> getPostConstruct() {
if (postConstruct == null) {
- postConstruct = new ArrayList<LifecycleCallback>();
+ postConstruct = new ArrayList<>();
}
return this.postConstruct;
}
@@ -718,7 +718,7 @@ public class SessionBean implements RemoteBean, Session, TimerConsumer {
public List<LifecycleCallback> getPreDestroy() {
if (preDestroy == null) {
- preDestroy = new ArrayList<LifecycleCallback>();
+ preDestroy = new ArrayList<>();
}
return this.preDestroy;
}
@@ -730,7 +730,7 @@ public class SessionBean implements RemoteBean, Session, TimerConsumer {
public List<LifecycleCallback> getPostActivate() {
if (postActivate == null) {
- postActivate = new ArrayList<LifecycleCallback>();
+ postActivate = new ArrayList<>();
}
return this.postActivate;
}
@@ -742,7 +742,7 @@ public class SessionBean implements RemoteBean, Session, TimerConsumer {
public List<LifecycleCallback> getPrePassivate() {
if (prePassivate == null) {
- prePassivate = new ArrayList<LifecycleCallback>();
+ prePassivate = new ArrayList<>();
}
return this.prePassivate;
}
@@ -755,7 +755,7 @@ public class SessionBean implements RemoteBean, Session, TimerConsumer {
public List<SecurityRoleRef> getSecurityRoleRef() {
if (securityRoleRef == null) {
- securityRoleRef = new ArrayList<SecurityRoleRef>();
+ securityRoleRef = new ArrayList<>();
}
return this.securityRoleRef;
}
@@ -810,14 +810,14 @@ public class SessionBean implements RemoteBean, Session, TimerConsumer {
public List<AroundTimeout> getAroundTimeout() {
if (aroundTimeout == null) {
- aroundTimeout = new ArrayList<AroundTimeout>();
+ aroundTimeout = new ArrayList<>();
}
return this.aroundTimeout;
}
public List<AsyncMethod> getAsyncMethod() {
if (asyncMethod == null) {
- asyncMethod = new ArrayList<AsyncMethod>();
+ asyncMethod = new ArrayList<>();
}
return this.asyncMethod;
}
@@ -832,7 +832,7 @@ public class SessionBean implements RemoteBean, Session, TimerConsumer {
public List<ConcurrentMethod> getConcurrentMethod() {
if (concurrentMethod == null) {
- concurrentMethod = new ArrayList<ConcurrentMethod>();
+ concurrentMethod = new ArrayList<>();
}
return this.concurrentMethod;
}
@@ -854,35 +854,35 @@ public class SessionBean implements RemoteBean, Session, TimerConsumer {
public List<LifecycleCallback> getAfterBegin() {
if (afterBegin == null) {
- afterBegin = new ArrayList<LifecycleCallback>();
+ afterBegin = new ArrayList<>();
}
return afterBegin;
}
public List<LifecycleCallback> getAfterCompletion() {
if (afterCompletion == null) {
- afterCompletion = new ArrayList<LifecycleCallback>();
+ afterCompletion = new ArrayList<>();
}
return this.afterCompletion;
}
public List<LifecycleCallback> getBeforeCompletion() {
if (beforeCompletion == null) {
- beforeCompletion = new ArrayList<LifecycleCallback>();
+ beforeCompletion = new ArrayList<>();
}
return this.beforeCompletion;
}
public Collection<DataSource> getDataSource() {
if (dataSource == null) {
- dataSource = new KeyedCollection<String, DataSource>();
+ dataSource = new KeyedCollection<>();
}
return this.dataSource;
}
public Map<String, DataSource> getDataSourceMap() {
if (dataSource == null) {
- dataSource = new KeyedCollection<String, DataSource>();
+ dataSource = new KeyedCollection<>();
}
return this.dataSource.toMap();
}
@@ -890,7 +890,7 @@ public class SessionBean implements RemoteBean, Session, TimerConsumer {
public List<Timer> getTimer() {
if (timer == null) {
- timer = new ArrayList<Timer>();
+ timer = new ArrayList<>();
}
return this.timer;
}
@@ -902,7 +902,7 @@ public class SessionBean implements RemoteBean, Session, TimerConsumer {
public Set<String> getAsynchronousClasses() {
if (asynchronousClasses == null) {
- asynchronousClasses = new HashSet<String>();
+ asynchronousClasses = new HashSet<>();
}
return asynchronousClasses;
}
@@ -971,7 +971,7 @@ public class SessionBean implements RemoteBean, Session, TimerConsumer {
@Override
public Map<String, ContextService> getContextServiceMap() {
if (contextService == null) {
- contextService = new KeyedCollection<String, ContextService>();
+ contextService = new KeyedCollection<>();
}
return this.contextService.toMap();
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/SessionConfig.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/SessionConfig.java
index 0700e9541f..61fcd0db13 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/SessionConfig.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/SessionConfig.java
@@ -91,7 +91,7 @@ public class SessionConfig {
public List<TrackingMode> getTrackingMode() {
if (trackingMode == null) {
- trackingMode = new ArrayList<TrackingMode>();
+ trackingMode = new ArrayList<>();
}
return this.trackingMode;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/Tag.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/Tag.java
index 4c35d88bb3..5a72aad7ba 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/Tag.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/Tag.java
@@ -80,7 +80,7 @@ public class Tag {
@XmlTransient
protected TextMap displayName = new TextMap();
@XmlElement(name = "icon", required = true)
- protected LocalCollection<Icon> icon = new LocalCollection<Icon>();
+ protected LocalCollection<Icon> icon = new LocalCollection<>();
@XmlElement(required = true)
protected String name;
@@ -130,14 +130,14 @@ public class Tag {
public Collection<Icon> getIcons() {
if (icon == null) {
- icon = new LocalCollection<Icon>();
+ icon = new LocalCollection<>();
}
return icon;
}
public Map<String, Icon> getIconMap() {
if (icon == null) {
- icon = new LocalCollection<Icon>();
+ icon = new LocalCollection<>();
}
return icon.toMap();
}
@@ -180,14 +180,14 @@ public class Tag {
public List<Variable> getVariable() {
if (variable == null) {
- variable = new ArrayList<Variable>();
+ variable = new ArrayList<>();
}
return this.variable;
}
public List<TldAttribute> getAttribute() {
if (attribute == null) {
- attribute = new ArrayList<TldAttribute>();
+ attribute = new ArrayList<>();
}
return this.attribute;
}
@@ -210,7 +210,7 @@ public class Tag {
public List<TldExtension> getTagExtension() {
if (tagExtension == null) {
- tagExtension = new ArrayList<TldExtension>();
+ tagExtension = new ArrayList<>();
}
return this.tagExtension;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/TagFile.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/TagFile.java
index bd22ffce97..361e3cbd37 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/TagFile.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/TagFile.java
@@ -72,7 +72,7 @@ public class TagFile {
@XmlTransient
protected TextMap displayName = new TextMap();
@XmlElement(name = "icon", required = true)
- protected LocalCollection<Icon> icon = new LocalCollection<Icon>();
+ protected LocalCollection<Icon> icon = new LocalCollection<>();
@XmlElement(required = true)
protected String name;
@@ -114,14 +114,14 @@ public class TagFile {
public Collection<Icon> getIcons() {
if (icon == null) {
- icon = new LocalCollection<Icon>();
+ icon = new LocalCollection<>();
}
return icon;
}
public Map<String, Icon> getIconMap() {
if (icon == null) {
- icon = new LocalCollection<Icon>();
+ icon = new LocalCollection<>();
}
return icon.toMap();
}
@@ -156,7 +156,7 @@ public class TagFile {
public List<TldExtension> getTagExtension() {
if (tagExtension == null) {
- tagExtension = new ArrayList<TldExtension>();
+ tagExtension = new ArrayList<>();
}
return this.tagExtension;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/TextMap.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/TextMap.java
index e0ac01c9fa..43e6099699 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/TextMap.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/TextMap.java
@@ -28,10 +28,10 @@ import java.util.Map;
*/
public class TextMap {
- protected Map<String, String> string = new LinkedHashMap<String, String>();
+ protected Map<String, String> string = new LinkedHashMap<>();
public Text[] toArray() {
- final List<Text> list = new ArrayList<Text>();
+ final List<Text> list = new ArrayList<>();
for (final Map.Entry<String, String> entry : string.entrySet()) {
list.add(new Text(entry.getKey(), entry.getValue()));
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/TldExtension.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/TldExtension.java
index ad510cce0a..d0cc25880e 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/TldExtension.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/TldExtension.java
@@ -62,7 +62,7 @@ public class TldExtension {
public List<String> getExtensionElement() {
if (extensionElement == null) {
- extensionElement = new ArrayList<String>();
+ extensionElement = new ArrayList<>();
}
return this.extensionElement;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/TldTaglib.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/TldTaglib.java
index 57f46d7f20..af6d65c575 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/TldTaglib.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/TldTaglib.java
@@ -84,7 +84,7 @@ public class TldTaglib {
@XmlTransient
protected TextMap displayName = new TextMap();
@XmlElement(name = "icon", required = true)
- protected LocalCollection<Icon> icon = new LocalCollection<Icon>();
+ protected LocalCollection<Icon> icon = new LocalCollection<>();
@XmlElement(name = "tlib-version", required = true)
protected String tlibVersion;
@@ -136,14 +136,14 @@ public class TldTaglib {
public Collection<Icon> getIcons() {
if (icon == null) {
- icon = new LocalCollection<Icon>();
+ icon = new LocalCollection<>();
}
return icon;
}
public Map<String, Icon> getIconMap() {
if (icon == null) {
- icon = new LocalCollection<Icon>();
+ icon = new LocalCollection<>();
}
return icon.toMap();
}
@@ -194,35 +194,35 @@ public class TldTaglib {
public List<Listener> getListener() {
if (listener == null) {
- listener = new ArrayList<Listener>();
+ listener = new ArrayList<>();
}
return this.listener;
}
public List<Tag> getTag() {
if (tag == null) {
- tag = new ArrayList<Tag>();
+ tag = new ArrayList<>();
}
return this.tag;
}
public List<TagFile> getTagFile() {
if (tagFile == null) {
- tagFile = new ArrayList<TagFile>();
+ tagFile = new ArrayList<>();
}
return this.tagFile;
}
public List<Function> getFunction() {
if (function == null) {
- function = new ArrayList<Function>();
+ function = new ArrayList<>();
}
return this.function;
}
public List<TldExtension> getTaglibExtension() {
if (taglibExtension == null) {
- taglibExtension = new ArrayList<TldExtension>();
+ taglibExtension = new ArrayList<>();
}
return this.taglibExtension;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/Validator.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/Validator.java
index 26604a89af..592baa6334 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/Validator.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/Validator.java
@@ -91,7 +91,7 @@ public class Validator {
public List<ParamValue> getInitParam() {
if (initParam == null) {
- initParam = new ArrayList<ParamValue>();
+ initParam = new ArrayList<>();
}
return this.initParam;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/WebApp.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/WebApp.java
index 320764e984..8c6671e045 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/WebApp.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/WebApp.java
@@ -115,7 +115,7 @@ public class WebApp implements WebCommon, Lifecycle, NamedModule {
@XmlTransient
protected TextMap displayName = new TextMap();
@XmlElement(name = "icon", required = true)
- protected LocalCollection<Icon> icon = new LocalCollection<Icon>();
+ protected LocalCollection<Icon> icon = new LocalCollection<>();
protected List<Empty> distributable;
@XmlElement(name = "context-param")
@@ -268,7 +268,7 @@ public class WebApp implements WebCommon, Lifecycle, NamedModule {
@Override
public Collection<Icon> getIcons() {
if (icon == null) {
- icon = new LocalCollection<Icon>();
+ icon = new LocalCollection<>();
}
return icon;
}
@@ -276,7 +276,7 @@ public class WebApp implements WebCommon, Lifecycle, NamedModule {
@Override
public Map<String, Icon> getIconMap() {
if (icon == null) {
- icon = new LocalCollection<Icon>();
+ icon = new LocalCollection<>();
}
return icon.toMap();
}
@@ -289,7 +289,7 @@ public class WebApp implements WebCommon, Lifecycle, NamedModule {
@Override
public List<Empty> getDistributable() {
if (distributable == null) {
- distributable = new ArrayList<Empty>();
+ distributable = new ArrayList<>();
}
return this.distributable;
}
@@ -297,7 +297,7 @@ public class WebApp implements WebCommon, Lifecycle, NamedModule {
@Override
public List<ParamValue> getContextParam() {
if (contextParam == null) {
- contextParam = new ArrayList<ParamValue>();
+ contextParam = new ArrayList<>();
}
return this.contextParam;
}
@@ -305,7 +305,7 @@ public class WebApp implements WebCommon, Lifecycle, NamedModule {
@Override
public List<Filter> getFilter() {
if (filter == null) {
- filter = new ArrayList<Filter>();
+ filter = new ArrayList<>();
}
return this.filter;
}
@@ -313,7 +313,7 @@ public class WebApp implements WebCommon, Lifecycle, NamedModule {
@Override
public List<FilterMapping> getFilterMapping() {
if (filterMapping == null) {
- filterMapping = new ArrayList<FilterMapping>();
+ filterMapping = new ArrayList<>();
}
return this.filterMapping;
}
@@ -321,7 +321,7 @@ public class WebApp implements WebCommon, Lifecycle, NamedModule {
@Override
public List<Listener> getListener() {
if (listener == null) {
- listener = new ArrayList<Listener>();
+ listener = new ArrayList<>();
}
return this.listener;
}
@@ -329,7 +329,7 @@ public class WebApp implements WebCommon, Lifecycle, NamedModule {
@Override
public List<Servlet> getServlet() {
if (servlet == null) {
- servlet = new ArrayList<Servlet>();
+ servlet = new ArrayList<>();
}
return this.servlet;
}
@@ -337,7 +337,7 @@ public class WebApp implements WebCommon, Lifecycle, NamedModule {
@Override
public List<ServletMapping> getServletMapping() {
if (servletMapping == null) {
- servletMapping = new ArrayList<ServletMapping>();
+ servletMapping = new ArrayList<>();
}
return this.servletMapping;
}
@@ -345,7 +345,7 @@ public class WebApp implements WebCommon, Lifecycle, NamedModule {
@Override
public List<SessionConfig> getSessionConfig() {
if (sessionConfig == null) {
- sessionConfig = new ArrayList<SessionConfig>();
+ sessionConfig = new ArrayList<>();
}
return this.sessionConfig;
}
@@ -353,7 +353,7 @@ public class WebApp implements WebCommon, Lifecycle, NamedModule {
@Override
public List<MimeMapping> getMimeMapping() {
if (mimeMapping == null) {
- mimeMapping = new ArrayList<MimeMapping>();
+ mimeMapping = new ArrayList<>();
}
return this.mimeMapping;
}
@@ -361,7 +361,7 @@ public class WebApp implements WebCommon, Lifecycle, NamedModule {
@Override
public List<WelcomeFileList> getWelcomeFileList() {
if (welcomeFileList == null) {
- welcomeFileList = new ArrayList<WelcomeFileList>();
+ welcomeFileList = new ArrayList<>();
}
return this.welcomeFileList;
}
@@ -369,7 +369,7 @@ public class WebApp implements WebCommon, Lifecycle, NamedModule {
@Override
public List<ErrorPage> getErrorPage() {
if (errorPage == null) {
- errorPage = new ArrayList<ErrorPage>();
+ errorPage = new ArrayList<>();
}
return this.errorPage;
}
@@ -377,7 +377,7 @@ public class WebApp implements WebCommon, Lifecycle, NamedModule {
@Override
public List<JspConfig> getJspConfig() {
if (jspConfig == null) {
- jspConfig = new ArrayList<JspConfig>();
+ jspConfig = new ArrayList<>();
}
return this.jspConfig;
}
@@ -385,7 +385,7 @@ public class WebApp implements WebCommon, Lifecycle, NamedModule {
@Override
public List<SecurityConstraint> getSecurityConstraint() {
if (securityConstraint == null) {
- securityConstraint = new ArrayList<SecurityConstraint>();
+ securityConstraint = new ArrayList<>();
}
return this.securityConstraint;
}
@@ -393,7 +393,7 @@ public class WebApp implements WebCommon, Lifecycle, NamedModule {
@Override
public List<LoginConfig> getLoginConfig() {
if (loginConfig == null) {
- loginConfig = new ArrayList<LoginConfig>();
+ loginConfig = new ArrayList<>();
}
return this.loginConfig;
}
@@ -401,7 +401,7 @@ public class WebApp implements WebCommon, Lifecycle, NamedModule {
@Override
public List<SecurityRole> getSecurityRole() {
if (securityRole == null) {
- securityRole = new ArrayList<SecurityRole>();
+ securityRole = new ArrayList<>();
}
return this.securityRole;
}
@@ -409,133 +409,133 @@ public class WebApp implements WebCommon, Lifecycle, NamedModule {
@Override
public List<LocaleEncodingMappingList> getLocaleEncodingMappingList() {
if (localeEncodingMappingList == null) {
- localeEncodingMappingList = new ArrayList<LocaleEncodingMappingList>();
+ localeEncodingMappingList = new ArrayList<>();
}
return this.localeEncodingMappingList;
}
public Collection<EnvEntry> getEnvEntry() {
if (envEntry == null) {
- envEntry = new KeyedCollection<String, EnvEntry>();
+ envEntry = new KeyedCollection<>();
}
return this.envEntry;
}
public Map<String, EnvEntry> getEnvEntryMap() {
if (envEntry == null) {
- envEntry = new KeyedCollection<String, EnvEntry>();
+ envEntry = new KeyedCollection<>();
}
return this.envEntry.toMap();
}
public Collection<EjbRef> getEjbRef() {
if (ejbRef == null) {
- ejbRef = new KeyedCollection<String, EjbRef>();
+ ejbRef = new KeyedCollection<>();
}
return this.ejbRef;
}
public Map<String, EjbRef> getEjbRefMap() {
if (ejbRef == null) {
- ejbRef = new KeyedCollection<String, EjbRef>();
+ ejbRef = new KeyedCollection<>();
}
return this.ejbRef.toMap();
}
public Collection<EjbLocalRef> getEjbLocalRef() {
if (ejbLocalRef == null) {
- ejbLocalRef = new KeyedCollection<String, EjbLocalRef>();
+ ejbLocalRef = new KeyedCollection<>();
}
return this.ejbLocalRef;
}
public Map<String, EjbLocalRef> getEjbLocalRefMap() {
if (ejbLocalRef == null) {
- ejbLocalRef = new KeyedCollection<String, EjbLocalRef>();
+ ejbLocalRef = new KeyedCollection<>();
}
return this.ejbLocalRef.toMap();
}
public Collection<ServiceRef> getServiceRef() {
if (serviceRef == null) {
- serviceRef = new KeyedCollection<String, ServiceRef>();
+ serviceRef = new KeyedCollection<>();
}
return this.serviceRef;
}
public Map<String, ServiceRef> getServiceRefMap() {
if (serviceRef == null) {
- serviceRef = new KeyedCollection<String, ServiceRef>();
+ serviceRef = new KeyedCollection<>();
}
return this.serviceRef.toMap();
}
public Collection<ResourceRef> getResourceRef() {
if (resourceRef == null) {
- resourceRef = new KeyedCollection<String, ResourceRef>();
+ resourceRef = new KeyedCollection<>();
}
return this.resourceRef;
}
public Map<String, ResourceRef> getResourceRefMap() {
if (resourceRef == null) {
- resourceRef = new KeyedCollection<String, ResourceRef>();
+ resourceRef = new KeyedCollection<>();
}
return this.resourceRef.toMap();
}
public Collection<ResourceEnvRef> getResourceEnvRef() {
if (resourceEnvRef == null) {
- resourceEnvRef = new KeyedCollection<String, ResourceEnvRef>();
+ resourceEnvRef = new KeyedCollection<>();
}
return this.resourceEnvRef;
}
public Map<String, ResourceEnvRef> getResourceEnvRefMap() {
if (resourceEnvRef == null) {
- resourceEnvRef = new KeyedCollection<String, ResourceEnvRef>();
+ resourceEnvRef = new KeyedCollection<>();
}
return this.resourceEnvRef.toMap();
}
public Collection<MessageDestinationRef> getMessageDestinationRef() {
if (messageDestinationRef == null) {
- messageDestinationRef = new KeyedCollection<String, MessageDestinationRef>();
+ messageDestinationRef = new KeyedCollection<>();
}
return this.messageDestinationRef;
}
public Map<String, MessageDestinationRef> getMessageDestinationRefMap() {
if (messageDestinationRef == null) {
- messageDestinationRef = new KeyedCollection<String, MessageDestinationRef>();
+ messageDestinationRef = new KeyedCollection<>();
}
return this.messageDestinationRef.toMap();
}
public Collection<PersistenceContextRef> getPersistenceContextRef() {
if (persistenceContextRef == null) {
- persistenceContextRef = new KeyedCollection<String, PersistenceContextRef>();
+ persistenceContextRef = new KeyedCollection<>();
}
return this.persistenceContextRef;
}
public Map<String, PersistenceContextRef> getPersistenceContextRefMap() {
if (persistenceContextRef == null) {
- persistenceContextRef = new KeyedCollection<String, PersistenceContextRef>();
+ persistenceContextRef = new KeyedCollection<>();
}
return this.persistenceContextRef.toMap();
}
public Collection<PersistenceUnitRef> getPersistenceUnitRef() {
if (persistenceUnitRef == null) {
- persistenceUnitRef = new KeyedCollection<String, PersistenceUnitRef>();
+ persistenceUnitRef = new KeyedCollection<>();
}
return this.persistenceUnitRef;
}
public Map<String, PersistenceUnitRef> getPersistenceUnitRefMap() {
if (persistenceUnitRef == null) {
- persistenceUnitRef = new KeyedCollection<String, PersistenceUnitRef>();
+ persistenceUnitRef = new KeyedCollection<>();
}
return this.persistenceUnitRef.toMap();
}
@@ -547,7 +547,7 @@ public class WebApp implements WebCommon, Lifecycle, NamedModule {
@Override
public List<LifecycleCallback> getPostConstruct() {
if (postConstruct == null) {
- postConstruct = new ArrayList<LifecycleCallback>();
+ postConstruct = new ArrayList<>();
}
return this.postConstruct;
}
@@ -559,7 +559,7 @@ public class WebApp implements WebCommon, Lifecycle, NamedModule {
@Override
public List<LifecycleCallback> getPreDestroy() {
if (preDestroy == null) {
- preDestroy = new ArrayList<LifecycleCallback>();
+ preDestroy = new ArrayList<>();
}
return this.preDestroy;
}
@@ -567,7 +567,7 @@ public class WebApp implements WebCommon, Lifecycle, NamedModule {
@Override
public List<MessageDestination> getMessageDestination() {
if (messageDestination == null) {
- messageDestination = new ArrayList<MessageDestination>();
+ messageDestination = new ArrayList<>();
}
return this.messageDestination;
}
@@ -619,14 +619,14 @@ public class WebApp implements WebCommon, Lifecycle, NamedModule {
public Collection<DataSource> getDataSource() {
if (dataSource == null) {
- dataSource = new KeyedCollection<String, DataSource>();
+ dataSource = new KeyedCollection<>();
}
return this.dataSource;
}
public Map<String, DataSource> getDataSourceMap() {
if (dataSource == null) {
- dataSource = new KeyedCollection<String, DataSource>();
+ dataSource = new KeyedCollection<>();
}
return this.dataSource.toMap();
}
@@ -662,7 +662,7 @@ public class WebApp implements WebCommon, Lifecycle, NamedModule {
}
public Map<String, String> contextParamsAsMap() {
- final Map<String, String> map = new HashMap<String, String>();
+ final Map<String, String> map = new HashMap<>();
if (contextParam != null) {
for (final ParamValue pv : contextParam) {
map.put(pv.getParamName(), pv.getParamValue());
@@ -717,7 +717,7 @@ public class WebApp implements WebCommon, Lifecycle, NamedModule {
for (final String mapping : mappings) {
if (servletMapping == null) {
- servletMapping = new ArrayList<ServletMapping>();
+ servletMapping = new ArrayList<>();
}
sm.getUrlPattern().add(mapping);
@@ -766,7 +766,7 @@ public class WebApp implements WebCommon, Lifecycle, NamedModule {
for (final String mapping : mappings) {
if (filterMapping == null) {
- filterMapping = new ArrayList<FilterMapping>();
+ filterMapping = new ArrayList<>();
}
sm.getUrlPattern().add(mapping);
@@ -838,7 +838,7 @@ public class WebApp implements WebCommon, Lifecycle, NamedModule {
@Override
public Map<String, ContextService> getContextServiceMap() {
if (contextService == null) {
- contextService = new KeyedCollection<String, ContextService>();
+ contextService = new KeyedCollection<>();
}
return this.contextService.toMap();
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/WebFragment.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/WebFragment.java
index 52913066dd..e1b707092d 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/WebFragment.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/WebFragment.java
@@ -110,7 +110,7 @@ public class WebFragment implements WebCommon {
@XmlTransient
protected TextMap displayName = new TextMap();
@XmlElement(name = "icon", required = true)
- protected LocalCollection<Icon> icon = new LocalCollection<Icon>();
+ protected LocalCollection<Icon> icon = new LocalCollection<>();
protected List<Empty> distributable;
@XmlElement(name = "context-param")
@@ -250,7 +250,7 @@ public class WebFragment implements WebCommon {
@Override
public Collection<Icon> getIcons() {
if (icon == null) {
- icon = new LocalCollection<Icon>();
+ icon = new LocalCollection<>();
}
return icon;
}
@@ -258,7 +258,7 @@ public class WebFragment implements WebCommon {
@Override
public Map<String, Icon> getIconMap() {
if (icon == null) {
- icon = new LocalCollection<Icon>();
+ icon = new LocalCollection<>();
}
return icon.toMap();
}
@@ -271,7 +271,7 @@ public class WebFragment implements WebCommon {
@Override
public List<Empty> getDistributable() {
if (distributable == null) {
- distributable = new ArrayList<Empty>();
+ distributable = new ArrayList<>();
}
return this.distributable;
}
@@ -279,7 +279,7 @@ public class WebFragment implements WebCommon {
@Override
public List<ParamValue> getContextParam() {
if (contextParam == null) {
- contextParam = new ArrayList<ParamValue>();
+ contextParam = new ArrayList<>();
}
return this.contextParam;
}
@@ -287,7 +287,7 @@ public class WebFragment implements WebCommon {
@Override
public List<Filter> getFilter() {
if (filter == null) {
- filter = new ArrayList<Filter>();
+ filter = new ArrayList<>();
}
return this.filter;
}
@@ -295,7 +295,7 @@ public class WebFragment implements WebCommon {
@Override
public List<FilterMapping> getFilterMapping() {
if (filterMapping == null) {
- filterMapping = new ArrayList<FilterMapping>();
+ filterMapping = new ArrayList<>();
}
return this.filterMapping;
}
@@ -303,7 +303,7 @@ public class WebFragment implements WebCommon {
@Override
public List<Listener> getListener() {
if (listener == null) {
- listener = new ArrayList<Listener>();
+ listener = new ArrayList<>();
}
return this.listener;
}
@@ -311,7 +311,7 @@ public class WebFragment implements WebCommon {
@Override
public List<Servlet> getServlet() {
if (servlet == null) {
- servlet = new ArrayList<Servlet>();
+ servlet = new ArrayList<>();
}
return this.servlet;
}
@@ -319,7 +319,7 @@ public class WebFragment implements WebCommon {
@Override
public List<ServletMapping> getServletMapping() {
if (servletMapping == null) {
- servletMapping = new ArrayList<ServletMapping>();
+ servletMapping = new ArrayList<>();
}
return this.servletMapping;
}
@@ -327,7 +327,7 @@ public class WebFragment implements WebCommon {
@Override
public List<SessionConfig> getSessionConfig() {
if (sessionConfig == null) {
- sessionConfig = new ArrayList<SessionConfig>();
+ sessionConfig = new ArrayList<>();
}
return this.sessionConfig;
}
@@ -335,7 +335,7 @@ public class WebFragment implements WebCommon {
@Override
public List<MimeMapping> getMimeMapping() {
if (mimeMapping == null) {
- mimeMapping = new ArrayList<MimeMapping>();
+ mimeMapping = new ArrayList<>();
}
return this.mimeMapping;
}
@@ -343,7 +343,7 @@ public class WebFragment implements WebCommon {
@Override
public List<WelcomeFileList> getWelcomeFileList() {
if (welcomeFileList == null) {
- welcomeFileList = new ArrayList<WelcomeFileList>();
+ welcomeFileList = new ArrayList<>();
}
return this.welcomeFileList;
}
@@ -351,7 +351,7 @@ public class WebFragment implements WebCommon {
@Override
public List<ErrorPage> getErrorPage() {
if (errorPage == null) {
- errorPage = new ArrayList<ErrorPage>();
+ errorPage = new ArrayList<>();
}
return this.errorPage;
}
@@ -359,7 +359,7 @@ public class WebFragment implements WebCommon {
@Override
public List<JspConfig> getJspConfig() {
if (jspConfig == null) {
- jspConfig = new ArrayList<JspConfig>();
+ jspConfig = new ArrayList<>();
}
return this.jspConfig;
}
@@ -367,7 +367,7 @@ public class WebFragment implements WebCommon {
@Override
public List<SecurityConstraint> getSecurityConstraint() {
if (securityConstraint == null) {
- securityConstraint = new ArrayList<SecurityConstraint>();
+ securityConstraint = new ArrayList<>();
}
return this.securityConstraint;
}
@@ -375,7 +375,7 @@ public class WebFragment implements WebCommon {
@Override
public List<LoginConfig> getLoginConfig() {
if (loginConfig == null) {
- loginConfig = new ArrayList<LoginConfig>();
+ loginConfig = new ArrayList<>();
}
return this.loginConfig;
}
@@ -383,7 +383,7 @@ public class WebFragment implements WebCommon {
@Override
public List<SecurityRole> getSecurityRole() {
if (securityRole == null) {
- securityRole = new ArrayList<SecurityRole>();
+ securityRole = new ArrayList<>();
}
return this.securityRole;
}
@@ -391,7 +391,7 @@ public class WebFragment implements WebCommon {
@Override
public List<LocaleEncodingMappingList> getLocaleEncodingMappingList() {
if (localeEncodingMappingList == null) {
- localeEncodingMappingList = new ArrayList<LocaleEncodingMappingList>();
+ localeEncodingMappingList = new ArrayList<>();
}
return this.localeEncodingMappingList;
}
@@ -399,7 +399,7 @@ public class WebFragment implements WebCommon {
@Override
public Collection<EnvEntry> getEnvEntry() {
if (envEntry == null) {
- envEntry = new KeyedCollection<String, EnvEntry>();
+ envEntry = new KeyedCollection<>();
}
return this.envEntry;
}
@@ -407,7 +407,7 @@ public class WebFragment implements WebCommon {
@Override
public Map<String, EnvEntry> getEnvEntryMap() {
if (envEntry == null) {
- envEntry = new KeyedCollection<String, EnvEntry>();
+ envEntry = new KeyedCollection<>();
}
return this.envEntry.toMap();
}
@@ -415,7 +415,7 @@ public class WebFragment implements WebCommon {
@Override
public Collection<EjbRef> getEjbRef() {
if (ejbRef == null) {
- ejbRef = new KeyedCollection<String, EjbRef>();
+ ejbRef = new KeyedCollection<>();
}
return this.ejbRef;
}
@@ -423,7 +423,7 @@ public class WebFragment implements WebCommon {
@Override
public Map<String, EjbRef> getEjbRefMap() {
if (ejbRef == null) {
- ejbRef = new KeyedCollection<String, EjbRef>();
+ ejbRef = new KeyedCollection<>();
}
return this.ejbRef.toMap();
}
@@ -431,7 +431,7 @@ public class WebFragment implements WebCommon {
@Override
public Collection<EjbLocalRef> getEjbLocalRef() {
if (ejbLocalRef == null) {
- ejbLocalRef = new KeyedCollection<String, EjbLocalRef>();
+ ejbLocalRef = new KeyedCollection<>();
}
return this.ejbLocalRef;
}
@@ -439,7 +439,7 @@ public class WebFragment implements WebCommon {
@Override
public Map<String, EjbLocalRef> getEjbLocalRefMap() {
if (ejbLocalRef == null) {
- ejbLocalRef = new KeyedCollection<String, EjbLocalRef>();
+ ejbLocalRef = new KeyedCollection<>();
}
return this.ejbLocalRef.toMap();
}
@@ -447,7 +447,7 @@ public class WebFragment implements WebCommon {
@Override
public Collection<ServiceRef> getServiceRef() {
if (serviceRef == null) {
- serviceRef = new KeyedCollection<String, ServiceRef>();
+ serviceRef = new KeyedCollection<>();
}
return this.serviceRef;
}
@@ -455,7 +455,7 @@ public class WebFragment implements WebCommon {
@Override
public Map<String, ServiceRef> getServiceRefMap() {
if (serviceRef == null) {
- serviceRef = new KeyedCollection<String, ServiceRef>();
+ serviceRef = new KeyedCollection<>();
}
return this.serviceRef.toMap();
}
@@ -463,7 +463,7 @@ public class WebFragment implements WebCommon {
@Override
public Collection<ResourceRef> getResourceRef() {
if (resourceRef == null) {
- resourceRef = new KeyedCollection<String, ResourceRef>();
+ resourceRef = new KeyedCollection<>();
}
return this.resourceRef;
}
@@ -471,7 +471,7 @@ public class WebFragment implements WebCommon {
@Override
public Map<String, ResourceRef> getResourceRefMap() {
if (resourceRef == null) {
- resourceRef = new KeyedCollection<String, ResourceRef>();
+ resourceRef = new KeyedCollection<>();
}
return this.resourceRef.toMap();
}
@@ -479,7 +479,7 @@ public class WebFragment implements WebCommon {
@Override
public Collection<ResourceEnvRef> getResourceEnvRef() {
if (resourceEnvRef == null) {
- resourceEnvRef = new KeyedCollection<String, ResourceEnvRef>();
+ resourceEnvRef = new KeyedCollection<>();
}
return this.resourceEnvRef;
}
@@ -487,7 +487,7 @@ public class WebFragment implements WebCommon {
@Override
public Map<String, ResourceEnvRef> getResourceEnvRefMap() {
if (resourceEnvRef == null) {
- resourceEnvRef = new KeyedCollection<String, ResourceEnvRef>();
+ resourceEnvRef = new KeyedCollection<>();
}
return this.resourceEnvRef.toMap();
}
@@ -495,7 +495,7 @@ public class WebFragment implements WebCommon {
@Override
public Collection<MessageDestinationRef> getMessageDestinationRef() {
if (messageDestinationRef == null) {
- messageDestinationRef = new KeyedCollection<String, MessageDestinationRef>();
+ messageDestinationRef = new KeyedCollection<>();
}
return this.messageDestinationRef;
}
@@ -503,7 +503,7 @@ public class WebFragment implements WebCommon {
@Override
public Map<String, MessageDestinationRef> getMessageDestinationRefMap() {
if (messageDestinationRef == null) {
- messageDestinationRef = new KeyedCollection<String, MessageDestinationRef>();
+ messageDestinationRef = new KeyedCollection<>();
}
return this.messageDestinationRef.toMap();
}
@@ -511,7 +511,7 @@ public class WebFragment implements WebCommon {
@Override
public Collection<PersistenceContextRef> getPersistenceContextRef() {
if (persistenceContextRef == null) {
- persistenceContextRef = new KeyedCollection<String, PersistenceContextRef>();
+ persistenceContextRef = new KeyedCollection<>();
}
return this.persistenceContextRef;
}
@@ -519,7 +519,7 @@ public class WebFragment implements WebCommon {
@Override
public Map<String, PersistenceContextRef> getPersistenceContextRefMap() {
if (persistenceContextRef == null) {
- persistenceContextRef = new KeyedCollection<String, PersistenceContextRef>();
+ persistenceContextRef = new KeyedCollection<>();
}
return this.persistenceContextRef.toMap();
}
@@ -527,7 +527,7 @@ public class WebFragment implements WebCommon {
@Override
public Collection<PersistenceUnitRef> getPersistenceUnitRef() {
if (persistenceUnitRef == null) {
- persistenceUnitRef = new KeyedCollection<String, PersistenceUnitRef>();
+ persistenceUnitRef = new KeyedCollection<>();
}
return this.persistenceUnitRef;
}
@@ -535,7 +535,7 @@ public class WebFragment implements WebCommon {
@Override
public Map<String, PersistenceUnitRef> getPersistenceUnitRefMap() {
if (persistenceUnitRef == null) {
- persistenceUnitRef = new KeyedCollection<String, PersistenceUnitRef>();
+ persistenceUnitRef = new KeyedCollection<>();
}
return this.persistenceUnitRef.toMap();
}
@@ -543,7 +543,7 @@ public class WebFragment implements WebCommon {
@Override
public List<LifecycleCallback> getPostConstruct() {
if (postConstruct == null) {
- postConstruct = new ArrayList<LifecycleCallback>();
+ postConstruct = new ArrayList<>();
}
return this.postConstruct;
}
@@ -551,7 +551,7 @@ public class WebFragment implements WebCommon {
@Override
public List<LifecycleCallback> getPreDestroy() {
if (preDestroy == null) {
- preDestroy = new ArrayList<LifecycleCallback>();
+ preDestroy = new ArrayList<>();
}
return this.preDestroy;
}
@@ -559,7 +559,7 @@ public class WebFragment implements WebCommon {
@Override
public List<MessageDestination> getMessageDestination() {
if (messageDestination == null) {
- messageDestination = new ArrayList<MessageDestination>();
+ messageDestination = new ArrayList<>();
}
return this.messageDestination;
}
@@ -597,7 +597,7 @@ public class WebFragment implements WebCommon {
@Override
public Collection<DataSource> getDataSource() {
if (dataSource == null) {
- dataSource = new KeyedCollection<String, DataSource>();
+ dataSource = new KeyedCollection<>();
}
return this.dataSource;
}
@@ -605,7 +605,7 @@ public class WebFragment implements WebCommon {
@Override
public Map<String, DataSource> getDataSourceMap() {
if (dataSource == null) {
- dataSource = new KeyedCollection<String, DataSource>();
+ dataSource = new KeyedCollection<>();
}
return this.dataSource.toMap();
}
@@ -649,7 +649,7 @@ public class WebFragment implements WebCommon {
@Override
public Map<String, ContextService> getContextServiceMap() {
if (contextService == null) {
- contextService = new KeyedCollection<String, ContextService>();
+ contextService = new KeyedCollection<>();
}
return this.contextService.toMap();
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/WebResourceCollection.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/WebResourceCollection.java
index 2a3eca118e..0c2caaec89 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/WebResourceCollection.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/WebResourceCollection.java
@@ -108,21 +108,21 @@ public class WebResourceCollection {
public List<String> getUrlPattern() {
if (urlPattern == null) {
- urlPattern = new ArrayList<String>();
+ urlPattern = new ArrayList<>();
}
return this.urlPattern;
}
public List<String> getHttpMethod() {
if (httpMethod == null) {
- httpMethod = new ArrayList<String>();
+ httpMethod = new ArrayList<>();
}
return this.httpMethod;
}
public List<String> getHttpMethodOmission() {
if (httpMethodOmission == null) {
- httpMethodOmission = new ArrayList<String>();
+ httpMethodOmission = new ArrayList<>();
}
return this.httpMethodOmission;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/WebserviceDescription.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/WebserviceDescription.java
index f5fcf9947e..21b89e3492 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/WebserviceDescription.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/WebserviceDescription.java
@@ -147,14 +147,14 @@ public class WebserviceDescription implements Keyable<String> {
public Collection<PortComponent> getPortComponent() {
if (portComponent == null) {
- portComponent = new KeyedCollection<String, PortComponent>();
+ portComponent = new KeyedCollection<>();
}
return this.portComponent;
}
public Map<String, PortComponent> getPortComponentMap() {
if (portComponent == null) {
- portComponent = new KeyedCollection<String, PortComponent>();
+ portComponent = new KeyedCollection<>();
}
return this.portComponent.toMap();
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/Webservices.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/Webservices.java
index 1654528d88..f402c8ac2e 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/Webservices.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/Webservices.java
@@ -67,7 +67,7 @@ public class Webservices {
@XmlTransient
protected TextMap displayName = new TextMap();
@XmlElement(name = "icon", required = true)
- protected LocalCollection<Icon> icon = new LocalCollection<Icon>();
+ protected LocalCollection<Icon> icon = new LocalCollection<>();
@XmlElement(name = "webservice-description", required = true)
protected KeyedCollection<String, WebserviceDescription> webserviceDescription;
@XmlAttribute
@@ -105,14 +105,14 @@ public class Webservices {
public Collection<Icon> getIcons() {
if (icon == null) {
- icon = new LocalCollection<Icon>();
+ icon = new LocalCollection<>();
}
return icon;
}
public Map<String, Icon> getIconMap() {
if (icon == null) {
- icon = new LocalCollection<Icon>();
+ icon = new LocalCollection<>();
}
return icon.toMap();
}
@@ -123,14 +123,14 @@ public class Webservices {
public Collection<WebserviceDescription> getWebserviceDescription() {
if (webserviceDescription == null) {
- webserviceDescription = new KeyedCollection<String, WebserviceDescription>();
+ webserviceDescription = new KeyedCollection<>();
}
return this.webserviceDescription;
}
public Map<String, WebserviceDescription> getWebserviceDescriptionMap() {
if (webserviceDescription == null) {
- webserviceDescription = new KeyedCollection<String, WebserviceDescription>();
+ webserviceDescription = new KeyedCollection<>();
}
return webserviceDescription.toMap();
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/WelcomeFileList.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/WelcomeFileList.java
index f653763965..f85dedabc5 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/WelcomeFileList.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/WelcomeFileList.java
@@ -64,7 +64,7 @@ public class WelcomeFileList {
public List<String> getWelcomeFile() {
if (welcomeFile == null) {
- welcomeFile = new ArrayList<String>();
+ welcomeFile = new ArrayList<>();
}
return this.welcomeFile;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/AnnotationType.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/AnnotationType.java
index c7c997162d..547c52cf37 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/AnnotationType.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/AnnotationType.java
@@ -74,7 +74,7 @@ public class AnnotationType {
*/
public List<ElementType> getElement() {
if (element == null) {
- element = new ArrayList<ElementType>();
+ element = new ArrayList<>();
}
return this.element;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/BeanType.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/BeanType.java
index a23081c9c1..05fa27f1fe 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/BeanType.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/BeanType.java
@@ -122,7 +122,7 @@ public class BeanType {
*/
public List<FieldType> getField() {
if (field == null) {
- field = new ArrayList<FieldType>();
+ field = new ArrayList<>();
}
return this.field;
}
@@ -151,7 +151,7 @@ public class BeanType {
*/
public List<GetterType> getGetter() {
if (getter == null) {
- getter = new ArrayList<GetterType>();
+ getter = new ArrayList<>();
}
return this.getter;
}
@@ -180,7 +180,7 @@ public class BeanType {
*/
public List<ConstructorType> getConstructor() {
if (constructor == null) {
- constructor = new ArrayList<ConstructorType>();
+ constructor = new ArrayList<>();
}
return this.constructor;
}
@@ -209,7 +209,7 @@ public class BeanType {
*/
public List<MethodType> getMethod() {
if (method == null) {
- method = new ArrayList<MethodType>();
+ method = new ArrayList<>();
}
return this.method;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/ClassType.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/ClassType.java
index 2dad547c99..868bb10515 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/ClassType.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/ClassType.java
@@ -107,7 +107,7 @@ public class ClassType {
*/
public List<ConstraintType> getConstraint() {
if (constraint == null) {
- constraint = new ArrayList<ConstraintType>();
+ constraint = new ArrayList<>();
}
return this.constraint;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/ConstraintMappingsType.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/ConstraintMappingsType.java
index 36f4f55798..2c634cb76c 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/ConstraintMappingsType.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/ConstraintMappingsType.java
@@ -114,7 +114,7 @@ public class ConstraintMappingsType {
*/
public List<BeanType> getBean() {
if (bean == null) {
- bean = new ArrayList<BeanType>();
+ bean = new ArrayList<>();
}
return this.bean;
}
@@ -143,7 +143,7 @@ public class ConstraintMappingsType {
*/
public List<ConstraintDefinitionType> getConstraintDefinition() {
if (constraintDefinition == null) {
- constraintDefinition = new ArrayList<ConstraintDefinitionType>();
+ constraintDefinition = new ArrayList<>();
}
return this.constraintDefinition;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/ConstraintType.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/ConstraintType.java
index 28fc638f69..f656ba13c7 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/ConstraintType.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/ConstraintType.java
@@ -163,7 +163,7 @@ public class ConstraintType {
*/
public List<ElementType> getElement() {
if (element == null) {
- element = new ArrayList<ElementType>();
+ element = new ArrayList<>();
}
return this.element;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/ConstructorType.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/ConstructorType.java
index 81d9c909c5..ed16a6cd78 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/ConstructorType.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/ConstructorType.java
@@ -87,7 +87,7 @@ public class ConstructorType {
*/
public List<ParameterType> getParameter() {
if (parameter == null) {
- parameter = new ArrayList<ParameterType>();
+ parameter = new ArrayList<>();
}
return this.parameter;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/CrossParameterType.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/CrossParameterType.java
index 438b748579..0d788df869 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/CrossParameterType.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/CrossParameterType.java
@@ -78,7 +78,7 @@ public class CrossParameterType {
*/
public List<ConstraintType> getConstraint() {
if (constraint == null) {
- constraint = new ArrayList<ConstraintType>();
+ constraint = new ArrayList<>();
}
return this.constraint;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/DefaultValidatedExecutableTypesType.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/DefaultValidatedExecutableTypesType.java
index 8f1d4dd059..adae806afd 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/DefaultValidatedExecutableTypesType.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/DefaultValidatedExecutableTypesType.java
@@ -89,7 +89,7 @@ public class DefaultValidatedExecutableTypesType {
*/
public List<ExecutableType> getExecutableType() {
if (executableType == null) {
- executableType = new ArrayList<ExecutableType>();
+ executableType = new ArrayList<>();
}
return this.executableType;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/ElementType.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/ElementType.java
index 79f6643c2e..a510c67c6d 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/ElementType.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/ElementType.java
@@ -94,7 +94,7 @@ public class ElementType {
*/
public List<Serializable> getContent() {
if (content == null) {
- content = new ArrayList<Serializable>();
+ content = new ArrayList<>();
}
return this.content;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/FieldType.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/FieldType.java
index ae76928107..07f4376ada 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/FieldType.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/FieldType.java
@@ -117,7 +117,7 @@ public class FieldType {
*/
public List<GroupConversionType> getConvertGroup() {
if (convertGroup == null) {
- convertGroup = new ArrayList<GroupConversionType>();
+ convertGroup = new ArrayList<>();
}
return this.convertGroup;
}
@@ -146,7 +146,7 @@ public class FieldType {
*/
public List<ConstraintType> getConstraint() {
if (constraint == null) {
- constraint = new ArrayList<ConstraintType>();
+ constraint = new ArrayList<>();
}
return this.constraint;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/GetterType.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/GetterType.java
index 5ad39d7148..399462d0ed 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/GetterType.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/GetterType.java
@@ -117,7 +117,7 @@ public class GetterType {
*/
public List<GroupConversionType> getConvertGroup() {
if (convertGroup == null) {
- convertGroup = new ArrayList<GroupConversionType>();
+ convertGroup = new ArrayList<>();
}
return this.convertGroup;
}
@@ -146,7 +146,7 @@ public class GetterType {
*/
public List<ConstraintType> getConstraint() {
if (constraint == null) {
- constraint = new ArrayList<ConstraintType>();
+ constraint = new ArrayList<>();
}
return this.constraint;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/GroupSequenceType.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/GroupSequenceType.java
index 4ff95b5eb7..255dd0b9b2 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/GroupSequenceType.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/GroupSequenceType.java
@@ -77,7 +77,7 @@ public class GroupSequenceType {
*/
public List<String> getValue() {
if (value == null) {
- value = new ArrayList<String>();
+ value = new ArrayList<>();
}
return this.value;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/GroupsType.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/GroupsType.java
index 180005f13d..6eb44e7e74 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/GroupsType.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/GroupsType.java
@@ -77,7 +77,7 @@ public class GroupsType {
*/
public List<String> getValue() {
if (value == null) {
- value = new ArrayList<String>();
+ value = new ArrayList<>();
}
return this.value;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/MethodType.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/MethodType.java
index 90f03c4371..ab58bce618 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/MethodType.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/MethodType.java
@@ -93,7 +93,7 @@ public class MethodType {
*/
public List<ParameterType> getParameter() {
if (parameter == null) {
- parameter = new ArrayList<ParameterType>();
+ parameter = new ArrayList<>();
}
return this.parameter;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/ObjectFactory.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/ObjectFactory.java
index 70c7d579fe..b5cced5b3c 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/ObjectFactory.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/ObjectFactory.java
@@ -243,7 +243,7 @@ public class ObjectFactory {
*/
@XmlElementDecl(namespace = "http://jboss.org/xml/ns/javax/validation/configuration", name = "validation-config")
public JAXBElement<ValidationConfigType> createValidationConfig(ValidationConfigType value) {
- return new JAXBElement<ValidationConfigType>(_ValidationConfig_QNAME, ValidationConfigType.class, null, value);
+ return new JAXBElement<>(_ValidationConfig_QNAME, ValidationConfigType.class, null, value);
}
/**
@@ -252,7 +252,7 @@ public class ObjectFactory {
*/
@XmlElementDecl(namespace = "http://jboss.org/xml/ns/javax/validation/mapping", name = "constraint-mappings")
public JAXBElement<ConstraintMappingsType> createConstraintMappings(ConstraintMappingsType value) {
- return new JAXBElement<ConstraintMappingsType>(_ConstraintMappings_QNAME, ConstraintMappingsType.class, null, value);
+ return new JAXBElement<>(_ConstraintMappings_QNAME, ConstraintMappingsType.class, null, value);
}
/**
@@ -261,7 +261,7 @@ public class ObjectFactory {
*/
@XmlElementDecl(namespace = "http://jboss.org/xml/ns/javax/validation/mapping", name = "annotation", scope = ElementType.class)
public JAXBElement<AnnotationType> createElementTypeAnnotation(AnnotationType value) {
- return new JAXBElement<AnnotationType>(_ElementTypeAnnotation_QNAME, AnnotationType.class, ElementType.class, value);
+ return new JAXBElement<>(_ElementTypeAnnotation_QNAME, AnnotationType.class, ElementType.class, value);
}
/**
@@ -271,7 +271,7 @@ public class ObjectFactory {
@XmlElementDecl(namespace = "http://jboss.org/xml/ns/javax/validation/mapping", name = "value", scope = ElementType.class)
@XmlJavaTypeAdapter(CollapsedStringAdapter.class)
public JAXBElement<String> createElementTypeValue(String value) {
- return new JAXBElement<String>(_ElementTypeValue_QNAME, String.class, ElementType.class, value);
+ return new JAXBElement<>(_ElementTypeValue_QNAME, String.class, ElementType.class, value);
}
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/ParameterType.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/ParameterType.java
index 1783823c36..813f42ed39 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/ParameterType.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/ParameterType.java
@@ -117,7 +117,7 @@ public class ParameterType {
*/
public List<GroupConversionType> getConvertGroup() {
if (convertGroup == null) {
- convertGroup = new ArrayList<GroupConversionType>();
+ convertGroup = new ArrayList<>();
}
return this.convertGroup;
}
@@ -146,7 +146,7 @@ public class ParameterType {
*/
public List<ConstraintType> getConstraint() {
if (constraint == null) {
- constraint = new ArrayList<ConstraintType>();
+ constraint = new ArrayList<>();
}
return this.constraint;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/PayloadType.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/PayloadType.java
index f6726162a6..302cfaa80e 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/PayloadType.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/PayloadType.java
@@ -77,7 +77,7 @@ public class PayloadType {
*/
public List<String> getValue() {
if (value == null) {
- value = new ArrayList<String>();
+ value = new ArrayList<>();
}
return this.value;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/ReturnValueType.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/ReturnValueType.java
index 3f1c3f6c4d..85d4a28346 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/ReturnValueType.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/ReturnValueType.java
@@ -113,7 +113,7 @@ public class ReturnValueType {
*/
public List<GroupConversionType> getConvertGroup() {
if (convertGroup == null) {
- convertGroup = new ArrayList<GroupConversionType>();
+ convertGroup = new ArrayList<>();
}
return this.convertGroup;
}
@@ -142,7 +142,7 @@ public class ReturnValueType {
*/
public List<ConstraintType> getConstraint() {
if (constraint == null) {
- constraint = new ArrayList<ConstraintType>();
+ constraint = new ArrayList<>();
}
return this.constraint;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/ValidatedByType.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/ValidatedByType.java
index 8b0ceb8c23..0b093945e5 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/ValidatedByType.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/ValidatedByType.java
@@ -81,7 +81,7 @@ public class ValidatedByType {
*/
public List<String> getValue() {
if (value == null) {
- value = new ArrayList<String>();
+ value = new ArrayList<>();
}
return this.value;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/ValidationConfigType.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/ValidationConfigType.java
index 6b787306c2..03448499b0 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/ValidationConfigType.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/ValidationConfigType.java
@@ -269,7 +269,7 @@ public class ValidationConfigType {
*/
public List<String> getValueExtractor() {
if (valueExtractor == null) {
- valueExtractor = new ArrayList<String>();
+ valueExtractor = new ArrayList<>();
}
return this.valueExtractor;
}
@@ -322,7 +322,7 @@ public class ValidationConfigType {
*/
public List<String> getConstraintMapping() {
if (constraintMapping == null) {
- constraintMapping = new ArrayList<String>();
+ constraintMapping = new ArrayList<>();
}
return this.constraintMapping;
}
@@ -351,7 +351,7 @@ public class ValidationConfigType {
*/
public List<PropertyType> getProperty() {
if (property == null) {
- property = new ArrayList<PropertyType>();
+ property = new ArrayList<>();
}
return this.property;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/ActivationConfig.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/ActivationConfig.java
index bbc3ca5722..a2a62213c2 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/ActivationConfig.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/ActivationConfig.java
@@ -58,7 +58,7 @@ public class ActivationConfig {
*/
public List<ActivationConfigProperty> getActivationConfigProperty() {
if (activationConfigProperty == null) {
- activationConfigProperty = new ArrayList<ActivationConfigProperty>();
+ activationConfigProperty = new ArrayList<>();
}
return this.activationConfigProperty;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/AssemblyDescriptor.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/AssemblyDescriptor.java
index bfb339f4ae..8b39c8efc3 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/AssemblyDescriptor.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/AssemblyDescriptor.java
@@ -61,7 +61,7 @@ public class AssemblyDescriptor {
*/
public List<SecurityRole> getSecurityRole() {
if (securityRole == null) {
- securityRole = new ArrayList<SecurityRole>();
+ securityRole = new ArrayList<>();
}
return this.securityRole;
}
@@ -88,7 +88,7 @@ public class AssemblyDescriptor {
*/
public List<MessageDestination> getMessageDestination() {
if (messageDestination == null) {
- messageDestination = new ArrayList<MessageDestination>();
+ messageDestination = new ArrayList<>();
}
return this.messageDestination;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/Bean.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/Bean.java
index 392e22cd0c..c810e9fefd 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/Bean.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/Bean.java
@@ -58,7 +58,7 @@ public class Bean {
*/
public List<Interceptor> getInterceptor() {
if (interceptor == null) {
- interceptor = new ArrayList<Interceptor>();
+ interceptor = new ArrayList<>();
}
return this.interceptor;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/CachePolicyConfOther.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/CachePolicyConfOther.java
index c19d5231e9..8cfbf9797e 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/CachePolicyConfOther.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/CachePolicyConfOther.java
@@ -63,7 +63,7 @@ public class CachePolicyConfOther {
*/
public List<Object> getContent() {
if (content == null) {
- content = new ArrayList<Object>();
+ content = new ArrayList<>();
}
return this.content;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/ContainerConfiguration.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/ContainerConfiguration.java
index 7d307453ca..fd4ee58563 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/ContainerConfiguration.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/ContainerConfiguration.java
@@ -520,7 +520,7 @@ public class ContainerConfiguration {
*/
public List<Depends> getDepends() {
if (depends == null) {
- depends = new ArrayList<Depends>();
+ depends = new ArrayList<>();
}
return this.depends;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/ContainerConfigurations.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/ContainerConfigurations.java
index 9e5d9bcae1..1646b7c5a1 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/ContainerConfigurations.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/ContainerConfigurations.java
@@ -58,7 +58,7 @@ public class ContainerConfigurations {
*/
public List<ContainerConfiguration> getContainerConfiguration() {
if (containerConfiguration == null) {
- containerConfiguration = new ArrayList<ContainerConfiguration>();
+ containerConfiguration = new ArrayList<>();
}
return this.containerConfiguration;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/ContainerInterceptors.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/ContainerInterceptors.java
index ba35fa609a..6f81172156 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/ContainerInterceptors.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/ContainerInterceptors.java
@@ -58,7 +58,7 @@ public class ContainerInterceptors {
*/
public List<Interceptor> getInterceptor() {
if (interceptor == null) {
- interceptor = new ArrayList<Interceptor>();
+ interceptor = new ArrayList<>();
}
return this.interceptor;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/EndpointInterceptors.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/EndpointInterceptors.java
index 3c4587c0e9..fa2595ab68 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/EndpointInterceptors.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/EndpointInterceptors.java
@@ -58,7 +58,7 @@ public class EndpointInterceptors {
*/
public List<Interceptor> getInterceptor() {
if (interceptor == null) {
- interceptor = new ArrayList<Interceptor>();
+ interceptor = new ArrayList<>();
}
return this.interceptor;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/EnterpriseBeans.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/EnterpriseBeans.java
index 2998415255..c91a50acf3 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/EnterpriseBeans.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/EnterpriseBeans.java
@@ -65,7 +65,7 @@ public class EnterpriseBeans {
*/
public List<Object> getSessionOrEntityOrMessageDriven() {
if (sessionOrEntityOrMessageDriven == null) {
- sessionOrEntityOrMessageDriven = new ArrayList<Object>();
+ sessionOrEntityOrMessageDriven = new ArrayList<>();
}
return this.sessionOrEntityOrMessageDriven;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/Entity.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/Entity.java
index 51407131e9..aa5cd6d37c 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/Entity.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/Entity.java
@@ -353,7 +353,7 @@ public class Entity {
*/
public List<EjbRef> getEjbRef() {
if (ejbRef == null) {
- ejbRef = new ArrayList<EjbRef>();
+ ejbRef = new ArrayList<>();
}
return this.ejbRef;
}
@@ -380,7 +380,7 @@ public class Entity {
*/
public List<EjbLocalRef> getEjbLocalRef() {
if (ejbLocalRef == null) {
- ejbLocalRef = new ArrayList<EjbLocalRef>();
+ ejbLocalRef = new ArrayList<>();
}
return this.ejbLocalRef;
}
@@ -407,7 +407,7 @@ public class Entity {
*/
public List<ServiceRef> getServiceRef() {
if (serviceRef == null) {
- serviceRef = new ArrayList<ServiceRef>();
+ serviceRef = new ArrayList<>();
}
return this.serviceRef;
}
@@ -454,7 +454,7 @@ public class Entity {
*/
public List<ResourceRef> getResourceRef() {
if (resourceRef == null) {
- resourceRef = new ArrayList<ResourceRef>();
+ resourceRef = new ArrayList<>();
}
return this.resourceRef;
}
@@ -481,7 +481,7 @@ public class Entity {
*/
public List<ResourceEnvRef> getResourceEnvRef() {
if (resourceEnvRef == null) {
- resourceEnvRef = new ArrayList<ResourceEnvRef>();
+ resourceEnvRef = new ArrayList<>();
}
return this.resourceEnvRef;
}
@@ -508,7 +508,7 @@ public class Entity {
*/
public List<MessageDestinationRef> getMessageDestinationRef() {
if (messageDestinationRef == null) {
- messageDestinationRef = new ArrayList<MessageDestinationRef>();
+ messageDestinationRef = new ArrayList<>();
}
return this.messageDestinationRef;
}
@@ -635,7 +635,7 @@ public class Entity {
*/
public List<Depends> getDepends() {
if (depends == null) {
- depends = new ArrayList<Depends>();
+ depends = new ArrayList<>();
}
return this.depends;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/Home.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/Home.java
index 1b59322bc1..abdfbbd5cb 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/Home.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/Home.java
@@ -58,7 +58,7 @@ public class Home {
*/
public List<Interceptor> getInterceptor() {
if (interceptor == null) {
- interceptor = new ArrayList<Interceptor>();
+ interceptor = new ArrayList<>();
}
return this.interceptor;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/Interceptor.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/Interceptor.java
index a98c563035..7251da9fa6 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/Interceptor.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/Interceptor.java
@@ -143,7 +143,7 @@ public class Interceptor {
*/
public List<Object> getContent() {
if (content == null) {
- content = new ArrayList<Object>();
+ content = new ArrayList<>();
}
return this.content;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/Invoker.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/Invoker.java
index b2300f3c83..aa7b6dc477 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/Invoker.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/Invoker.java
@@ -104,7 +104,7 @@ public class Invoker {
*/
public List<EjbRef> getEjbRef() {
if (ejbRef == null) {
- ejbRef = new ArrayList<EjbRef>();
+ ejbRef = new ArrayList<>();
}
return this.ejbRef;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/InvokerBindings.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/InvokerBindings.java
index 08d7b4da37..a17556006d 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/InvokerBindings.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/InvokerBindings.java
@@ -58,7 +58,7 @@ public class InvokerBindings {
*/
public List<Invoker> getInvoker() {
if (invoker == null) {
- invoker = new ArrayList<Invoker>();
+ invoker = new ArrayList<>();
}
return this.invoker;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/InvokerProxyBindings.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/InvokerProxyBindings.java
index 6e48417416..c8358182ac 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/InvokerProxyBindings.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/InvokerProxyBindings.java
@@ -58,7 +58,7 @@ public class InvokerProxyBindings {
*/
public List<InvokerProxyBinding> getInvokerProxyBinding() {
if (invokerProxyBinding == null) {
- invokerProxyBinding = new ArrayList<InvokerProxyBinding>();
+ invokerProxyBinding = new ArrayList<>();
}
return this.invokerProxyBinding;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/ListEntity.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/ListEntity.java
index bca77ef3ce..7ab4a9e1b0 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/ListEntity.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/ListEntity.java
@@ -58,7 +58,7 @@ public class ListEntity {
*/
public List<Interceptor> getInterceptor() {
if (interceptor == null) {
- interceptor = new ArrayList<Interceptor>();
+ interceptor = new ArrayList<>();
}
return this.interceptor;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/MessageDriven.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/MessageDriven.java
index 08d636098a..852e5a2941 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/MessageDriven.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/MessageDriven.java
@@ -434,7 +434,7 @@ public class MessageDriven {
*/
public List<EjbRef> getEjbRef() {
if (ejbRef == null) {
- ejbRef = new ArrayList<EjbRef>();
+ ejbRef = new ArrayList<>();
}
return this.ejbRef;
}
@@ -461,7 +461,7 @@ public class MessageDriven {
*/
public List<EjbLocalRef> getEjbLocalRef() {
if (ejbLocalRef == null) {
- ejbLocalRef = new ArrayList<EjbLocalRef>();
+ ejbLocalRef = new ArrayList<>();
}
return this.ejbLocalRef;
}
@@ -488,7 +488,7 @@ public class MessageDriven {
*/
public List<ServiceRef> getServiceRef() {
if (serviceRef == null) {
- serviceRef = new ArrayList<ServiceRef>();
+ serviceRef = new ArrayList<>();
}
return this.serviceRef;
}
@@ -535,7 +535,7 @@ public class MessageDriven {
*/
public List<ResourceRef> getResourceRef() {
if (resourceRef == null) {
- resourceRef = new ArrayList<ResourceRef>();
+ resourceRef = new ArrayList<>();
}
return this.resourceRef;
}
@@ -562,7 +562,7 @@ public class MessageDriven {
*/
public List<ResourceEnvRef> getResourceEnvRef() {
if (resourceEnvRef == null) {
- resourceEnvRef = new ArrayList<ResourceEnvRef>();
+ resourceEnvRef = new ArrayList<>();
}
return this.resourceEnvRef;
}
@@ -589,7 +589,7 @@ public class MessageDriven {
*/
public List<MessageDestinationRef> getMessageDestinationRef() {
if (messageDestinationRef == null) {
- messageDestinationRef = new ArrayList<MessageDestinationRef>();
+ messageDestinationRef = new ArrayList<>();
}
return this.messageDestinationRef;
}
@@ -616,7 +616,7 @@ public class MessageDriven {
*/
public List<Depends> getDepends() {
if (depends == null) {
- depends = new ArrayList<Depends>();
+ depends = new ArrayList<>();
}
return this.depends;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/MethodAttributes.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/MethodAttributes.java
index 63dfd79851..b1043de634 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/MethodAttributes.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/MethodAttributes.java
@@ -56,7 +56,7 @@ public class MethodAttributes {
*/
public List<Method> getMethod() {
if (method == null) {
- method = new ArrayList<Method>();
+ method = new ArrayList<>();
}
return this.method;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/ResourceManager.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/ResourceManager.java
index 19093f2a26..651dd1d931 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/ResourceManager.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/ResourceManager.java
@@ -86,7 +86,7 @@ public class ResourceManager {
*/
public List<Object> getResJndiNameOrResUrl() {
if (resJndiNameOrResUrl == null) {
- resJndiNameOrResUrl = new ArrayList<Object>();
+ resJndiNameOrResUrl = new ArrayList<>();
}
return this.resJndiNameOrResUrl;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/ResourceManagers.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/ResourceManagers.java
index df0ccc8026..af1d1db2ac 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/ResourceManagers.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/ResourceManagers.java
@@ -58,7 +58,7 @@ public class ResourceManagers {
*/
public List<ResourceManager> getResourceManager() {
if (resourceManager == null) {
- resourceManager = new ArrayList<ResourceManager>();
+ resourceManager = new ArrayList<>();
}
return this.resourceManager;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/ResourceRef.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/ResourceRef.java
index c8cfc71234..2f73f97fa5 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/ResourceRef.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/ResourceRef.java
@@ -88,7 +88,7 @@ public class ResourceRef {
*/
public List<Object> getResourceNameOrJndiNameOrResUrl() {
if (resourceNameOrJndiNameOrResUrl == null) {
- resourceNameOrJndiNameOrResUrl = new ArrayList<Object>();
+ resourceNameOrJndiNameOrResUrl = new ArrayList<>();
}
return this.resourceNameOrJndiNameOrResUrl;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/RetryHandlers.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/RetryHandlers.java
index 96af53ed52..546c7b6901 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/RetryHandlers.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/RetryHandlers.java
@@ -58,7 +58,7 @@ public class RetryHandlers {
*/
public List<Handler> getHandler() {
if (handler == null) {
- handler = new ArrayList<Handler>();
+ handler = new ArrayList<>();
}
return this.handler;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/SecurityRole.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/SecurityRole.java
index e88c15bc8d..b52771a53a 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/SecurityRole.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/SecurityRole.java
@@ -81,7 +81,7 @@ public class SecurityRole {
*/
public List<PrincipalName> getPrincipalName() {
if (principalName == null) {
- principalName = new ArrayList<PrincipalName>();
+ principalName = new ArrayList<>();
}
return this.principalName;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/Session.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/Session.java
index fcf61c57da..9069b83951 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/Session.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/Session.java
@@ -330,7 +330,7 @@ public class Session {
*/
public List<EjbRef> getEjbRef() {
if (ejbRef == null) {
- ejbRef = new ArrayList<EjbRef>();
+ ejbRef = new ArrayList<>();
}
return this.ejbRef;
}
@@ -357,7 +357,7 @@ public class Session {
*/
public List<EjbLocalRef> getEjbLocalRef() {
if (ejbLocalRef == null) {
- ejbLocalRef = new ArrayList<EjbLocalRef>();
+ ejbLocalRef = new ArrayList<>();
}
return this.ejbLocalRef;
}
@@ -384,7 +384,7 @@ public class Session {
*/
public List<ServiceRef> getServiceRef() {
if (serviceRef == null) {
- serviceRef = new ArrayList<ServiceRef>();
+ serviceRef = new ArrayList<>();
}
return this.serviceRef;
}
@@ -431,7 +431,7 @@ public class Session {
*/
public List<ResourceRef> getResourceRef() {
if (resourceRef == null) {
- resourceRef = new ArrayList<ResourceRef>();
+ resourceRef = new ArrayList<>();
}
return this.resourceRef;
}
@@ -458,7 +458,7 @@ public class Session {
*/
public List<ResourceEnvRef> getResourceEnvRef() {
if (resourceEnvRef == null) {
- resourceEnvRef = new ArrayList<ResourceEnvRef>();
+ resourceEnvRef = new ArrayList<>();
}
return this.resourceEnvRef;
}
@@ -485,7 +485,7 @@ public class Session {
*/
public List<MessageDestinationRef> getMessageDestinationRef() {
if (messageDestinationRef == null) {
- messageDestinationRef = new ArrayList<MessageDestinationRef>();
+ messageDestinationRef = new ArrayList<>();
}
return this.messageDestinationRef;
}
@@ -572,7 +572,7 @@ public class Session {
*/
public List<Depends> getDepends() {
if (depends == null) {
- depends = new ArrayList<Depends>();
+ depends = new ArrayList<>();
}
return this.depends;
}
@@ -619,7 +619,7 @@ public class Session {
*/
public List<PortComponent> getPortComponent() {
if (portComponent == null) {
- portComponent = new ArrayList<PortComponent>();
+ portComponent = new ArrayList<>();
}
return this.portComponent;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/CmpField.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/CmpField.java
index 46ddf16a1e..92b247e931 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/CmpField.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/CmpField.java
@@ -263,7 +263,7 @@ public class CmpField {
*/
public List<Property> getProperty() {
if (property == null) {
- property = new ArrayList<Property>();
+ property = new ArrayList<>();
}
return this.property;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/DependentValueClass.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/DependentValueClass.java
index 448310268a..32c3bce652 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/DependentValueClass.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/DependentValueClass.java
@@ -122,7 +122,7 @@ public class DependentValueClass {
*/
public List<Property> getProperty() {
if (property == null) {
- property = new ArrayList<Property>();
+ property = new ArrayList<>();
}
return this.property;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/DependentValueClasses.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/DependentValueClasses.java
index 8295b874de..796817eb37 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/DependentValueClasses.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/DependentValueClasses.java
@@ -75,7 +75,7 @@ public class DependentValueClasses {
*/
public List<DependentValueClass> getDependentValueClass() {
if (dependentValueClass == null) {
- dependentValueClass = new ArrayList<DependentValueClass>();
+ dependentValueClass = new ArrayList<>();
}
return this.dependentValueClass;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/EjbRelation.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/EjbRelation.java
index ed75956971..eb80a31f71 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/EjbRelation.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/EjbRelation.java
@@ -108,7 +108,7 @@ public class EjbRelation {
*/
public List<Object> getContent() {
if (content == null) {
- content = new ArrayList<Object>();
+ content = new ArrayList<>();
}
return this.content;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/EnterpriseBeans.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/EnterpriseBeans.java
index 030e0d48f7..ea13ca4585 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/EnterpriseBeans.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/EnterpriseBeans.java
@@ -75,7 +75,7 @@ public class EnterpriseBeans {
*/
public List<Entity> getEntity() {
if (entity == null) {
- entity = new ArrayList<Entity>();
+ entity = new ArrayList<>();
}
return this.entity;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/Entity.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/Entity.java
index a6ff9eb2b1..3503c5889b 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/Entity.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/Entity.java
@@ -464,7 +464,7 @@ public class Entity {
*/
public List<CmpField> getCmpField() {
if (cmpField == null) {
- cmpField = new ArrayList<CmpField>();
+ cmpField = new ArrayList<>();
}
return this.cmpField;
}
@@ -551,7 +551,7 @@ public class Entity {
*/
public List<Query> getQuery() {
if (query == null) {
- query = new ArrayList<Query>();
+ query = new ArrayList<>();
}
return this.query;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/EntityCommand.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/EntityCommand.java
index b80db9137e..feb6b3686b 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/EntityCommand.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/EntityCommand.java
@@ -77,7 +77,7 @@ public class EntityCommand {
*/
public List<Attribute> getAttribute() {
if (attribute == null) {
- attribute = new ArrayList<Attribute>();
+ attribute = new ArrayList<>();
}
return this.attribute;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/EntityCommands.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/EntityCommands.java
index c7c31e2846..2951ad1afb 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/EntityCommands.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/EntityCommands.java
@@ -75,7 +75,7 @@ public class EntityCommands {
*/
public List<EntityCommand> getEntityCommand() {
if (entityCommand == null) {
- entityCommand = new ArrayList<EntityCommand>();
+ entityCommand = new ArrayList<>();
}
return this.entityCommand;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/KeyField.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/KeyField.java
index 6b7dd9ddd4..c406e0e2fe 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/KeyField.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/KeyField.java
@@ -181,7 +181,7 @@ public class KeyField {
*/
public List<Property> getProperty() {
if (property == null) {
- property = new ArrayList<Property>();
+ property = new ArrayList<>();
}
return this.property;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/KeyFields.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/KeyFields.java
index e05dcbef79..1b18d340ae 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/KeyFields.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/KeyFields.java
@@ -75,7 +75,7 @@ public class KeyFields {
*/
public List<KeyField> getKeyField() {
if (keyField == null) {
- keyField = new ArrayList<KeyField>();
+ keyField = new ArrayList<>();
}
return this.keyField;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/LazyLoadGroups.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/LazyLoadGroups.java
index b2a9c6f0a7..5d0d33bf7d 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/LazyLoadGroups.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/LazyLoadGroups.java
@@ -75,7 +75,7 @@ public class LazyLoadGroups {
*/
public List<LoadGroupName> getLoadGroupName() {
if (loadGroupName == null) {
- loadGroupName = new ArrayList<LoadGroupName>();
+ loadGroupName = new ArrayList<>();
}
return this.loadGroupName;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/LeftJoin.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/LeftJoin.java
index 9b34e5ec02..203f388069 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/LeftJoin.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/LeftJoin.java
@@ -79,7 +79,7 @@ public class LeftJoin {
*/
public List<LeftJoin> getLeftJoin() {
if (leftJoin == null) {
- leftJoin = new ArrayList<LeftJoin>();
+ leftJoin = new ArrayList<>();
}
return this.leftJoin;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/LoadGroup.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/LoadGroup.java
index 6fee7ad574..7a5550c44f 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/LoadGroup.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/LoadGroup.java
@@ -122,7 +122,7 @@ public class LoadGroup {
*/
public List<FieldName> getFieldName() {
if (fieldName == null) {
- fieldName = new ArrayList<FieldName>();
+ fieldName = new ArrayList<>();
}
return this.fieldName;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/LoadGroups.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/LoadGroups.java
index 9c994c1347..cf852de482 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/LoadGroups.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/LoadGroups.java
@@ -75,7 +75,7 @@ public class LoadGroups {
*/
public List<LoadGroup> getLoadGroup() {
if (loadGroup == null) {
- loadGroup = new ArrayList<LoadGroup>();
+ loadGroup = new ArrayList<>();
}
return this.loadGroup;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/MethodParams.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/MethodParams.java
index 20ad405d2f..8ea3522967 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/MethodParams.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/MethodParams.java
@@ -75,7 +75,7 @@ public class MethodParams {
*/
public List<MethodParam> getMethodParam() {
if (methodParam == null) {
- methodParam = new ArrayList<MethodParam>();
+ methodParam = new ArrayList<>();
}
return this.methodParam;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/PostTableCreate.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/PostTableCreate.java
index 7778468301..7f743c823a 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/PostTableCreate.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/PostTableCreate.java
@@ -75,7 +75,7 @@ public class PostTableCreate {
*/
public List<SqlStatement> getSqlStatement() {
if (sqlStatement == null) {
- sqlStatement = new ArrayList<SqlStatement>();
+ sqlStatement = new ArrayList<>();
}
return this.sqlStatement;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/ReadAhead.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/ReadAhead.java
index 5b9e97fbef..ef99e0cf6e 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/ReadAhead.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/ReadAhead.java
@@ -147,7 +147,7 @@ public class ReadAhead {
*/
public List<LeftJoin> getLeftJoin() {
if (leftJoin == null) {
- leftJoin = new ArrayList<LeftJoin>();
+ leftJoin = new ArrayList<>();
}
return this.leftJoin;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/Relationships.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/Relationships.java
index fa4504ee74..7fce9506c1 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/Relationships.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/Relationships.java
@@ -75,7 +75,7 @@ public class Relationships {
*/
public List<EjbRelation> getEjbRelation() {
if (ejbRelation == null) {
- ejbRelation = new ArrayList<EjbRelation>();
+ ejbRelation = new ArrayList<>();
}
return this.ejbRelation;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/ReservedWords.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/ReservedWords.java
index 3ae96bb3f2..788c9d8d7f 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/ReservedWords.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/ReservedWords.java
@@ -75,7 +75,7 @@ public class ReservedWords {
*/
public List<Word> getWord() {
if (word == null) {
- word = new ArrayList<Word>();
+ word = new ArrayList<>();
}
return this.word;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/TypeMapping.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/TypeMapping.java
index 3ea1b5a8a0..cdee1cc2ab 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/TypeMapping.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/TypeMapping.java
@@ -415,7 +415,7 @@ public class TypeMapping {
*/
public List<FunctionMapping> getFunctionMapping() {
if (functionMapping == null) {
- functionMapping = new ArrayList<FunctionMapping>();
+ functionMapping = new ArrayList<>();
}
return this.functionMapping;
}
@@ -442,7 +442,7 @@ public class TypeMapping {
*/
public List<Mapping> getMapping() {
if (mapping == null) {
- mapping = new ArrayList<Mapping>();
+ mapping = new ArrayList<>();
}
return this.mapping;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/TypeMappings.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/TypeMappings.java
index 51e84fa2e8..fd41ef8b0d 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/TypeMappings.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/TypeMappings.java
@@ -75,7 +75,7 @@ public class TypeMappings {
*/
public List<TypeMapping> getTypeMapping() {
if (typeMapping == null) {
- typeMapping = new ArrayList<TypeMapping>();
+ typeMapping = new ArrayList<>();
}
return this.typeMapping;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/UserTypeMappings.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/UserTypeMappings.java
index 9806f8dfac..0fe564e86e 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/UserTypeMappings.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/UserTypeMappings.java
@@ -75,7 +75,7 @@ public class UserTypeMappings {
*/
public List<UserTypeMapping> getUserTypeMapping() {
if (userTypeMapping == null) {
- userTypeMapping = new ArrayList<UserTypeMapping>();
+ userTypeMapping = new ArrayList<>();
}
return this.userTypeMapping;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/AssociationOverride.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/AssociationOverride.java
index b4f06fa7ae..3d90b070f9 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/AssociationOverride.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/AssociationOverride.java
@@ -115,7 +115,7 @@ public class AssociationOverride {
*/
public List<JoinColumn> getJoinColumn() {
if (joinColumn == null) {
- joinColumn = new ArrayList<JoinColumn>();
+ joinColumn = new ArrayList<>();
}
return this.joinColumn;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/Attributes.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/Attributes.java
index 2199d7c326..7f6d3791ed 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/Attributes.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/Attributes.java
@@ -145,7 +145,7 @@ public class Attributes {
*/
public List<Id> getId() {
if (id == null) {
- id = new ArrayList<Id>();
+ id = new ArrayList<>();
}
return this.id;
}
@@ -192,7 +192,7 @@ public class Attributes {
*/
public List<Basic> getBasic() {
if (basic == null) {
- basic = new ArrayList<Basic>();
+ basic = new ArrayList<>();
}
return this.basic;
}
@@ -219,7 +219,7 @@ public class Attributes {
*/
public List<Version> getVersion() {
if (version == null) {
- version = new ArrayList<Version>();
+ version = new ArrayList<>();
}
return this.version;
}
@@ -246,7 +246,7 @@ public class Attributes {
*/
public List<ManyToOne> getManyToOne() {
if (manyToOne == null) {
- manyToOne = new ArrayList<ManyToOne>();
+ manyToOne = new ArrayList<>();
}
return this.manyToOne;
}
@@ -273,7 +273,7 @@ public class Attributes {
*/
public List<OneToMany> getOneToMany() {
if (oneToMany == null) {
- oneToMany = new ArrayList<OneToMany>();
+ oneToMany = new ArrayList<>();
}
return this.oneToMany;
}
@@ -300,7 +300,7 @@ public class Attributes {
*/
public List<OneToOne> getOneToOne() {
if (oneToOne == null) {
- oneToOne = new ArrayList<OneToOne>();
+ oneToOne = new ArrayList<>();
}
return this.oneToOne;
}
@@ -327,13 +327,13 @@ public class Attributes {
*/
public List<ManyToMany> getManyToMany() {
if (manyToMany == null) {
- manyToMany = new ArrayList<ManyToMany>();
+ manyToMany = new ArrayList<>();
}
return this.manyToMany;
}
public Map<String, RelationField> getRelationshipFieldMap() {
- final KeyedCollection<String, RelationField> fields = new KeyedCollection<String, RelationField>();
+ final KeyedCollection<String, RelationField> fields = new KeyedCollection<>();
if (oneToOne != null) fields.addAll(oneToOne);
if (oneToMany != null) fields.addAll(oneToMany);
if (manyToMany != null) fields.addAll(manyToMany);
@@ -363,7 +363,7 @@ public class Attributes {
*/
public List<ElementCollection> getElementCollection() {
if (elementCollection == null) {
- elementCollection = new ArrayList<ElementCollection>();
+ elementCollection = new ArrayList<>();
}
return this.elementCollection;
}
@@ -390,7 +390,7 @@ public class Attributes {
*/
public List<Embedded> getEmbedded() {
if (embedded == null) {
- embedded = new ArrayList<Embedded>();
+ embedded = new ArrayList<>();
}
return this.embedded;
}
@@ -417,7 +417,7 @@ public class Attributes {
*/
public List<Transient> getTransient() {
if (_transient == null) {
- _transient = new ArrayList<Transient>();
+ _transient = new ArrayList<>();
}
return this._transient;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/CollectionTable.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/CollectionTable.java
index eb832d175e..b0bf78e0b9 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/CollectionTable.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/CollectionTable.java
@@ -98,7 +98,7 @@ public class CollectionTable {
*/
public List<JoinColumn> getJoinColumn() {
if (joinColumn == null) {
- joinColumn = new ArrayList<JoinColumn>();
+ joinColumn = new ArrayList<>();
}
return this.joinColumn;
}
@@ -125,7 +125,7 @@ public class CollectionTable {
*/
public List<UniqueConstraint> getUniqueConstraint() {
if (uniqueConstraint == null) {
- uniqueConstraint = new ArrayList<UniqueConstraint>();
+ uniqueConstraint = new ArrayList<>();
}
return this.uniqueConstraint;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/ElementCollection.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/ElementCollection.java
index 2219ccb19f..2a1a785fe0 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/ElementCollection.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/ElementCollection.java
@@ -288,7 +288,7 @@ public class ElementCollection {
*/
public List<AttributeOverride> getMapKeyAttributeOverride() {
if (mapKeyAttributeOverride == null) {
- mapKeyAttributeOverride = new ArrayList<AttributeOverride>();
+ mapKeyAttributeOverride = new ArrayList<>();
}
return this.mapKeyAttributeOverride;
}
@@ -335,7 +335,7 @@ public class ElementCollection {
*/
public List<MapKeyJoinColumn> getMapKeyJoinColumn() {
if (mapKeyJoinColumn == null) {
- mapKeyJoinColumn = new ArrayList<MapKeyJoinColumn>();
+ mapKeyJoinColumn = new ArrayList<>();
}
return this.mapKeyJoinColumn;
}
@@ -442,7 +442,7 @@ public class ElementCollection {
*/
public List<AttributeOverride> getAttributeOverride() {
if (attributeOverride == null) {
- attributeOverride = new ArrayList<AttributeOverride>();
+ attributeOverride = new ArrayList<>();
}
return this.attributeOverride;
}
@@ -469,7 +469,7 @@ public class ElementCollection {
*/
public List<AssociationOverride> getAssociationOverride() {
if (associationOverride == null) {
- associationOverride = new ArrayList<AssociationOverride>();
+ associationOverride = new ArrayList<>();
}
return this.associationOverride;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/EmbeddableAttributes.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/EmbeddableAttributes.java
index 4944103e55..484f6916eb 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/EmbeddableAttributes.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/EmbeddableAttributes.java
@@ -99,7 +99,7 @@ public class EmbeddableAttributes {
*/
public List<Basic> getBasic() {
if (basic == null) {
- basic = new ArrayList<Basic>();
+ basic = new ArrayList<>();
}
return this.basic;
}
@@ -126,7 +126,7 @@ public class EmbeddableAttributes {
*/
public List<ManyToOne> getManyToOne() {
if (manyToOne == null) {
- manyToOne = new ArrayList<ManyToOne>();
+ manyToOne = new ArrayList<>();
}
return this.manyToOne;
}
@@ -153,7 +153,7 @@ public class EmbeddableAttributes {
*/
public List<OneToMany> getOneToMany() {
if (oneToMany == null) {
- oneToMany = new ArrayList<OneToMany>();
+ oneToMany = new ArrayList<>();
}
return this.oneToMany;
}
@@ -180,7 +180,7 @@ public class EmbeddableAttributes {
*/
public List<OneToOne> getOneToOne() {
if (oneToOne == null) {
- oneToOne = new ArrayList<OneToOne>();
+ oneToOne = new ArrayList<>();
}
return this.oneToOne;
}
@@ -207,7 +207,7 @@ public class EmbeddableAttributes {
*/
public List<ManyToMany> getManyToMany() {
if (manyToMany == null) {
- manyToMany = new ArrayList<ManyToMany>();
+ manyToMany = new ArrayList<>();
}
return this.manyToMany;
}
@@ -234,7 +234,7 @@ public class EmbeddableAttributes {
*/
public List<ElementCollection> getElementCollection() {
if (elementCollection == null) {
- elementCollection = new ArrayList<ElementCollection>();
+ elementCollection = new ArrayList<>();
}
return this.elementCollection;
}
@@ -261,7 +261,7 @@ public class EmbeddableAttributes {
*/
public List<Embedded> getEmbedded() {
if (embedded == null) {
- embedded = new ArrayList<Embedded>();
+ embedded = new ArrayList<>();
}
return this.embedded;
}
@@ -288,7 +288,7 @@ public class EmbeddableAttributes {
*/
public List<Transient> getTransient() {
if (_transient == null) {
- _transient = new ArrayList<Transient>();
+ _transient = new ArrayList<>();
}
return this._transient;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/Embedded.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/Embedded.java
index 429b9333f1..eb3f26fc12 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/Embedded.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/Embedded.java
@@ -89,7 +89,7 @@ public class Embedded {
*/
public List<AttributeOverride> getAttributeOverride() {
if (attributeOverride == null) {
- attributeOverride = new ArrayList<AttributeOverride>();
+ attributeOverride = new ArrayList<>();
}
return this.attributeOverride;
}
@@ -116,7 +116,7 @@ public class Embedded {
*/
public List<AssociationOverride> getAssociationOverride() {
if (associationOverride == null) {
- associationOverride = new ArrayList<AssociationOverride>();
+ associationOverride = new ArrayList<>();
}
return this.associationOverride;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/EmbeddedId.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/EmbeddedId.java
index 544a96a671..52a42ce3e9 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/EmbeddedId.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/EmbeddedId.java
@@ -85,7 +85,7 @@ public class EmbeddedId {
*/
public List<AttributeOverride> getAttributeOverride() {
if (attributeOverride == null) {
- attributeOverride = new ArrayList<AttributeOverride>();
+ attributeOverride = new ArrayList<>();
}
return this.attributeOverride;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/Entity.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/Entity.java
index 7fc1be30ea..fd11f90374 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/Entity.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/Entity.java
@@ -255,7 +255,7 @@ public class Entity implements Mapping, Keyable<String> {
*/
public List<SecondaryTable> getSecondaryTable() {
if (secondaryTable == null) {
- secondaryTable = new ArrayList<SecondaryTable>();
+ secondaryTable = new ArrayList<>();
}
return this.secondaryTable;
}
@@ -282,7 +282,7 @@ public class Entity implements Mapping, Keyable<String> {
*/
public List<PrimaryKeyJoinColumn> getPrimaryKeyJoinColumn() {
if (primaryKeyJoinColumn == null) {
- primaryKeyJoinColumn = new ArrayList<PrimaryKeyJoinColumn>();
+ primaryKeyJoinColumn = new ArrayList<>();
}
return this.primaryKeyJoinColumn;
}
@@ -429,7 +429,7 @@ public class Entity implements Mapping, Keyable<String> {
*/
public List<NamedQuery> getNamedQuery() {
if (namedQuery == null) {
- namedQuery = new ArrayList<NamedQuery>();
+ namedQuery = new ArrayList<>();
}
return this.namedQuery;
}
@@ -456,7 +456,7 @@ public class Entity implements Mapping, Keyable<String> {
*/
public List<NamedNativeQuery> getNamedNativeQuery() {
if (namedNativeQuery == null) {
- namedNativeQuery = new ArrayList<NamedNativeQuery>();
+ namedNativeQuery = new ArrayList<>();
}
return this.namedNativeQuery;
}
@@ -483,7 +483,7 @@ public class Entity implements Mapping, Keyable<String> {
*/
public List<SqlResultSetMapping> getSqlResultSetMapping() {
if (sqlResultSetMapping == null) {
- sqlResultSetMapping = new ArrayList<SqlResultSetMapping>();
+ sqlResultSetMapping = new ArrayList<>();
}
return this.sqlResultSetMapping;
}
@@ -710,7 +710,7 @@ public class Entity implements Mapping, Keyable<String> {
*/
public List<AttributeOverride> getAttributeOverride() {
if (attributeOverride == null) {
- attributeOverride = new ArrayList<AttributeOverride>();
+ attributeOverride = new ArrayList<>();
}
return this.attributeOverride;
}
@@ -737,7 +737,7 @@ public class Entity implements Mapping, Keyable<String> {
*/
public List<AssociationOverride> getAssociationOverride() {
if (associationOverride == null) {
- associationOverride = new ArrayList<AssociationOverride>();
+ associationOverride = new ArrayList<>();
}
return this.associationOverride;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/EntityListeners.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/EntityListeners.java
index 8effadbc31..7b4372b11c 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/EntityListeners.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/EntityListeners.java
@@ -80,7 +80,7 @@ public class EntityListeners {
*/
public List<EntityListener> getEntityListener() {
if (entityListener == null) {
- entityListener = new ArrayList<EntityListener>();
+ entityListener = new ArrayList<>();
}
return this.entityListener;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/EntityMappings.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/EntityMappings.java
index 8c487fe0bb..06a69aaca8 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/EntityMappings.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/EntityMappings.java
@@ -278,7 +278,7 @@ public class EntityMappings {
*/
public List<SequenceGenerator> getSequenceGenerator() {
if (sequenceGenerator == null) {
- sequenceGenerator = new ArrayList<SequenceGenerator>();
+ sequenceGenerator = new ArrayList<>();
}
return this.sequenceGenerator;
}
@@ -305,7 +305,7 @@ public class EntityMappings {
*/
public List<TableGenerator> getTableGenerator() {
if (tableGenerator == null) {
- tableGenerator = new ArrayList<TableGenerator>();
+ tableGenerator = new ArrayList<>();
}
return this.tableGenerator;
}
@@ -332,7 +332,7 @@ public class EntityMappings {
*/
public List<NamedQuery> getNamedQuery() {
if (namedQuery == null) {
- namedQuery = new ArrayList<NamedQuery>();
+ namedQuery = new ArrayList<>();
}
return this.namedQuery;
}
@@ -359,7 +359,7 @@ public class EntityMappings {
*/
public List<NamedNativeQuery> getNamedNativeQuery() {
if (namedNativeQuery == null) {
- namedNativeQuery = new ArrayList<NamedNativeQuery>();
+ namedNativeQuery = new ArrayList<>();
}
return this.namedNativeQuery;
}
@@ -386,7 +386,7 @@ public class EntityMappings {
*/
public List<SqlResultSetMapping> getSqlResultSetMapping() {
if (sqlResultSetMapping == null) {
- sqlResultSetMapping = new ArrayList<SqlResultSetMapping>();
+ sqlResultSetMapping = new ArrayList<>();
}
return this.sqlResultSetMapping;
}
@@ -413,7 +413,7 @@ public class EntityMappings {
*/
public Collection<MappedSuperclass> getMappedSuperclass() {
if (mappedSuperclass == null) {
- mappedSuperclass = new KeyedCollection<String, MappedSuperclass>();
+ mappedSuperclass = new KeyedCollection<>();
}
return this.mappedSuperclass;
}
@@ -444,7 +444,7 @@ public class EntityMappings {
*/
public Collection<Entity> getEntity() {
if (entity == null) {
- entity = new KeyedCollection<String, Entity>();
+ entity = new KeyedCollection<>();
}
return this.entity;
}
@@ -475,7 +475,7 @@ public class EntityMappings {
*/
public List<Embeddable> getEmbeddable() {
if (embeddable == null) {
- embeddable = new ArrayList<Embeddable>();
+ embeddable = new ArrayList<>();
}
return this.embeddable;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/EntityResult.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/EntityResult.java
index 1afbb37d41..969a2ace3e 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/EntityResult.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/EntityResult.java
@@ -89,7 +89,7 @@ public class EntityResult {
*/
public List<FieldResult> getFieldResult() {
if (fieldResult == null) {
- fieldResult = new ArrayList<FieldResult>();
+ fieldResult = new ArrayList<>();
}
return this.fieldResult;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/JoinTable.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/JoinTable.java
index 8f70bee435..b40acf2348 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/JoinTable.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/JoinTable.java
@@ -103,7 +103,7 @@ public class JoinTable {
*/
public List<JoinColumn> getJoinColumn() {
if (joinColumn == null) {
- joinColumn = new ArrayList<JoinColumn>();
+ joinColumn = new ArrayList<>();
}
return this.joinColumn;
}
@@ -130,7 +130,7 @@ public class JoinTable {
*/
public List<JoinColumn> getInverseJoinColumn() {
if (inverseJoinColumn == null) {
- inverseJoinColumn = new ArrayList<JoinColumn>();
+ inverseJoinColumn = new ArrayList<>();
}
return this.inverseJoinColumn;
}
@@ -157,7 +157,7 @@ public class JoinTable {
*/
public List<UniqueConstraint> getUniqueConstraint() {
if (uniqueConstraint == null) {
- uniqueConstraint = new ArrayList<UniqueConstraint>();
+ uniqueConstraint = new ArrayList<>();
}
return this.uniqueConstraint;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/ManyToMany.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/ManyToMany.java
index 219f834842..afd8bb10f1 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/ManyToMany.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/ManyToMany.java
@@ -273,7 +273,7 @@ public class ManyToMany implements RelationField {
*/
public List<AttributeOverride> getMapKeyAttributeOverride() {
if (mapKeyAttributeOverride == null) {
- mapKeyAttributeOverride = new ArrayList<AttributeOverride>();
+ mapKeyAttributeOverride = new ArrayList<>();
}
return this.mapKeyAttributeOverride;
}
@@ -320,7 +320,7 @@ public class ManyToMany implements RelationField {
*/
public List<MapKeyJoinColumn> getMapKeyJoinColumn() {
if (mapKeyJoinColumn == null) {
- mapKeyJoinColumn = new ArrayList<MapKeyJoinColumn>();
+ mapKeyJoinColumn = new ArrayList<>();
}
return this.mapKeyJoinColumn;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/ManyToOne.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/ManyToOne.java
index 3469ec3054..fe2e59e8cf 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/ManyToOne.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/ManyToOne.java
@@ -119,7 +119,7 @@ public class ManyToOne implements RelationField {
*/
public List<JoinColumn> getJoinColumn() {
if (joinColumn == null) {
- joinColumn = new ArrayList<JoinColumn>();
+ joinColumn = new ArrayList<>();
}
return this.joinColumn;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/NamedNativeQuery.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/NamedNativeQuery.java
index 9271f73735..3c37263c80 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/NamedNativeQuery.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/NamedNativeQuery.java
@@ -140,7 +140,7 @@ public class NamedNativeQuery {
*/
public List<QueryHint> getHint() {
if (hint == null) {
- hint = new ArrayList<QueryHint>();
+ hint = new ArrayList<>();
}
return this.hint;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/NamedQuery.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/NamedQuery.java
index 122db56cf8..f553edd9df 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/NamedQuery.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/NamedQuery.java
@@ -157,7 +157,7 @@ public class NamedQuery {
*/
public List<QueryHint> getHint() {
if (hint == null) {
- hint = new ArrayList<QueryHint>();
+ hint = new ArrayList<>();
}
return this.hint;
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/OneToMany.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/OneToMany.java
index 5df5320642..7278ada472 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/OneToMany.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/OneToMany.java
@@ -280,7 +280,7 @@ public class OneToMany implements RelationField {
*/
public List<AttributeOverride> getMapKeyAttributeOverride() {
if (mapKeyAttributeOverride == null) {
- mapKeyAttributeOverride = new ArrayList<AttributeOverride>();
... 9582 lines suppressed ...