You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by tv...@apache.org on 2014/02/22 02:58:23 UTC
svn commit: r1570779 [1/7] - in
/tomee/tomee/trunk/container/openejb-core/src/main: config/
java/org/apache/openejb/ java/org/apache/openejb/assembler/classic/
java/org/apache/openejb/assembler/classic/cmd/
java/org/apache/openejb/bval/ java/org/apache...
Author: tveronezi
Date: Sat Feb 22 01:58:19 2014
New Revision: 1570779
URL: http://svn.apache.org/r1570779
Log:
https://issues.apache.org/jira/browse/OPENEJB-2076
Checks for braces around code blocks.
Modified:
tomee/tomee/trunk/container/openejb-core/src/main/config/checkstyle.xml
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/Injection.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/InjectionProcessor.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbJarBuilder.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbResolver.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EnterpriseBeanBuilder.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/InterceptorBindingBuilder.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiBuilder.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/LazyEjbReference.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodConcurrencyBuilder.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodInfoUtil.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodTransactionBuilder.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ProxyInterfaceResolver.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/cmd/Info2Properties.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/bval/BeanValidationAppendixInterceptor.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiPlugin.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiResourceInjectionService.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CustomELAdapter.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/OWBContextThreadListener.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/OptimizedLoaderService.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/RequestScopedThreadContextListener.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cli/MainImpl.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ActivationConfigPropertyOverride.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AutoDeployer.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/BuiltInEnvironmentEntries.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/CleanEnvEntries.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ClearEmptyMappedName.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/CmpJpaConversion.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigUtils.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ConvertDataSourceDefinitions.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentModule.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/EjbJarInfoBuilder.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/EjbModule.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/EnvEntriesPropertiesDeployer.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/LegacyProcessor.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/LinkBuiltInTypes.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/MergeWebappJndiContext.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/OpenEJBDeploymentManager.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/OutputGeneratedDescriptors.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/PersistenceContextAnnFactory.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/RemoveWebServices.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ReportValidationResults.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ServiceUtils.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/SunConversion.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/TldScanner.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/VmDeploymentManager.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/WebModule.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/WlsConversion.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/WsDeployer.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/provider/ID.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/provider/ProviderManager.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/provider/ServiceJarXmlLoader.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckAssemblyBindings.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckCallbacks.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckClasses.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckDependsOn.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckInjectionPointUsage.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckInjectionTargets.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckMethods.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckPersistenceRefs.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/ValidationBase.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/AbstractService.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/JaxbOpenejb.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/PropertiesAdapter.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Resource.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/SaxOpenejb.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/StackHandler.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/WikiGenerator.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/util/ObjectMap.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/util/ProviderGenerator.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/BaseContext.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/BaseSessionContext.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/TempClassLoader.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/WebContext.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/AbstractKeyGenerator.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp2Generator.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp2Util.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmrSet.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/SetValuedCmr.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/SingleValuedCmr.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/jpa/JpaCmpEngine.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityEjbHomeHandler.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityEjbObjectHandler.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityInstanceManager.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntrancyTracker.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/interceptor/Interceptor.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/interceptor/InterceptorData.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/interceptor/InterceptorStack.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/interceptor/ReflectionInvocationContext.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbObjectInputStream.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/IntraVmArtifact.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/IntraVmMetaData.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IvmContext.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IvmJndiFactory.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/JndiEncArtifact.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/NameNode.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/ParsedName.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/SystemComponentReference.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/managed/ManagedContainer.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/managed/ManagedObjectHandler.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/managed/RAFPassivater.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/managed/SimpleCache.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/EndpointHandler.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbInstanceFactory.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/security/JaccProvider.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/security/jaas/GroupPrincipal.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/security/jaas/PropertiesLoginModule.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/security/jaas/SQLLoginModule.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/security/jaas/UserPrincipal.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/security/jacc/BasicJaccProvider.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/security/jacc/BasicPolicyConfiguration.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/singleton/SingletonEjbObjectHandler.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/singleton/SingletonInstanceManager.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/RAFPassivater.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/SimpleCache.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainer.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulEjbObjectHandler.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessContainerFactory.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessInstanceManager.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/DefaultTimerThreadPoolAdapter.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EJBCronTrigger.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/MemoryTimerStore.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/TimerImpl.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/JtaTransactionPolicy.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/JtaTransactionPolicyFactory.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/SimpleWorkManager.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TransactionType.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxBeanManaged.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/HandlerData.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/JaxWsUtils.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/PortAddressRegistryImpl.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/ProviderWrapper.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/dyni/DynamicSubclass.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/log/FileHandler.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/util/MathUtils.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/util/ResizableDoubleArray.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/monitoring/Event.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/monitoring/ManagedMBean.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/monitoring/StatsInterceptor.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/persistence/JtaEntityManager.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/persistence/JtaEntityManagerRegistry.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceBootstrap.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceUnitInfoImpl.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/AutoConnectionTracker.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/GeronimoConnectionManagerFactory.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/BasicDataSourceUtil.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/IsolationLevels.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/dbcp/BasicDataSource.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/dbcp/BasicManagedDataSource.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/logging/LoggingPreparedSqlStatement.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/logging/LoggingSqlStatement.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/quartz/JobSpec.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/ri/sp/PseudoTransactionService.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/AnnotationFinder.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Classes.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/ConfUtils.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/CountingLatch.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Debug.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Duration.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Enumerator.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Index.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/IntrospectionSupport.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/JarCreator.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/JarExtractor.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/JuliLogStream.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/LengthInputStream.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/LinkedListStack.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Log4jLogStreamFactory.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Memoizer.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/OpenEjbVersion.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/PojoSerialization.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Pool.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/References.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/ServiceManagerProxy.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/StringTemplate.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Strings.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/SuperProperties.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Tee.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/URISupport.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/URLs.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/UrlComparator.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/classloader/URLClassLoaderFirst.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/executor/OfferRejectedExecutionHandler.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/ProxyManager.java
Modified: tomee/tomee/trunk/container/openejb-core/src/main/config/checkstyle.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/config/checkstyle.xml?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/config/checkstyle.xml (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/config/checkstyle.xml Sat Feb 22 01:58:19 2014
@@ -110,7 +110,7 @@
<!-- See http://checkstyle.sf.net/config_blocks.html -->
<!--<module name="AvoidNestedBlocks"/>-->
<!--<module name="LeftCurly"/>-->
- <!--<module name="NeedBraces"/>-->
+ <module name="NeedBraces"/>
<!--<module name="RightCurly"/>-->
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java Sat Feb 22 01:58:19 2014
@@ -296,17 +296,22 @@ public class BeanContext extends Deploym
public InterfaceType getInterfaceType(final Class clazz) {
final InterfaceType type = interfaces.get(clazz);
- if (type != null)
+ if (type != null) {
return type;
+ }
- if (EJBLocalHome.class.isAssignableFrom(clazz))
+ if (EJBLocalHome.class.isAssignableFrom(clazz)) {
return InterfaceType.EJB_LOCAL_HOME;
- if (EJBLocalObject.class.isAssignableFrom(clazz))
+ }
+ if (EJBLocalObject.class.isAssignableFrom(clazz)) {
return InterfaceType.EJB_LOCAL;
- if (EJBHome.class.isAssignableFrom(clazz))
+ }
+ if (EJBHome.class.isAssignableFrom(clazz)) {
return InterfaceType.EJB_HOME;
- if (EJBObject.class.isAssignableFrom(clazz))
+ }
+ if (EJBObject.class.isAssignableFrom(clazz)) {
return InterfaceType.EJB_OBJECT;
+ }
for (final Entry<Class, InterfaceType> entry : interfaces.entrySet()) { // for @Remote case where the loaded interface can be different from the stored one
if (entry.getKey().getName().equals(clazz.getName())) {
@@ -366,14 +371,18 @@ public class BeanContext extends Deploym
this.proxyClass = proxy;
- if (homeInterface != null)
+ if (homeInterface != null) {
this.getLegacyView().homeInterface = homeInterface;
- if (localInterface != null)
+ }
+ if (localInterface != null) {
this.getLegacyView().localInterface = localInterface;
- if (localHomeInterface != null)
+ }
+ if (localHomeInterface != null) {
this.getLegacyView().localHomeInterface = localHomeInterface;
- if (remoteInterface != null)
+ }
+ if (remoteInterface != null) {
this.getLegacyView().remoteInterface = remoteInterface;
+ }
if (businessLocals != null) {
this.businessLocals.addAll(businessLocals);
@@ -479,8 +488,9 @@ public class BeanContext extends Deploym
* @param type InterfaceType
*/
private void addInterface(final Class interfce, final InterfaceType type) {
- if (interfce == null)
+ if (interfce == null) {
return;
+ }
interfaces.put(interfce, type);
for (final Class clazz : interfce.getInterfaces()) {
@@ -673,8 +683,9 @@ public class BeanContext extends Deploym
methodContext = getViewMethodContext(method, interfaceType.getSpecName());
}
- if (methodContext == null)
+ if (methodContext == null) {
methodContext = methodContextMap.get(method);
+ }
if (methodContext == null) {
final Method beanMethod = getMatchingBeanMethod(method);
@@ -1175,8 +1186,9 @@ public class BeanContext extends Deploym
if (this.componentType == BeanType.BMP_ENTITY || this.componentType == BeanType.CMP_ENTITY) {
ejbCreateName.insert(3, "Post");
Class clazz = beanClass;
- if (getCmp().cmpImplClass != null)
+ if (getCmp().cmpImplClass != null) {
clazz = getCmp().cmpImplClass;
+ }
final Method postCreateMethod = clazz.getMethod(ejbCreateName.toString(), method.getParameterTypes());
getCmp().postCreateMethodMap.put(getLegacyView().createMethod, postCreateMethod);
}
@@ -1718,8 +1730,9 @@ public class BeanContext extends Deploym
public MethodContext initMethodContext(final Method method) {
MethodContext methodContext = methodContextMap.get(method);
- if (methodContext != null)
+ if (methodContext != null) {
return methodContext;
+ }
methodContext = new MethodContext(BeanContext.this, method);
methodContextMap.put(method, methodContext);
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/Injection.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/Injection.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/Injection.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/Injection.java Sat Feb 22 01:58:19 2014
@@ -70,13 +70,21 @@ public class Injection {
@Override
public boolean equals(final Object o) {
- if (this == o) return true;
- if (!(o instanceof Injection)) return false;
+ if (this == o) {
+ return true;
+ }
+ if (!(o instanceof Injection)) {
+ return false;
+ }
final Injection injection = (Injection) o;
- if (name != null ? !name.equals(injection.name) : injection.name != null) return false;
- if (classname != null ? !classname.equals(injection.classname) : injection.classname != null) return false;
+ if (name != null ? !name.equals(injection.name) : injection.name != null) {
+ return false;
+ }
+ if (classname != null ? !classname.equals(injection.classname) : injection.classname != null) {
+ return false;
+ }
return true;
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/InjectionProcessor.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/InjectionProcessor.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/InjectionProcessor.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/InjectionProcessor.java Sat Feb 22 01:58:19 2014
@@ -97,7 +97,9 @@ public class InjectionProcessor<T> {
}
private void construct() throws OpenEJBException {
- if (instance != null) throw new IllegalStateException("Instance already constructed");
+ if (instance != null) {
+ throw new IllegalStateException("Instance already constructed");
+ }
Class<? extends T> clazz = beanClass;
@@ -139,8 +141,12 @@ public class InjectionProcessor<T> {
}
public void postConstruct() throws OpenEJBException {
- if (instance == null) throw new IllegalStateException("Instance has not been constructed");
- if (postConstructMethods == null) return;
+ if (instance == null) {
+ throw new IllegalStateException("Instance has not been constructed");
+ }
+ if (postConstructMethods == null) {
+ return;
+ }
for (final Method postConstruct : postConstructMethods) {
try {
postConstruct.invoke(instance);
@@ -154,8 +160,12 @@ public class InjectionProcessor<T> {
}
public void preDestroy() {
- if (instance == null) return;
- if (preDestroyMethods == null) return;
+ if (instance == null) {
+ return;
+ }
+ if (preDestroyMethods == null) {
+ return;
+ }
for (final Method preDestroy : preDestroyMethods) {
try {
preDestroy.invoke(instance);
@@ -169,11 +179,15 @@ public class InjectionProcessor<T> {
}
private void fillInjectionProperties(final ObjectRecipe objectRecipe) {
- if (injections == null) return;
+ if (injections == null) {
+ return;
+ }
boolean usePrefix = true;
try {
- if (beanClass != null) beanClass.getConstructor();
+ if (beanClass != null) {
+ beanClass.getConstructor();
+ }
} catch (final NoSuchMethodException e) {
// Using constructor injection
// xbean can't handle the prefix yet
@@ -182,12 +196,18 @@ public class InjectionProcessor<T> {
Class clazz = beanClass;
- if (suppliedInstance != null) clazz = suppliedInstance.getClass();
+ if (suppliedInstance != null) {
+ clazz = suppliedInstance.getClass();
+ }
if (context != null) {
for (final Injection injection : injections) {
- if (injection.getTarget() == null) continue;
- if (!injection.getTarget().isAssignableFrom(clazz)) continue;
+ if (injection.getTarget() == null) {
+ continue;
+ }
+ if (!injection.getTarget().isAssignableFrom(clazz)) {
+ continue;
+ }
final String jndiName = injection.getJndiName();
Object value;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java Sat Feb 22 01:58:19 2014
@@ -248,12 +248,16 @@ public final class OpenEjbContainer exte
{
final BeanContext context = containerSystem.getBeanContext(clazz.getName());
- if (context != null) return context;
+ if (context != null) {
+ return context;
+ }
}
for (final BeanContext context : containerSystem.deployments()) {
- if (clazz == context.getBeanClass()) return context;
+ if (clazz == context.getBeanClass()) {
+ return context;
+ }
}
@@ -310,7 +314,9 @@ public final class OpenEjbContainer exte
map = new HashMap<Object, Object>();
}
- if (isOtherProvider(map)) return null;
+ if (isOtherProvider(map)) {
+ return null;
+ }
if (instance != null || OpenEJB.isInitialized()) {
logger().info("EJBContainer already initialized. Call ejbContainer.close() to allow reinitialization");
@@ -366,7 +372,9 @@ public final class OpenEjbContainer exte
for (final String caller : callers) {
- if (!isValid(caller)) continue;
+ if (!isValid(caller)) {
+ continue;
+ }
String name = caller;
if (name.contains("$")) {
@@ -538,7 +546,9 @@ public final class OpenEjbContainer exte
final AppModule appModule = load(map);
- if (appModule != null) return appModule;
+ if (appModule != null) {
+ return appModule;
+ }
throw invalidModulesValue(modules);
@@ -673,7 +683,9 @@ public final class OpenEjbContainer exte
@Override
protected Name getName(Name name) throws NamingException {
String first = name.get(0);
- if (!first.startsWith("java:")) throw new NameNotFoundException("Name must be in java: namespace");
+ if (!first.startsWith("java:")) {
+ throw new NameNotFoundException("Name must be in java: namespace");
+ }
first = first.substring("java:".length());
name = name.getSuffix(1);
return name.add(0, first);
@@ -681,21 +693,31 @@ public final class OpenEjbContainer exte
@Override
protected String getName(final String name) throws NamingException {
- if ("inject".equals(name)) return name;
- if (!name.startsWith("java:")) throw new NameNotFoundException("Name must be in java: namespace");
+ if ("inject".equals(name)) {
+ return name;
+ }
+ if (!name.startsWith("java:")) {
+ throw new NameNotFoundException("Name must be in java: namespace");
+ }
return name.substring("java:".length());
}
@Override
public void bind(final Name name, final Object obj) throws NamingException {
- if (name.size() == 1 && "inject".equals(name.get(0))) inject(obj);
- else super.bind(name, obj);
+ if (name.size() == 1 && "inject".equals(name.get(0))) {
+ inject(obj);
+ } else {
+ super.bind(name, obj);
+ }
}
@Override
public void bind(final String name, final Object obj) throws NamingException {
- if (name != null && "inject".equals(name)) inject(obj);
- else super.bind(name, obj);
+ if (name != null && "inject".equals(name)) {
+ inject(obj);
+ } else {
+ super.bind(name, obj);
+ }
}
@Override
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbJarBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbJarBuilder.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbJarBuilder.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbJarBuilder.java Sat Feb 22 01:58:19 2014
@@ -75,7 +75,9 @@ public class EjbJarBuilder {
// TODO: replace with get() on application context or parent
final Container container = (Container) props.get(ejbInfo.containerId);
- if (container == null) throw new IllegalStateException("Container does not exist: " + ejbInfo.containerId + ". Referenced by deployment: " + bean.getDeploymentID());
+ if (container == null) {
+ throw new IllegalStateException("Container does not exist: " + ejbInfo.containerId + ". Referenced by deployment: " + bean.getDeploymentID());
+ }
// Don't deploy to the container, yet. That will be done by deploy() once Assembler as finished configuring the DeploymentInfo
bean.setContainer(container);
} catch (final Throwable e) {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbResolver.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbResolver.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbResolver.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbResolver.java Sat Feb 22 01:58:19 2014
@@ -133,7 +133,9 @@ public class EjbResolver {
}
private String resolveLink(final String link, final URI moduleUri) {
- if (link == null || link.length() == 0) return null;
+ if (link == null || link.length() == 0) {
+ return null;
+ }
String id = resolver.resolveLink(link, moduleUri);
if (id == null && parent != null) {
@@ -180,7 +182,9 @@ public class EjbResolver {
}
private String first(final List<Interfaces> list) {
- if (list.size() == 0) return null;
+ if (list.size() == 0) {
+ return null;
+ }
return list.get(0).getId();
}
@@ -208,9 +212,13 @@ public class EjbResolver {
}
public Scope getScope(final String deploymentId) {
- if (deployments.containsKey(deploymentId)) return scope;
+ if (deployments.containsKey(deploymentId)) {
+ return scope;
+ }
- if (parent != null) return parent.getScope(deploymentId);
+ if (parent != null) {
+ return parent.getScope(deploymentId);
+ }
return null;
}
@@ -245,7 +253,9 @@ public class EjbResolver {
private final String objectInterface;
public Interfaces(final String objectInterface, final Type type, final String id) {
- if (objectInterface == null) throw new NullPointerException("objectInterface is null");
+ if (objectInterface == null) {
+ throw new NullPointerException("objectInterface is null");
+ }
this.homeInterface = "<none>";
this.objectInterface = objectInterface;
this.type = type;
@@ -253,8 +263,12 @@ public class EjbResolver {
}
public Interfaces(String homeInterface, final String objectInterface, final Type type, final String id) {
- if (homeInterface == null) homeInterface = "<none>";
- if (objectInterface == null) throw new NullPointerException("objectInterface is null");
+ if (homeInterface == null) {
+ homeInterface = "<none>";
+ }
+ if (objectInterface == null) {
+ throw new NullPointerException("objectInterface is null");
+ }
this.homeInterface = homeInterface;
this.objectInterface = objectInterface;
this.type = type;
@@ -262,8 +276,12 @@ public class EjbResolver {
}
public Interfaces(String homeInterface, final String objectInterface) {
- if (homeInterface == null) homeInterface = "<none>";
- if (objectInterface == null) throw new NullPointerException("objectInterface is null");
+ if (homeInterface == null) {
+ homeInterface = "<none>";
+ }
+ if (objectInterface == null) {
+ throw new NullPointerException("objectInterface is null");
+ }
this.homeInterface = homeInterface;
this.objectInterface = objectInterface;
this.type = null;
@@ -279,8 +297,12 @@ public class EjbResolver {
}
public boolean equals(final Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
final Interfaces that = (Interfaces) o;
@@ -295,7 +317,9 @@ public class EjbResolver {
}
public int compareTo(final Object o) {
- if (this == o) return 0;
+ if (this == o) {
+ return 0;
+ }
final Interfaces that = (Interfaces) o;
return toString().compareTo(that.toString());
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EnterpriseBeanBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EnterpriseBeanBuilder.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EnterpriseBeanBuilder.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EnterpriseBeanBuilder.java Sat Feb 22 01:58:19 2014
@@ -186,13 +186,21 @@ class EnterpriseBeanBuilder {
final Method beanMethod = MethodInfoUtil.toMethod(ejbClass, init.beanMethod);
final List<Method> methods = new ArrayList<Method>();
- if (home != null) methods.addAll(Arrays.asList(home.getMethods()));
- if (localhome != null) methods.addAll(Arrays.asList(localhome.getMethods()));
+ if (home != null) {
+ methods.addAll(Arrays.asList(home.getMethods()));
+ }
+ if (localhome != null) {
+ methods.addAll(Arrays.asList(localhome.getMethods()));
+ }
for (final Method homeMethod : methods) {
- if (init.createMethod != null && !init.createMethod.methodName.equals(homeMethod.getName())) continue;
+ if (init.createMethod != null && !init.createMethod.methodName.equals(homeMethod.getName())) {
+ continue;
+ }
- if (!homeMethod.getName().startsWith("create")) continue;
+ if (!homeMethod.getName().startsWith("create")) {
+ continue;
+ }
if (paramsMatch(beanMethod, homeMethod)){
deployment.mapMethods(homeMethod, beanMethod);
@@ -276,7 +284,9 @@ class EnterpriseBeanBuilder {
methodSignature.append('(');
boolean first = true;
for (final String methodParam : query.method.methodParams) {
- if (!first) methodSignature.append(",");
+ if (!first) {
+ methodSignature.append(",");
+ }
methodSignature.append(methodParam);
first = false;
}
@@ -334,7 +344,9 @@ class EnterpriseBeanBuilder {
for (int i = 0; i < methodA.getParameterTypes().length; i++) {
final Class<?> a = methodA.getParameterTypes()[i];
final Class<?> b = methodB.getParameterTypes()[i];
- if (!a.equals(b)) return false;
+ if (!a.equals(b)) {
+ return false;
+ }
}
return true;
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/InterceptorBindingBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/InterceptorBindingBuilder.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/InterceptorBindingBuilder.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/InterceptorBindingBuilder.java Sat Feb 22 01:58:19 2014
@@ -209,7 +209,9 @@ public class InterceptorBindingBuilder {
for (final InterceptorBindingInfo info : bindings) {
final Level level = level(info);
- if (!implies(method, ejbName, level, info)) continue;
+ if (!implies(method, ejbName, level, info)) {
+ continue;
+ }
final Type type = type(level, info);
@@ -235,21 +237,31 @@ public class InterceptorBindingBuilder {
excludes.add(level);
}
- if (!excludes.contains(level)) methodBindings.add(info);
+ if (!excludes.contains(level)) {
+ methodBindings.add(info);
+ }
if (info.excludeClassInterceptors) {
excludes.add(Level.CLASS);
excludes.add(Level.ANNOTATION_CLASS);
}
- if (info.excludeDefaultInterceptors) excludes.add(Level.PACKAGE);
+ if (info.excludeDefaultInterceptors) {
+ excludes.add(Level.PACKAGE);
+ }
}
return methodBindings;
}
private boolean implies(final Method method, final String ejbName, final Level level, final InterceptorBindingInfo info) {
- if (level == Level.PACKAGE) return true;
- if (!ejbName.equals(info.ejbName)) return false;
- if (level == Level.CLASS || level == Level.ANNOTATION_CLASS) return true;
+ if (level == Level.PACKAGE) {
+ return true;
+ }
+ if (!ejbName.equals(info.ejbName)) {
+ return false;
+ }
+ if (level == Level.CLASS || level == Level.ANNOTATION_CLASS) {
+ return true;
+ }
final NamedMethodInfo methodInfo = info.method;
return MethodInfoUtil.matches(method, methodInfo);
@@ -286,7 +298,9 @@ public class InterceptorBindingBuilder {
// find declared class
Class<?> c = clazz;
- while (c != null && !c.getName().equals(callbackInfo.className)) c = c.getSuperclass();
+ while (c != null && !c.getName().equals(callbackInfo.className)) {
+ c = c.getSuperclass();
+ }
// get callback method
if (c != null) {
@@ -353,7 +367,9 @@ public class InterceptorBindingBuilder {
// find declared class
Class<?> c = clazz;
- while (c != null && !c.getName().equals(callbackInfo.className)) c = c.getSuperclass();
+ while (c != null && !c.getName().equals(callbackInfo.className)) {
+ c = c.getSuperclass();
+ }
// get callback method
if (c != null) {
@@ -399,7 +415,9 @@ public class InterceptorBindingBuilder {
final Method method = clazz.getDeclaredMethod(methodName, parameterTypes);
return SetAccessible.on(method);
} catch (final NoSuchMethodException e) {
- if (original == null) original = e;
+ if (original == null) {
+ original = e;
+ }
}
clazz = clazz.getSuperclass();
}
@@ -415,7 +433,9 @@ public class InterceptorBindingBuilder {
final Level levelA = level(a);
final Level levelB = level(b);
- if (levelA != levelB) return levelA.ordinal() - levelB.ordinal();
+ if (levelA != levelB) {
+ return levelA.ordinal() - levelB.ordinal();
+ }
// Now resort to secondary sorting.
@@ -459,8 +479,12 @@ public class InterceptorBindingBuilder {
public int compare(final Method m1, final Method m2) {
final Class<?> c1 = m1.getDeclaringClass();
final Class<?> c2 = m2.getDeclaringClass();
- if (c1.equals(c2)) return 0;
- if (c1.isAssignableFrom(c2)) return -1;
+ if (c1.equals(c2)) {
+ return 0;
+ }
+ if (c1.isAssignableFrom(c2)) {
+ return -1;
+ }
return 1;
}
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiBuilder.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiBuilder.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiBuilder.java Sat Feb 22 01:58:19 2014
@@ -217,7 +217,9 @@ public class JndiBuilder {
}
final Iterator<BeanContext> it = deployments.values().iterator();
- if (!it.hasNext()) return;
+ if (!it.hasNext()) {
+ return;
+ }
// TODO we should just pass in the ModuleContext
final ModuleContext moduleContext = it.next().getModuleContext();
@@ -236,8 +238,12 @@ public class JndiBuilder {
private void putAll(final Map<String, String> map, final Properties properties) {
for (final Map.Entry<Object, Object> e : properties.entrySet()) {
- if (!(e.getValue() instanceof String)) continue;
- if (!(e.getKey() instanceof String)) continue;
+ if (!(e.getValue() instanceof String)) {
+ continue;
+ }
+ if (!(e.getKey() instanceof String)) {
+ continue;
+ }
map.put((String) e.getKey(), (String) e.getValue());
}
@@ -262,7 +268,9 @@ public class JndiBuilder {
for (final JndiNameInfo nameInfo : beanInfo.jndiNamess) {
String intrface = nameInfo.intrface;
- if (intrface == null) intrface = "";
+ if (intrface == null) {
+ intrface = "";
+ }
templates.put(intrface, addTemplate(templates.get(intrface), getType(nameInfo.name), new StringTemplate(nameInfo.name)));
}
beanInfo.jndiNames.clear();
@@ -295,8 +303,12 @@ public class JndiBuilder {
public String getName(final Class interfce, final String key, final Interface type) {
Map<String, StringTemplate> template = templates.get(interfce.getName());
- if (template == null) template = templates.get(type.getAnnotationName());
- if (template == null) template = templates.get("");
+ if (template == null) {
+ template = templates.get(type.getAnnotationName());
+ }
+ if (template == null) {
+ template = templates.get("");
+ }
final Map<String, String> contextData = new HashMap<String, String>(beanContext);
contextData.put("interfaceType", type.getAnnotationName());
@@ -455,7 +467,9 @@ public class JndiBuilder {
bean.getModuleContext().getAppContext().getBindings().put(name, ref);
}
- if (simpleNameRef == null) simpleNameRef = ref;
+ if (simpleNameRef == null) {
+ simpleNameRef = ref;
+ }
}
} catch (final NamingException e) {
throw new OpenEJBRuntimeException("Unable to bind business local interface for deployment " + id, e);
@@ -482,7 +496,9 @@ public class JndiBuilder {
bean.getModuleContext().getAppContext().getBindings().put(name, ref);
}
- if (simpleNameRef == null) simpleNameRef = ref;
+ if (simpleNameRef == null) {
+ simpleNameRef = ref;
+ }
}
} catch (final NamingException e) {
throw new OpenEJBRuntimeException("Unable to bind business remote deployment in jndi.", e);
@@ -506,7 +522,9 @@ public class JndiBuilder {
bind(name, ref, bindings, beanInfo, localHomeInterface);
bindJava(bean, localHomeInterface, ref, bindings, beanInfo);
- if (simpleNameRef == null) simpleNameRef = ref;
+ if (simpleNameRef == null) {
+ simpleNameRef = ref;
+ }
}
} catch (final NamingException e) {
throw new OpenEJBRuntimeException("Unable to bind local home interface for deployment " + id, e);
@@ -531,7 +549,9 @@ public class JndiBuilder {
bind(name, ref, bindings, beanInfo, homeInterface);
bindJava(bean, homeInterface, ref, bindings, beanInfo);
- if (simpleNameRef == null) simpleNameRef = ref;
+ if (simpleNameRef == null) {
+ simpleNameRef = ref;
+ }
}
} catch (final NamingException e) {
throw new OpenEJBRuntimeException("Unable to bind remote home interface for deployment " + id, e);
@@ -624,7 +644,9 @@ public class JndiBuilder {
}
// Construct a new exception as the IvmContext doesn't include
// the name in the exception that it throws
- if (failOnCollision) throw new NameAlreadyBoundException(externalName);
+ if (failOnCollision) {
+ throw new NameAlreadyBoundException(externalName);
+ }
}
} else {
try {
@@ -706,7 +728,9 @@ public class JndiBuilder {
final ContainerSystem containerSystem = SystemInstance.get().getComponent(ContainerSystem.class);
for (final BeanContext beanContext : containerSystem.deployments()) {
final Bindings bindings = beanContext.get(Bindings.class);
- if (bindings != null && bindings.getBindings().contains(name)) return beanContext;
+ if (bindings != null && bindings.getBindings().contains(name)) {
+ return beanContext;
+ }
}
return null;
}
@@ -733,7 +757,9 @@ public class JndiBuilder {
final boolean aIsRmote = Remote.class.isAssignableFrom(a);
final boolean bIsRmote = Remote.class.isAssignableFrom(b);
- if (aIsRmote == bIsRmote) return 0;
+ if (aIsRmote == bIsRmote) {
+ return 0;
+ }
return aIsRmote ? 1 : -1;
}
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java Sat Feb 22 01:58:19 2014
@@ -237,9 +237,9 @@ public class JndiEncBuilder {
try {
final Class type = Classes.deprimitivize(getType(entry.type, entry));
final Object obj;
- if (type == String.class)
+ if (type == String.class) {
obj = new String(entry.value);
- else if (type == Double.class) {
+ } else if (type == Double.class) {
obj = new Double(entry.value);
} else if (type == Integer.class) {
obj = new Integer(entry.value);
@@ -350,7 +350,9 @@ public class JndiEncBuilder {
reference = new LinkRef(jndiName);
// Let the container bind this into JNDI
- if (jndiName.equals(referenceInfo.referenceName)) continue;
+ if (jndiName.equals(referenceInfo.referenceName)) {
+ continue;
+ }
} else if (Validator.class.equals(type)) {
final String jndiName = "comp/Validator";
reference = new LinkRef(jndiName);
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/LazyEjbReference.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/LazyEjbReference.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/LazyEjbReference.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/LazyEjbReference.java Sat Feb 22 01:58:19 2014
@@ -102,7 +102,9 @@ public class LazyEjbReference extends Re
case LOCAL: return false;
case UNKNOWN:{
for (final Class clazz : beanContext.getInterfaces(InterfaceType.BUSINESS_REMOTE)) {
- if (clazz.getName().equals(info.getInterface())) return true;
+ if (clazz.getName().equals(info.getInterface())) {
+ return true;
+ }
}
}
default: return false;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodConcurrencyBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodConcurrencyBuilder.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodConcurrencyBuilder.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodConcurrencyBuilder.java Sat Feb 22 01:58:19 2014
@@ -47,7 +47,9 @@ public class MethodConcurrencyBuilder {
public static void applyConcurrencyAttributes(final BeanContext beanContext, final List<MethodConcurrencyInfo> methodConcurrencyInfos) throws OpenEJBException {
- if (beanContext.isBeanManagedConcurrency()) return;
+ if (beanContext.isBeanManagedConcurrency()) {
+ return;
+ }
final Logger log = Logger.getInstance(LogCategory.OPENEJB_STARTUP.createChild("attributes"), MethodConcurrencyBuilder.class);
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodInfoUtil.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodInfoUtil.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodInfoUtil.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodInfoUtil.java Sat Feb 22 01:58:19 2014
@@ -89,15 +89,21 @@ public class MethodInfoUtil {
public static List<Method> matchingMethods(final Method signature, final Class clazz) {
final List<Method> list = new ArrayList<Method>();
METHOD: for (final Method method : clazz.getMethods()) {
- if (!method.getName().equals(signature.getName())) continue;
+ if (!method.getName().equals(signature.getName())) {
+ continue;
+ }
final Class<?>[] methodTypes = method.getParameterTypes();
final Class<?>[] signatureTypes = signature.getParameterTypes();
- if (methodTypes.length != signatureTypes.length) continue;
+ if (methodTypes.length != signatureTypes.length) {
+ continue;
+ }
for (int i = 0; i < methodTypes.length; i++) {
- if (!methodTypes[i].equals(signatureTypes[i])) continue METHOD;
+ if (!methodTypes[i].equals(signatureTypes[i])) {
+ continue METHOD;
+ }
}
list.add(method);
}
@@ -254,8 +260,9 @@ public class MethodInfoUtil {
return Short.TYPE;
} else if (className.equals("byte")) {
return Byte.TYPE;
- } else
+ } else {
return Class.forName(className, false, cl);
+ }
}
@@ -383,13 +390,21 @@ public class MethodInfoUtil {
@Override
public boolean equals(final Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
final ViewMethod that = (ViewMethod) o;
- if (!method.equals(that.method)) return false;
- if (view != null ? !view.equals(that.view) : that.view != null) return false;
+ if (!method.equals(that.method)) {
+ return false;
+ }
+ if (view != null ? !view.equals(that.view) : that.view != null) {
+ return false;
+ }
return true;
}
@@ -456,7 +471,9 @@ public class MethodInfoUtil {
final Iterator<Method> iterator = methods.iterator();
while (iterator.hasNext()) {
final Method method = iterator.next();
- if (containerMethod(method)) iterator.remove();
+ if (containerMethod(method)) {
+ iterator.remove();
+ }
}
return methods;
@@ -484,7 +501,9 @@ public class MethodInfoUtil {
}
public static boolean match(final Method methodA, final Method methodB) {
- if (!methodA.getName().equals(methodB.getName())) return false;
+ if (!methodA.getName().equals(methodB.getName())) {
+ return false;
+ }
if (methodA.getParameterTypes().length != methodB.getParameterTypes().length){
return false;
@@ -493,7 +512,9 @@ public class MethodInfoUtil {
for (int i = 0; i < methodA.getParameterTypes().length; i++) {
final Class<?> a = methodA.getParameterTypes()[i];
final Class<?> b = methodB.getParameterTypes()[i];
- if (!a.equals(b)) return false;
+ if (!a.equals(b)) {
+ return false;
+ }
}
return true;
}
@@ -553,15 +574,26 @@ public class MethodInfoUtil {
}
public static View view(final MethodInfo methodInfo) {
- if (methodInfo.className != null && !methodInfo.className.equals("*")) return View.CLASS;
- if (methodInfo.methodIntf != null && !methodInfo.methodIntf.equals("*")) return View.INTERFACE;
- else return View.ANY;
+ if (methodInfo.className != null && !methodInfo.className.equals("*")) {
+ return View.CLASS;
+ }
+ if (methodInfo.methodIntf != null && !methodInfo.methodIntf.equals("*")) {
+ return View.INTERFACE;
+ } else {
+ return View.ANY;
+ }
}
public static Level level(final MethodInfo methodInfo) {
- if (methodInfo.ejbName != null && methodInfo.ejbName.equals("*")) return Level.PACKAGE;
- if (methodInfo.methodName.equals("*")) return Level.BEAN;
- if (methodInfo.methodParams == null) return Level.OVERLOADED_METHOD;
+ if (methodInfo.ejbName != null && methodInfo.ejbName.equals("*")) {
+ return Level.PACKAGE;
+ }
+ if (methodInfo.methodName.equals("*")) {
+ return Level.BEAN;
+ }
+ if (methodInfo.methodParams == null) {
+ return Level.OVERLOADED_METHOD;
+ }
return Level.EXACT_METHOD;
}
@@ -578,7 +610,9 @@ public class MethodInfoUtil {
final Level levelB = level(bm);
// Primary sort
- if (levelA != levelB) return levelA.ordinal() - levelB.ordinal();
+ if (levelA != levelB) {
+ return levelA.ordinal() - levelB.ordinal();
+ }
// Secondary sort
return view(am).ordinal() - view(bm).ordinal();
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodTransactionBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodTransactionBuilder.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodTransactionBuilder.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodTransactionBuilder.java Sat Feb 22 01:58:19 2014
@@ -46,7 +46,9 @@ public class MethodTransactionBuilder {
public static void applyTransactionAttributes(final BeanContext beanContext, List<MethodTransactionInfo> methodTransactionInfos) throws OpenEJBException {
- if (beanContext.isBeanManagedTransaction()) return;
+ if (beanContext.isBeanManagedTransaction()) {
+ return;
+ }
methodTransactionInfos = normalize(methodTransactionInfos);
@@ -62,7 +64,9 @@ public class MethodTransactionBuilder {
final MethodTransactionInfo transactionInfo = (MethodTransactionInfo) entry.getValue();
- if (debug) log.debug("Transaction Attribute: " + method + " -- " + MethodInfoUtil.toString(transactionInfo));
+ if (debug) {
+ log.debug("Transaction Attribute: " + method + " -- " + MethodInfoUtil.toString(transactionInfo));
+ }
beanContext.setMethodTransactionAttribute(method, TransactionType.get(transactionInfo.transAttribute), view);
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ProxyInterfaceResolver.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ProxyInterfaceResolver.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ProxyInterfaceResolver.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ProxyInterfaceResolver.java Sat Feb 22 01:58:19 2014
@@ -80,7 +80,9 @@ public class ProxyInterfaceResolver {
}
// No remote interfaces, we're good to go
- if (remotes.size() == 0) return valid;
+ if (remotes.size() == 0) {
+ return valid;
+ }
// -----------------------------------------------------------
// If we got here, we have potentially clashing interfaces
@@ -183,12 +185,18 @@ public class ProxyInterfaceResolver {
// This equals returns true only if the method signatures
// are the same *and* one is remote and one is not
public boolean equals(final Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
final Signature signature = (Signature) o;
- if (!sig.equals(signature.sig)) return false;
+ if (!sig.equals(signature.sig)) {
+ return false;
+ }
final boolean aIsRemote = Remote.class.isAssignableFrom(clazz);
final boolean bIsRemote = Remote.class.isAssignableFrom(signature.clazz);
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/cmd/Info2Properties.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/cmd/Info2Properties.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/cmd/Info2Properties.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/cmd/Info2Properties.java Sat Feb 22 01:58:19 2014
@@ -221,8 +221,12 @@ public class Info2Properties {
private static void copyOpenEjbProperties(final Properties source, final Properties dest) {
for (final Map.Entry<Object, Object> entry : source.entrySet()) {
- if (!(entry.getKey() instanceof String)) continue;
- if (!(entry.getValue() instanceof String)) continue;
+ if (!(entry.getKey() instanceof String)) {
+ continue;
+ }
+ if (!(entry.getValue() instanceof String)) {
+ continue;
+ }
final String key = (String) entry.getKey();
if (key.startsWith("openejb.")) {
@@ -275,8 +279,12 @@ public class Info2Properties {
p.put(info.id, uri);
for (final Map.Entry<Object, Object> entry : info.properties.entrySet()) {
- if (!(entry.getKey() instanceof String)) continue;
- if (!(entry.getValue() instanceof String)) continue;
+ if (!(entry.getKey() instanceof String)) {
+ continue;
+ }
+ if (!(entry.getValue() instanceof String)) {
+ continue;
+ }
// If property name is 'password' replace value with 'xxxx' to protect it
if ("password".equalsIgnoreCase((String) entry.getKey())) {
@@ -304,8 +312,11 @@ public class Info2Properties {
}
public void write(final int b) throws IOException {
- if (pastFirstLine) super.write(b);
- else pastFirstLine = b == '\n';
+ if (pastFirstLine) {
+ super.write(b);
+ } else {
+ pastFirstLine = b == '\n';
+ }
}
}
@@ -319,7 +330,9 @@ public class Info2Properties {
public void write(final int b) throws IOException {
super.write(b);
- if (b == '\n') super.write('#');
+ if (b == '\n') {
+ super.write('#');
+ }
}
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/bval/BeanValidationAppendixInterceptor.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/bval/BeanValidationAppendixInterceptor.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/bval/BeanValidationAppendixInterceptor.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/bval/BeanValidationAppendixInterceptor.java Sat Feb 22 01:58:19 2014
@@ -66,7 +66,9 @@ public class BeanValidationAppendixInter
@AroundInvoke
public Object aroundInvoke(final InvocationContext ejbContext) throws Exception {
- if (!BeanValidationAppendixInterceptor.ON) return ejbContext.proceed();
+ if (!BeanValidationAppendixInterceptor.ON) {
+ return ejbContext.proceed();
+ }
Object validatorObject = null;
Validator validator = null;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiPlugin.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiPlugin.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiPlugin.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiPlugin.java Sat Feb 22 01:58:19 2014
@@ -491,7 +491,9 @@ public class CdiPlugin extends AbstractO
}
public static Method doResolveViewMethod(final Bean<?> component, final Method declaredMethod) {
- if (!(component instanceof CdiEjbBean)) return declaredMethod;
+ if (!(component instanceof CdiEjbBean)) {
+ return declaredMethod;
+ }
final CdiEjbBean cdiEjbBean = (CdiEjbBean) component;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiResourceInjectionService.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiResourceInjectionService.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiResourceInjectionService.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiResourceInjectionService.java Sat Feb 22 01:58:19 2014
@@ -106,8 +106,12 @@ public class CdiResourceInjectionService
for (final BeanContext beanContext : compContexts) {
for (final Injection injection : beanContext.getInjections()) {
- if (injection.getTarget() == null) continue;
- if (!injection.getTarget().isAssignableFrom(clazz)) continue;
+ if (injection.getTarget() == null) {
+ continue;
+ }
+ if (!injection.getTarget().isAssignableFrom(clazz)) {
+ continue;
+ }
try {
final Object value = lookup(beanContext, injection);
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CustomELAdapter.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CustomELAdapter.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CustomELAdapter.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CustomELAdapter.java Sat Feb 22 01:58:19 2014
@@ -42,7 +42,9 @@ public class CustomELAdapter implements
@Override
public ExpressionFactory getOwbWrappedExpressionFactory(final ExpressionFactory expressionFactory) {
- if (!appContext.isCdiEnabled()) return expressionFactory;
+ if (!appContext.isCdiEnabled()) {
+ return expressionFactory;
+ }
return new WrappedExpressionFactory(expressionFactory);
}
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/OWBContextThreadListener.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/OWBContextThreadListener.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/OWBContextThreadListener.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/OWBContextThreadListener.java Sat Feb 22 01:58:19 2014
@@ -36,7 +36,9 @@ public class OWBContextThreadListener im
@Override
public void contextEntered(final ThreadContext oldContext, final ThreadContext newContext) {
final BeanContext beanContext = newContext.getBeanContext();
- if (beanContext == null) return;
+ if (beanContext == null) {
+ return;
+ }
final ModuleContext moduleContext = beanContext.getModuleContext();
//TODO its not clear what the scope for one of these context should be: ejb, module, or app
//For now, go with the attachment of the BeanManager to AppContext
@@ -53,7 +55,9 @@ public class OWBContextThreadListener im
@Override
public void contextExited(final ThreadContext exitedContext, final ThreadContext reenteredContext) {
final OWBContextHolder oldOWBContext = exitedContext.get(OWBContextHolder.class);
- if (oldOWBContext == null) throw new NullPointerException("OWBContext not set in this thread");
+ if (oldOWBContext == null) {
+ throw new NullPointerException("OWBContext not set in this thread");
+ }
singletonService.contextExited(oldOWBContext.getContext());
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/OptimizedLoaderService.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/OptimizedLoaderService.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/OptimizedLoaderService.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/OptimizedLoaderService.java Sat Feb 22 01:58:19 2014
@@ -57,7 +57,9 @@ public class OptimizedLoaderService impl
@Override
public <T> List<T> load(final Class<T> serviceType, final ClassLoader classLoader) {
// ServiceLoader is expensive (can take up to a half second). This is an optimization
- if (OpenWebBeansPlugin.class.equals(serviceType)) return loadWebBeansPlugins(classLoader);
+ if (OpenWebBeansPlugin.class.equals(serviceType)) {
+ return loadWebBeansPlugins(classLoader);
+ }
// As far as we know, this only is reached for CDI Extension discovery
final List<T> list = loaderService.load(serviceType, classLoader);
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/RequestScopedThreadContextListener.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/RequestScopedThreadContextListener.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/RequestScopedThreadContextListener.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/RequestScopedThreadContextListener.java Sat Feb 22 01:58:19 2014
@@ -53,11 +53,15 @@ public class RequestScopedThreadContextL
@Override
public void contextExited(final ThreadContext exitedContext, final ThreadContext reenteredContext) {
- if (exitedContext == null) return;
+ if (exitedContext == null) {
+ return;
+ }
final DestroyContext destroyContext = exitedContext.get(DestroyContext.class);
- if (destroyContext == null || destroyContext.threadContext != exitedContext) return;
+ if (destroyContext == null || destroyContext.threadContext != exitedContext) {
+ return;
+ }
destroyContext.contextsService.endContext(RequestScoped.class, null);
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cli/MainImpl.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cli/MainImpl.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cli/MainImpl.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cli/MainImpl.java Sat Feb 22 01:58:19 2014
@@ -221,7 +221,9 @@ public class MainImpl implements Main {
final ResourceFinder commandFinder = new ResourceFinder("META-INF");
final Map<String, Properties> commands = commandFinder.mapAvailableProperties("org.apache.openejb.cli");
for (final Map.Entry<String, Properties> command : commands.entrySet()) {
- if (command.getKey().contains(".")) continue;
+ if (command.getKey().contains(".")) {
+ continue;
+ }
final Properties p = command.getValue();
final String description = p.getProperty(descriptionI18n, p.getProperty(descriptionBase));
options.addOption(command.getKey(), false, description);
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ActivationConfigPropertyOverride.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ActivationConfigPropertyOverride.java?rev=1570779&r1=1570778&r2=1570779&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ActivationConfigPropertyOverride.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ActivationConfigPropertyOverride.java Sat Feb 22 01:58:19 2014
@@ -62,8 +62,9 @@ public class ActivationConfigPropertyOve
final String ejbName = bean.getEjbName();
final EjbDeployment ejbDeployment = deployments.get(ejbName);
- if (!(bean instanceof MessageDrivenBean))
+ if (!(bean instanceof MessageDrivenBean)) {
continue;
+ }
final Properties properties = new Properties();
properties.putAll(module);