You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@onami.apache.org by as...@apache.org on 2014/07/13 08:26:31 UTC
svn commit: r1610122 - in /onami/trunk:
autobind/aop/src/main/java/org/apache/onami/autobind/aop/
autobind/aop/src/main/java/org/apache/onami/autobind/aop/feature/
autobind/aop/src/test/java/org/apache/onami/autobind/test/aop/annoherited/
autobind/aop/...
Author: ash2k
Date: Sun Jul 13 06:26:31 2014
New Revision: 1610122
URL: http://svn.apache.org/r1610122
Log:
Idea inspection: declaration can be final
No functional changes
Modified:
onami/trunk/autobind/aop/src/main/java/org/apache/onami/autobind/aop/GuiceMethodInterceptor.java
onami/trunk/autobind/aop/src/main/java/org/apache/onami/autobind/aop/feature/InterceptorFeature.java
onami/trunk/autobind/aop/src/test/java/org/apache/onami/autobind/test/aop/annoherited/AnnoheritedInterceptorTests.java
onami/trunk/autobind/aop/src/test/java/org/apache/onami/autobind/test/aop/annotated/AnnotatedInterceptorTests.java
onami/trunk/autobind/aop/src/test/java/org/apache/onami/autobind/test/aop/inherited/InheritedInterceptorTests.java
onami/trunk/autobind/configuration/src/main/java/org/apache/onami/autobind/configuration/PropertiesProvider.java
onami/trunk/autobind/core/src/main/java/org/apache/onami/autobind/install/BindingTracer.java
onami/trunk/autobind/core/src/main/java/org/apache/onami/autobind/scanner/PackageFilter.java
onami/trunk/autobind/core/src/main/java/org/apache/onami/autobind/scanner/ScannerModule.java
onami/trunk/autobind/core/src/main/java/org/apache/onami/autobind/scanner/features/BindingScannerFeature.java
onami/trunk/autobind/examples/src/main/java/org/apache/onami/autobind/aop/MethodCallingInterceptor.java
onami/trunk/autobind/examples/src/main/java/org/apache/onami/autobind/scanner/asm/example/autobind/multiple/ExampleContainer.java
onami/trunk/autobind/integrations/commons.configurations/src/main/java/org/apache/onami/autobind/integrations/commons/configuration/CommonsConfigurationFeature.java
onami/trunk/autobind/integrations/metro/src/main/java/org/apache/onami/autobind/integrations/metro/GuiceContextListener.java
onami/trunk/autobind/scanner/asm/src/test/java/org/apache/onami/autobind/scanner/asm/tests/autobind/multiple/MultibindTests.java
onami/trunk/configuration/src/main/java/org/apache/onami/configuration/variables/KeyAppender.java
onami/trunk/configuration/src/main/java/org/apache/onami/configuration/variables/Tree.java
onami/trunk/persist/src/test/java/org/apache/onami/persist/test/UnderstandRequestInjectionTest.java
onami/trunk/spi/services/src/main/java/org/apache/onami/spi/services/ServiceLoaderModule.java
onami/trunk/test/src/test/java/org/apache/onami/test/data/ComplexModule.java
onami/trunk/test/src/test/java/org/apache/onami/test/data/WhoIm.java
Modified: onami/trunk/autobind/aop/src/main/java/org/apache/onami/autobind/aop/GuiceMethodInterceptor.java
URL: http://svn.apache.org/viewvc/onami/trunk/autobind/aop/src/main/java/org/apache/onami/autobind/aop/GuiceMethodInterceptor.java?rev=1610122&r1=1610121&r2=1610122&view=diff
==============================================================================
--- onami/trunk/autobind/aop/src/main/java/org/apache/onami/autobind/aop/GuiceMethodInterceptor.java (original)
+++ onami/trunk/autobind/aop/src/main/java/org/apache/onami/autobind/aop/GuiceMethodInterceptor.java Sun Jul 13 06:26:31 2014
@@ -33,9 +33,9 @@ public abstract class GuiceMethodInterce
implements MethodInterceptor
{
- public static Type CLASS_MATCHER_TYPE;
+ public static final Type CLASS_MATCHER_TYPE;
- public static Type METHOD_MATCHER_TYPE;
+ public static final Type METHOD_MATCHER_TYPE;
static
{
@@ -48,7 +48,7 @@ public abstract class GuiceMethodInterce
}
catch ( Exception e )
{
- // ignore
+ throw new AssertionError( e );
}
}
Modified: onami/trunk/autobind/aop/src/main/java/org/apache/onami/autobind/aop/feature/InterceptorFeature.java
URL: http://svn.apache.org/viewvc/onami/trunk/autobind/aop/src/main/java/org/apache/onami/autobind/aop/feature/InterceptorFeature.java?rev=1610122&r1=1610121&r2=1610122&view=diff
==============================================================================
--- onami/trunk/autobind/aop/src/main/java/org/apache/onami/autobind/aop/feature/InterceptorFeature.java (original)
+++ onami/trunk/autobind/aop/src/main/java/org/apache/onami/autobind/aop/feature/InterceptorFeature.java Sun Jul 13 06:26:31 2014
@@ -43,7 +43,7 @@ import com.google.inject.matcher.Matcher
@Singleton
public class InterceptorFeature extends BindingScannerFeature {
- private Logger _logger = Logger.getLogger(InterceptorFeature.class.getName());
+ private static final Logger _logger = Logger.getLogger(InterceptorFeature.class.getName());
@Override
public BindingStage accept(Class<Object> annotatedClass, Map<String, Annotation> annotations) {
Modified: onami/trunk/autobind/aop/src/test/java/org/apache/onami/autobind/test/aop/annoherited/AnnoheritedInterceptorTests.java
URL: http://svn.apache.org/viewvc/onami/trunk/autobind/aop/src/test/java/org/apache/onami/autobind/test/aop/annoherited/AnnoheritedInterceptorTests.java?rev=1610122&r1=1610121&r2=1610122&view=diff
==============================================================================
--- onami/trunk/autobind/aop/src/test/java/org/apache/onami/autobind/test/aop/annoherited/AnnoheritedInterceptorTests.java (original)
+++ onami/trunk/autobind/aop/src/test/java/org/apache/onami/autobind/test/aop/annoherited/AnnoheritedInterceptorTests.java Sun Jul 13 06:26:31 2014
@@ -46,7 +46,7 @@ import com.google.inject.matcher.Matcher
public class AnnoheritedInterceptorTests
{
- private static ThreadLocal<Boolean> called = new ThreadLocal<Boolean>();
+ private static final ThreadLocal<Boolean> called = new ThreadLocal<Boolean>();
@Test
public void createDynamicModule()
Modified: onami/trunk/autobind/aop/src/test/java/org/apache/onami/autobind/test/aop/annotated/AnnotatedInterceptorTests.java
URL: http://svn.apache.org/viewvc/onami/trunk/autobind/aop/src/test/java/org/apache/onami/autobind/test/aop/annotated/AnnotatedInterceptorTests.java?rev=1610122&r1=1610121&r2=1610122&view=diff
==============================================================================
--- onami/trunk/autobind/aop/src/test/java/org/apache/onami/autobind/test/aop/annotated/AnnotatedInterceptorTests.java (original)
+++ onami/trunk/autobind/aop/src/test/java/org/apache/onami/autobind/test/aop/annotated/AnnotatedInterceptorTests.java Sun Jul 13 06:26:31 2014
@@ -46,7 +46,7 @@ import com.google.inject.matcher.Matcher
public class AnnotatedInterceptorTests
{
- private static ThreadLocal<Boolean> called = new ThreadLocal<Boolean>();
+ private static final ThreadLocal<Boolean> called = new ThreadLocal<Boolean>();
@Test
public void createDynamicModule()
Modified: onami/trunk/autobind/aop/src/test/java/org/apache/onami/autobind/test/aop/inherited/InheritedInterceptorTests.java
URL: http://svn.apache.org/viewvc/onami/trunk/autobind/aop/src/test/java/org/apache/onami/autobind/test/aop/inherited/InheritedInterceptorTests.java?rev=1610122&r1=1610121&r2=1610122&view=diff
==============================================================================
--- onami/trunk/autobind/aop/src/test/java/org/apache/onami/autobind/test/aop/inherited/InheritedInterceptorTests.java (original)
+++ onami/trunk/autobind/aop/src/test/java/org/apache/onami/autobind/test/aop/inherited/InheritedInterceptorTests.java Sun Jul 13 06:26:31 2014
@@ -44,7 +44,7 @@ import com.google.inject.matcher.Matcher
public class InheritedInterceptorTests
{
- private static ThreadLocal<Boolean> called = new ThreadLocal<Boolean>();
+ private static final ThreadLocal<Boolean> called = new ThreadLocal<Boolean>();
@Test
public void createDynamicModule()
Modified: onami/trunk/autobind/configuration/src/main/java/org/apache/onami/autobind/configuration/PropertiesProvider.java
URL: http://svn.apache.org/viewvc/onami/trunk/autobind/configuration/src/main/java/org/apache/onami/autobind/configuration/PropertiesProvider.java?rev=1610122&r1=1610121&r2=1610122&view=diff
==============================================================================
--- onami/trunk/autobind/configuration/src/main/java/org/apache/onami/autobind/configuration/PropertiesProvider.java (original)
+++ onami/trunk/autobind/configuration/src/main/java/org/apache/onami/autobind/configuration/PropertiesProvider.java Sun Jul 13 06:26:31 2014
@@ -35,9 +35,9 @@ public class PropertiesProvider
private final Logger _logger = getLogger( getClass().getName() );
- private URL url;
+ private final URL url;
- private boolean isXML;
+ private final boolean isXML;
public PropertiesProvider( URL url, boolean isXML )
{
Modified: onami/trunk/autobind/core/src/main/java/org/apache/onami/autobind/install/BindingTracer.java
URL: http://svn.apache.org/viewvc/onami/trunk/autobind/core/src/main/java/org/apache/onami/autobind/install/BindingTracer.java?rev=1610122&r1=1610121&r2=1610122&view=diff
==============================================================================
--- onami/trunk/autobind/core/src/main/java/org/apache/onami/autobind/install/BindingTracer.java (original)
+++ onami/trunk/autobind/core/src/main/java/org/apache/onami/autobind/install/BindingTracer.java Sun Jul 13 06:26:31 2014
@@ -30,7 +30,7 @@ public class BindingTracer
implements Iterable<BindingJob>
{
- private Set<BindingJob> jobs = new HashSet<BindingJob>();
+ private final Set<BindingJob> jobs = new HashSet<BindingJob>();
public synchronized boolean add( BindingJob e )
{
Modified: onami/trunk/autobind/core/src/main/java/org/apache/onami/autobind/scanner/PackageFilter.java
URL: http://svn.apache.org/viewvc/onami/trunk/autobind/core/src/main/java/org/apache/onami/autobind/scanner/PackageFilter.java?rev=1610122&r1=1610121&r2=1610122&view=diff
==============================================================================
--- onami/trunk/autobind/core/src/main/java/org/apache/onami/autobind/scanner/PackageFilter.java (original)
+++ onami/trunk/autobind/core/src/main/java/org/apache/onami/autobind/scanner/PackageFilter.java Sun Jul 13 06:26:31 2014
@@ -20,9 +20,9 @@ package org.apache.onami.autobind.scanne
public class PackageFilter
{
- private String _package;
+ private final String _package;
- private boolean deep;
+ private final boolean deep;
public PackageFilter( String p, boolean deeper )
{
Modified: onami/trunk/autobind/core/src/main/java/org/apache/onami/autobind/scanner/ScannerModule.java
URL: http://svn.apache.org/viewvc/onami/trunk/autobind/core/src/main/java/org/apache/onami/autobind/scanner/ScannerModule.java?rev=1610122&r1=1610121&r2=1610122&view=diff
==============================================================================
--- onami/trunk/autobind/core/src/main/java/org/apache/onami/autobind/scanner/ScannerModule.java (original)
+++ onami/trunk/autobind/core/src/main/java/org/apache/onami/autobind/scanner/ScannerModule.java Sun Jul 13 06:26:31 2014
@@ -48,7 +48,7 @@ public class ScannerModule
implements Module
{
- private static String LINE_SEPARATOR = getProperty( "line.separator" );
+ private static final String LINE_SEPARATOR = getProperty( "line.separator" );
private final Logger _logger = getLogger( getClass().getName() );
Modified: onami/trunk/autobind/core/src/main/java/org/apache/onami/autobind/scanner/features/BindingScannerFeature.java
URL: http://svn.apache.org/viewvc/onami/trunk/autobind/core/src/main/java/org/apache/onami/autobind/scanner/features/BindingScannerFeature.java?rev=1610122&r1=1610121&r2=1610122&view=diff
==============================================================================
--- onami/trunk/autobind/core/src/main/java/org/apache/onami/autobind/scanner/features/BindingScannerFeature.java (original)
+++ onami/trunk/autobind/core/src/main/java/org/apache/onami/autobind/scanner/features/BindingScannerFeature.java Sun Jul 13 06:26:31 2014
@@ -99,15 +99,14 @@ public abstract class BindingScannerFeat
{
context.add( new StageableRequest()
{
- private Class<Object> _annotatedClass = annotatedClass;
- private Map<String, Annotation> _annotations = new HashMap<String, Annotation>( annotations );
+ private final Map<String, Annotation> _annotations = new HashMap<String, Annotation>( annotations );
@Override
public Void call()
throws Exception
{
- process( _annotatedClass, _annotations );
+ process( annotatedClass, _annotations );
return null;
}
Modified: onami/trunk/autobind/examples/src/main/java/org/apache/onami/autobind/aop/MethodCallingInterceptor.java
URL: http://svn.apache.org/viewvc/onami/trunk/autobind/examples/src/main/java/org/apache/onami/autobind/aop/MethodCallingInterceptor.java?rev=1610122&r1=1610121&r2=1610122&view=diff
==============================================================================
--- onami/trunk/autobind/examples/src/main/java/org/apache/onami/autobind/aop/MethodCallingInterceptor.java (original)
+++ onami/trunk/autobind/examples/src/main/java/org/apache/onami/autobind/aop/MethodCallingInterceptor.java Sun Jul 13 06:26:31 2014
@@ -34,7 +34,7 @@ import com.google.inject.matcher.Matcher
*/
@Interceptor
public class MethodCallingInterceptor {
- private Logger _logger = Logger.getLogger(MethodCallingInterceptor.class.getName());
+ private static final Logger _logger = Logger.getLogger(MethodCallingInterceptor.class.getName());
@Invoke
public Object invoke(MethodInvocation invocation) throws Throwable {
Modified: onami/trunk/autobind/examples/src/main/java/org/apache/onami/autobind/scanner/asm/example/autobind/multiple/ExampleContainer.java
URL: http://svn.apache.org/viewvc/onami/trunk/autobind/examples/src/main/java/org/apache/onami/autobind/scanner/asm/example/autobind/multiple/ExampleContainer.java?rev=1610122&r1=1610121&r2=1610122&view=diff
==============================================================================
--- onami/trunk/autobind/examples/src/main/java/org/apache/onami/autobind/scanner/asm/example/autobind/multiple/ExampleContainer.java (original)
+++ onami/trunk/autobind/examples/src/main/java/org/apache/onami/autobind/scanner/asm/example/autobind/multiple/ExampleContainer.java Sun Jul 13 06:26:31 2014
@@ -22,7 +22,7 @@ import java.util.Set;
import javax.inject.Inject;
public class ExampleContainer {
- private List<Example> _examples;
+ private final List<Example> _examples;
@Inject
public ExampleContainer(Set<Example> example) {
Modified: onami/trunk/autobind/integrations/commons.configurations/src/main/java/org/apache/onami/autobind/integrations/commons/configuration/CommonsConfigurationFeature.java
URL: http://svn.apache.org/viewvc/onami/trunk/autobind/integrations/commons.configurations/src/main/java/org/apache/onami/autobind/integrations/commons/configuration/CommonsConfigurationFeature.java?rev=1610122&r1=1610121&r2=1610122&view=diff
==============================================================================
--- onami/trunk/autobind/integrations/commons.configurations/src/main/java/org/apache/onami/autobind/integrations/commons/configuration/CommonsConfigurationFeature.java (original)
+++ onami/trunk/autobind/integrations/commons.configurations/src/main/java/org/apache/onami/autobind/integrations/commons/configuration/CommonsConfigurationFeature.java Sun Jul 13 06:26:31 2014
@@ -45,7 +45,7 @@ import org.apache.onami.autobind.scanner
*/
@Singleton
public class CommonsConfigurationFeature extends BindingScannerFeature {
- private Logger _logger = Logger.getLogger(CommonsConfigurationFeature.class.getName());
+ private static final Logger _logger = Logger.getLogger(CommonsConfigurationFeature.class.getName());
@Override
public BindingStage accept(Class<Object> annotatedClass, Map<String, Annotation> annotations) {
Modified: onami/trunk/autobind/integrations/metro/src/main/java/org/apache/onami/autobind/integrations/metro/GuiceContextListener.java
URL: http://svn.apache.org/viewvc/onami/trunk/autobind/integrations/metro/src/main/java/org/apache/onami/autobind/integrations/metro/GuiceContextListener.java?rev=1610122&r1=1610121&r2=1610122&view=diff
==============================================================================
--- onami/trunk/autobind/integrations/metro/src/main/java/org/apache/onami/autobind/integrations/metro/GuiceContextListener.java (original)
+++ onami/trunk/autobind/integrations/metro/src/main/java/org/apache/onami/autobind/integrations/metro/GuiceContextListener.java Sun Jul 13 06:26:31 2014
@@ -23,7 +23,7 @@ import com.google.inject.Module;
import com.sun.xml.ws.transport.http.servlet.WSServletContextListener;
public abstract class GuiceContextListener implements ServletContextListener{
- private WSServletContextListener delegate = new WSServletContextListener();
+ private final WSServletContextListener delegate = new WSServletContextListener();
public void attributeAdded(ServletContextAttributeEvent event) {
delegate.attributeAdded(event);
Modified: onami/trunk/autobind/scanner/asm/src/test/java/org/apache/onami/autobind/scanner/asm/tests/autobind/multiple/MultibindTests.java
URL: http://svn.apache.org/viewvc/onami/trunk/autobind/scanner/asm/src/test/java/org/apache/onami/autobind/scanner/asm/tests/autobind/multiple/MultibindTests.java?rev=1610122&r1=1610121&r2=1610122&view=diff
==============================================================================
--- onami/trunk/autobind/scanner/asm/src/test/java/org/apache/onami/autobind/scanner/asm/tests/autobind/multiple/MultibindTests.java (original)
+++ onami/trunk/autobind/scanner/asm/src/test/java/org/apache/onami/autobind/scanner/asm/tests/autobind/multiple/MultibindTests.java Sun Jul 13 06:26:31 2014
@@ -168,7 +168,7 @@ public class MultibindTests
public static class FirstContainer
{
- private List<FirstInterface> implementations;
+ private final List<FirstInterface> implementations;
@Inject
public FirstContainer( Set<FirstInterface> implementations )
@@ -190,7 +190,7 @@ public class MultibindTests
public static class SecondContainer
{
- private List<SecondInterface> implementations;
+ private final List<SecondInterface> implementations;
@Inject
public SecondContainer( Set<SecondInterface> implementations )
Modified: onami/trunk/configuration/src/main/java/org/apache/onami/configuration/variables/KeyAppender.java
URL: http://svn.apache.org/viewvc/onami/trunk/configuration/src/main/java/org/apache/onami/configuration/variables/KeyAppender.java?rev=1610122&r1=1610121&r2=1610122&view=diff
==============================================================================
--- onami/trunk/configuration/src/main/java/org/apache/onami/configuration/variables/KeyAppender.java (original)
+++ onami/trunk/configuration/src/main/java/org/apache/onami/configuration/variables/KeyAppender.java Sun Jul 13 06:26:31 2014
@@ -35,10 +35,10 @@ final class KeyAppender
private final Appender key;
/** Appender which will resolve default value */
- private Appender defaultValue;
+ private final Appender defaultValue;
/** Parser to use if dynamic resolution is needed */
- private Parser parser;
+ private final Parser parser;
/**
* Constructor for key without default value.
Modified: onami/trunk/configuration/src/main/java/org/apache/onami/configuration/variables/Tree.java
URL: http://svn.apache.org/viewvc/onami/trunk/configuration/src/main/java/org/apache/onami/configuration/variables/Tree.java?rev=1610122&r1=1610121&r2=1610122&view=diff
==============================================================================
--- onami/trunk/configuration/src/main/java/org/apache/onami/configuration/variables/Tree.java (original)
+++ onami/trunk/configuration/src/main/java/org/apache/onami/configuration/variables/Tree.java Sun Jul 13 06:26:31 2014
@@ -31,7 +31,7 @@ final class Tree<T>
{
/** Current tree node data */
- private T data;
+ private final T data;
/** Parent node */
private Tree<T> parent = null;
Modified: onami/trunk/persist/src/test/java/org/apache/onami/persist/test/UnderstandRequestInjectionTest.java
URL: http://svn.apache.org/viewvc/onami/trunk/persist/src/test/java/org/apache/onami/persist/test/UnderstandRequestInjectionTest.java?rev=1610122&r1=1610121&r2=1610122&view=diff
==============================================================================
--- onami/trunk/persist/src/test/java/org/apache/onami/persist/test/UnderstandRequestInjectionTest.java (original)
+++ onami/trunk/persist/src/test/java/org/apache/onami/persist/test/UnderstandRequestInjectionTest.java Sun Jul 13 06:26:31 2014
@@ -82,7 +82,7 @@ public class UnderstandRequestInjectionT
private static class ObjectWithSetterInjection
{
- private Set<Integer> actuals = newHashSet();
+ private final Set<Integer> actuals = newHashSet();
@Inject
public void addFoo( Foo foo )
Modified: onami/trunk/spi/services/src/main/java/org/apache/onami/spi/services/ServiceLoaderModule.java
URL: http://svn.apache.org/viewvc/onami/trunk/spi/services/src/main/java/org/apache/onami/spi/services/ServiceLoaderModule.java?rev=1610122&r1=1610121&r2=1610122&view=diff
==============================================================================
--- onami/trunk/spi/services/src/main/java/org/apache/onami/spi/services/ServiceLoaderModule.java (original)
+++ onami/trunk/spi/services/src/main/java/org/apache/onami/spi/services/ServiceLoaderModule.java Sun Jul 13 06:26:31 2014
@@ -44,7 +44,7 @@ public abstract class ServiceLoaderModul
extends AbstractModule
{
- private List<ServiceInfo<?>> services = new LinkedList<ServiceInfo<?>>();
+ private final List<ServiceInfo<?>> services = new LinkedList<ServiceInfo<?>>();
@Override
protected final void configure()
Modified: onami/trunk/test/src/test/java/org/apache/onami/test/data/ComplexModule.java
URL: http://svn.apache.org/viewvc/onami/trunk/test/src/test/java/org/apache/onami/test/data/ComplexModule.java?rev=1610122&r1=1610121&r2=1610122&view=diff
==============================================================================
--- onami/trunk/test/src/test/java/org/apache/onami/test/data/ComplexModule.java (original)
+++ onami/trunk/test/src/test/java/org/apache/onami/test/data/ComplexModule.java Sun Jul 13 06:26:31 2014
@@ -25,7 +25,7 @@ public class ComplexModule
extends AbstractModule
{
- private String name;
+ private final String name;
public ComplexModule( String name )
{
Modified: onami/trunk/test/src/test/java/org/apache/onami/test/data/WhoIm.java
URL: http://svn.apache.org/viewvc/onami/trunk/test/src/test/java/org/apache/onami/test/data/WhoIm.java?rev=1610122&r1=1610121&r2=1610122&view=diff
==============================================================================
--- onami/trunk/test/src/test/java/org/apache/onami/test/data/WhoIm.java (original)
+++ onami/trunk/test/src/test/java/org/apache/onami/test/data/WhoIm.java Sun Jul 13 06:26:31 2014
@@ -22,7 +22,7 @@ package org.apache.onami.test.data;
public class WhoIm
{
- private String name;
+ private final String name;
public WhoIm( String name )
{