You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by st...@apache.org on 2015/05/19 08:21:55 UTC
svn commit: r1680185 - in /openwebbeans/trunk:
webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/
webbeans-ee/src/main/java/org/apache/webbeans/ee/event/
webbeans-el22/src/test/java/org/apache/webbean...
Author: struberg
Date: Tue May 19 06:21:53 2015
New Revision: 1680185
URL: http://svn.apache.org/r1680185
Log:
bring method and field modifiers in order with JLS suggestions
Just to make Sonar even happier
Modified:
openwebbeans/trunk/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/OwbArquillianScannerService.java
openwebbeans/trunk/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/OwbSWClassLoader.java
openwebbeans/trunk/webbeans-ee/src/main/java/org/apache/webbeans/ee/event/TransactionalEventNotifier.java
openwebbeans/trunk/webbeans-el22/src/test/java/org/apache/webbeans/el/test/ELPerformanceTest.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OpenWebBeansConfiguration.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/PropertyLoader.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationManager.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverMethodImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedElementFactory.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/AbstractProxyFactory.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/InterceptorDecoratorProxyFactory.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/contexts/threadsafety/LongInitApplicationBean.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/contexts/threadsafety/ThreadSafeBeanInitialisationTest.java
openwebbeans/trunk/webbeans-jee5-ejb-resource/src/main/java/org/apache/webbeans/resource/spi/ee/ExtendedStandaloneResourceInjectionService.java
openwebbeans/trunk/webbeans-tomcat6/src/main/java/org/apache/webbeans/web/tomcat/TomcatAnnotProcessor.java
openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/scanner/WebScannerService.java
Modified: openwebbeans/trunk/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/OwbArquillianScannerService.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/OwbArquillianScannerService.java?rev=1680185&r1=1680184&r2=1680185&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/OwbArquillianScannerService.java (original)
+++ openwebbeans/trunk/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/OwbArquillianScannerService.java Tue May 19 06:21:53 2015
@@ -48,7 +48,7 @@ import java.util.Set;
public class OwbArquillianScannerService implements ScannerService
{
- private final static String WEB_INF_CLASS_FOLDER = "/WEB-INF/classes/";
+ private static final String WEB_INF_CLASS_FOLDER = "/WEB-INF/classes/";
private final boolean beansXmlBdaScanningEnabled;
private final WebBeansContext webBeansContext;
Modified: openwebbeans/trunk/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/OwbSWClassLoader.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/OwbSWClassLoader.java?rev=1680185&r1=1680184&r2=1680185&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/OwbSWClassLoader.java (original)
+++ openwebbeans/trunk/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/OwbSWClassLoader.java Tue May 19 06:21:53 2015
@@ -43,7 +43,7 @@ import java.util.List;
public class OwbSWClassLoader extends URLClassLoader implements Closeable
{
// Collections.emptyEnumeration only exists in java7++
- private final static Enumeration EMPTY_ENUMERATION = new Enumeration()
+ private static final Enumeration EMPTY_ENUMERATION = new Enumeration()
{
@Override
public boolean hasMoreElements()
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=1680185&r1=1680184&r2=1680185&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 Tue May 19 06:21:53 2015
@@ -139,7 +139,7 @@ public class TransactionalEventNotifier
}
}
- private final static class BeforeCompletion extends AbstractSynchronization
+ private static final class BeforeCompletion extends AbstractSynchronization
{
private BeforeCompletion(ObserverMethod observer, Object event, EventMetadata metadata)
{
@@ -153,7 +153,7 @@ public class TransactionalEventNotifier
}
}
- private final static class AfterCompletion extends AbstractSynchronization
+ private static final class AfterCompletion extends AbstractSynchronization
{
private AfterCompletion(ObserverMethod observer, Object event, EventMetadata metadata)
{
@@ -167,7 +167,7 @@ public class TransactionalEventNotifier
}
}
- private final static class AfterCompletionSuccess extends AbstractSynchronization
+ private static final class AfterCompletionSuccess extends AbstractSynchronization
{
private AfterCompletionSuccess(ObserverMethod observer, Object event, EventMetadata metadata)
{
@@ -184,7 +184,7 @@ public class TransactionalEventNotifier
}
}
- private final static class AfterCompletionFailure extends AbstractSynchronization
+ private static final class AfterCompletionFailure extends AbstractSynchronization
{
private AfterCompletionFailure(ObserverMethod observer, Object event, EventMetadata metadata)
{
Modified: openwebbeans/trunk/webbeans-el22/src/test/java/org/apache/webbeans/el/test/ELPerformanceTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-el22/src/test/java/org/apache/webbeans/el/test/ELPerformanceTest.java?rev=1680185&r1=1680184&r2=1680185&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-el22/src/test/java/org/apache/webbeans/el/test/ELPerformanceTest.java (original)
+++ openwebbeans/trunk/webbeans-el22/src/test/java/org/apache/webbeans/el/test/ELPerformanceTest.java Tue May 19 06:21:53 2015
@@ -38,8 +38,8 @@ import javax.enterprise.context.SessionS
public class ELPerformanceTest extends AbstractUnitTest
{
- private final static int THREADS = 100;
- private final static int ITERATIONS = 200;
+ private static final int THREADS = 100;
+ private static final int ITERATIONS = 200;
private static Logger logger = WebBeansLoggerFacade.getLogger(ELPerformanceTest.class);
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OpenWebBeansConfiguration.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OpenWebBeansConfiguration.java?rev=1680185&r1=1680184&r2=1680185&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OpenWebBeansConfiguration.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OpenWebBeansConfiguration.java Tue May 19 06:21:53 2015
@@ -47,10 +47,10 @@ import org.apache.webbeans.logger.WebBea
public class OpenWebBeansConfiguration
{
/**Logger instance*/
- private final static Logger logger = WebBeansLoggerFacade.getLogger(OpenWebBeansConfiguration.class);
+ private static final Logger logger = WebBeansLoggerFacade.getLogger(OpenWebBeansConfiguration.class);
/**Default configuration files*/
- private final static String DEFAULT_CONFIG_PROPERTIES_NAME = "META-INF/openwebbeans/openwebbeans.properties";
+ private static final String DEFAULT_CONFIG_PROPERTIES_NAME = "META-INF/openwebbeans/openwebbeans.properties";
/**Property of application*/
private final Properties configProperties = new Properties();
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/PropertyLoader.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/PropertyLoader.java?rev=1680185&r1=1680184&r2=1680185&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/PropertyLoader.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/PropertyLoader.java Tue May 19 06:21:53 2015
@@ -40,9 +40,9 @@ import java.util.logging.Logger;
*/
public class PropertyLoader
{
- public final static int CONFIGURATION_ORDINAL_DEFAULT_VALUE = 100;
+ public static final int CONFIGURATION_ORDINAL_DEFAULT_VALUE = 100;
- public final static String CONFIGURATION_ORDINAL_PROPERTY_NAME = "configuration.ordinal";
+ public static final String CONFIGURATION_ORDINAL_PROPERTY_NAME = "configuration.ordinal";
private static final Logger logger = WebBeansLoggerFacade.getLogger(PropertyLoader.class);
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java?rev=1680185&r1=1680184&r2=1680185&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java Tue May 19 06:21:53 2015
@@ -78,7 +78,7 @@ import static org.apache.webbeans.util.I
*/
public class InjectionResolver
{
- private final static Logger logger = WebBeansLoggerFacade.getLogger(InjectionResolver.class);
+ private static final Logger logger = WebBeansLoggerFacade.getLogger(InjectionResolver.class);
/**
* Bean Manager
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationManager.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationManager.java?rev=1680185&r1=1680184&r2=1680185&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationManager.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationManager.java Tue May 19 06:21:53 2015
@@ -52,7 +52,7 @@ import org.apache.webbeans.util.Asserts;
*/
public class ConversationManager
{
- private final static Logger logger = WebBeansLoggerFacade.getLogger(ConversationManager.class);
+ private static final Logger logger = WebBeansLoggerFacade.getLogger(ConversationManager.class);
private final WebBeansContext webBeansContext;
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=1680185&r1=1680184&r2=1680185&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 Tue May 19 06:21:53 2015
@@ -84,7 +84,7 @@ import org.apache.webbeans.spi.plugins.O
public class ObserverMethodImpl<T> implements OwbObserverMethod<T>
{
/**Logger instance*/
- private final static Logger logger = WebBeansLoggerFacade.getLogger(ObserverMethodImpl.class);
+ private static final Logger logger = WebBeansLoggerFacade.getLogger(ObserverMethodImpl.class);
/**Observer owner bean that defines observer method*/
private final AbstractOwbBean<?> bean;
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedElementFactory.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedElementFactory.java?rev=1680185&r1=1680184&r2=1680185&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedElementFactory.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedElementFactory.java Tue May 19 06:21:53 2015
@@ -51,7 +51,7 @@ public final class AnnotatedElementFacto
public static final String OWB_DEFAULT_KEY = "OWB_DEFAULT_KEY";
// Logger instance
- private final static Logger logger = WebBeansLoggerFacade.getLogger(AnnotatedElementFactory.class);
+ private static final Logger logger = WebBeansLoggerFacade.getLogger(AnnotatedElementFactory.class);
/**
* Cache of the initial AnnotatedTypes
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=1680185&r1=1680184&r2=1680185&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 Tue May 19 06:21:53 2015
@@ -43,7 +43,7 @@ import org.apache.xbean.asm5.Type;
*/
public abstract class AbstractProxyFactory
{
- public final static int MAX_CLASSLOAD_TRIES = 10000;
+ public static final int MAX_CLASSLOAD_TRIES = 10000;
/**
* This is needed as the Modifier#VARARGS is not (yet) public.
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/InterceptorDecoratorProxyFactory.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/InterceptorDecoratorProxyFactory.java?rev=1680185&r1=1680184&r2=1680185&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/InterceptorDecoratorProxyFactory.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/InterceptorDecoratorProxyFactory.java Tue May 19 06:21:53 2015
@@ -53,7 +53,7 @@ import java.util.logging.Logger;
*/
public class InterceptorDecoratorProxyFactory extends AbstractProxyFactory
{
- private final static Logger logger = WebBeansLoggerFacade.getLogger(InterceptorDecoratorProxyFactory.class);
+ private static final Logger logger = WebBeansLoggerFacade.getLogger(InterceptorDecoratorProxyFactory.class);
/** the name of the field which stores the proxied instance */
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/contexts/threadsafety/LongInitApplicationBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/contexts/threadsafety/LongInitApplicationBean.java?rev=1680185&r1=1680184&r2=1680185&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/contexts/threadsafety/LongInitApplicationBean.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/contexts/threadsafety/LongInitApplicationBean.java Tue May 19 06:21:53 2015
@@ -31,7 +31,7 @@ public class LongInitApplicationBean
{
private static int initCounter = 0;
- private final static Logger log = Logger.getLogger(LongInitApplicationBean.class.getName());
+ private static final Logger log = Logger.getLogger(LongInitApplicationBean.class.getName());
@PostConstruct
public void init()
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/contexts/threadsafety/ThreadSafeBeanInitialisationTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/contexts/threadsafety/ThreadSafeBeanInitialisationTest.java?rev=1680185&r1=1680184&r2=1680185&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/contexts/threadsafety/ThreadSafeBeanInitialisationTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/contexts/threadsafety/ThreadSafeBeanInitialisationTest.java Tue May 19 06:21:53 2015
@@ -39,7 +39,7 @@ import java.util.logging.Logger;
*/
public class ThreadSafeBeanInitialisationTest extends AbstractUnitTest
{
- private final static Logger log = Logger.getLogger(ThreadSafeBeanInitialisationTest.class.getName());
+ private static final Logger log = Logger.getLogger(ThreadSafeBeanInitialisationTest.class.getName());
/**
Modified: openwebbeans/trunk/webbeans-jee5-ejb-resource/src/main/java/org/apache/webbeans/resource/spi/ee/ExtendedStandaloneResourceInjectionService.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-jee5-ejb-resource/src/main/java/org/apache/webbeans/resource/spi/ee/ExtendedStandaloneResourceInjectionService.java?rev=1680185&r1=1680184&r2=1680185&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-jee5-ejb-resource/src/main/java/org/apache/webbeans/resource/spi/ee/ExtendedStandaloneResourceInjectionService.java (original)
+++ openwebbeans/trunk/webbeans-jee5-ejb-resource/src/main/java/org/apache/webbeans/resource/spi/ee/ExtendedStandaloneResourceInjectionService.java Tue May 19 06:21:53 2015
@@ -42,7 +42,7 @@ import java.util.logging.Logger;
*/
public class ExtendedStandaloneResourceInjectionService extends StandaloneResourceInjectionService
{
- private final static Logger logger = WebBeansLoggerFacade.getLogger(ExtendedStandaloneResourceInjectionService.class);
+ private static final Logger logger = WebBeansLoggerFacade.getLogger(ExtendedStandaloneResourceInjectionService.class);
private List<EjbResolver> ejbResolvers = new ArrayList<EjbResolver>();
Modified: openwebbeans/trunk/webbeans-tomcat6/src/main/java/org/apache/webbeans/web/tomcat/TomcatAnnotProcessor.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-tomcat6/src/main/java/org/apache/webbeans/web/tomcat/TomcatAnnotProcessor.java?rev=1680185&r1=1680184&r2=1680185&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-tomcat6/src/main/java/org/apache/webbeans/web/tomcat/TomcatAnnotProcessor.java (original)
+++ openwebbeans/trunk/webbeans-tomcat6/src/main/java/org/apache/webbeans/web/tomcat/TomcatAnnotProcessor.java Tue May 19 06:21:53 2015
@@ -31,7 +31,7 @@ import org.apache.webbeans.logger.WebBea
public class TomcatAnnotProcessor implements AnnotationProcessor
{
- private final static Logger logger = WebBeansLoggerFacade.getLogger(TomcatAnnotProcessor.class);
+ private static final Logger logger = WebBeansLoggerFacade.getLogger(TomcatAnnotProcessor.class);
private AnnotationProcessor processor;
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=1680185&r1=1680184&r2=1680185&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 Tue May 19 06:21:53 2015
@@ -36,7 +36,7 @@ public class WebScannerService extends A
{
public static final String WEB_INF_BEANS_XML = "/WEB-INF/beans.xml";
- private final static Logger logger = WebBeansLoggerFacade.getLogger(WebScannerService.class);
+ private static final Logger logger = WebBeansLoggerFacade.getLogger(WebScannerService.class);
protected ServletContext servletContext = null;
private BeanArchiveService beanArchiveService;