Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/DefaultBeanArchiveInformation.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/DefaultBeanArchiveInformation.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/DefaultBeanArchiveInformation.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/DefaultBeanArchiveInformation.java Sun Jun 18 09:32:33 2017 @@ -35,10 +35,10 @@ public class DefaultBeanArchiveInformati private List<String> alternativeStereotypes = new ArrayList<String>(); /** Either an excluded class or an excluded .* path */ - private List<String> excludedClasses = null; + private List<String> excludedClasses; /** Exclude all subpackages (exclude= .**) */ - private List<String> excludedPackages = null; + private List<String> excludedPackages; private List<String> allowProxyingClasses = new ArrayList<String>(); public DefaultBeanArchiveInformation(String bdaUrl)
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/ElementIterator.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/ElementIterator.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/ElementIterator.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/ElementIterator.java Sun Jun 18 09:32:33 2017 @@ -31,7 +31,7 @@ import org.w3c.dom.NodeList; public class ElementIterator implements Iterator<Element> { private final NodeList children; - private int currentPosition = 0; + private int currentPosition; public ElementIterator(Element parent) { Modified: openwebbeans/trunk/webbeans-jms/src/main/java/org/apache/webbeans/jms/component/JmsBean.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-jms/src/main/java/org/apache/webbeans/jms/component/JmsBean.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-jms/src/main/java/org/apache/webbeans/jms/component/JmsBean.java (original) +++ openwebbeans/trunk/webbeans-jms/src/main/java/org/apache/webbeans/jms/component/JmsBean.java Sun Jun 18 09:32:33 2017 @@ -30,7 +30,7 @@ import org.apache.webbeans.jms.JMSModel; public class JmsBean<T> extends AbstractOwbBean<T> implements JmsBeanMarker { - private JMSModel jmsModel = null; + private JMSModel jmsModel; JmsBean(WebBeansContext webBeansContext, JMSModel jmsModel, BeanAttributes<T> beanAttributes) { Modified: openwebbeans/trunk/webbeans-jms/src/main/java/org/apache/webbeans/jms/component/JmsComponentFactory.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-jms/src/main/java/org/apache/webbeans/jms/component/JmsComponentFactory.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-jms/src/main/java/org/apache/webbeans/jms/component/JmsComponentFactory.java (original) +++ openwebbeans/trunk/webbeans-jms/src/main/java/org/apache/webbeans/jms/component/JmsComponentFactory.java Sun Jun 18 09:32:33 2017 @@ -61,7 +61,7 @@ public final class JmsComponentFactory Set<Type> apiTypes = new HashSet<Type>(); Set<Annotation> qualifiers = new HashSet<Annotation>(); - if(model.getJmsType().equals(JMSType.QUEUE)) + if(model.getJmsType() == JMSType.QUEUE) { apiTypes.add(Queue.class); apiTypes.add(QueueConnection.class); Modified: openwebbeans/trunk/webbeans-jms/src/main/java/org/apache/webbeans/jms/util/JmsProxyHandler.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-jms/src/main/java/org/apache/webbeans/jms/util/JmsProxyHandler.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-jms/src/main/java/org/apache/webbeans/jms/util/JmsProxyHandler.java (original) +++ openwebbeans/trunk/webbeans-jms/src/main/java/org/apache/webbeans/jms/util/JmsProxyHandler.java Sun Jun 18 09:32:33 2017 @@ -45,9 +45,9 @@ import org.apache.webbeans.util.ClassUti public class JmsProxyHandler implements InvocationHandler { - private JmsBean<?> jmsComponent = null; + private JmsBean<?> jmsComponent; - private static volatile ConnectionFactory connectionFactory = null; + private static volatile ConnectionFactory connectionFactory; private AtomicBoolean cfSet = new AtomicBoolean(false); @@ -55,9 +55,9 @@ public class JmsProxyHandler implements private static Map<String, Destination> dests = new ConcurrentHashMap<String, Destination>(); - private Object jmsObject = null; + private Object jmsObject; - private Class<?> injectionClazz = null; + private Class<?> injectionClazz; public JmsProxyHandler(JmsBean<?> jmsComponent, Class<?> injectionClazz) { @@ -232,7 +232,7 @@ public class JmsProxyHandler implements try { - if (jmsModel.getJmsType().equals(JMSType.QUEUE)) + if (jmsModel.getJmsType() == JMSType.QUEUE) { if (connections.containsKey(JMSType.QUEUE)) { @@ -247,7 +247,7 @@ public class JmsProxyHandler implements return qc; } } - else if (jmsModel.getJmsType().equals(JMSType.TOPIC)) + else if (jmsModel.getJmsType() == JMSType.TOPIC) { if (connections.containsKey(JMSType.TOPIC)) { Modified: openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/ConversationAwareViewHandler.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/ConversationAwareViewHandler.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/ConversationAwareViewHandler.java (original) +++ openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/ConversationAwareViewHandler.java Sun Jun 18 09:32:33 2017 @@ -33,7 +33,7 @@ public class ConversationAwareViewHandle { private final ViewHandler delegate; - private Boolean owbApplication = null; + private Boolean owbApplication; public ConversationAwareViewHandler(ViewHandler delegate) { Modified: openwebbeans/trunk/webbeans-maven/src/main/java/org/apache/openwebbeans/maven/shade/OpenWebBeansPropertiesTransformer.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-maven/src/main/java/org/apache/openwebbeans/maven/shade/OpenWebBeansPropertiesTransformer.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-maven/src/main/java/org/apache/openwebbeans/maven/shade/OpenWebBeansPropertiesTransformer.java (original) +++ openwebbeans/trunk/webbeans-maven/src/main/java/org/apache/openwebbeans/maven/shade/OpenWebBeansPropertiesTransformer.java Sun Jun 18 09:32:33 2017 @@ -36,7 +36,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 String s) Modified: openwebbeans/trunk/webbeans-osgi/src/main/java/org/apache/webbeans/osgi/scanner/OsgiMetaDataScannerService.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-osgi/src/main/java/org/apache/webbeans/osgi/scanner/OsgiMetaDataScannerService.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-osgi/src/main/java/org/apache/webbeans/osgi/scanner/OsgiMetaDataScannerService.java (original) +++ openwebbeans/trunk/webbeans-osgi/src/main/java/org/apache/webbeans/osgi/scanner/OsgiMetaDataScannerService.java Sun Jun 18 09:32:33 2017 @@ -59,7 +59,7 @@ public class OsgiMetaDataScannerService { private static final Logger logger = WebBeansLoggerFacade.getLogger(OsgiMetaDataScannerService.class); - protected ServletContext servletContext = null; + protected ServletContext servletContext; private static final String META_INF_BEANS_XML = "META-INF/beans.xml"; private static final String WEB_INF_BEANS_XML = "WEB-INF/beans.xml"; @@ -150,7 +150,7 @@ public class OsgiMetaDataScannerService @Override public boolean rangeDiscoveryRequired(DiscoveryRange discoveryRange) { - return discoveryRange.equals(DiscoveryRange.BUNDLE_CLASSPATH); + return discoveryRange == DiscoveryRange.BUNDLE_CLASSPATH; } }); Modified: openwebbeans/trunk/webbeans-resource/src/main/java/org/apache/webbeans/resource/spi/se/StandaloneResourceProcessor.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-resource/src/main/java/org/apache/webbeans/resource/spi/se/StandaloneResourceProcessor.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-resource/src/main/java/org/apache/webbeans/resource/spi/se/StandaloneResourceProcessor.java (original) +++ openwebbeans/trunk/webbeans-resource/src/main/java/org/apache/webbeans/resource/spi/se/StandaloneResourceProcessor.java Sun Jun 18 09:32:33 2017 @@ -37,7 +37,7 @@ import org.apache.webbeans.logger.WebBea public class StandaloneResourceProcessor { - private static InitialContext context = null; + private static InitialContext context; private static Logger logger = WebBeansLoggerFacade.getLogger(StandaloneResourceProcessor.class); Modified: openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationFilter.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationFilter.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationFilter.java (original) +++ openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationFilter.java Sun Jun 18 09:32:33 2017 @@ -61,7 +61,7 @@ public class WebBeansConfigurationFilter private static final Logger logger = WebBeansLoggerFacade.getLogger(WebBeansConfigurationFilter.class); /**Manages the container lifecycle*/ - protected ContainerLifecycle lifeCycle = null; + protected ContainerLifecycle lifeCycle; private WebBeansContext webBeansContext; private ServletContext servletContext; Modified: openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationHttpSessionListener.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationHttpSessionListener.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationHttpSessionListener.java (original) +++ openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationHttpSessionListener.java Sun Jun 18 09:32:33 2017 @@ -38,7 +38,7 @@ public class WebBeansConfigurationHttpSe private static final Logger logger = WebBeansLoggerFacade.getLogger(WebBeansConfigurationHttpSessionListener.class); /**Manages the container lifecycle*/ - protected ContainerLifecycle lifeCycle = null; + protected ContainerLifecycle lifeCycle; public WebBeansConfigurationHttpSessionListener() { Modified: openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationListener.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationListener.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationListener.java (original) +++ openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationListener.java Sun Jun 18 09:32:33 2017 @@ -58,7 +58,7 @@ public class WebBeansConfigurationListen /**Manages the container lifecycle*/ - protected ContainerLifecycle lifeCycle = null; + protected ContainerLifecycle lifeCycle; private WebBeansContext webBeansContext; private ContextsService contextsService; Modified: openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/context/WebContextsService.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/context/WebContextsService.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/context/WebContextsService.java (original) +++ openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/context/WebContextsService.java Sun Jun 18 09:32:33 2017 @@ -80,13 +80,13 @@ public class WebContextsService extends protected SingletonContext singletonContext; /**Current request context*/ - protected ThreadLocal<ServletRequestContext> requestContexts = null; + protected ThreadLocal<ServletRequestContext> requestContexts; /**Current session context*/ - protected ThreadLocal<SessionContext> sessionContexts = null; + protected ThreadLocal<SessionContext> sessionContexts; /**Current conversation context*/ - protected ThreadLocal<ConversationContext> conversationContexts = null; + protected ThreadLocal<ConversationContext> conversationContexts; /**Current dependent context*/ protected DependentContext dependentContext; @@ -94,11 +94,11 @@ public class WebContextsService extends /**Conversation context manager*/ protected final ConversationManager conversationManager; - protected Boolean eagerSessionInitialisation = null; - protected Pattern eagerSessionPattern = null; + protected Boolean eagerSessionInitialisation; + protected Pattern eagerSessionPattern; - protected Boolean fireRequestLifecycleEvents = null; + protected Boolean fireRequestLifecycleEvents; /** * Creates a new instance. Modified: openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/WebContainerLifecycle.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/WebContainerLifecycle.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/WebContainerLifecycle.java (original) +++ openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/WebContainerLifecycle.java Sun Jun 18 09:32:33 2017 @@ -54,7 +54,7 @@ import java.util.logging.Level; * @version $Rev: 911764 $Â $Date: 2010-02-19 11:52:54 +0200 (Fri, 19 Feb 2010) $ * @see org.apache.webbeans.servlet.WebBeansConfigurationListener */ -public final class WebContainerLifecycle extends AbstractLifeCycle +public class WebContainerLifecycle extends AbstractLifeCycle { /** Modified: openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/scanner/WebScannerService.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/scanner/WebScannerService.java?rev=1799064&r1=1799063&r2=1799064&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/scanner/WebScannerService.java (original) +++ openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/scanner/WebScannerService.java Sun Jun 18 09:32:33 2017 @@ -38,7 +38,7 @@ public class WebScannerService extends A private static final Logger logger = WebBeansLoggerFacade.getLogger(WebScannerService.class); - protected ServletContext servletContext = null; + protected ServletContext servletContext; public WebScannerService() {
