Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 99530200CAB for ; Sun, 18 Jun 2017 11:32:41 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 97ADB160BE3; Sun, 18 Jun 2017 09:32:41 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 47EA9160BCC for ; Sun, 18 Jun 2017 11:32:39 +0200 (CEST) Received: (qmail 22949 invoked by uid 500); 18 Jun 2017 09:32:38 -0000 Mailing-List: contact commits-help@openwebbeans.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openwebbeans.apache.org Delivered-To: mailing list commits@openwebbeans.apache.org Received: (qmail 22937 invoked by uid 99); 18 Jun 2017 09:32:38 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 18 Jun 2017 09:32:38 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 457243A0111 for ; Sun, 18 Jun 2017 09:32:36 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1799064 [1/2] - in /openwebbeans/trunk: samples/guess/src/main/java/org/apache/webbeans/sample/bean/ samples/guess/src/main/java/org/apache/webbeans/sample/guess/ samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/admi... Date: Sun, 18 Jun 2017 09:32:35 -0000 To: commits@openwebbeans.apache.org From: struberg@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20170618093237.457243A0111@svn01-us-west.apache.org> archived-at: Sun, 18 Jun 2017 09:32:41 -0000 Author: struberg Date: Sun Jun 18 09:32:33 2017 New Revision: 1799064 URL: http://svn.apache.org/viewvc?rev=1799064&view=rev Log: OWB-1195 apply codestyle check findings Modified: openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/bean/AppObject.java openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/bean/LoginBean.java openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/guess/JSFNumberGuess.java openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/admin/AdminListBean.java openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/user/UserListBean.java openwebbeans/trunk/samples/standalone-sample/src/main/java/org/apache/webbeans/se/sample/Boot.java openwebbeans/trunk/samples/standalone-sample/src/main/java/org/apache/webbeans/se/sample/beans/FileLogin.java openwebbeans/trunk/samples/standalone-sample/src/main/java/org/apache/webbeans/se/sample/gui/LoginWindow.java openwebbeans/trunk/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/OwbStandaloneConfiguration.java openwebbeans/trunk/webbeans-ee/src/main/java/org/apache/webbeans/ee/event/TransactionalEventNotifier.java openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/component/BaseEjbBean.java openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/util/EjbValidator.java openwebbeans/trunk/webbeans-gradle/src/main/java/org/apache/openwebbeans/gradle/shadow/OpenWebBeansPropertiesTransformer.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/AnyLiteral.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/DefaultLiteral.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/NewLiteral.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/boot/Bootstrap.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractOwbBean.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InterceptorBean.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerFieldBean.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ResourceBean.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ResourceProvider.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ObserverMethodsBuilder.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/SelfInterceptorBeanBuilder.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/third/ThirdpartyBeanImpl.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/DeploymentValidationService.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContext.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansFinder.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/configurator/BeanConfiguratorImpl.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/configurator/ObserverMethodConfiguratorImpl.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContext.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContextsService.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ApplicationContext.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/WrappedCreationalContext.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationImpl.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/AbstractMetaDataDiscovery.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/xbean/BeanArchiveFilter.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultContextsService.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/StereoTypeModel.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/EventUtil.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverMethodImpl.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableConstructor.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableMethod.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/ApplicationScopedBeanInterceptorHandler.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/ConstructorInterceptorInvocationContext.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorInvocationContext.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorResolutionService.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/LifecycleInterceptorInvocationContext.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/jms/JMSModel.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/plugins/PluginLoader.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractAnnotated.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractDecoratorInjectionTarget.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessAnnotatedTypeImpl.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessBeanAttributesImpl.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessInjectionTargetImpl.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessObserverMethodImpl.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessProducerImpl.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessSyntheticAnnotatedTypeImpl.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/AfterBeanDiscoveryImpl.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/BeforeBeanDiscoveryImpl.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/AbstractProxyFactory.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/AnnotationUtil.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ClassUtil.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/PriorityClasses.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/DefaultBeanArchiveInformation.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/ElementIterator.java openwebbeans/trunk/webbeans-jms/src/main/java/org/apache/webbeans/jms/component/JmsBean.java openwebbeans/trunk/webbeans-jms/src/main/java/org/apache/webbeans/jms/component/JmsComponentFactory.java openwebbeans/trunk/webbeans-jms/src/main/java/org/apache/webbeans/jms/util/JmsProxyHandler.java openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/ConversationAwareViewHandler.java openwebbeans/trunk/webbeans-maven/src/main/java/org/apache/openwebbeans/maven/shade/OpenWebBeansPropertiesTransformer.java openwebbeans/trunk/webbeans-osgi/src/main/java/org/apache/webbeans/osgi/scanner/OsgiMetaDataScannerService.java openwebbeans/trunk/webbeans-resource/src/main/java/org/apache/webbeans/resource/spi/se/StandaloneResourceProcessor.java openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationFilter.java openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationHttpSessionListener.java openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationListener.java openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/context/WebContextsService.java openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/WebContainerLifecycle.java openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/scanner/WebScannerService.java Modified: openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/bean/AppObject.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/bean/AppObject.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/bean/AppObject.java (original) +++ openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/bean/AppObject.java Sun Jun 18 09:32:33 2017 @@ -20,7 +20,7 @@ package org.apache.webbeans.sample.bean; public class AppObject { - public boolean config = false; + public boolean config; public AppObject() { config = true; Modified: openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/bean/LoginBean.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/bean/LoginBean.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/bean/LoginBean.java (original) +++ openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/bean/LoginBean.java Sun Jun 18 09:32:33 2017 @@ -41,7 +41,7 @@ import org.apache.webbeans.sample.util.F @Named public class LoginBean { - private User user = null; + private User user; private String userName; Modified: openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/guess/JSFNumberGuess.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/guess/JSFNumberGuess.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/guess/JSFNumberGuess.java (original) +++ openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/guess/JSFNumberGuess.java Sun Jun 18 09:32:33 2017 @@ -39,7 +39,7 @@ public class JSFNumberGuess implements S private static final long serialVersionUID = 2264057893898002872L; private int no; - private boolean correct = false; + private boolean correct; private int guess = 1; private int smallRange; private int maxRange; Modified: openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/admin/AdminListBean.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/admin/AdminListBean.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/admin/AdminListBean.java (original) +++ openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/admin/AdminListBean.java Sun Jun 18 09:32:33 2017 @@ -47,7 +47,7 @@ public class AdminListBean implements Se private Hotel selected; - private boolean renderedDetailPanel = false; + private boolean renderedDetailPanel; public String update() Modified: openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/user/UserListBean.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/user/UserListBean.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/user/UserListBean.java (original) +++ openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/user/UserListBean.java Sun Jun 18 09:32:33 2017 @@ -39,7 +39,7 @@ public class UserListBean private List reservations = new ArrayList(); - private HtmlDataTable model = null; + private HtmlDataTable model; private @Inject @Default UserController controller; Modified: openwebbeans/trunk/samples/standalone-sample/src/main/java/org/apache/webbeans/se/sample/Boot.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/standalone-sample/src/main/java/org/apache/webbeans/se/sample/Boot.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/samples/standalone-sample/src/main/java/org/apache/webbeans/se/sample/Boot.java (original) +++ openwebbeans/trunk/samples/standalone-sample/src/main/java/org/apache/webbeans/se/sample/Boot.java Sun Jun 18 09:32:33 2017 @@ -32,9 +32,9 @@ import org.apache.webbeans.spi.Container public class Boot { - private static ContainerLifecycle lifecycle = null; + private static ContainerLifecycle lifecycle; - private static JFrame frame = null; + private static JFrame frame; private static void boot(Object startupObject) throws Exception { Modified: openwebbeans/trunk/samples/standalone-sample/src/main/java/org/apache/webbeans/se/sample/beans/FileLogin.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/standalone-sample/src/main/java/org/apache/webbeans/se/sample/beans/FileLogin.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/samples/standalone-sample/src/main/java/org/apache/webbeans/se/sample/beans/FileLogin.java (original) +++ openwebbeans/trunk/samples/standalone-sample/src/main/java/org/apache/webbeans/se/sample/beans/FileLogin.java Sun Jun 18 09:32:33 2017 @@ -31,7 +31,7 @@ import org.apache.webbeans.se.sample.bin @Singleton public class FileLogin implements Login { - private static Properties properties = null; + private static Properties properties; static { Modified: openwebbeans/trunk/samples/standalone-sample/src/main/java/org/apache/webbeans/se/sample/gui/LoginWindow.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/standalone-sample/src/main/java/org/apache/webbeans/se/sample/gui/LoginWindow.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/samples/standalone-sample/src/main/java/org/apache/webbeans/se/sample/gui/LoginWindow.java (original) +++ openwebbeans/trunk/samples/standalone-sample/src/main/java/org/apache/webbeans/se/sample/gui/LoginWindow.java Sun Jun 18 09:32:33 2017 @@ -59,7 +59,7 @@ public class LoginWindow extends JPanel private JButton btnCancel; - private Logger logger = null; + private Logger logger; @Inject public LoginWindow(@JavaLogger LoggerFactory loggerFactory) Modified: openwebbeans/trunk/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/OwbStandaloneConfiguration.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/OwbStandaloneConfiguration.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/OwbStandaloneConfiguration.java (original) +++ openwebbeans/trunk/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/OwbStandaloneConfiguration.java Sun Jun 18 09:32:33 2017 @@ -34,13 +34,13 @@ public class OwbStandaloneConfiguration * used to skip classpath resources which are not in the archive, * can be useful when a resource should appear a single time in an app */ - private boolean useOnlyArchiveResources = false; - private String useOnlyArchiveResourcesExcludes = null; + private boolean useOnlyArchiveResources; + private String useOnlyArchiveResourcesExcludes; /** * config */ - private String properties = null; + private String properties; @Override public void validate() throws ConfigurationException Modified: openwebbeans/trunk/webbeans-ee/src/main/java/org/apache/webbeans/ee/event/TransactionalEventNotifier.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-ee/src/main/java/org/apache/webbeans/ee/event/TransactionalEventNotifier.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-ee/src/main/java/org/apache/webbeans/ee/event/TransactionalEventNotifier.java (original) +++ openwebbeans/trunk/webbeans-ee/src/main/java/org/apache/webbeans/ee/event/TransactionalEventNotifier.java Sun Jun 18 09:32:33 2017 @@ -77,11 +77,11 @@ public final class TransactionalEventNot if(transaction != null) { - if (phase.equals(TransactionPhase.AFTER_COMPLETION)) + if (phase == TransactionPhase.AFTER_COMPLETION) { registerEvent(transaction, new AfterCompletion(observer, event, metadata), true); } - else if (phase.equals(TransactionPhase.AFTER_SUCCESS)) + else if (phase == TransactionPhase.AFTER_SUCCESS) { if (transaction.getStatus() == Status.STATUS_NO_TRANSACTION) { @@ -93,11 +93,11 @@ public final class TransactionalEventNot registerEvent(transaction, new AfterCompletionSuccess(observer, event, metadata), false); } } - else if (phase.equals(TransactionPhase.AFTER_FAILURE)) + else if (phase == TransactionPhase.AFTER_FAILURE) { registerEvent(transaction, new AfterCompletionFailure(observer, event, metadata), true); } - else if (phase.equals(TransactionPhase.BEFORE_COMPLETION)) + else if (phase == TransactionPhase.BEFORE_COMPLETION) { registerEvent(transaction, new BeforeCompletion(observer, event, metadata), true); } Modified: openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/component/BaseEjbBean.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/component/BaseEjbBean.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/component/BaseEjbBean.java (original) +++ openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/component/BaseEjbBean.java Sun Jun 18 09:32:33 2017 @@ -83,7 +83,7 @@ public abstract class BaseEjbBean ext @Override public boolean isPassivationCapable() { - if(getEjbType().equals(SessionBeanType.STATEFUL)) + if(getEjbType() == SessionBeanType.STATEFUL) { return true; } Modified: openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/util/EjbValidator.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/util/EjbValidator.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/util/EjbValidator.java (original) +++ openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/util/EjbValidator.java Sun Jun 18 09:32:33 2017 @@ -72,14 +72,14 @@ public final class EjbValidator throw new NullPointerException("Session Bean type can not be null. It must be one of @Stateless, @Stateful, @Singleton"); } - if (ejbBean.getEjbType().equals(SessionBeanType.STATELESS)) + if (ejbBean.getEjbType() == SessionBeanType.STATELESS) { if (!ejbBean.getScope().equals(Dependent.class)) { throw new WebBeansConfigurationException("Stateless Session Bean class : " + ejbBean.getReturnType() + " " + "can not define scope other than @Dependent"); } } - else if (ejbBean.getEjbType().equals(SessionBeanType.SINGLETON)) + else if (ejbBean.getEjbType() == SessionBeanType.SINGLETON) { if (!ejbBean.getScope().equals(Dependent.class) && !ejbBean.getScope().equals(ApplicationScoped.class)) { Modified: openwebbeans/trunk/webbeans-gradle/src/main/java/org/apache/openwebbeans/gradle/shadow/OpenWebBeansPropertiesTransformer.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-gradle/src/main/java/org/apache/openwebbeans/gradle/shadow/OpenWebBeansPropertiesTransformer.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-gradle/src/main/java/org/apache/openwebbeans/gradle/shadow/OpenWebBeansPropertiesTransformer.java (original) +++ openwebbeans/trunk/webbeans-gradle/src/main/java/org/apache/openwebbeans/gradle/shadow/OpenWebBeansPropertiesTransformer.java Sun Jun 18 09:32:33 2017 @@ -37,7 +37,7 @@ public class OpenWebBeansPropertiesTrans private String resource = "META-INF/openwebbeans/openwebbeans.properties"; private String ordinalKey = "configuration.ordinal"; private int defaultOrdinal = 100; - private boolean reverseOrder = false; + private boolean reverseOrder; @Override public boolean canTransformResource(final FileTreeElement s) Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/AnyLiteral.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/AnyLiteral.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/AnyLiteral.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/AnyLiteral.java Sun Jun 18 09:32:33 2017 @@ -25,7 +25,7 @@ import javax.enterprise.inject.Any; public class AnyLiteral extends EmptyAnnotationLiteral implements Any { public static final AnyLiteral INSTANCE = new AnyLiteral(); - public static final Annotation[] ARRAY = new Annotation[]{AnyLiteral.INSTANCE}; + public static final Annotation[] ARRAY = {AnyLiteral.INSTANCE}; private static final String TOSTRING = "@javax.enterprise.inject.Any()"; private static final long serialVersionUID = -8922048102786275371L; Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/DefaultLiteral.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/DefaultLiteral.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/DefaultLiteral.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/DefaultLiteral.java Sun Jun 18 09:32:33 2017 @@ -32,7 +32,7 @@ import javax.enterprise.inject.Default; public class DefaultLiteral extends EmptyAnnotationLiteral implements Default { public static final DefaultLiteral INSTANCE = new DefaultLiteral(); - public static final Annotation[] ARRAY = new Annotation[]{DefaultLiteral.INSTANCE}; + public static final Annotation[] ARRAY = {DefaultLiteral.INSTANCE}; public static final Set SET = Collections.singleton(INSTANCE); private static final String TOSTRING = "@javax.enterprise.inject.Default()"; Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/NewLiteral.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/NewLiteral.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/NewLiteral.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/NewLiteral.java Sun Jun 18 09:32:33 2017 @@ -30,7 +30,7 @@ import javax.enterprise.util.AnnotationL public class NewLiteral extends AnnotationLiteral implements New { private static final long serialVersionUID = -2981014729208063412L; - private Class clazz = null; + private Class clazz; public NewLiteral() { Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/boot/Bootstrap.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/boot/Bootstrap.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/boot/Bootstrap.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/boot/Bootstrap.java Sun Jun 18 09:32:33 2017 @@ -34,9 +34,9 @@ public class Bootstrap private final CountDownLatch latch = new CountDownLatch(1); - private ContainerLifecycle containerLifecycle = null; + private ContainerLifecycle containerLifecycle; - private Properties properties = null; + private Properties properties; @SuppressWarnings("deprecated") public void init(Properties properties) Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractOwbBean.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractOwbBean.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractOwbBean.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractOwbBean.java Sun Jun 18 09:32:33 2017 @@ -53,7 +53,7 @@ public abstract class AbstractOwbBean implements OwbBean, PassivationCapable { /**Logger instance*/ - protected Logger logger = null; + protected Logger logger; /** Web Beans type */ protected WebBeansType webBeansType; @@ -72,7 +72,7 @@ public abstract class AbstractOwbBean * It will be created on the first use. * @see #getId() */ - protected String passivatingId = null; + protected String passivatingId; protected final WebBeansContext webBeansContext; @@ -247,7 +247,7 @@ public abstract class AbstractOwbBean } /** cache previously calculated result */ - private Boolean isPassivationCapable = null; + private Boolean isPassivationCapable; /** * Get web bean type of the bean. Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InterceptorBean.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InterceptorBean.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InterceptorBean.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InterceptorBean.java Sun Jun 18 09:32:33 2017 @@ -55,7 +55,7 @@ public abstract class InterceptorBean /** * This is for performance reasons */ - protected Method aroundInvokeMethod = null; + protected Method aroundInvokeMethod; protected InterceptorBean(WebBeansContext webBeansContext, AnnotatedType annotatedType, Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerFieldBean.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerFieldBean.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerFieldBean.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerFieldBean.java Sun Jun 18 09:32:33 2017 @@ -34,7 +34,7 @@ public class ProducerFieldBean extend { /** Producer field that defines the component */ - private Field producerField = null; + private Field producerField; /** * Defines the new producer field component. Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ResourceBean.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ResourceBean.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ResourceBean.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ResourceBean.java Sun Jun 18 09:32:33 2017 @@ -29,7 +29,7 @@ import javax.enterprise.inject.spi.Produ public class ResourceBean extends ProducerFieldBean { - private ResourceReference resourceReference = null; + private ResourceReference resourceReference; public ResourceBean(InjectionTargetBean ownerComponent, ResourceReference resourceReference, Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ResourceProvider.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ResourceProvider.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ResourceProvider.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ResourceProvider.java Sun Jun 18 09:32:33 2017 @@ -30,7 +30,7 @@ import java.io.Serializable; public class ResourceProvider implements Provider, Serializable { - private ResourceReference resourceReference = null; + private ResourceReference resourceReference; private transient WebBeansContext webBeansContext; public ResourceProvider(ResourceReference resourceReference, WebBeansContext webBeansContext) Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ObserverMethodsBuilder.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ObserverMethodsBuilder.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ObserverMethodsBuilder.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ObserverMethodsBuilder.java Sun Jun 18 09:32:33 2017 @@ -179,7 +179,7 @@ public class ObserverMethodsBuilder reception = observesAsync.notifyObserver(); } - if(reception.equals(Reception.IF_EXISTS)) + if(reception == Reception.IF_EXISTS) { throw new WebBeansConfigurationException("Dependent Bean : " + annotatedType.getJavaClass() + " can not define observer method with @Receiver = IF_EXIST"); } Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/SelfInterceptorBeanBuilder.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/SelfInterceptorBeanBuilder.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/SelfInterceptorBeanBuilder.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/SelfInterceptorBeanBuilder.java Sun Jun 18 09:32:33 2017 @@ -34,7 +34,7 @@ import org.apache.webbeans.config.WebBea */ public class SelfInterceptorBeanBuilder extends InterceptorBeanBuilder> { - private boolean enabled = false; + private boolean enabled; public SelfInterceptorBeanBuilder(WebBeansContext webBeansContext, AnnotatedType annotatedType, BeanAttributesImpl beanAttributes) { Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/third/ThirdpartyBeanImpl.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/third/ThirdpartyBeanImpl.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/third/ThirdpartyBeanImpl.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/third/ThirdpartyBeanImpl.java Sun Jun 18 09:32:33 2017 @@ -33,7 +33,7 @@ import org.apache.webbeans.context.creat public class ThirdpartyBeanImpl extends AbstractOwbBean implements Bean { - private Bean bean = null; + private Bean bean; public ThirdpartyBeanImpl(WebBeansContext webBeansContext, Bean bean) { Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java Sun Jun 18 09:32:33 2017 @@ -170,13 +170,13 @@ public class BeansDeployer /**Deployment is started or not*/ - protected boolean deployed = false; + protected boolean deployed; /**XML Configurator*/ protected BeanArchiveService beanArchiveService; /**Discover ejb or not*/ - protected boolean discoverEjb = false; + protected boolean discoverEjb; private final WebBeansContext webBeansContext; private final ScannerService scannerService; @@ -434,7 +434,7 @@ public class BeansDeployer BeanArchiveInformation bdaInfo = atEntry.getKey(); List> annotatedTypes = atEntry.getValue(); - boolean onlyScopedBeans = BeanDiscoveryMode.TRIM.equals(bdaInfo.getBeanDiscoveryMode()); + boolean onlyScopedBeans = BeanDiscoveryMode.TRIM == bdaInfo.getBeanDiscoveryMode(); final Map, ExtendedBeanAttributes> bdaBeanAttributes = new IdentityHashMap, ExtendedBeanAttributes>(annotatedTypes.size()); final Iterator> iterator = annotatedTypes.iterator(); Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/DeploymentValidationService.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/DeploymentValidationService.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/DeploymentValidationService.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/DeploymentValidationService.java Sun Jun 18 09:32:33 2017 @@ -56,7 +56,7 @@ public class DeploymentValidationService /** * Classes which are allowed to be proxies despite having a non-private, non-static final method */ - private Set allowProxyingClasses = null; + private Set allowProxyingClasses; public DeploymentValidationService(WebBeansContext webBeansContext) Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContext.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContext.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContext.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContext.java Sun Jun 18 09:32:33 2017 @@ -104,7 +104,7 @@ public class WebBeansContext private ScannerService scannerService; private ContextsService contextsService; private final ConversationManager conversationManager; - private ConversationService conversationService = null; + private ConversationService conversationService; private final ApplicationBoundaryService applicationBoundaryService; private final NotificationManager notificationManager; Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansFinder.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansFinder.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansFinder.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansFinder.java Sun Jun 18 09:32:33 2017 @@ -37,7 +37,7 @@ public final class WebBeansFinder private static SingletonService singletonService = new DefaultSingletonService(); /** safety mechanism to allow setting a special SingletonService only once */ - private static boolean customSingletonServiceUsed = false; + private static boolean customSingletonServiceUsed; /** * No instantiate. Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/configurator/BeanConfiguratorImpl.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/configurator/BeanConfiguratorImpl.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/configurator/BeanConfiguratorImpl.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/configurator/BeanConfiguratorImpl.java Sun Jun 18 09:32:33 2017 @@ -51,10 +51,10 @@ public class BeanConfiguratorImpl imp { private final WebBeansContext webBeansContext; - private Class beanClass = null; - private String passivationId = null; + private Class beanClass; + private String passivationId; private Class scope = Dependent.class; - private String name = null; + private String name; private boolean alternative; private Set typeClosures = new LinkedHashSet<>(); @@ -333,7 +333,7 @@ public class BeanConfiguratorImpl imp { private final Class returnType; private final boolean dependent; - private boolean specialized = false; + private boolean specialized; private boolean enabled = true; public ConstructedBean() Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/configurator/ObserverMethodConfiguratorImpl.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/configurator/ObserverMethodConfiguratorImpl.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/configurator/ObserverMethodConfiguratorImpl.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/configurator/ObserverMethodConfiguratorImpl.java Sun Jun 18 09:32:33 2017 @@ -64,7 +64,7 @@ public class ObserverMethodConfiguratorI private Reception reception = Reception.ALWAYS; private TransactionPhase transactionPhase = TransactionPhase.IN_PROGRESS; private int priority = ObserverMethod.DEFAULT_PRIORITY; - private boolean async = false; + private boolean async; private EventConsumer notifyWith; Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java Sun Jun 18 09:32:33 2017 @@ -149,7 +149,7 @@ public class BeanManagerImpl implements private Map, Object> cacheProxies = new ConcurrentHashMap, Object>(); /**Injection resolver instance*/ - private InjectionResolver injectionResolver = null; + private InjectionResolver injectionResolver; /** * This list contains additional qualifiers which got set via the @@ -195,7 +195,7 @@ public class BeanManagerImpl implements * (all non-internal beans like {@link org.apache.webbeans.component.BeanManagerBean;} etc) * gets set. */ - private boolean inUse = false; + private boolean inUse; /** * This flag will get set to handle lifecyle around @@ -207,7 +207,7 @@ public class BeanManagerImpl implements * This flag will get set to {@code true} after the * {@link javax.enterprise.inject.spi.AfterDeploymentValidation} gets fired */ - private boolean afterDeploymentValidationFired = false; + private boolean afterDeploymentValidationFired; /** * we cache results of calls to {@link #isNormalScope(Class)} because Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContext.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContext.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContext.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContext.java Sun Jun 18 09:32:33 2017 @@ -57,7 +57,7 @@ public abstract class AbstractContext im /**Context contextual instances*/ - protected Map, BeanInstanceBag> componentInstanceMap = null; + protected Map, BeanInstanceBag> componentInstanceMap; /**Contextual Scope Type*/ protected Class scopeType; Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContextsService.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContextsService.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContextsService.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContextsService.java Sun Jun 18 09:32:33 2017 @@ -35,7 +35,7 @@ public abstract class AbstractContextsSe { protected final WebBeansContext webBeansContext; - protected boolean supportsConversation = false; + protected boolean supportsConversation; protected AbstractContextsService(WebBeansContext webBeansContext) Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ApplicationContext.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ApplicationContext.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ApplicationContext.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ApplicationContext.java Sun Jun 18 09:32:33 2017 @@ -40,7 +40,7 @@ public class ApplicationContext extends * used to prevent us firing the Destroyed event twice. * We cannot just use setActive(false) as this would trash @BeforeShutdown */ - private boolean destroyed = false; + private boolean destroyed; public ApplicationContext() { Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java Sun Jun 18 09:32:33 2017 @@ -50,29 +50,29 @@ public class CreationalContextImpl im /** * The injection point objects to be injected into injection points of type InjectionPoint */ - private transient Stack injectionPoints = null; + private transient Stack injectionPoints; /** * The EventMetadata objects to be injected into injection points of type EventMetadata */ - private transient Stack eventMetadata = null; + private transient Stack eventMetadata; /** * Contextual bean dependent instances * *

ATTENTION This variable gets initiated lazily!

*/ - private List> dependentObjects = null; + private List> dependentObjects; /** * Contains the currently created bean */ - private Bean bean = null; + private Bean bean; /** * Contains the currently created contextual, may be a bean, interceptor or decorator */ - private Contextual contextual = null; + private Contextual contextual; private WebBeansContext webBeansContext; @@ -80,7 +80,7 @@ public class CreationalContextImpl im * This flag will get set to true to prevent recursive loops while destroying * the CreationContext. */ - private boolean destroying = false; + private boolean destroying; /** * Package private Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/WrappedCreationalContext.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/WrappedCreationalContext.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/WrappedCreationalContext.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/WrappedCreationalContext.java Sun Jun 18 09:32:33 2017 @@ -27,7 +27,7 @@ class WrappedCreationalContext extend { private static final long serialVersionUID = 3580925478881669439L; - private CreationalContext wrapped = null; + private CreationalContext wrapped; WrappedCreationalContext(Contextual contextual, CreationalContext creationalContext, WebBeansContext webBeansContext) Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationImpl.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationImpl.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationImpl.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationImpl.java Sun Jun 18 09:32:33 2017 @@ -65,9 +65,9 @@ public class ConversationImpl implements /** * Active duration of the conversation */ - private long lastAccessTime = 0L; + private long lastAccessTime; - private transient RuntimeException problemDuringCreation = null; + private transient RuntimeException problemDuringCreation; /** * This instance is under used and by which threads, Atomicinteger would be great but then contract of ContextsService but be enhanced to Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/AbstractMetaDataDiscovery.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/AbstractMetaDataDiscovery.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/AbstractMetaDataDiscovery.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/AbstractMetaDataDiscovery.java Sun Jun 18 09:32:33 2017 @@ -91,7 +91,7 @@ public abstract class AbstractMetaDataDi protected ClassLoader loader; protected CdiArchive archive; protected OwbAnnotationFinder finder; - protected boolean isBDAScannerEnabled = false; + protected boolean isBDAScannerEnabled; protected BDABeansXmlScanner bdaBeansXmlScanner; protected WebBeansContext webBeansContext; @@ -379,7 +379,7 @@ public abstract class AbstractMetaDataDi for (CdiArchive.FoundClasses foundClasses : archive.classesByUrl().values()) { Set> classSet = new HashSet>(); - boolean scanModeAnnotated = BeanDiscoveryMode.ANNOTATED.equals(foundClasses.getBeanArchiveInfo().getBeanDiscoveryMode()); + boolean scanModeAnnotated = BeanDiscoveryMode.ANNOTATED == foundClasses.getBeanArchiveInfo().getBeanDiscoveryMode(); for (String className : foundClasses.getClassNames()) { try Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/xbean/BeanArchiveFilter.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/xbean/BeanArchiveFilter.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/xbean/BeanArchiveFilter.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/xbean/BeanArchiveFilter.java Sun Jun 18 09:32:33 2017 @@ -42,7 +42,7 @@ public class BeanArchiveFilter implement this.userFilter = userFilter; BeanDiscoveryMode discoveryMode = beanArchiveInfo.getBeanDiscoveryMode(); - scanNone = BeanDiscoveryMode.NONE.equals(discoveryMode); + scanNone = BeanDiscoveryMode.NONE == discoveryMode; } @Override Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultContextsService.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultContextsService.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultContextsService.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultContextsService.java Sun Jun 18 09:32:33 2017 @@ -48,17 +48,17 @@ import org.apache.webbeans.intercept.Ses public class DefaultContextsService extends AbstractContextsService { - private static ThreadLocal requestContext = null; + private static ThreadLocal requestContext; - private static ThreadLocal sessionContext = null; + private static ThreadLocal sessionContext; - private ApplicationContext applicationContext = null; + private ApplicationContext applicationContext; - private static ThreadLocal conversationContext = null; + private static ThreadLocal conversationContext; - private static ThreadLocal singletonContext = null; + private static ThreadLocal singletonContext; - private static ThreadLocal dependentContext = null; + private static ThreadLocal dependentContext; private final boolean supportsConversation; Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/StereoTypeModel.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/StereoTypeModel.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/StereoTypeModel.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/StereoTypeModel.java Sun Jun 18 09:32:33 2017 @@ -157,22 +157,22 @@ public class StereoTypeModel implements for (ElementType innerValue : innerValues) { - if (innerValue.equals(ElementType.METHOD) || innerValue.equals(ElementType.FIELD)) + if (innerValue == ElementType.METHOD || innerValue == ElementType.FIELD) { for (ElementType outerValue : outerValues) { - if (outerValue.equals(ElementType.TYPE) && outerValues.length == 1) + if (outerValue == ElementType.TYPE && outerValues.length == 1) { throw new WebBeansConfigurationException("Inherited StereoType with class name : " + clazz.getName() + " must have compatible @Target annotation with Stereotype class name : " + clazz.getName()); } } } - else if (innerValue.equals(ElementType.TYPE) && innerValues.length == 1) + else if (innerValue == ElementType.TYPE && innerValues.length == 1) { for (ElementType outerValue : outerValues) { - if (outerValue.equals(ElementType.METHOD) || outerValue.equals(ElementType.FIELD)) + if (outerValue == ElementType.METHOD || outerValue == ElementType.FIELD) { throw new WebBeansConfigurationException("Inherited StereoType with class name : " + clazz.getName() + " must have compatible @Target annotation with Stereotype class name : " + clazz.getName()); Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/EventUtil.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/EventUtil.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/EventUtil.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/EventUtil.java Sun Jun 18 09:32:33 2017 @@ -47,7 +47,7 @@ public final class EventUtil //This is added, because TCK Event tests for this. Retention retention = qualifier.annotationType().getAnnotation(Retention.class); RetentionPolicy policy = retention.value(); - if(!policy.equals(RetentionPolicy.RUNTIME)) + if(policy != RetentionPolicy.RUNTIME) { throw new IllegalArgumentException("Event qualifier RetentionPolicy must be RUNTIME for qualifier : " + qualifier.annotationType().getName()); } Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java Sun Jun 18 09:32:33 2017 @@ -704,7 +704,7 @@ public final class NotificationManager TransactionPhase phase = observer.getTransactionPhase(); - if(phase != null && !phase.equals(TransactionPhase.IN_PROGRESS)) + if(phase != null && phase != TransactionPhase.IN_PROGRESS) { if (async) { @@ -929,7 +929,7 @@ public final class NotificationManager private static final class CloseableExecutor implements Executor, Closeable { private final Collection tracker = new CopyOnWriteArrayList<>(); - private volatile boolean reject = false; + private volatile boolean reject; @Override public void close() throws IOException Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverMethodImpl.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverMethodImpl.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverMethodImpl.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverMethodImpl.java Sun Jun 18 09:32:33 2017 @@ -116,7 +116,7 @@ public class ObserverMethodImpl imple private int priority = ObserverMethod.DEFAULT_PRIORITY; - private boolean isAsync = false; + private boolean isAsync; private static class ObserverParams { @@ -126,7 +126,7 @@ public class ObserverMethodImpl imple private CreationalContext creational; - private boolean isBean = false; + private boolean isBean; } /** Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableConstructor.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableConstructor.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableConstructor.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableConstructor.java Sun Jun 18 09:32:33 2017 @@ -42,7 +42,7 @@ public class InjectableConstructor ex /** Injectable constructor instance */ protected Constructor con; - private Object[] params = null; + private Object[] params; private T instance; /** Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableMethod.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableMethod.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableMethod.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableMethod.java Sun Jun 18 09:32:33 2017 @@ -54,7 +54,7 @@ public class InjectableMethod extends private boolean disposable; /**Used in dispose method, represents produces method parameter instance*/ - private Object producerMethodInstance = null; + private Object producerMethodInstance; private Map, Object> dependentParameters = new HashMap, Object>(); Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/ApplicationScopedBeanInterceptorHandler.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/ApplicationScopedBeanInterceptorHandler.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/ApplicationScopedBeanInterceptorHandler.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/ApplicationScopedBeanInterceptorHandler.java Sun Jun 18 09:32:33 2017 @@ -46,7 +46,7 @@ public class ApplicationScopedBeanInterc * contextual instances because they could be injected into EJBs or other * shared instances which span over multiple web-apps. */ - private transient Object cachedInstance = null; + private transient Object cachedInstance; public ApplicationScopedBeanInterceptorHandler(BeanManager beanManager, Bean bean) Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/ConstructorInterceptorInvocationContext.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/ConstructorInterceptorInvocationContext.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/ConstructorInterceptorInvocationContext.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/ConstructorInterceptorInvocationContext.java Sun Jun 18 09:32:33 2017 @@ -30,7 +30,7 @@ import java.util.Map; public class ConstructorInterceptorInvocationContext extends InterceptorInvocationContext { - protected Object newInstance = null; + protected Object newInstance; public ConstructorInterceptorInvocationContext(final Provider provider, final List> aroundConstructInterceptors, Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorInvocationContext.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorInvocationContext.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorInvocationContext.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorInvocationContext.java Sun Jun 18 09:32:33 2017 @@ -35,7 +35,7 @@ public class InterceptorInvocationContex protected InterceptionType type; protected List> interceptors; protected Map, ?> instances; - protected int index = 0; + protected int index; public InterceptorInvocationContext(Provider provider, InterceptionType type, List> interceptors, Map, ?> instances, Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorResolutionService.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorResolutionService.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorResolutionService.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorResolutionService.java Sun Jun 18 09:32:33 2017 @@ -913,7 +913,7 @@ public class InterceptorResolutionServic /** * All the Decorator Beans active on this class. */ - private List> decorators = null; + private List> decorators; /** * For each business method which is either decorated or intercepted we keep an entry. @@ -986,9 +986,9 @@ public class InterceptorResolutionServic */ public static class BusinessMethodInterceptorInfo { - private Interceptor[] ejbInterceptors = null; - private Interceptor[] cdiInterceptors = null; - private LinkedHashMap, Method> methodDecorators = null; + private Interceptor[] ejbInterceptors; + private Interceptor[] cdiInterceptors; + private LinkedHashMap, Method> methodDecorators; public BusinessMethodInterceptorInfo() { Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/LifecycleInterceptorInvocationContext.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/LifecycleInterceptorInvocationContext.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/LifecycleInterceptorInvocationContext.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/LifecycleInterceptorInvocationContext.java Sun Jun 18 09:32:33 2017 @@ -41,7 +41,7 @@ public class LifecycleInterceptorInvocat private List> interceptors; private Map, ?> instances; private Map contextData = new HashMap(); - private int interceptorIndex = 0; + private int interceptorIndex; private List> lifecycleMethods; public LifecycleInterceptorInvocationContext(T target, InterceptionType type, List> interceptors, Map, ?> instances, Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/jms/JMSModel.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/jms/JMSModel.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/jms/JMSModel.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/jms/JMSModel.java Sun Jun 18 09:32:33 2017 @@ -145,7 +145,7 @@ public class JMSModel return false; } } - else if (!jmsType.equals(other.jmsType)) + else if (jmsType != other.jmsType) { return false; } Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/plugins/PluginLoader.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/plugins/PluginLoader.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/plugins/PluginLoader.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/plugins/PluginLoader.java Sun Jun 18 09:32:33 2017 @@ -52,7 +52,7 @@ public class PluginLoader private static final Logger logger = WebBeansLoggerFacade.getLogger(PluginLoader.class); /** unmodifiable list with all found OWB plugins */ - private List plugins = null; + private List plugins; private AtomicBoolean started = new AtomicBoolean(false); Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractAnnotated.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractAnnotated.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractAnnotated.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractAnnotated.java Sun Jun 18 09:32:33 2017 @@ -49,7 +49,7 @@ public abstract class AbstractAnnotated private final Type baseType; /**Type closures*/ - private Set typeClosures = null; + private Set typeClosures; /**Set of annotations*/ private Set annotations = new HashSet<>(); Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractDecoratorInjectionTarget.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractDecoratorInjectionTarget.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractDecoratorInjectionTarget.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractDecoratorInjectionTarget.java Sun Jun 18 09:32:33 2017 @@ -36,7 +36,7 @@ import org.apache.webbeans.inject.Inject public class AbstractDecoratorInjectionTarget extends InjectionTargetImpl { - private Class proxySubClass = null; + private Class proxySubClass; public AbstractDecoratorInjectionTarget(AnnotatedType annotatedType, Set points, WebBeansContext webBeansContext, List> postConstructMethods, List> preDestroyMethods) Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessAnnotatedTypeImpl.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessAnnotatedTypeImpl.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessAnnotatedTypeImpl.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessAnnotatedTypeImpl.java Sun Jun 18 09:32:33 2017 @@ -37,22 +37,22 @@ public class ProcessAnnotatedTypeImpl /**Annotated Type*/ - private AnnotatedType annotatedType = null; + private AnnotatedType annotatedType; /**veto or not*/ - private boolean veto = false; + private boolean veto; /** * This field gets set to true when a custom AnnotatedType * got set in an Extension. In this case we must now take this modified * AnnotatedType for our further processing! */ - private boolean modifiedAnnotatedType = false; + private boolean modifiedAnnotatedType; /** * Gets set when one makes use the AnnotatedTypeConfigurator */ - private AnnotatedTypeConfiguratorImpl configurator = null; + private AnnotatedTypeConfiguratorImpl configurator; /** * Creates a new instance with the given annotated type. Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessBeanAttributesImpl.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessBeanAttributesImpl.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessBeanAttributesImpl.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessBeanAttributesImpl.java Sun Jun 18 09:32:33 2017 @@ -31,10 +31,10 @@ public class ProcessBeanAttributesImpl attributes; - private boolean veto = false; - private Throwable definitionError = null; - private boolean ignoreFinalMethods = false; - private BeanAttributesConfiguratorImpl beanAttributesConfigurator = null; + private boolean veto; + private Throwable definitionError; + private boolean ignoreFinalMethods; + private BeanAttributesConfiguratorImpl beanAttributesConfigurator; public ProcessBeanAttributesImpl(WebBeansContext webBeansContext, Annotated annotated, BeanAttributes attributes) { Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessInjectionTargetImpl.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessInjectionTargetImpl.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessInjectionTargetImpl.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessInjectionTargetImpl.java Sun Jun 18 09:32:33 2017 @@ -37,10 +37,10 @@ public class ProcessInjectionTargetImpl< private final AnnotatedType annotatedType; /**Injection target that is used by container to inject dependencies*/ - private InjectionTarget injectionTarget = null; + private InjectionTarget injectionTarget; /**Injection target is set or not*/ - private boolean set = false; + private boolean set; /** * Creates a new instance. Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessObserverMethodImpl.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessObserverMethodImpl.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessObserverMethodImpl.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessObserverMethodImpl.java Sun Jun 18 09:32:33 2017 @@ -45,8 +45,8 @@ public class ProcessObserverMethodImpl observerMethod; - private boolean vetoed = false; - private ObserverMethodConfiguratorImpl observerMethodConfigurator = null; + private boolean vetoed; + private ObserverMethodConfiguratorImpl observerMethodConfigurator; private Extension extension; Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessProducerImpl.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessProducerImpl.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessProducerImpl.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessProducerImpl.java Sun Jun 18 09:32:33 2017 @@ -40,11 +40,11 @@ public class ProcessProducerImpl ex private final AnnotatedMember annotateMember; /**Used by container to produce instance for producer method or field*/ - private Producer producer = null; + private Producer producer; - private ProducerConfiguratorImpl producerConfigurator = null; + private ProducerConfiguratorImpl producerConfigurator; - private boolean customProducerSet = false; + private boolean customProducerSet; public ProcessProducerImpl(Producer producer,AnnotatedMember annotateMember) { Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessSyntheticAnnotatedTypeImpl.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessSyntheticAnnotatedTypeImpl.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessSyntheticAnnotatedTypeImpl.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessSyntheticAnnotatedTypeImpl.java Sun Jun 18 09:32:33 2017 @@ -40,7 +40,7 @@ public class ProcessSyntheticAnnotatedTy * got set in an Extension. In this case we must now take this modified * AnnotatedType for our further processing! */ - private boolean modifiedAnnotatedType = false; + private boolean modifiedAnnotatedType; public ProcessSyntheticAnnotatedTypeImpl(WebBeansContext webBeansContext, AnnotatedType annotatedType, Extension source) Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/AfterBeanDiscoveryImpl.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/AfterBeanDiscoveryImpl.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/AfterBeanDiscoveryImpl.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/AfterBeanDiscoveryImpl.java Sun Jun 18 09:32:33 2017 @@ -61,7 +61,7 @@ import java.util.logging.Logger; */ public class AfterBeanDiscoveryImpl extends EventBase implements AfterBeanDiscovery, ExtensionAware { - private BeanManagerImpl beanManager = null; + private BeanManagerImpl beanManager; private static final Logger logger = WebBeansLoggerFacade.getLogger(AfterBeanDiscoveryImpl.class); private final WebBeansContext webBeansContext; Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/BeforeBeanDiscoveryImpl.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/BeforeBeanDiscoveryImpl.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/BeforeBeanDiscoveryImpl.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/BeforeBeanDiscoveryImpl.java Sun Jun 18 09:32:33 2017 @@ -46,7 +46,7 @@ import org.apache.webbeans.portable.even public class BeforeBeanDiscoveryImpl extends EventBase implements BeforeBeanDiscovery, ExtensionAware { - private BeanManagerImpl beanManager = null; + private BeanManagerImpl beanManager; private final WebBeansContext webBeansContext; private Extension extension; private Map annotatedTypeConfigurators = new HashMap<>(); Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/AbstractProxyFactory.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/AbstractProxyFactory.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/AbstractProxyFactory.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/AbstractProxyFactory.java Sun Jun 18 09:32:33 2017 @@ -64,8 +64,8 @@ public abstract class AbstractProxyFacto * We use it for creating the proxy instance without fully * initializing the class. */ - private Object unsafe = null; - private Method unsafeAllocateInstance = null; + private Object unsafe; + private Method unsafeAllocateInstance; private Method unsafeDefineClass; private final int javaVersion; @@ -283,7 +283,7 @@ public abstract class AbstractProxyFacto ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_FRAMES); String classFileName = classToProxy.getName().replace('.', '/'); - String[] interfaceNames = new String[]{Type.getInternalName(getMarkerInterface())}; + String[] interfaceNames = {Type.getInternalName(getMarkerInterface())}; String superClassName = classFileName; if (classToProxy.isInterface()) Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/AnnotationUtil.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/AnnotationUtil.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/AnnotationUtil.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/AnnotationUtil.java Sun Jun 18 09:32:33 2017 @@ -48,7 +48,7 @@ public final class AnnotationUtil public static final Object[] EMPTY_OBJECT_ARRAY = new Object[0]; - public static final Annotation[] DEFAULT_AND_ANY_ANNOTATION_ARRAY = new Annotation[] {DefaultLiteral.INSTANCE, AnyLiteral.INSTANCE}; + public static final Annotation[] DEFAULT_AND_ANY_ANNOTATION_ARRAY = {DefaultLiteral.INSTANCE, AnyLiteral.INSTANCE}; public static final Set DEFAULT_AND_ANY_ANNOTATION = Collections.unmodifiableSet(ArrayUtil.asSet(DEFAULT_AND_ANY_ANNOTATION_ARRAY)); Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ClassUtil.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ClassUtil.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ClassUtil.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ClassUtil.java Sun Jun 18 09:32:33 2017 @@ -255,7 +255,7 @@ public final class ClassUtil return objectMethodNames; } - private static volatile Set objectMethodNames= null; + private static volatile Set objectMethodNames; /** * collect all non-private, non-static and non-abstract methods from the given class. Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/PriorityClasses.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/PriorityClasses.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/PriorityClasses.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/PriorityClasses.java Sun Jun 18 09:32:33 2017 @@ -32,7 +32,7 @@ public class PriorityClasses * value: the priority. Alternatives from beans.xml have -1 as they are lowest prio. */ private final List raw = new ArrayList(); - private List> sorted = null; + private List> sorted; public void add(final Class clazz, final Priority priority) { Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java Sun Jun 18 09:32:33 2017 @@ -629,7 +629,7 @@ public final class WebBeansUtil * * @param sortedProducerBeans */ - protected void configSpecializedProducerMethodBeans(List sortedProducerBeans) + private void configSpecializedProducerMethodBeans(List sortedProducerBeans) { if (sortedProducerBeans.isEmpty()) {