From commits-return-44284-archive-asf-public=cust-asf.ponee.io@tomee.apache.org Tue Dec 4 05:54:37 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 184561807AC for ; Tue, 4 Dec 2018 05:54:34 +0100 (CET) Received: (qmail 24953 invoked by uid 500); 4 Dec 2018 04:54:34 -0000 Mailing-List: contact commits-help@tomee.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tomee.apache.org Delivered-To: mailing list commits@tomee.apache.org Received: (qmail 24308 invoked by uid 99); 4 Dec 2018 04:54:33 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Dec 2018 04:54:33 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C5610E13D8; Tue, 4 Dec 2018 04:54:32 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dblevins@apache.org To: commits@tomee.apache.org Date: Tue, 04 Dec 2018 04:54:42 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [11/12] tomee git commit: Added diamond operator usage to the OpenEJB Container Core project, where appropriate Added diamond operator usage to the OpenEJB Container Core project, where appropriate Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/bfb1ed40 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/bfb1ed40 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/bfb1ed40 Branch: refs/heads/master Commit: bfb1ed40c211e5cf94d53f1230624320e8587349 Parents: 55b7e2b Author: David R. Heffelfinger Authored: Sat Dec 1 15:28:24 2018 -0500 Committer: David R. Heffelfinger Committed: Sat Dec 1 15:28:24 2018 -0500 ---------------------------------------------------------------------- .../java/org/apache/openejb/AppContext.java | 8 +-- .../java/org/apache/openejb/BeanContext.java | 76 ++++++++++---------- .../org/apache/openejb/ClassLoaderUtil.java | 8 +-- .../org/apache/openejb/DeploymentContext.java | 2 +- .../org/apache/openejb/InjectionProcessor.java | 4 +- .../java/org/apache/openejb/MethodContext.java | 6 +- .../org/apache/openejb/OpenEjbContainer.java | 4 +- .../org/apache/openejb/UndeployException.java | 2 +- .../openejb/assembler/classic/AppInfo.java | 34 ++++----- .../openejb/assembler/classic/Assembler.java | 62 ++++++++-------- .../assembler/classic/ClassListInfo.java | 2 +- .../openejb/assembler/classic/ClientInfo.java | 10 +-- .../assembler/classic/CmpJarBuilder.java | 2 +- .../assembler/classic/ConnectorInfo.java | 12 ++-- .../assembler/classic/ContainerSystemInfo.java | 6 +- .../classic/DelegatePermissionCollection.java | 4 +- .../assembler/classic/DeployTimeEnhancer.java | 10 +-- .../assembler/classic/EjbJarBuilder.java | 2 +- .../openejb/assembler/classic/EjbJarInfo.java | 24 +++---- .../openejb/assembler/classic/EjbResolver.java | 8 +-- .../classic/EnterpriseBeanBuilder.java | 10 +-- .../assembler/classic/EnterpriseBeanInfo.java | 28 ++++---- .../assembler/classic/EntityBeanInfo.java | 6 +- .../classic/EntityManagerFactoryCallable.java | 2 +- .../assembler/classic/FacilitiesInfo.java | 10 +-- .../assembler/classic/HandlerChainInfo.java | 4 +- .../openejb/assembler/classic/HandlerInfo.java | 4 +- .../assembler/classic/InjectableInfo.java | 2 +- .../assembler/classic/InjectionBuilder.java | 2 +- .../classic/InterceptorBindingBuilder.java | 18 ++--- .../classic/InterceptorBindingInfo.java | 4 +- .../assembler/classic/InterceptorInfo.java | 18 ++--- .../classic/JaccPermissionsBuilder.java | 4 +- .../openejb/assembler/classic/JndiBuilder.java | 18 ++--- .../assembler/classic/JndiEncBuilder.java | 4 +- .../openejb/assembler/classic/JndiEncInfo.java | 16 ++--- .../assembler/classic/ManagedBeanInfo.java | 6 +- .../classic/MessageDrivenBeanInfo.java | 2 +- .../assembler/classic/MethodAttributeInfo.java | 2 +- .../classic/MethodConcurrencyBuilder.java | 4 +- .../assembler/classic/MethodInfoUtil.java | 26 +++---- .../assembler/classic/MethodPermissionInfo.java | 2 +- .../assembler/classic/MethodScheduleInfo.java | 2 +- .../classic/MethodTransactionBuilder.java | 2 +- .../assembler/classic/PersistenceUnitInfo.java | 8 +-- .../assembler/classic/PolicyContext.java | 2 +- .../openejb/assembler/classic/PortInfo.java | 2 +- .../classic/ProxyInterfaceResolver.java | 8 +-- .../openejb/assembler/classic/ServiceInfo.java | 2 +- .../assembler/classic/ServiceReferenceInfo.java | 4 +- .../openejb/assembler/classic/ServletInfo.java | 4 +- .../assembler/classic/StatefulBeanInfo.java | 14 ++-- .../assembler/classic/ValidatorBuilder.java | 2 +- .../openejb/assembler/classic/WebAppInfo.java | 24 +++---- .../openejb/assembler/classic/WsBuilder.java | 4 +- .../assembler/classic/util/ServiceInfos.java | 2 +- .../apache/openejb/async/AsynchronousPool.java | 2 +- .../org/apache/openejb/bval/ValidatorUtil.java | 2 +- .../org/apache/openejb/cdi/CdiBeanInfo.java | 50 ++++++------- .../java/org/apache/openejb/cdi/CdiEjbBean.java | 12 ++-- .../java/org/apache/openejb/cdi/CdiPlugin.java | 16 ++--- .../cdi/CdiResourceInjectionService.java | 2 +- .../openejb/cdi/ConstructorInjectionBean.java | 2 +- .../openejb/cdi/CurrentCreationalContext.java | 2 +- .../apache/openejb/cdi/OpenEJBBeanBuilder.java | 2 +- .../openejb/cdi/OptimizedLoaderService.java | 2 +- .../CompositeClassLoaderConfigurer.java | 2 +- .../ProvisioningClassLoaderConfigurer.java | 4 +- .../java/org/apache/openejb/cli/MainImpl.java | 2 +- .../openejb/component/ClassLoaderEnricher.java | 2 +- .../openejb/config/AnnotationDeployer.java | 72 +++++++++---------- .../config/AppContextConfigDeployer.java | 2 +- .../apache/openejb/config/AppInfoBuilder.java | 10 +-- .../org/apache/openejb/config/AppModule.java | 34 ++++----- .../org/apache/openejb/config/AppValidator.java | 2 +- .../org/apache/openejb/config/AutoConfig.java | 44 ++++++------ .../org/apache/openejb/config/AutoDeployer.java | 8 +-- .../openejb/config/BaseConvertDefinitions.java | 2 +- .../apache/openejb/config/BeanProperties.java | 2 +- .../apache/openejb/config/CleanEnvEntries.java | 2 +- .../openejb/config/ClearEmptyMappedName.java | 2 +- .../org/apache/openejb/config/ClientModule.java | 6 +- .../apache/openejb/config/CmpJpaConversion.java | 18 ++--- .../config/ConfigurableClasspathArchive.java | 4 +- .../openejb/config/ConfigurationFactory.java | 26 +++---- .../apache/openejb/config/ConnectorModule.java | 4 +- .../apache/openejb/config/ContainerUtils.java | 2 +- .../config/ConvertDataSourceDefinitions.java | 4 +- .../openejb/config/DebuggableVmHackery.java | 4 +- .../apache/openejb/config/DeploymentLoader.java | 68 +++++++++--------- .../apache/openejb/config/DeploymentModule.java | 2 +- .../openejb/config/DeploymentsResolver.java | 4 +- .../config/EnvEntriesPropertiesDeployer.java | 2 +- .../apache/openejb/config/FinderFactory.java | 6 +- .../openejb/config/GeneratedClientModules.java | 2 +- .../openejb/config/InitEjbDeployments.java | 6 +- .../openejb/config/JndiEncInfoBuilder.java | 6 +- .../apache/openejb/config/LinkBuiltInTypes.java | 4 +- .../apache/openejb/config/MBeanDeployer.java | 4 +- .../java/org/apache/openejb/config/Module.java | 4 +- .../apache/openejb/config/NewLoaderLogic.java | 12 ++-- .../config/OpenEJBDeploymentManager.java | 12 ++-- .../openejb/config/OpenEjb2Conversion.java | 10 +-- .../config/PersistenceContextAnnFactory.java | 8 +-- .../openejb/config/PersistenceModule.java | 2 +- .../config/PersistenceUnitLinkResolver.java | 2 +- .../openejb/config/QuickServerXmlParser.java | 2 +- .../org/apache/openejb/config/RemoteServer.java | 6 +- .../openejb/config/RemoveWebServices.java | 2 +- .../org/apache/openejb/config/ScanUtil.java | 4 +- .../org/apache/openejb/config/ServiceUtils.java | 2 +- .../apache/openejb/config/SunConversion.java | 36 +++++----- .../org/apache/openejb/config/TldScanner.java | 12 ++-- .../openejb/config/ValidationContext.java | 6 +- .../openejb/config/VmDeploymentManager.java | 10 +-- .../org/apache/openejb/config/WebModule.java | 20 +++--- .../openejb/config/WebappAggregatedArchive.java | 2 +- .../org/apache/openejb/config/WsDeployer.java | 6 +- .../config/provider/ProviderManager.java | 16 ++--- .../config/provider/ServiceJarXmlLoader.java | 6 +- .../config/rules/CheckAssemblyBindings.java | 6 +- .../openejb/config/rules/CheckAsynchronous.java | 2 +- .../openejb/config/rules/CheckCallbacks.java | 2 +- .../openejb/config/rules/CheckClassLoading.java | 8 +-- .../openejb/config/rules/CheckDependsOn.java | 8 +-- .../config/rules/CheckDescriptorLocation.java | 4 +- .../config/rules/CheckInjectionTargets.java | 2 +- .../openejb/config/rules/CheckMethods.java | 8 +-- .../config/rules/CheckRestMethodArePublic.java | 4 +- .../apache/openejb/config/sys/JaxbOpenejb.java | 2 +- .../apache/openejb/config/sys/ListAdapter.java | 2 +- .../org/apache/openejb/config/sys/Openejb.java | 2 +- .../apache/openejb/config/sys/Resources.java | 10 +-- .../openejb/config/sys/SaxAppCtxConfig.java | 6 +- .../apache/openejb/config/sys/SaxOpenejb.java | 2 +- .../openejb/config/sys/ServiceProvider.java | 2 +- .../apache/openejb/config/sys/ServicesJar.java | 2 +- .../openejb/config/sys/WikiGenerator.java | 4 +- .../openejb/config/typed/util/ObjectMap.java | 4 +- .../config/typed/util/ProviderGenerator.java | 4 +- .../apache/openejb/core/BaseSessionContext.java | 10 +-- .../openejb/core/CoreContainerSystem.java | 12 ++-- ...impleTransactionSynchronizationRegistry.java | 4 +- .../org/apache/openejb/core/ThreadContext.java | 2 +- .../org/apache/openejb/core/WebContext.java | 4 +- .../apache/openejb/core/cmp/CmpContainer.java | 12 ++-- .../openejb/core/cmp/ComplexKeyGenerator.java | 2 +- .../openejb/core/cmp/cmp2/Cmp2Generator.java | 8 +-- .../apache/openejb/core/cmp/cmp2/CmrSet.java | 2 +- .../openejb/core/cmp/cmp2/SetValuedCmr.java | 2 +- .../openejb/core/cmp/jpa/JpaCmpEngine.java | 2 +- .../openejb/core/entity/EntityContainer.java | 6 +- .../openejb/core/entity/EntityContext.java | 4 +- .../core/entity/EntityInstanceManager.java | 2 +- .../openejb/core/entity/EntrancyTracker.java | 4 +- .../core/interceptor/InterceptorData.java | 20 +++--- .../core/interceptor/InterceptorStack.java | 2 +- .../ReflectionInvocationContext.java | 2 +- .../openejb/core/ivm/BaseEjbProxyHandler.java | 10 +-- .../openejb/core/ivm/EjbHomeProxyHandler.java | 6 +- .../openejb/core/ivm/EjbObjectProxyHandler.java | 2 +- .../openejb/core/ivm/IntraVmArtifact.java | 2 +- .../ivm/naming/AbstractThreadLocalProxy.java | 2 +- .../ivm/naming/ContextualJndiReference.java | 4 +- .../openejb/core/ivm/naming/IvmContext.java | 6 +- .../core/ivm/naming/JaxWsServiceReference.java | 8 +-- .../apache/openejb/core/managed/Instance.java | 4 +- .../openejb/core/managed/ManagedContainer.java | 18 ++--- .../openejb/core/managed/SimpleCache.java | 8 +-- .../openejb/core/mdb/EndpointFactory.java | 2 +- .../apache/openejb/core/mdb/MdbContainer.java | 4 +- .../openejb/core/mdb/MdbInstanceManager.java | 6 +- .../openejb/core/mdb/MdbPoolContainer.java | 4 +- .../core/security/AbstractSecurityService.java | 6 +- .../core/security/jaas/SQLLoginModule.java | 6 +- .../core/security/jaas/ScriptLoginModule.java | 4 +- .../jaas/ServiceProviderLoginModule.java | 4 +- .../core/security/jacc/BasicJaccProvider.java | 2 +- .../security/jacc/BasicPolicyConfiguration.java | 2 +- .../core/singleton/SingletonContainer.java | 10 +-- .../singleton/SingletonInstanceManager.java | 6 +- .../apache/openejb/core/stateful/Instance.java | 4 +- .../openejb/core/stateful/SimpleCache.java | 8 +-- .../core/stateful/StatefulContainer.java | 14 ++-- .../core/stateless/StatelessContainer.java | 10 +-- .../stateless/StatelessInstanceManager.java | 4 +- .../openejb/core/timer/EJBCronTrigger.java | 16 ++--- .../openejb/core/timer/EjbTimerServiceImpl.java | 4 +- .../openejb/core/timer/MemoryTimerStore.java | 18 ++--- .../core/transaction/JtaTransactionPolicy.java | 8 +-- .../core/webservices/HandlerChainData.java | 4 +- .../openejb/core/webservices/HandlerData.java | 8 +-- .../core/webservices/HandlerResolverImpl.java | 16 ++--- .../webservices/PortAddressRegistryImpl.java | 18 ++--- .../openejb/core/webservices/PortData.java | 4 +- .../openejb/core/webservices/PortRefData.java | 2 +- .../core/webservices/ProviderWrapper.java | 2 +- .../core/webservices/ServiceRefData.java | 4 +- .../apache/openejb/dyni/DynamicSubclass.java | 2 +- .../org/apache/openejb/log/ColorFormatter.java | 2 +- .../apache/openejb/log/logger/Log4jLogger.java | 2 +- .../openejb/monitoring/DynamicMBeanWrapper.java | 12 ++-- .../apache/openejb/monitoring/ManagedMBean.java | 14 ++-- .../openejb/monitoring/ObjectNameBuilder.java | 2 +- .../openejb/monitoring/StatsInterceptor.java | 2 +- .../remote/RemoteResourceMonitor.java | 4 +- .../openejb/persistence/JtaEntityManager.java | 2 +- .../persistence/JtaEntityManagerRegistry.java | 2 +- .../apache/openejb/persistence/JtaQuery.java | 2 +- .../persistence/PersistenceBootstrap.java | 8 +-- .../persistence/PersistenceUnitInfoImpl.java | 6 +- .../openejb/resource/AutoConnectionTracker.java | 10 +-- .../resource/activemq/ActiveMQ5Factory.java | 4 +- .../resource/jdbc/DataSourceFactory.java | 2 +- .../resource/jdbc/driver/AlternativeDriver.java | 2 +- .../logging/LoggingPreparedSqlStatement.java | 2 +- .../jdbc/pool/PoolDataSourceCreator.java | 2 +- .../jdbc/pool/XADataSourceResource.java | 2 +- .../resource/jdbc/router/FailOverRouter.java | 2 +- .../resource/quartz/QuartzResourceAdapter.java | 8 +-- .../rest/AbstractRestThreadLocalProxy.java | 2 +- ...MultivaluedMapWithCaseInsensitiveKeySet.java | 2 +- .../openejb/rest/ThreadLocalHttpHeaders.java | 2 +- .../openejb/ri/sp/PseudoTransactionService.java | 14 ++-- .../java/org/apache/openejb/table/Lines.java | 2 +- .../openejb/testing/ApplicationComposers.java | 30 ++++---- .../openejb/testng/PropertiesBuilder.java | 2 +- .../impl/ManagedExecutorServiceImpl.java | 2 +- .../ManagedScheduledExecutorServiceImpl.java | 12 ++-- .../apache/openejb/util/AnnotationFinder.java | 10 +-- .../apache/openejb/util/AsynchronousRunner.java | 2 +- .../java/org/apache/openejb/util/Classes.java | 4 +- .../java/org/apache/openejb/util/Debug.java | 14 ++-- .../apache/openejb/util/DirectoryMonitor.java | 4 +- .../java/org/apache/openejb/util/Duration.java | 2 +- .../apache/openejb/util/ExecutorBuilder.java | 8 +-- .../java/org/apache/openejb/util/Index.java | 20 +++--- .../openejb/util/IntrospectionSupport.java | 4 +- .../main/java/org/apache/openejb/util/Join.java | 2 +- .../org/apache/openejb/util/LinkResolver.java | 6 +- .../apache/openejb/util/ListConfigurator.java | 2 +- .../openejb/util/Log4jLogStreamFactory.java | 2 +- .../java/org/apache/openejb/util/Logger.java | 2 +- .../java/org/apache/openejb/util/Memoizer.java | 4 +- .../java/org/apache/openejb/util/Messages.java | 2 +- .../apache/openejb/util/ObjectRecipeHelper.java | 2 +- .../apache/openejb/util/OpenEJBScripter.java | 2 +- .../apache/openejb/util/PojoSerialization.java | 2 +- .../main/java/org/apache/openejb/util/Pool.java | 2 +- .../apache/openejb/util/PropertiesHelper.java | 2 +- .../org/apache/openejb/util/References.java | 20 +++--- .../apache/openejb/util/SimpleJSonParser.java | 4 +- .../apache/openejb/util/SuperProperties.java | 16 ++--- .../org/apache/openejb/util/URISupport.java | 6 +- .../java/org/apache/openejb/util/UrlCache.java | 10 +-- .../org/apache/openejb/util/UrlComparator.java | 2 +- .../openejb/util/proxy/Jdk13ProxyFactory.java | 2 +- .../util/proxy/LocalBeanProxyFactory.java | 4 +- .../org/apache/openejb/util/proxy/ProxyEJB.java | 2 +- .../apache/openejb/util/proxy/QueryProxy.java | 6 +- .../openejb/web/LightweightWebAppBuilder.java | 22 +++--- .../openejb/DependenceValidationTest.java | 2 +- .../org/apache/openejb/DependencyVisitor.java | 8 +-- .../apache/openejb/OpenEjbContainerTest.java | 4 +- .../openejb/assembler/DeployerEjbTest.java | 2 +- .../assembler/classic/AccessTimeoutTest.java | 4 +- .../classic/AppNamingReadOnlyTest.java | 4 +- .../classic/ConcurrentLockTypeTest.java | 4 +- .../assembler/classic/ConcurrentMethodTest.java | 4 +- .../classic/DataSourceDefinitionTest.java | 2 +- .../DescriptorDataSourceDefinitionTest.java | 2 +- .../InterceptorBindingInfoComparatorTest.java | 10 +-- .../assembler/classic/JdbcConfigTest.java | 4 +- .../assembler/classic/LinkResolverTest.java | 2 +- .../MethodTransactionInfoComparatorTest.java | 6 +- .../OpenEjbConfigurationValidationTest.java | 2 +- .../classic/ResourceInfoComparatorTest.java | 6 +- .../apache/openejb/cdi/BasicObserverTest.java | 2 +- .../apache/openejb/cdi/DependentScopedTest.java | 2 +- .../openejb/config/AnnotationDeployerTest.java | 2 +- .../config/ApplicationPropertiesTest.java | 14 ++-- .../config/AutoConfigMdbContainerTest.java | 2 +- .../config/AutoConfigResourceRefsTest.java | 4 +- .../apache/openejb/config/AutoDeployerTest.java | 2 +- .../openejb/config/BeanPropertiesTest.java | 12 ++-- .../openejb/config/BusinessInterfacesTest.java | 8 +-- .../config/CheckDescriptorLocationTest.java | 6 +- ...escriptorLocationTestFileDeletionHelper.java | 2 +- .../openejb/config/CleanEnvEntriesTest.java | 2 +- .../openejb/config/DeploymentLoaderTest.java | 4 +- .../openejb/config/DeploymentsElementTest.java | 16 ++--- .../openejb/config/EarModuleNamesTest.java | 28 ++++---- .../apache/openejb/config/EarUnpackTest.java | 4 +- .../apache/openejb/config/EjbModuleIdTest.java | 14 ++-- .../openejb/config/JMXDataSourceTest.java | 2 +- .../config/JndiEncInfoBuilderInsertTest.java | 10 +-- .../openejb/config/MBeanDeployerTest.java | 2 +- .../openejb/config/ModulePropertiesTest.java | 10 +-- .../PersistenceContextAnnFactoryTest.java | 2 +- .../openejb/config/ProviderManagerTest.java | 4 +- .../openejb/config/ServiceClasspathTest.java | 6 +- .../openejb/config/SunCmpConversionTest.java | 2 +- .../apache/openejb/config/XmlOverridesTest.java | 2 +- ...CheckInvalidAsynchronousAnnotationsTest.java | 4 +- .../openejb/config/rules/InvokeMethod.java | 10 +-- .../config/rules/KeysAnnotationVisitor.java | 4 +- .../config/rules/ValidationAssertions.java | 2 +- .../config/rules/ValidationKeysAuditorTest.java | 18 ++--- .../openejb/core/InheritedAppExceptionTest.java | 2 +- .../openejb/core/asynch/AsynchInRoleTest.java | 14 ++-- .../apache/openejb/core/asynch/AsynchTest.java | 14 ++-- .../apache/openejb/core/cmp/jpa/AuthorBean.java | 2 +- .../apache/openejb/core/cmp/jpa/BookBean.java | 2 +- .../openejb/core/ivm/naming/IvmContextTest.java | 4 +- .../core/mdb/CustomMdbContainerTest.java | 2 +- .../org/apache/openejb/core/mdb/JmsTest.java | 4 +- .../org/apache/openejb/core/mdb/MdbInvoker.java | 4 +- .../org/apache/openejb/core/mdb/MdbProxy.java | 2 +- .../org/apache/openejb/core/mdb/MdbTest.java | 4 +- .../openejb/core/mdb/NoMessageDeliveryTest.java | 2 +- .../connector/impl/SampleManagedConnection.java | 2 +- .../connector/impl/SampleResourceAdapter.java | 2 +- .../core/singleton/AsyncPostContructTest.java | 6 +- .../stateful/EntityManagerPropogationTest.java | 4 +- .../stateful/StatefulConcurrentLookupTest.java | 2 +- .../core/stateful/StatefulContainerTest.java | 2 +- .../StatefulSecurityPermissionsTest.java | 2 +- .../core/stateless/StatelessPoolStatsTest.java | 12 ++-- .../interceptors/FullyInterceptedBean.java | 4 +- .../interceptors/FullyInterceptedTest.java | 4 +- .../MethodLevelInterceptorOnlySLSBean.java | 2 +- .../MethodLevelInterceptorOnlyTest.java | 2 +- .../SecondStatelessInterceptedBean.java | 2 +- .../SecondStatelessInterceptedTest.java | 2 +- .../openejb/interceptors/ThirdSLSBean.java | 4 +- .../openejb/interceptors/ThirdSLSBeanTest.java | 4 +- .../org/apache/openejb/interceptors/Utils.java | 2 +- .../java/org/apache/openejb/meta/MetaTest.java | 4 +- .../persistence/JtaEntityManagerTest.java | 2 +- .../resource/AutoConnectionTrackerTest.java | 8 +-- .../resource/jdbc/DynamicDataSourceTest.java | 6 +- .../MultiThreadedManagedDataSourceTest.java | 2 +- .../cmr/onetomany/ExampleABean_ABean.java | 4 +- .../entity/cmr/onetoone/ExampleABean_ABean.java | 2 +- .../entity/cmr/onetoone/ExampleBBean_BBean.java | 2 +- .../TransactionRollbackCauseTest.java | 2 +- .../java/org/apache/openejb/util/Archives.java | 2 +- .../apache/openejb/util/DynamicEJBImplTest.java | 4 +- .../org/apache/openejb/util/OptionsTest.java | 2 +- .../java/org/apache/openejb/util/PoolTest.java | 18 ++--- .../org/apache/openejb/util/PropertiesTest.java | 2 +- .../org/apache/openejb/util/ReferencesTest.java | 24 +++---- .../openejb/util/SuperPropertiesTest.java | 2 +- .../apache/openejb/util/UrlComparatorTest.java | 2 +- .../org/apache/openejb/util/WebArchives.java | 2 +- .../util/proxy/LocalBeanProxyFactoryTest.java | 6 +- .../openejb/util/proxy/SampleLocalBean.java | 2 +- 357 files changed, 1240 insertions(+), 1240 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/container/openejb-core/src/main/java/org/apache/openejb/AppContext.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/AppContext.java b/container/openejb-core/src/main/java/org/apache/openejb/AppContext.java index d607e07..47772d2 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/AppContext.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/AppContext.java @@ -43,12 +43,12 @@ public class AppContext extends DeploymentContext { private final boolean standaloneModule; private boolean cdiEnabled; private WebBeansContext webBeansContext; - private final Collection injections = new HashSet(); - private final Map bindings = new HashMap(); + private final Collection injections = new HashSet<>(); + private final Map bindings = new HashMap<>(); // TODO perhaps to be deleted - private final List beanContexts = new ArrayList(); - private final List webContexts = new ArrayList(); + private final List beanContexts = new ArrayList<>(); + private final List webContexts = new ArrayList<>(); public AppContext(final String id, final SystemInstance systemInstance, final ClassLoader classLoader, final Context globalJndiContext, final Context appJndiContext, final boolean standaloneModule) { super(id, systemInstance.getOptions()); http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java b/container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java index 5b9bd79..0b98269 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java @@ -184,8 +184,8 @@ public class BeanContext extends DeploymentContext { final InterceptorData data = createInterceptorData(i); addCdiMethodInterceptor(entry.getKey(), data); } - entry.getValue().setEjbInterceptors(new ArrayList>()); - entry.getValue().setCdiInterceptors(new ArrayList>()); + entry.getValue().setEjbInterceptors(new ArrayList<>()); + entry.getValue().setCdiInterceptors(new ArrayList<>()); } // handled by OpenEJB now so clean up all duplication from OWB @@ -302,8 +302,8 @@ public class BeanContext extends DeploymentContext { private boolean destroyed; private final Class beanClass; - private final List businessLocals = new ArrayList(); - private final List businessRemotes = new ArrayList(); + private final List businessLocals = new ArrayList<>(); + private final List businessRemotes = new ArrayList<>(); private Class serviceEndpointInterface; private Method ejbTimeout; @@ -322,26 +322,26 @@ public class BeanContext extends DeploymentContext { private boolean hidden; //private final Map methodTransactionType = new HashMap(); - private final Map methodMap = new HashMap(); - private final Map methodContextMap = new HashMap(); - private final Map viewContextMap = new HashMap(); + private final Map methodMap = new HashMap<>(); + private final Map methodContextMap = new HashMap<>(); + private final Map viewContextMap = new HashMap<>(); private TransactionPolicyFactory transactionPolicyFactory; - private final List callbackInterceptors = new ArrayList(); - private final List beanCallbackInterceptors = new ArrayList(); - private final Set instanceScopedInterceptors = new HashSet(); - private final List systemInterceptors = new ArrayList(); - private final List userInterceptors = new ArrayList(); - private final List injections = new ArrayList(); - private final Map interfaces = new HashMap(); - private final Map exceptions = new ConcurrentHashMap(); + private final List callbackInterceptors = new ArrayList<>(); + private final List beanCallbackInterceptors = new ArrayList<>(); + private final Set instanceScopedInterceptors = new HashSet<>(); + private final List systemInterceptors = new ArrayList<>(); + private final List userInterceptors = new ArrayList<>(); + private final List injections = new ArrayList<>(); + private final Map interfaces = new HashMap<>(); + private final Map exceptions = new ConcurrentHashMap<>(); private final boolean localbean; private Duration accessTimeout; - private final Set> asynchronousClasses = new HashSet>(); - private final Set asynchronousMethodSignatures = new HashSet(); + private final Set> asynchronousClasses = new HashSet<>(); + private final Set asynchronousMethodSignatures = new HashSet<>(); private Class proxyClass; private Mdb mdb; @@ -350,12 +350,12 @@ public class BeanContext extends DeploymentContext { private Cmp cmp; private LegacyView legacyView; - private final Map securityRoleReferences = new HashMap(); + private final Map securityRoleReferences = new HashMap<>(); /** * TODO: Move to MethodContext */ - private final Map removeExceptionPolicy = new HashMap(); + private final Map removeExceptionPolicy = new HashMap<>(); public Class getInterface(final InterfaceType interfaceType) { switch (interfaceType) { @@ -395,7 +395,7 @@ public class BeanContext extends DeploymentContext { case BUSINESS_LOCAL: return getBusinessLocalInterfaces(); default: - final List interfaces = new ArrayList(); + final List interfaces = new ArrayList<>(); interfaces.add(getInterface(interfaceType)); return interfaces; } @@ -690,7 +690,7 @@ public class BeanContext extends DeploymentContext { return; } - final ArrayList classes = new ArrayList(); + final ArrayList classes = new ArrayList<>(); for (final Class local : businessRemotes) { classes.add(local); @@ -943,7 +943,7 @@ public class BeanContext extends DeploymentContext { } public BusinessLocalBeanHome getBusinessLocalBeanHome() { - final List interfaces = new ArrayList(); + final List interfaces = new ArrayList<>(); interfaces.add(this.beanClass); return (BusinessLocalBeanHome) EjbHomeProxyHandler.createHomeProxy(this, InterfaceType.BUSINESS_LOCALBEAN_HOME, interfaces, this.beanClass); } @@ -1142,12 +1142,12 @@ public class BeanContext extends DeploymentContext { } public List getUserAndSystemInterceptors() { - final List interceptors = new ArrayList(systemInterceptors); + final List interceptors = new ArrayList<>(systemInterceptors); interceptors.addAll(userInterceptors); return interceptors; } - private final Set cdiInterceptors = new LinkedHashSet(); + private final Set cdiInterceptors = new LinkedHashSet<>(); public List getCallbackInterceptors() { final List datas = getInterceptorData(); @@ -1172,7 +1172,7 @@ public class BeanContext extends DeploymentContext { } public List getCdiInterceptors() { - return new ArrayList(cdiInterceptors); + return new ArrayList<>(cdiInterceptors); } public void setCdiInterceptors(final List cdiInterceptors) { @@ -1186,7 +1186,7 @@ public class BeanContext extends DeploymentContext { } public List getInterceptorData() { - final List datas = new ArrayList(getUserAndSystemInterceptors().size()); + final List datas = new ArrayList<>(getUserAndSystemInterceptors().size()); for (final InterceptorInstance instance : getUserAndSystemInterceptors()) { datas.add(instance.getData()); } @@ -1365,11 +1365,11 @@ public class BeanContext extends DeploymentContext { } else if (BusinessRemoteHome.class.isAssignableFrom(homeInterface)) { return getBusinessRemoteInterfaces(); } else if (EJBLocalHome.class.isAssignableFrom(homeInterface)) { - final List classes = new ArrayList(); + final List classes = new ArrayList<>(); classes.add(getLocalInterface()); return classes; } else if (EJBHome.class.isAssignableFrom(homeInterface)) { - final List classes = new ArrayList(); + final List classes = new ArrayList<>(); classes.add(getRemoteInterface()); return classes; } else { @@ -1606,7 +1606,7 @@ public class BeanContext extends DeploymentContext { inject(beanInstance, creationalContext); } else { // update target - final List newInjections = new ArrayList(); + final List newInjections = new ArrayList<>(); for (final Injection injection : getInjections()) { if (beanClass.equals(injection.getTarget())) { final Injection updated = new Injection(injection.getJndiName(), injection.getName(), proxyClass); @@ -1625,7 +1625,7 @@ public class BeanContext extends DeploymentContext { } // Create interceptors - final Map interceptorInstances = new LinkedHashMap(); + final Map interceptorInstances = new LinkedHashMap<>(); // Add the stats interceptor instance and other already created interceptor instances for (final InterceptorInstance interceptorInstance : this.getUserAndSystemInterceptors()) { @@ -1752,7 +1752,7 @@ public class BeanContext extends DeploymentContext { // decorators final Object instance = beanInstance; final List> decorators = interceptorInfo.getDecorators(); - final Map, Object> instances = new HashMap, Object>(); + final Map, Object> instances = new HashMap<>(); for (int i = decorators.size(); i > 0; i--) { final Decorator decorator = decorators.get(i - 1); CreationalContextImpl cc = (CreationalContextImpl) creationalContext; @@ -1798,7 +1798,7 @@ public class BeanContext extends DeploymentContext { synchronized (this) { // concurrentmodificationexception because of annotatedtype internals otherwise if (constructorInjectionBean == null) { - constructorInjectionBean = new ConstructorInjectionBean( + constructorInjectionBean = new ConstructorInjectionBean<>( webBeansContext, getManagedClass(), webBeansContext.getAnnotatedElementFactory().newAnnotatedType(getManagedClass())); } @@ -1891,7 +1891,7 @@ public class BeanContext extends DeploymentContext { public class ViewContext { - private final Map methodContextMap = new HashMap(); + private final Map methodContextMap = new HashMap<>(); public MethodContext getMethodContext(final Method method) { return methodContextMap.get(method); @@ -1962,15 +1962,15 @@ public class BeanContext extends DeploymentContext { private Class cmpImplClass; private String abstractSchemaName; private Class pkClass; - private final Set remoteQueryResults = new TreeSet(); + private final Set remoteQueryResults = new TreeSet<>(); private boolean isReentrant; - private final Map postCreateMethodMap = new HashMap(); + private final Map postCreateMethodMap = new HashMap<>(); } private static class Mdb { private String destinationId; - private final Map activationProperties = new HashMap(); + private final Map activationProperties = new HashMap<>(); private Class mdbInterface; } @@ -1978,14 +1978,14 @@ public class BeanContext extends DeploymentContext { private LockType lockType = LockType.WRITE; private boolean loadOnStartup; - private final Set dependsOn = new LinkedHashSet(); + private final Set dependsOn = new LinkedHashSet<>(); } private static class Stateful { private Index extendedEntityManagerFactories; private Duration statefulTimeout; - private final List removeMethods = new ArrayList(); + private final List removeMethods = new ArrayList<>(); } private static class LegacyView { http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/container/openejb-core/src/main/java/org/apache/openejb/ClassLoaderUtil.java ---------------------------------------------------------------------- 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 63d7319..d36eb60 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 @@ -105,14 +105,14 @@ public class ClassLoaderUtil { private static URLClassLoader cacheClassLoader(final String appId, final URLClassLoader classLoader) { List classLoaders = classLoadersByApp.get(appId); if (classLoaders == null) { - classLoaders = new ArrayList(2); + classLoaders = new ArrayList<>(2); classLoadersByApp.put(appId, classLoaders); } classLoaders.add(classLoader); Set apps = appsByClassLoader.get(classLoader); if (apps == null) { - apps = new LinkedHashSet(1); + apps = new LinkedHashSet<>(1); appsByClassLoader.put(classLoader, apps); } apps.add(appId); @@ -176,7 +176,7 @@ public class ClassLoaderUtil { */ private static List getClosedJarFiles(final ClassLoader cl) { - final List files = new ArrayList(); + final List files = new ArrayList<>(); if (null != cl && cl instanceof URLClassLoader) { @@ -334,7 +334,7 @@ public class ClassLoaderUtil { urls = rawUrls; } else { final CompositeClassLoaderConfigurer configurer = new CompositeClassLoaderConfigurer(configurer1, configurer2, configurer3); - final Collection list = new ArrayList(); + final Collection list = new ArrayList<>(); list.addAll(Arrays.asList(rawUrls)); ClassLoaderConfigurer.Helper.configure(list, configurer); urls = list.toArray(new URL[list.size()]); http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/container/openejb-core/src/main/java/org/apache/openejb/DeploymentContext.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/DeploymentContext.java b/container/openejb-core/src/main/java/org/apache/openejb/DeploymentContext.java index e88fa63..616a52f 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/DeploymentContext.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/DeploymentContext.java @@ -29,7 +29,7 @@ import java.util.Properties; */ public class DeploymentContext { private final String id; - private final Map data = new HashMap(); + private final Map data = new HashMap<>(); private final Properties properties = new SuperProperties().caseInsensitive(true); private final Options options; http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/container/openejb-core/src/main/java/org/apache/openejb/InjectionProcessor.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/InjectionProcessor.java b/container/openejb-core/src/main/java/org/apache/openejb/InjectionProcessor.java index 054d0c1..7cc06ef 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/InjectionProcessor.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/InjectionProcessor.java @@ -43,13 +43,13 @@ public class InjectionProcessor { private static final Logger logger = Logger.getInstance(LogCategory.OPENEJB, InjectionProcessor.class); private final Class beanClass; private final Collection injections; - private final Map properties = new LinkedHashMap(); + private final Map properties = new LinkedHashMap<>(); private final List postConstructMethods; private final List preDestroyMethods; private final Context context; private T instance; private T suppliedInstance; - private final Map bindings = new HashMap(); + private final Map bindings = new HashMap<>(); public InjectionProcessor(final T suppliedInstance, final Collection injections, final Context context) { http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/container/openejb-core/src/main/java/org/apache/openejb/MethodContext.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/MethodContext.java b/container/openejb-core/src/main/java/org/apache/openejb/MethodContext.java index 6814605..71e2e46 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/MethodContext.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/MethodContext.java @@ -35,9 +35,9 @@ import java.util.Set; public class MethodContext { private final BeanContext beanContext; private final Method beanMethod; - private final List schedules = new ArrayList(); - private final List interceptors = new ArrayList(); - private final Set cdiInterceptors = new LinkedHashSet(); + private final List schedules = new ArrayList<>(); + private final List interceptors = new ArrayList<>(); + private final Set cdiInterceptors = new LinkedHashSet<>(); private InterceptorData self = null; private LockType lockType; private TransactionType transactionType; http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java b/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java index 722b1de..fb3cae2 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java @@ -226,7 +226,7 @@ public final class OpenEjbContainer extends EJBContainer { @Override public EJBContainer createEJBContainer(Map map) { if (map == null) { // JBoss EJB API pass null when calling EJBContainer.createEJBContainer() - map = new HashMap(); + map = new HashMap<>(); } if (isOtherProvider(map)) { @@ -278,7 +278,7 @@ public final class OpenEjbContainer extends EJBContainer { final Set callers; if (map.containsKey(OPENEJB_ADDITIONNAL_CALLERS_KEY)) { - callers = new LinkedHashSet(); + callers = new LinkedHashSet<>(); callers.addAll(Arrays.asList(((String) map.get(OPENEJB_ADDITIONNAL_CALLERS_KEY)).split(","))); } else { callers = NewLoaderLogic.callers(); http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/container/openejb-core/src/main/java/org/apache/openejb/UndeployException.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/UndeployException.java b/container/openejb-core/src/main/java/org/apache/openejb/UndeployException.java index f097a75..1eedc58 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/UndeployException.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/UndeployException.java @@ -27,7 +27,7 @@ import java.util.List; */ public class UndeployException extends OpenEJBException { - private final List causes = new ArrayList(); + private final List causes = new ArrayList<>(); public UndeployException() { } http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/AppInfo.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/AppInfo.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/AppInfo.java index 6481792..f5dfeb2 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/AppInfo.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/AppInfo.java @@ -32,29 +32,29 @@ public class AppInfo extends InfoObject { public String appId; public String path; - public Set paths = new LinkedHashSet(); + public Set paths = new LinkedHashSet<>(); public boolean autoDeploy = true; public boolean delegateFirst = true; public boolean standaloneModule; - public final List clients = new ArrayList(); - public final List ejbJars = new ArrayList(); - public final List pojoConfigurations = new ArrayList(); - public final List connectors = new ArrayList(); - public final List webApps = new ArrayList(); - public final List persistenceUnits = new ArrayList(); - public List services = new ArrayList(); - public List containers = new ArrayList(); - public final List libs = new ArrayList(); - public final Set watchedResources = new TreeSet(); - public final Set resourceIds = new TreeSet(); - public final Set resourceAliases = new TreeSet(); + public final List clients = new ArrayList<>(); + public final List ejbJars = new ArrayList<>(); + public final List pojoConfigurations = new ArrayList<>(); + public final List connectors = new ArrayList<>(); + public final List webApps = new ArrayList<>(); + public final List persistenceUnits = new ArrayList<>(); + public List services = new ArrayList<>(); + public List containers = new ArrayList<>(); + public final List libs = new ArrayList<>(); + public final Set watchedResources = new TreeSet<>(); + public final Set resourceIds = new TreeSet<>(); + public final Set resourceAliases = new TreeSet<>(); public final JndiEncInfo globalJndiEnc = new JndiEncInfo(); public final JndiEncInfo appJndiEnc = new JndiEncInfo(); public String cmpMappingsXml; public final Properties jmx = new Properties(); - public final Set mbeans = new TreeSet(); - public final Set jaxRsProviders = new TreeSet(); - public final Set jsfClasses = new TreeSet(); - public final Set eventClassesNeedingAppClassloader = new TreeSet(); + public final Set mbeans = new TreeSet<>(); + public final Set jaxRsProviders = new TreeSet<>(); + public final Set jsfClasses = new TreeSet<>(); + public final Set eventClassesNeedingAppClassloader = new TreeSet<>(); public boolean webAppAlone; } http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java ---------------------------------------------------------------------- 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 e0a5fcb..12cae0b 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 @@ -289,9 +289,9 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A private TransactionManager transactionManager; private SecurityService securityService; protected OpenEjbConfigurationFactory configFactory; - private final Map deployedApplications = new HashMap(); - private final Map creationalContextForAppMbeans = new HashMap(); - private final Set containerObjectNames = new HashSet(); + private final Map deployedApplications = new HashMap<>(); + private final Map creationalContextForAppMbeans = new HashMap<>(); + private final Set containerObjectNames = new HashSet<>(); private final RemoteResourceMonitor remoteResourceMonitor = new RemoteResourceMonitor(); @Override @@ -477,7 +477,7 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A public static Map getContext() { Map map = context.get(); if (map == null) { - map = new HashMap(); + map = new HashMap<>(); context.set(map); } return map; @@ -485,7 +485,7 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A @Override public void build() throws OpenEJBException { - setContext(new HashMap()); + setContext(new HashMap<>()); try { final OpenEjbConfiguration config = getOpenEjbConfiguration(); buildContainerSystem(config); @@ -577,8 +577,8 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A reservedResourceIds.addAll(appInfo.resourceIds); } - final Map appInfoClassLoaders = new HashMap(); - final Map appClassLoaders = new HashMap(); + final Map appInfoClassLoaders = new HashMap<>(); + final Map appClassLoaders = new HashMap<>(); for (final AppInfo appInfo : containerSystemInfo.applications) { appInfoClassLoaders.put(appInfo, createAppClassLoader(appInfo)); @@ -599,12 +599,12 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A } // Containers - create containers using the application's classloader - final Map> appContainers = new HashMap>(); + final Map> appContainers = new HashMap<>(); for (final ContainerInfo serviceInfo : containerSystemInfo.containers) { List containerInfos = appContainers.get(serviceInfo.originAppName); if (containerInfos == null) { - containerInfos = new ArrayList(); + containerInfos = new ArrayList<>(); appContainers.put(serviceInfo.originAppName, containerInfos); } @@ -678,7 +678,7 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A } public Collection getDeployedApplications() { - return new ArrayList(deployedApplications.values()); + return new ArrayList<>(deployedApplications.values()); } public AppContext createApplication(final EjbJarInfo ejbJar) throws NamingException, IOException, OpenEJBException { @@ -808,7 +808,7 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A //Construct the global and app jndi contexts for this app final InjectionBuilder injectionBuilder = new InjectionBuilder(classLoader); - final Set injections = new HashSet(); + final Set injections = new HashSet<>(); injections.addAll(injectionBuilder.buildInjections(appInfo.globalJndiEnc)); injections.addAll(injectionBuilder.buildInjections(appInfo.appJndiEnc)); @@ -840,18 +840,18 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A appContext.set(AsynchronousPool.class, AsynchronousPool.create(appContext)); - final Map lazyValidatorFactories = new HashMap(); - final Map lazyValidators = new HashMap(); + final Map lazyValidatorFactories = new HashMap<>(); + final Map lazyValidators = new HashMap<>(); final boolean isGeronimo = SystemInstance.get().hasProperty("openejb.geronimo"); // try to not create N times the same validator for a single app - final Map validatorFactoriesByConfig = new HashMap(); + final Map validatorFactoriesByConfig = new HashMap<>(); if (!isGeronimo) { // Bean Validation // ValidatorFactory needs to be put in the map sent to the entity manager factory // so it has to be constructed before final List vfs = listCommonInfoObjectsForAppInfo(appInfo); - final Map validatorFactories = new HashMap(); + final Map validatorFactories = new HashMap<>(); for (final CommonInfoObject info : vfs) { if (info.validationInfo == null) { @@ -913,7 +913,7 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A // JPA - Persistence Units MUST be processed first since they will add ClassFileTransformers // to the class loader which must be added before any classes are loaded - final Map units = new HashMap(); + final Map units = new HashMap<>(); final PersistenceBuilder persistenceBuilder = new PersistenceBuilder(persistenceClassLoaderHandler); for (final PersistenceUnitInfo info : appInfo.persistenceUnits) { final ReloadableEntityManagerFactory factory; @@ -956,7 +956,7 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A } } - final List allDeployments = initEjbs(classLoader, appInfo, appContext, injections, new ArrayList(), null); + final List allDeployments = initEjbs(classLoader, appInfo, appContext, injections, new ArrayList<>(), null); if ("true".equalsIgnoreCase(SystemInstance.get() .getProperty(PROPAGATE_APPLICATION_EXCEPTIONS, @@ -1125,7 +1125,7 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A } private List getDuplicates(final AppInfo appInfo) { - final List used = new ArrayList(); + final List used = new ArrayList<>(); for (final EjbJarInfo ejbJarInfo : appInfo.ejbJars) { for (final EnterpriseBeanInfo beanInfo : ejbJarInfo.enterpriseBeans) { if (containerSystem.getBeanContext(beanInfo.ejbDeploymentId) != null) { @@ -1413,7 +1413,7 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A } private static List listCommonInfoObjectsForAppInfo(final AppInfo appInfo) { - final List vfs = new ArrayList( + final List vfs = new ArrayList<>( appInfo.clients.size() + appInfo.connectors.size() + appInfo.ejbJars.size() + appInfo.webApps.size()); for (final ClientInfo clientInfo : appInfo.clients) { @@ -1473,7 +1473,7 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A private void resumePersistentSchedulers(final AppContext appContext) { try { // if quartz is missing final Scheduler globalScheduler = SystemInstance.get().getComponent(Scheduler.class); - final Collection schedulers = new ArrayList(); + final Collection schedulers = new ArrayList<>(); for (final BeanContext ejb : appContext.getBeanContexts()) { final Scheduler scheduler = ejb.get(Scheduler.class); if (scheduler == null || scheduler == globalScheduler || schedulers.contains(scheduler)) { @@ -1586,7 +1586,7 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A // if local bean or mdb generate proxy class now to avoid bottleneck on classloader later if (beanContext.isLocalbean() && !beanContext.getComponentType().isMessageDriven() && !beanContext.isDynamicallyImplemented()) { - final List interfaces = new ArrayList(3); + final List interfaces = new ArrayList<>(3); interfaces.add(Serializable.class); interfaces.add(IntraVmProxy.class); final BeanType type = beanContext.getComponentType(); @@ -1668,7 +1668,7 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A if (start) { SystemInstance.get().fireEvent(new BeforeStartEjbs(allDeployments)); - final Collection toStart = new ArrayList(); + final Collection toStart = new ArrayList<>(); // deploy for (final BeanContext deployment : allDeployments) { @@ -1783,7 +1783,7 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A if (webBeansContext == null) { - final Map, Object> services = new HashMap, Object>(); + final Map, Object> services = new HashMap<>(); services.put(Executor.class, new ManagedExecutorServiceImpl(ForkJoinPool.commonPool())); services.put(JNDIService.class, new OpenEJBJndiService()); @@ -1900,7 +1900,7 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A logger.debug("Undeploying Applications"); final Assembler assembler = this; - final List deployedApps = new ArrayList(assembler.getDeployedApplications()); + final List deployedApps = new ArrayList<>(assembler.getDeployedApplications()); Collections.reverse(deployedApps); // if an app relies on the previous one it surely relies on it too at undeploy time for (final AppInfo appInfo : deployedApps) { try { @@ -2359,7 +2359,7 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A } // get all of the ejb deployments - List deployments = new ArrayList(); + List deployments = new ArrayList<>(); for (final EjbJarInfo ejbJarInfo : appInfo.ejbJars) { for (final EnterpriseBeanInfo beanInfo : ejbJarInfo.enterpriseBeans) { final String deploymentId = beanInfo.ejbDeploymentId; @@ -2419,7 +2419,7 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A } // get the client ids - final List clientIds = new ArrayList(); + final List clientIds = new ArrayList<>(); for (final ClientInfo clientInfo : appInfo.clients) { clientIds.add(clientInfo.moduleId); for (final String className : clientInfo.localClients) { @@ -3173,7 +3173,7 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A if (customLoader) { final Collection> apis; if (serviceInfo.classpathAPI == null) { - apis = new ArrayList>(Arrays.asList(service.getClass().getInterfaces())); + apis = new ArrayList<>(Arrays.asList(service.getClass().getInterfaces())); } else { final String[] split = serviceInfo.classpathAPI.split(" *, *"); apis = new ArrayList<>(split.length); @@ -3225,7 +3225,7 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A final SecurityContextHandler securityContextHandler = new SecurityContextHandler(securityRealmName); final HintsContextHandler hintsContextHandler = new HintsContextHandler(); - final Collection workContextHandlers = new ArrayList(); + final Collection workContextHandlers = new ArrayList<>(); workContextHandlers.add(txWorkContextHandler); workContextHandlers.add(securityContextHandler); workContextHandlers.add(hintsContextHandler); @@ -3306,7 +3306,7 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A final Map unsetA = serviceRecipe.getUnsetProperties(); final Map unsetB = connectionManagerRecipe.getUnsetProperties(); - final Map unset = new HashMap(); + final Map unset = new HashMap<>(); for (final Entry entry : unsetA.entrySet()) { if (unsetB.containsKey(entry.getKey())) { unset.put(entry.getKey(), entry.getValue()); @@ -3787,7 +3787,7 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A private static class PersistenceClassLoaderHandlerImpl implements PersistenceClassLoaderHandler { private static final AtomicBoolean logged = new AtomicBoolean(false); - private final Map> transformers = new TreeMap>(); + private final Map> transformers = new TreeMap<>(); @Override public void addTransformer(final String unitId, final ClassLoader classLoader, final ClassFileTransformer classFileTransformer) { @@ -3798,7 +3798,7 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A if (unitId != null) { List transformers = this.transformers.get(unitId); if (transformers == null) { - transformers = new ArrayList(1); + transformers = new ArrayList<>(1); this.transformers.put(unitId, transformers); } transformers.add(classFileTransformer); http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ClassListInfo.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ClassListInfo.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ClassListInfo.java index 72051a8..50f88f8 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ClassListInfo.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ClassListInfo.java @@ -24,5 +24,5 @@ import java.util.Set; // TODO: find a better name, key can be a classname, a jar/file path... public class ClassListInfo extends InfoObject { public String name; - public final Set list = new HashSet(); + public final Set list = new HashSet<>(); } http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ClientInfo.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ClientInfo.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ClientInfo.java index 15699b1..1951ee7 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ClientInfo.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ClientInfo.java @@ -31,14 +31,14 @@ public class ClientInfo extends CommonInfoObject { public String largeIcon; public String moduleId; public String mainClass; - public final List localClients = new ArrayList(); - public final List remoteClients = new ArrayList(); + public final List localClients = new ArrayList<>(); + public final List remoteClients = new ArrayList<>(); public String callbackHandler; - public final Set watchedResources = new TreeSet(); + public final Set watchedResources = new TreeSet<>(); public final JndiEncInfo jndiEnc = new JndiEncInfo(); - public final List postConstruct = new ArrayList(); - public final List preDestroy = new ArrayList(); + public final List postConstruct = new ArrayList<>(); + public final List preDestroy = new ArrayList<>(); } http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/CmpJarBuilder.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/CmpJarBuilder.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/CmpJarBuilder.java index 5d590a9..d10e17e 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/CmpJarBuilder.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/CmpJarBuilder.java @@ -46,7 +46,7 @@ public class CmpJarBuilder { private final ClassLoader tempClassLoader; private File jarFile; - private final Set entries = new TreeSet(); + private final Set entries = new TreeSet<>(); private final AppInfo appInfo; public CmpJarBuilder(final AppInfo appInfo, final ClassLoader classLoader) { http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ConnectorInfo.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ConnectorInfo.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ConnectorInfo.java index d0db22b..7d60acd 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ConnectorInfo.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ConnectorInfo.java @@ -30,12 +30,12 @@ public class ConnectorInfo extends CommonInfoObject { public String smallIcon; public String largeIcon; public String moduleId; - public final List libs = new ArrayList(); - public final Set watchedResources = new TreeSet(); + public final List libs = new ArrayList<>(); + public final Set watchedResources = new TreeSet<>(); public ResourceInfo resourceAdapter; - public List outbound = new ArrayList(); - public List inbound = new ArrayList(); - public List adminObject = new ArrayList(); - public Set mbeans = new TreeSet(); + public List outbound = new ArrayList<>(); + public List inbound = new ArrayList<>(); + public List adminObject = new ArrayList<>(); + public Set mbeans = new TreeSet<>(); } http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ContainerSystemInfo.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ContainerSystemInfo.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ContainerSystemInfo.java index 5686ed8..c822391 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ContainerSystemInfo.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ContainerSystemInfo.java @@ -22,10 +22,10 @@ import java.util.List; public class ContainerSystemInfo extends InfoObject { - public final List containers = new ArrayList(); + public final List containers = new ArrayList<>(); - public final List applications = new ArrayList(); + public final List applications = new ArrayList<>(); - public final List autoDeploy = new ArrayList(); + public final List autoDeploy = new ArrayList<>(); } http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/DelegatePermissionCollection.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/DelegatePermissionCollection.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/DelegatePermissionCollection.java index d4b365f..81fb9e6 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/DelegatePermissionCollection.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/DelegatePermissionCollection.java @@ -63,8 +63,8 @@ public class DelegatePermissionCollection extends PermissionCollection { public static class FastPermissionCollection extends PermissionCollection { private static final int MAX_CACHE_SIZE = SystemInstance.get().getOptions().get("openejb.permission-collection.cache.size", 3000); - private final List permissions = new ArrayList(); - private final Map alreadyEvaluatedPermissions = new ConcurrentHashMap(); + private final List permissions = new ArrayList<>(); + private final Map alreadyEvaluatedPermissions = new ConcurrentHashMap<>(); @Override public synchronized void add(final Permission permission) { http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/DeployTimeEnhancer.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/DeployTimeEnhancer.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/DeployTimeEnhancer.java index c8239a2..5423885 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/DeployTimeEnhancer.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/DeployTimeEnhancer.java @@ -88,8 +88,8 @@ public class DeployTimeEnhancer { } // find persistence.xml - final Map> classesByPXml = new HashMap>(); - final List usedUrls = new ArrayList(); // for fake classloader + final Map> classesByPXml = new HashMap<>(); + final List usedUrls = new ArrayList<>(); // for fake classloader for (final URL url : event.getUrls()) { final File file = URLs.toFile(url); if (file.isDirectory()) { @@ -196,7 +196,7 @@ public class DeployTimeEnhancer { } private void feed(final Map> classesByPXml, final String pXml) { - final List paths = new ArrayList(); + final List paths = new ArrayList<>(); // first add the classes directory where is the persistence.xml if (pXml.endsWith(META_INF_PERSISTENCE_XML)) { @@ -242,7 +242,7 @@ public class DeployTimeEnhancer { } private String[] toFilePaths(final List urls) { - final List files = new ArrayList(); + final List files = new ArrayList<>(); for (final String url : urls) { final File dir = new File(url); if (!dir.isDirectory()) { @@ -275,7 +275,7 @@ public class DeployTimeEnhancer { } private static class JarFileParser extends DefaultHandler { - private final List paths = new ArrayList(); + private final List paths = new ArrayList<>(); private boolean getIt; @Override http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbJarBuilder.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbJarBuilder.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbJarBuilder.java index 832e740..d1999b3 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbJarBuilder.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbJarBuilder.java @@ -50,7 +50,7 @@ public class EjbJarBuilder { final Context moduleJndiContext = new JndiEncBuilder(ejbJar.moduleJndiEnc, moduleInjections, null, ejbJar.moduleName, ejbJar.moduleUri, ejbJar.uniqueId, classLoader, context.getProperties()) .build(JndiEncBuilder.JndiScope.module); - final HashMap deployments = new HashMap(); + final HashMap deployments = new HashMap<>(); final ModuleContext moduleContext = !ejbJar.properties.containsKey("openejb.test.module") ? new ModuleContext(ejbJar.moduleName, ejbJar.moduleUri, ejbJar.uniqueId, context, moduleJndiContext, classLoader) : http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbJarInfo.java ---------------------------------------------------------------------- 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 91e8b76..3e50b53 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 @@ -45,19 +45,19 @@ public class EjbJarInfo extends CommonInfoObject { }) public final List enterpriseBeans = new ArrayList(); - public final List securityRoles = new ArrayList(); - public final List methodPermissions = new ArrayList(); - public final List methodTransactions = new ArrayList(); - public final List methodConcurrency = new ArrayList(); - public final List interceptors = new ArrayList(); - public final List interceptorBindings = new ArrayList(); - public final List excludeList = new ArrayList(); - public final List applicationException = new ArrayList(); - public final List portInfos = new ArrayList(); - public final Set watchedResources = new TreeSet(); + public final List securityRoles = new ArrayList<>(); + public final List methodPermissions = new ArrayList<>(); + public final List methodTransactions = new ArrayList<>(); + public final List methodConcurrency = new ArrayList<>(); + public final List interceptors = new ArrayList<>(); + public final List interceptorBindings = new ArrayList<>(); + public final List excludeList = new ArrayList<>(); + public final List applicationException = new ArrayList<>(); + public final List portInfos = new ArrayList<>(); + public final Set watchedResources = new TreeSet<>(); public final JndiEncInfo moduleJndiEnc = new JndiEncInfo(); public BeansInfo beans; - public Set mbeans = new TreeSet(); - public final List pojoConfigurations = new ArrayList(); + public Set mbeans = new TreeSet<>(); + public final List pojoConfigurations = new ArrayList<>(); } http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbResolver.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbResolver.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbResolver.java index 04d1427..ff0d273 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbResolver.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbResolver.java @@ -54,9 +54,9 @@ public class EjbResolver { GLOBAL, EAR, EJBJAR; } - private final Map deployments = new TreeMap(); - private final LinkResolver resolver = new LinkResolver(); - private final Map> interfaces = new TreeMap>(); + private final Map deployments = new TreeMap<>(); + private final LinkResolver resolver = new LinkResolver<>(); + private final Map> interfaces = new TreeMap<>(); private final EjbResolver parent; @@ -127,7 +127,7 @@ public class EjbResolver { private void addInterfaces(final Interfaces interfaces) { List similar = this.interfaces.get(interfaces); if (similar == null) { - similar = new ArrayList(); + similar = new ArrayList<>(); this.interfaces.put(interfaces, similar); } similar.add(interfaces); http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EnterpriseBeanBuilder.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EnterpriseBeanBuilder.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EnterpriseBeanBuilder.java index 2b819ba..5fd3b16 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EnterpriseBeanBuilder.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EnterpriseBeanBuilder.java @@ -50,7 +50,7 @@ import java.util.concurrent.TimeUnit; class EnterpriseBeanBuilder { private final EnterpriseBeanInfo bean; private final BeanType ejbType; - private final List warnings = new ArrayList(); + private final List warnings = new ArrayList<>(); private final ModuleContext moduleContext; private final List moduleInjections; @@ -103,12 +103,12 @@ class EnterpriseBeanBuilder { local = loadClass(bean.local, "classNotFound.local"); } - final List businessLocals = new ArrayList(); + final List businessLocals = new ArrayList<>(); for (final String businessLocal : bean.businessLocal) { businessLocals.add(loadClass(businessLocal, "classNotFound.businessLocal")); } - final List businessRemotes = new ArrayList(); + final List businessRemotes = new ArrayList<>(); for (final String businessRemote : bean.businessRemote) { businessRemotes.add(loadClass(businessRemote, "classNotFound.businessRemote")); } @@ -131,7 +131,7 @@ class EnterpriseBeanBuilder { // determine the injections final InjectionBuilder injectionBuilder = new InjectionBuilder(moduleContext.getClassLoader()); final List injections = injectionBuilder.buildInjections(bean.jndiEnc); - final Set> relevantClasses = new HashSet>(); + final Set> relevantClasses = new HashSet<>(); Class c = ejbClass; do { relevantClasses.add(c); @@ -186,7 +186,7 @@ class EnterpriseBeanBuilder { for (final InitMethodInfo init : statefulBeanInfo.initMethods) { final Method beanMethod = MethodInfoUtil.toMethod(ejbClass, init.beanMethod); - final List methods = new ArrayList(); + final List methods = new ArrayList<>(); if (home != null) { methods.addAll(Arrays.asList(home.getMethods())); http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EnterpriseBeanInfo.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EnterpriseBeanInfo.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EnterpriseBeanInfo.java index 790ec42..5dcd67e 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EnterpriseBeanInfo.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EnterpriseBeanInfo.java @@ -52,9 +52,9 @@ public abstract class EnterpriseBeanInfo extends InfoObject { public String localHome; public String local; public String proxy; - public final List businessLocal = new ArrayList(); - public final List businessRemote = new ArrayList(); - public final List parents = new ArrayList(); + public final List businessLocal = new ArrayList<>(); + public final List businessRemote = new ArrayList<>(); + public final List parents = new ArrayList<>(); public boolean localbean; public String ejbClass; @@ -68,29 +68,29 @@ public abstract class EnterpriseBeanInfo extends InfoObject { public String runAs; public String runAsUser; - public final List securityRoleReferences = new ArrayList(); + public final List securityRoleReferences = new ArrayList<>(); - public final List aroundInvoke = new ArrayList(); + public final List aroundInvoke = new ArrayList<>(); - public final List postConstruct = new ArrayList(); - public final List preDestroy = new ArrayList(); + public final List postConstruct = new ArrayList<>(); + public final List preDestroy = new ArrayList<>(); - public final List aroundTimeout = new ArrayList(); + public final List aroundTimeout = new ArrayList<>(); - public final List asynchronous = new ArrayList(); - public Set asynchronousClasses = new HashSet(); + public final List asynchronous = new ArrayList<>(); + public Set asynchronousClasses = new HashSet<>(); public String containerId; public String serviceEndpoint; - public List jndiNamess = new ArrayList(); + public List jndiNamess = new ArrayList<>(); - public List jndiNames = new ArrayList(); + public List jndiNames = new ArrayList<>(); public boolean loadOnStartup; - public final List dependsOn = new ArrayList(); + public final List dependsOn = new ArrayList<>(); public TimeoutInfo statefulTimeout; - public List methodScheduleInfos = new ArrayList(); + public List methodScheduleInfos = new ArrayList<>(); public boolean restService; public boolean passivable; http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EntityBeanInfo.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EntityBeanInfo.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EntityBeanInfo.java index d1c04c2..4d6fb15 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EntityBeanInfo.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EntityBeanInfo.java @@ -26,10 +26,10 @@ public class EntityBeanInfo extends EnterpriseBeanInfo { public String primKeyField; public String persistenceType; public String reentrant; - public final List cmpFieldNames = new ArrayList(); - public final List cmrFields = new ArrayList(); + public final List cmpFieldNames = new ArrayList<>(); + public final List cmrFields = new ArrayList<>(); public int cmpVersion; - public final List queries = new ArrayList(); + public final List queries = new ArrayList<>(); public EntityBeanInfo() { type = ENTITY; http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EntityManagerFactoryCallable.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EntityManagerFactoryCallable.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EntityManagerFactoryCallable.java index 175136d..c4a01aa 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EntityManagerFactoryCallable.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EntityManagerFactoryCallable.java @@ -85,7 +85,7 @@ public class EntityManagerFactoryCallable implements Callable properties = new HashMap(); + final Map properties = new HashMap<>(); if (!ValidationMode.NONE.equals(unitInfo.getValidationMode())) { properties.put("javax.persistence.validation.factory", potentialValidators != null && potentialValidators.size() == 1 ? // optim to avoid lookups