Author: sebb
Date: Thu Mar 27 13:07:56 2014
New Revision: 1582286
URL: http://svn.apache.org/r1582286
Log:
Add missing method @Overrides (Java 5)
Modified:
commons/proper/proxy/trunk/asm4/src/main/java/org/apache/commons/proxy2/asm4/ASM4ProxyFactory.java
commons/proper/proxy/trunk/core/src/main/java/org/apache/commons/proxy2/impl/AbstractSubclassingProxyFactory.java
commons/proper/proxy/trunk/core/src/main/java/org/apache/commons/proxy2/impl/MethodSignature.java
commons/proper/proxy/trunk/core/src/main/java/org/apache/commons/proxy2/invoker/RecordedInvocation.java
commons/proper/proxy/trunk/core/src/main/java/org/apache/commons/proxy2/provider/SingletonProvider.java
commons/proper/proxy/trunk/core/src/test/java/org/apache/commons/proxy2/AbstractSubclassingProxyFactoryTestCase.java
commons/proper/proxy/trunk/core/src/test/java/org/apache/commons/proxy2/provider/CloningProviderTest.java
commons/proper/proxy/trunk/core/src/test/java/org/apache/commons/proxy2/provider/CountingProvider.java
commons/proper/proxy/trunk/jdk/src/main/java/org/apache/commons/proxy2/jdk/JdkProxyFactory.java
Modified:
commons/proper/proxy/trunk/asm4/src/main/java/org/apache/commons/proxy2/asm4/ASM4ProxyFactory.java
URL:
http://svn.apache.org/viewvc/commons/proper/proxy/trunk/asm4/src/main/java/org/apache/commons/proxy2/asm4/ASM4ProxyFactory.java?rev=1582286&r1=1582285&r2=1582286&view=diff
==============================================================================
---
commons/proper/proxy/trunk/asm4/src/main/java/org/apache/commons/proxy2/asm4/ASM4ProxyFactory.java
(original)
+++
commons/proper/proxy/trunk/asm4/src/main/java/org/apache/commons/proxy2/asm4/ASM4ProxyFactory.java
Thu Mar 27 13:07:56 2014
@@ -346,6 +346,7 @@ public class ASM4ProxyFactory extends Ab
this.delegateProvider = delegateProvider;
}
+ @Override
public Object invokeImpl(Object proxy, Method method, Object[] args)
throws Throwable
{
try
@@ -371,6 +372,7 @@ public class ASM4ProxyFactory extends Ab
this.methodInterceptor = methodInterceptor;
}
+ @Override
public Object invokeImpl(Object proxy, Method method, Object[] args)
throws Throwable
{
final ReflectionInvocation invocation = new
ReflectionInvocation(target, proxy, method, args);
@@ -407,6 +409,7 @@ public class ASM4ProxyFactory extends Ab
this.invoker = invoker;
}
+ @Override
public Object invokeImpl(Object proxy, Method method, Object[] args)
throws Throwable
{
return invoker.invoke(proxy, method, args);
Modified:
commons/proper/proxy/trunk/core/src/main/java/org/apache/commons/proxy2/impl/AbstractSubclassingProxyFactory.java
URL:
http://svn.apache.org/viewvc/commons/proper/proxy/trunk/core/src/main/java/org/apache/commons/proxy2/impl/AbstractSubclassingProxyFactory.java?rev=1582286&r1=1582285&r2=1582286&view=diff
==============================================================================
---
commons/proper/proxy/trunk/core/src/main/java/org/apache/commons/proxy2/impl/AbstractSubclassingProxyFactory.java
(original)
+++
commons/proper/proxy/trunk/core/src/main/java/org/apache/commons/proxy2/impl/AbstractSubclassingProxyFactory.java
Thu Mar 27 13:07:56 2014
@@ -41,6 +41,7 @@ public abstract class AbstractSubclassin
* the proxy classes
* @return true if a suitable superclass can be found, given the desired
<code>proxyClasses</code>
*/
+ @Override
public boolean canProxy(Class<?>... proxyClasses)
{
try
Modified:
commons/proper/proxy/trunk/core/src/main/java/org/apache/commons/proxy2/impl/MethodSignature.java
URL:
http://svn.apache.org/viewvc/commons/proper/proxy/trunk/core/src/main/java/org/apache/commons/proxy2/impl/MethodSignature.java?rev=1582286&r1=1582285&r2=1582286&view=diff
==============================================================================
---
commons/proper/proxy/trunk/core/src/main/java/org/apache/commons/proxy2/impl/MethodSignature.java
(original)
+++
commons/proper/proxy/trunk/core/src/main/java/org/apache/commons/proxy2/impl/MethodSignature.java
Thu Mar 27 13:07:56 2014
@@ -233,6 +233,7 @@ public class MethodSignature implements
/**
* {@inheritDoc}
*/
+ @Override
public boolean equals(Object o)
{
if (o == null)
@@ -254,6 +255,7 @@ public class MethodSignature implements
/**
* {@inheritDoc}
*/
+ @Override
public int hashCode()
{
return new HashCodeBuilder().append(internal).build();
@@ -262,6 +264,7 @@ public class MethodSignature implements
/**
* {@inheritDoc}
*/
+ @Override
public String toString()
{
return internal;
Modified:
commons/proper/proxy/trunk/core/src/main/java/org/apache/commons/proxy2/invoker/RecordedInvocation.java
URL:
http://svn.apache.org/viewvc/commons/proper/proxy/trunk/core/src/main/java/org/apache/commons/proxy2/invoker/RecordedInvocation.java?rev=1582286&r1=1582285&r2=1582286&view=diff
==============================================================================
---
commons/proper/proxy/trunk/core/src/main/java/org/apache/commons/proxy2/invoker/RecordedInvocation.java
(original)
+++
commons/proper/proxy/trunk/core/src/main/java/org/apache/commons/proxy2/invoker/RecordedInvocation.java
Thu Mar 27 13:07:56 2014
@@ -73,6 +73,7 @@ public class RecordedInvocation
/**
* {@inheritDoc}
*/
+ @Override
public String toString()
{
StringBuilder buffer = new StringBuilder();
Modified:
commons/proper/proxy/trunk/core/src/main/java/org/apache/commons/proxy2/provider/SingletonProvider.java
URL:
http://svn.apache.org/viewvc/commons/proper/proxy/trunk/core/src/main/java/org/apache/commons/proxy2/provider/SingletonProvider.java?rev=1582286&r1=1582285&r2=1582286&view=diff
==============================================================================
---
commons/proper/proxy/trunk/core/src/main/java/org/apache/commons/proxy2/provider/SingletonProvider.java
(original)
+++
commons/proper/proxy/trunk/core/src/main/java/org/apache/commons/proxy2/provider/SingletonProvider.java
Thu Mar 27 13:07:56 2014
@@ -55,6 +55,7 @@ public class SingletonProvider<T> extend
/**
* {@inheritDoc}
*/
+ @Override
public T getObject()
{
synchronized (this)
Modified:
commons/proper/proxy/trunk/core/src/test/java/org/apache/commons/proxy2/AbstractSubclassingProxyFactoryTestCase.java
URL:
http://svn.apache.org/viewvc/commons/proper/proxy/trunk/core/src/test/java/org/apache/commons/proxy2/AbstractSubclassingProxyFactoryTestCase.java?rev=1582286&r1=1582285&r2=1582286&view=diff
==============================================================================
---
commons/proper/proxy/trunk/core/src/test/java/org/apache/commons/proxy2/AbstractSubclassingProxyFactoryTestCase.java
(original)
+++
commons/proper/proxy/trunk/core/src/test/java/org/apache/commons/proxy2/AbstractSubclassingProxyFactoryTestCase.java
Thu Mar 27 13:07:56 2014
@@ -48,6 +48,7 @@ public abstract class AbstractSubclassin
// Other Methods
//----------------------------------------------------------------------------------------------------------------------
+ @Override
@Test
public void testCanProxy()
{
@@ -61,6 +62,7 @@ public abstract class AbstractSubclassin
assertFalse(factory.canProxy(new Class[] { Echo.class, EchoImpl.class,
String.class }));
}
+ @Override
@Test
public void testDelegatorEquals() throws Exception
{
@@ -89,6 +91,7 @@ public abstract class AbstractSubclassin
assertTrue(echo instanceof EchoImpl);
}
+ @Override
@Test
public void testInterceptorEquals()
{
@@ -123,6 +126,7 @@ public abstract class AbstractSubclassin
factory.createInvokerProxy(new NullInvoker(), new Class[] {
EchoImpl.class, String.class });
}
+ @Override
@Test
public void testInvokerEquals() throws Exception
{
@@ -189,6 +193,7 @@ public abstract class AbstractSubclassin
public static class FinalMethodEcho extends EchoImpl
{
+ @Override
public final String echoBack(String message)
{
return "final";
Modified:
commons/proper/proxy/trunk/core/src/test/java/org/apache/commons/proxy2/provider/CloningProviderTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/proxy/trunk/core/src/test/java/org/apache/commons/proxy2/provider/CloningProviderTest.java?rev=1582286&r1=1582285&r2=1582286&view=diff
==============================================================================
---
commons/proper/proxy/trunk/core/src/test/java/org/apache/commons/proxy2/provider/CloningProviderTest.java
(original)
+++
commons/proper/proxy/trunk/core/src/test/java/org/apache/commons/proxy2/provider/CloningProviderTest.java
Thu Mar 27 13:07:56 2014
@@ -88,6 +88,7 @@ public class CloningProviderTest extends
public static class ExceptionCloneable implements Cloneable
{
+ @Override
public Object clone()
{
throw new RuntimeException("No clone for you!");
@@ -100,6 +101,7 @@ public class CloningProviderTest extends
public static class ProtectedCloneable implements Cloneable
{
+ @Override
protected Object clone()
{
return this;
Modified:
commons/proper/proxy/trunk/core/src/test/java/org/apache/commons/proxy2/provider/CountingProvider.java
URL:
http://svn.apache.org/viewvc/commons/proper/proxy/trunk/core/src/test/java/org/apache/commons/proxy2/provider/CountingProvider.java?rev=1582286&r1=1582285&r2=1582286&view=diff
==============================================================================
---
commons/proper/proxy/trunk/core/src/test/java/org/apache/commons/proxy2/provider/CountingProvider.java
(original)
+++
commons/proper/proxy/trunk/core/src/test/java/org/apache/commons/proxy2/provider/CountingProvider.java
Thu Mar 27 13:07:56 2014
@@ -44,6 +44,7 @@ public class CountingProvider<T> extends
// ObjectProvider Implementation
//**********************************************************************************************************************
+ @Override
public synchronized T getObject()
{
count++;
Modified:
commons/proper/proxy/trunk/jdk/src/main/java/org/apache/commons/proxy2/jdk/JdkProxyFactory.java
URL:
http://svn.apache.org/viewvc/commons/proper/proxy/trunk/jdk/src/main/java/org/apache/commons/proxy2/jdk/JdkProxyFactory.java?rev=1582286&r1=1582285&r2=1582286&view=diff
==============================================================================
---
commons/proper/proxy/trunk/jdk/src/main/java/org/apache/commons/proxy2/jdk/JdkProxyFactory.java
(original)
+++
commons/proper/proxy/trunk/jdk/src/main/java/org/apache/commons/proxy2/jdk/JdkProxyFactory.java
Thu Mar 27 13:07:56 2014
@@ -52,6 +52,7 @@ public class JdkProxyFactory extends Abs
* the interfaces that the proxy2 should implement
* @return a proxy2 which delegates to the object provided by the target
<code>delegateProvider>
*/
+ @Override
@SuppressWarnings("unchecked")
public <T> T createDelegatorProxy(ClassLoader classLoader,
ObjectProvider<?> delegateProvider,
Class<?>... proxyClasses)
@@ -74,6 +75,7 @@ public class JdkProxyFactory extends Abs
* @return a proxy2 which passes through a {@link Interceptor interceptor}
before eventually reaching the
* <code>target</code> object.
*/
+ @Override
@SuppressWarnings("unchecked")
public <T> T createInterceptorProxy(ClassLoader classLoader, Object
target, Interceptor interceptor,
Class<?>... proxyClasses)
@@ -93,6 +95,7 @@ public class JdkProxyFactory extends Abs
* the interfaces that the proxy2 should implement
* @return a proxy2 which uses the provided {@link Invoker} to handle all
method invocations
*/
+ @Override
@SuppressWarnings("unchecked")
public <T> T createInvokerProxy(ClassLoader classLoader, Invoker invoker,
Class<?>... proxyClasses)
{
@@ -108,6 +111,7 @@ public class JdkProxyFactory extends Abs
/** Serialization version */
private static final long serialVersionUID = 1L;
+ @Override
public Object invoke(Object proxy, Method method, Object[] args)
throws Throwable
{
if (ProxyUtils.isHashCode(method))
@@ -139,6 +143,7 @@ public class JdkProxyFactory extends Abs
this.delegateProvider = delegateProvider;
}
+ @Override
public Object invokeImpl(Object proxy, Method method, Object[] args)
throws Throwable
{
try
@@ -166,6 +171,7 @@ public class JdkProxyFactory extends Abs
this.methodInterceptor = methodInterceptor;
}
+ @Override
public Object invokeImpl(Object proxy, Method method, Object[] args)
throws Throwable
{
final ReflectionInvocation invocation = new
ReflectionInvocation(proxy, target, method, args);
@@ -185,6 +191,7 @@ public class JdkProxyFactory extends Abs
this.invoker = invoker;
}
+ @Override
public Object invokeImpl(Object proxy, Method method, Object[] args)
throws Throwable
{
return invoker.invoke(proxy, method, args);
@@ -206,21 +213,25 @@ public class JdkProxyFactory extends Abs
this.arguments =
ObjectUtils.defaultIfNull(ArrayUtils.clone(arguments),
ProxyUtils.EMPTY_ARGUMENTS);
}
+ @Override
public Object[] getArguments()
{
return arguments;
}
+ @Override
public Method getMethod()
{
return method;
}
+ @Override
public Object getProxy()
{
return proxy;
}
+ @Override
public Object proceed() throws Throwable
{
try
