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=1582033&r1=1582032&r2=1582033&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 Wed Mar 26 20:20:01 2014 @@ -17,90 +17,104 @@ package org.apache.commons.proxy2.jdk; -import org.apache.commons.proxy2.*; -import org.apache.commons.proxy2.impl.AbstractProxyFactory; - import java.io.Serializable; import java.lang.reflect.InvocationHandler; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.lang.reflect.Proxy; +import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.commons.proxy2.Interceptor; +import org.apache.commons.proxy2.Invocation; +import org.apache.commons.proxy2.Invoker; +import org.apache.commons.proxy2.ObjectProvider; +import org.apache.commons.proxy2.ProxyUtils; +import org.apache.commons.proxy2.impl.AbstractProxyFactory; + /** * {@link ProxyFactory} implementation that uses {@link java.lang.reflect.Proxy} proxies. */ public class JdkProxyFactory extends AbstractProxyFactory { -//********************************************************************************************************************** -// ProxyFactory Implementation -//********************************************************************************************************************** + //****************************************************************************************************************** + // ProxyFactory Implementation + //****************************************************************************************************************** /** * Creates a proxy2 which delegates to the object provided by <code>delegateProvider</code>. - * - * @param classLoader the class loader to use when generating the proxy2 - * @param delegateProvider the delegate provider - * @param proxyClasses the interfaces that the proxy2 should implement + * + * @param classLoader + * the class loader to use when generating the proxy2 + * @param delegateProvider + * the delegate provider + * @param proxyClasses + * the interfaces that the proxy2 should implement * @return a proxy2 which delegates to the object provided by the target <code>delegateProvider> */ @SuppressWarnings("unchecked") - public <T> T createDelegatorProxy( ClassLoader classLoader, ObjectProvider<?> delegateProvider, - Class<?>... proxyClasses ) + public <T> T createDelegatorProxy(ClassLoader classLoader, ObjectProvider<?> delegateProvider, + Class<?>... proxyClasses) { - return (T) Proxy.newProxyInstance(classLoader, proxyClasses, - new DelegatorInvocationHandler(delegateProvider)); + return (T) Proxy.newProxyInstance(classLoader, proxyClasses, new DelegatorInvocationHandler(delegateProvider)); } /** * Creates a proxy2 which passes through a {@link Interceptor interceptor} before eventually reaching the * <code>target</code> object. - * - * @param classLoader the class loader to use when generating the proxy2 - * @param target the target object - * @param interceptor the method interceptor - * @param proxyClasses the interfaces that the proxy2 should implement. + * + * @param classLoader + * the class loader to use when generating the proxy2 + * @param target + * the target object + * @param interceptor + * the method interceptor + * @param proxyClasses + * the interfaces that the proxy2 should implement. * @return a proxy2 which passes through a {@link Interceptor interceptor} before eventually reaching the * <code>target</code> object. */ @SuppressWarnings("unchecked") - public <T> T createInterceptorProxy( ClassLoader classLoader, Object target, Interceptor interceptor, - Class<?>... proxyClasses ) + public <T> T createInterceptorProxy(ClassLoader classLoader, Object target, Interceptor interceptor, + Class<?>... proxyClasses) { - return (T) Proxy - .newProxyInstance(classLoader, proxyClasses, new InterceptorInvocationHandler(target, interceptor)); + return (T) Proxy.newProxyInstance(classLoader, proxyClasses, new InterceptorInvocationHandler(target, + interceptor)); } /** * Creates a proxy2 which uses the provided {@link Invoker} to handle all method invocations. - * - * @param classLoader the class loader to use when generating the proxy2 - * @param invoker the invoker - * @param proxyClasses the interfaces that the proxy2 should implement + * + * @param classLoader + * the class loader to use when generating the proxy2 + * @param invoker + * the invoker + * @param proxyClasses + * the interfaces that the proxy2 should implement * @return a proxy2 which uses the provided {@link Invoker} to handle all method invocations */ @SuppressWarnings("unchecked") - public <T> T createInvokerProxy( ClassLoader classLoader, Invoker invoker, - Class<?>... proxyClasses ) + public <T> T createInvokerProxy(ClassLoader classLoader, Invoker invoker, Class<?>... proxyClasses) { return (T) Proxy.newProxyInstance(classLoader, proxyClasses, new InvokerInvocationHandler(invoker)); } -//********************************************************************************************************************** -// Inner Classes -//********************************************************************************************************************** + //****************************************************************************************************************** + // Inner Classes + //****************************************************************************************************************** private abstract static class AbstractInvocationHandler implements InvocationHandler, Serializable { /** Serialization version */ private static final long serialVersionUID = 1L; - public Object invoke( Object proxy, Method method, Object[] args ) throws Throwable + public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { - if( ProxyUtils.isHashCode(method) ) + if (ProxyUtils.isHashCode(method)) { return System.identityHashCode(proxy); } - else if( ProxyUtils.isEqualsMethod(method) ) + else if (ProxyUtils.isEqualsMethod(method)) { return proxy == args[0]; } @@ -110,7 +124,7 @@ public class JdkProxyFactory extends Abs } } - protected abstract Object invokeImpl( Object proxy, Method method, Object[] args ) throws Throwable; + protected abstract Object invokeImpl(Object proxy, Method method, Object[] args) throws Throwable; } private static class DelegatorInvocationHandler extends AbstractInvocationHandler @@ -120,18 +134,18 @@ public class JdkProxyFactory extends Abs private final ObjectProvider<?> delegateProvider; - protected DelegatorInvocationHandler( ObjectProvider<?> delegateProvider ) + protected DelegatorInvocationHandler(ObjectProvider<?> delegateProvider) { this.delegateProvider = delegateProvider; } - public Object invokeImpl( Object proxy, Method method, Object[] args ) throws Throwable + public Object invokeImpl(Object proxy, Method method, Object[] args) throws Throwable { try { return method.invoke(delegateProvider.getObject(), args); } - catch( InvocationTargetException e ) + catch (InvocationTargetException e) { throw e.getTargetException(); } @@ -146,13 +160,13 @@ public class JdkProxyFactory extends Abs private final Object target; private final Interceptor methodInterceptor; - public InterceptorInvocationHandler( Object target, Interceptor methodInterceptor ) + public InterceptorInvocationHandler(Object target, Interceptor methodInterceptor) { this.target = target; this.methodInterceptor = methodInterceptor; } - public Object invokeImpl( Object proxy, Method method, Object[] args ) throws Throwable + public Object invokeImpl(Object proxy, Method method, Object[] args) throws Throwable { final ReflectionInvocation invocation = new ReflectionInvocation(proxy, target, method, args); return methodInterceptor.intercept(invocation); @@ -166,33 +180,30 @@ public class JdkProxyFactory extends Abs private final Invoker invoker; - public InvokerInvocationHandler( Invoker invoker ) + public InvokerInvocationHandler(Invoker invoker) { this.invoker = invoker; } - public Object invokeImpl( Object proxy, Method method, Object[] args ) throws Throwable + public Object invokeImpl(Object proxy, Method method, Object[] args) throws Throwable { return invoker.invoke(proxy, method, args); } } - private static class ReflectionInvocation implements Invocation, Serializable + private static class ReflectionInvocation implements Invocation { - /** Serialization version */ - private static final long serialVersionUID = 1L; - private final Object proxy; private final Object target; private final Method method; private final Object[] arguments; - public ReflectionInvocation( Object proxy, Object target, Method method, Object[] arguments ) + public ReflectionInvocation(Object proxy, Object target, Method method, Object[] arguments) { this.proxy = proxy; this.target = target; this.method = method; - this.arguments = ( arguments == null ? ProxyUtils.EMPTY_ARGUMENTS : arguments ); + this.arguments = ObjectUtils.defaultIfNull(ArrayUtils.clone(arguments), ProxyUtils.EMPTY_ARGUMENTS); } public Object[] getArguments() @@ -216,7 +227,7 @@ public class JdkProxyFactory extends Abs { return method.invoke(target, arguments); } - catch( InvocationTargetException e ) + catch (InvocationTargetException e) { throw e.getTargetException(); }
Modified: commons/proper/proxy/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/proxy/trunk/pom.xml?rev=1582033&r1=1582032&r2=1582033&view=diff ============================================================================== --- commons/proper/proxy/trunk/pom.xml (original) +++ commons/proper/proxy/trunk/pom.xml Wed Mar 26 20:20:01 2014 @@ -249,7 +249,7 @@ <dependency> <groupId>org.javassist</groupId> <artifactId>javassist</artifactId> - <version>3.18.1.GA</version> + <version>3.18.1-GA</version> </dependency> <dependency> <groupId>org.ow2.asm</groupId> @@ -281,6 +281,11 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + <version>${checkstyle.version}</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> <version>2.8</version> </plugin> @@ -418,7 +423,7 @@ </dependencies> <configuration> <configLocation>org/apache/commons/proxy2/checkstyle.xml</configLocation> - <headerLocation>org/apache/commons/proxy2/license-header.txt</headerLocation> + <includes>**/*.java</includes> </configuration> </plugin> <!-- Unfortunately the much simpler @@ -493,7 +498,7 @@ <dependencies> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>commons-weaver-build-tools</artifactId> + <artifactId>commons-proxy2-build-tools</artifactId> <version>${project.version}</version> </dependency> </dependencies> @@ -592,12 +597,12 @@ <dependencies> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>commons-weaver-build-tools</artifactId> + <artifactId>commons-proxy2-build-tools</artifactId> <version>${project.version}</version> </dependency> </dependencies> <configuration> - <!--excludeFilterFile>/org/apache/commons/proxy2/findbugs-exclude-filter.xml</excludeFilterFile--> + <excludeFilterFile>/org/apache/commons/proxy2/findbugs-exclude-filter.xml</excludeFilterFile> </configuration> </plugin> </plugins> @@ -607,14 +612,6 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-checkstyle-plugin</artifactId> - <configuration> - <configLocation>org/apache/commons/proxy2/checkstyle.xml</configLocation> - <headerLocation>org/apache/commons/proxy2/license-header.txt</headerLocation> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> <configuration> <source>${maven.compiler.source}</source> Modified: commons/proper/proxy/trunk/src/site/site.xml URL: http://svn.apache.org/viewvc/commons/proper/proxy/trunk/src/site/site.xml?rev=1582033&r1=1582032&r2=1582033&view=diff ============================================================================== --- commons/proper/proxy/trunk/src/site/site.xml (original) +++ commons/proper/proxy/trunk/src/site/site.xml Wed Mar 26 20:20:01 2014 @@ -21,7 +21,7 @@ <bannerRight> <name>Commons Proxy</name> <src>images/logo.png</src> - <href>http://commons.apache.org/proxy/</href> + <href>/index.html</href> </bannerRight> <body> <menu name="Commons Proxy"> Modified: commons/proper/proxy/trunk/test/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/proxy/trunk/test/pom.xml?rev=1582033&r1=1582032&r2=1582033&view=diff ============================================================================== --- commons/proper/proxy/trunk/test/pom.xml (original) +++ commons/proper/proxy/trunk/test/pom.xml Wed Mar 26 20:20:01 2014 @@ -92,4 +92,17 @@ </plugin> </plugins> </build> + + <reporting> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + <version>${checkstyle.version}</version> + <configuration> + <configLocation>org/apache/commons/proxy2/checkstyle.xml</configLocation> + </configuration> + </plugin> + </plugins> + </reporting> </project> Modified: commons/proper/proxy/trunk/test/src/test/java/org/apache/commons/proxy2/DefaultProxyFactoryTest.java URL: http://svn.apache.org/viewvc/commons/proper/proxy/trunk/test/src/test/java/org/apache/commons/proxy2/DefaultProxyFactoryTest.java?rev=1582033&r1=1582032&r2=1582033&view=diff ============================================================================== --- commons/proper/proxy/trunk/test/src/test/java/org/apache/commons/proxy2/DefaultProxyFactoryTest.java (original) +++ commons/proper/proxy/trunk/test/src/test/java/org/apache/commons/proxy2/DefaultProxyFactoryTest.java Wed Mar 26 20:20:01 2014 @@ -17,52 +17,56 @@ package org.apache.commons.proxy2; -import org.apache.commons.proxy2.invoker.NullInvoker; -import org.junit.Before; -import org.junit.Test; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; import java.lang.reflect.Proxy; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import org.apache.commons.proxy2.invoker.NullInvoker; +import org.junit.Before; +import org.junit.Test; /** * Test the default ProxyFactory provided by {@link ProxyUtils}. */ -public class DefaultProxyFactoryTest { +public class DefaultProxyFactoryTest +{ private ProxyFactory proxyFactory; @Before - public void setUp() { + public void setUp() + { proxyFactory = ProxyUtils.proxyFactory(); } @Test - public void testBasic() { - Foo foo = proxyFactory.createInvokerProxy(NullInvoker.INSTANCE, - Foo.class); + public void testBasic() + { + Foo foo = proxyFactory.createInvokerProxy(NullInvoker.INSTANCE, Foo.class); assertNotNull(foo); assertTrue(foo instanceof Proxy); } @Test - public void testSubclassing() { - Bar bar = proxyFactory.createInvokerProxy(NullInvoker.INSTANCE, - Bar.class); + public void testSubclassing() + { + Bar bar = proxyFactory.createInvokerProxy(NullInvoker.INSTANCE, Bar.class); assertNotNull(bar); } @Test - public void testCombined() { - Bar bar = proxyFactory.createInvokerProxy(NullInvoker.INSTANCE, - Bar.class, Foo.class); + public void testCombined() + { + Bar bar = proxyFactory.createInvokerProxy(NullInvoker.INSTANCE, Bar.class, Foo.class); assertNotNull(bar); assertTrue(bar instanceof Foo); } - public interface Foo { + public interface Foo + { } - public static class Bar { + public static class Bar + { } } Modified: commons/proper/proxy/trunk/test/src/test/java/org/apache/commons/proxy2/serialization/SerializationProxyTest.java URL: http://svn.apache.org/viewvc/commons/proper/proxy/trunk/test/src/test/java/org/apache/commons/proxy2/serialization/SerializationProxyTest.java?rev=1582033&r1=1582032&r2=1582033&view=diff ============================================================================== --- commons/proper/proxy/trunk/test/src/test/java/org/apache/commons/proxy2/serialization/SerializationProxyTest.java (original) +++ commons/proper/proxy/trunk/test/src/test/java/org/apache/commons/proxy2/serialization/SerializationProxyTest.java Wed Mar 26 20:20:01 2014 @@ -16,7 +16,8 @@ */ package org.apache.commons.proxy2.serialization; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; import java.io.Serializable; @@ -58,24 +59,24 @@ public class SerializationProxyTest exte private static SwitchInterceptor implementProvider(String value) { return new SwitchInterceptor().when(new DeclaredByMatcher(Provider.class)).then( - InterceptorUtils.constant(new NonSerializableStringWrapper(value))); + InterceptorUtils.constant(new NonSerializableStringWrapper(value))); } private static Provider serializableProvider(final String value) { return PROXY_FACTORY.get().createInterceptorProxy( - null, - implementProvider(value).when(new DeclaredByMatcher(WriteReplace.class)).then( - InterceptorUtils.constant(new ReadResolve() - { - private static final long serialVersionUID = 1L; - - @Override - public Object readResolve() - { - return serializableProvider(value); - } - })), Provider.class, WriteReplace.class); + null, + implementProvider(value).when(new DeclaredByMatcher(WriteReplace.class)).then( + InterceptorUtils.constant(new ReadResolve() + { + private static final long serialVersionUID = 1L; + + @Override + public Object readResolve() + { + return serializableProvider(value); + } + })), Provider.class, WriteReplace.class); } @Before @@ -93,15 +94,16 @@ public class SerializationProxyTest exte @Test(expected = SerializationException.class) public void testNaive() { - final Provider proxy = - proxyFactory.createInterceptorProxy(null, implementProvider("foo"), Provider.class, Serializable.class); + final Provider proxy = proxyFactory.createInterceptorProxy(null, implementProvider("foo"), Provider.class, + Serializable.class); assertEquals("foo", proxy.getObject().getValue()); assertTrue(Serializable.class.isInstance(proxy)); SerializationUtils.roundtrip((Serializable) proxy); } @Test - public void testSerializationProxy() { + public void testSerializationProxy() + { final Provider proxy = serializableProvider("foo"); assertEquals("foo", proxy.getObject().getValue()); assertTrue(Serializable.class.isInstance(proxy)); Modified: commons/proper/proxy/trunk/test/src/test/java/org/apache/commons/proxy2/stub/AbstractProxyFactoryAgnosticTest.java URL: http://svn.apache.org/viewvc/commons/proper/proxy/trunk/test/src/test/java/org/apache/commons/proxy2/stub/AbstractProxyFactoryAgnosticTest.java?rev=1582033&r1=1582032&r2=1582033&view=diff ============================================================================== --- commons/proper/proxy/trunk/test/src/test/java/org/apache/commons/proxy2/stub/AbstractProxyFactoryAgnosticTest.java (original) +++ commons/proper/proxy/trunk/test/src/test/java/org/apache/commons/proxy2/stub/AbstractProxyFactoryAgnosticTest.java Wed Mar 26 20:20:01 2014 @@ -33,10 +33,12 @@ import org.junit.runners.Parameterized.P * Conveniently defines the setup for a unit test class that runs with all known {@link ProxyFactory} implementations. */ @RunWith(Parameterized.class) -public abstract class AbstractProxyFactoryAgnosticTest { +public abstract class AbstractProxyFactoryAgnosticTest +{ @Parameters(name = "{0}") - public static List<Object[]> createParameters() { + public static List<Object[]> createParameters() + { final List<Object[]> result = new ArrayList<Object[]>(); result.add(new Object[] { new JdkProxyFactory() }); result.add(new Object[] { new CglibProxyFactory() }); Modified: commons/proper/proxy/trunk/test/src/test/java/org/apache/commons/proxy2/stub/AbstractStubTestCase.java URL: http://svn.apache.org/viewvc/commons/proper/proxy/trunk/test/src/test/java/org/apache/commons/proxy2/stub/AbstractStubTestCase.java?rev=1582033&r1=1582032&r2=1582033&view=diff ============================================================================== --- commons/proper/proxy/trunk/test/src/test/java/org/apache/commons/proxy2/stub/AbstractStubTestCase.java (original) +++ commons/proper/proxy/trunk/test/src/test/java/org/apache/commons/proxy2/stub/AbstractStubTestCase.java Wed Mar 26 20:20:01 2014 @@ -125,8 +125,7 @@ public abstract class AbstractStubTestCa { when(trainee.one("Whatever")).thenReturn("One"); } - }) - .build(); + }).build(); } }); Modified: commons/proper/proxy/trunk/test/src/test/java/org/apache/commons/proxy2/stub/RetentionWrapper.java URL: http://svn.apache.org/viewvc/commons/proper/proxy/trunk/test/src/test/java/org/apache/commons/proxy2/stub/RetentionWrapper.java?rev=1582033&r1=1582032&r2=1582033&view=diff ============================================================================== --- commons/proper/proxy/trunk/test/src/test/java/org/apache/commons/proxy2/stub/RetentionWrapper.java (original) +++ commons/proper/proxy/trunk/test/src/test/java/org/apache/commons/proxy2/stub/RetentionWrapper.java Wed Mar 26 20:20:01 2014 @@ -26,9 +26,9 @@ import java.lang.annotation.Target; @Retention(RetentionPolicy.RUNTIME) public @interface RetentionWrapper { -//---------------------------------------------------------------------------------------------------------------------- -// Other Methods -//---------------------------------------------------------------------------------------------------------------------- + //---------------------------------------------------------------------------------------------------------------------- + // Other Methods + //---------------------------------------------------------------------------------------------------------------------- Retention value(); } Modified: commons/proper/proxy/trunk/test/src/test/java/org/apache/commons/proxy2/stub/StubBuilderTest.java URL: http://svn.apache.org/viewvc/commons/proper/proxy/trunk/test/src/test/java/org/apache/commons/proxy2/stub/StubBuilderTest.java?rev=1582033&r1=1582032&r2=1582033&view=diff ============================================================================== --- commons/proper/proxy/trunk/test/src/test/java/org/apache/commons/proxy2/stub/StubBuilderTest.java (original) +++ commons/proper/proxy/trunk/test/src/test/java/org/apache/commons/proxy2/stub/StubBuilderTest.java Wed Mar 26 20:20:01 2014 @@ -33,10 +33,9 @@ import org.junit.Test; public class StubBuilderTest extends AbstractStubTestCase { -//---------------------------------------------------------------------------------------------------------------------- -// Other Methods -//---------------------------------------------------------------------------------------------------------------------- - + //---------------------------------------------------------------------------------------------------------------------- + // Other Methods + //---------------------------------------------------------------------------------------------------------------------- @Override protected StubInterface createProxy(Trainer<StubInterface> trainer) @@ -47,7 +46,8 @@ public class StubBuilderTest extends Abs @Test public void testWithConcreteTarget() { - StubBuilder<StubInterface> builder = new StubBuilder<StubInterface>(proxyFactory, StubInterface.class, new SimpleStub()); + StubBuilder<StubInterface> builder = new StubBuilder<StubInterface>(proxyFactory, StubInterface.class, + new SimpleStub()); builder.train(new Trainer<StubInterface>() { @Override @@ -87,7 +87,8 @@ public class StubBuilderTest extends Abs @Test public void testWithObjectProviderTarget() { - StubBuilder<StubInterface> builder = new StubBuilder<StubInterface>(proxyFactory, StubInterface.class, new BeanProvider<StubInterface>(SimpleStub.class)); + StubBuilder<StubInterface> builder = new StubBuilder<StubInterface>(proxyFactory, StubInterface.class, + new BeanProvider<StubInterface>(SimpleStub.class)); builder.train(new Trainer<StubInterface>() { @Override @@ -101,7 +102,8 @@ public class StubBuilderTest extends Abs } @Test - public void testAdditionalInterfaces() { + public void testAdditionalInterfaces() + { StubBuilder<StubInterface> builder = new StubBuilder<StubInterface>(proxyFactory, StubInterface.class, ObjectProviderUtils.constant(new SimpleStub())); builder.train(new Trainer<Iterable<String>>() @@ -127,9 +129,9 @@ public class StubBuilderTest extends Abs assertTrue(stub instanceof Marker); } -//---------------------------------------------------------------------------------------------------------------------- -// Inner Classes -//---------------------------------------------------------------------------------------------------------------------- + //---------------------------------------------------------------------------------------------------------------------- + // Inner Classes + //---------------------------------------------------------------------------------------------------------------------- private static class SimpleStub implements StubInterface { @@ -154,55 +156,55 @@ public class StubBuilderTest extends Abs @Override public byte[] byteArray() { - return new byte[]{1, 2, 3}; + return new byte[] { 1, 2, 3 }; } @Override public char[] charArray() { - return new char[]{'1', '2', '3'}; + return new char[] { '1', '2', '3' }; } @Override public short[] shortArray() { - return new short[]{1, 2, 3}; + return new short[] { 1, 2, 3 }; } @Override public int[] intArray() { - return new int[]{1, 2, 3}; + return new int[] { 1, 2, 3 }; } @Override public long[] longArray() { - return new long[]{1, 2, 3}; + return new long[] { 1, 2, 3 }; } @Override public float[] floatArray() { - return new float[]{1.0f, 2.0f, 3.0f}; + return new float[] { 1.0f, 2.0f, 3.0f }; } @Override public double[] doubleArray() { - return new double[]{1.0, 2.0, 3.0}; + return new double[] { 1.0, 2.0, 3.0 }; } @Override public boolean[] booleanArray() { - return new boolean[]{true, false, true}; + return new boolean[] { true, false, true }; } @Override public String[] stringArray() { - return new String[]{"One", "Two", "Three"}; + return new String[] { "One", "Two", "Three" }; } @Override Modified: commons/proper/proxy/trunk/test/src/test/java/org/apache/commons/proxy2/stub/StubInterceptorBuilderTest.java URL: http://svn.apache.org/viewvc/commons/proper/proxy/trunk/test/src/test/java/org/apache/commons/proxy2/stub/StubInterceptorBuilderTest.java?rev=1582033&r1=1582032&r2=1582033&view=diff ============================================================================== --- commons/proper/proxy/trunk/test/src/test/java/org/apache/commons/proxy2/stub/StubInterceptorBuilderTest.java (original) +++ commons/proper/proxy/trunk/test/src/test/java/org/apache/commons/proxy2/stub/StubInterceptorBuilderTest.java Wed Mar 26 20:20:01 2014 @@ -30,15 +30,15 @@ import org.junit.Test; public class StubInterceptorBuilderTest extends AbstractStubTestCase { -//---------------------------------------------------------------------------------------------------------------------- -// Fields -//---------------------------------------------------------------------------------------------------------------------- + //---------------------------------------------------------------------------------------------------------------------- + // Fields + //---------------------------------------------------------------------------------------------------------------------- private StubInterceptorBuilder builder; -//---------------------------------------------------------------------------------------------------------------------- -// Other Methods -//---------------------------------------------------------------------------------------------------------------------- + //---------------------------------------------------------------------------------------------------------------------- + // Other Methods + //---------------------------------------------------------------------------------------------------------------------- @Before public void initialize() @@ -51,8 +51,7 @@ public class StubInterceptorBuilderTest { Interceptor interceptor = builder.train(trainer).build(); return proxyFactory.createInterceptorProxy( - proxyFactory.createInvokerProxy(NullInvoker.INSTANCE, StubInterface.class), - interceptor, + proxyFactory.createInvokerProxy(NullInvoker.INSTANCE, StubInterface.class), interceptor, StubInterface.class); } @@ -75,7 +74,8 @@ public class StubInterceptorBuilderTest }); } }).build(); - RetentionWrapper wrapper = proxyFactory.createInterceptorProxy(proxyFactory.createInvokerProxy(NullInvoker.INSTANCE), interceptor, RetentionWrapper.class); + RetentionWrapper wrapper = proxyFactory.createInterceptorProxy( + proxyFactory.createInvokerProxy(NullInvoker.INSTANCE), interceptor, RetentionWrapper.class); assertNotNull(wrapper.value()); assertEquals(RetentionPolicy.RUNTIME, wrapper.value().value()); } @@ -91,7 +91,8 @@ public class StubInterceptorBuilderTest when(trainee.value()).thenReturn(RetentionPolicy.RUNTIME); } }).build(); - Retention wrapper = proxyFactory.createInterceptorProxy(proxyFactory.createInvokerProxy(NullInvoker.INSTANCE), interceptor, Retention.class); + Retention wrapper = proxyFactory.createInterceptorProxy(proxyFactory.createInvokerProxy(NullInvoker.INSTANCE), + interceptor, Retention.class); assertEquals(RetentionPolicy.RUNTIME, wrapper.value()); } Modified: commons/proper/proxy/trunk/test/src/test/java/org/apache/commons/proxy2/stub/StubInterface.java URL: http://svn.apache.org/viewvc/commons/proper/proxy/trunk/test/src/test/java/org/apache/commons/proxy2/stub/StubInterface.java?rev=1582033&r1=1582032&r2=1582033&view=diff ============================================================================== --- commons/proper/proxy/trunk/test/src/test/java/org/apache/commons/proxy2/stub/StubInterface.java (original) +++ commons/proper/proxy/trunk/test/src/test/java/org/apache/commons/proxy2/stub/StubInterface.java Wed Mar 26 20:20:01 2014 @@ -19,22 +19,32 @@ package org.apache.commons.proxy2.stub; public interface StubInterface { -//---------------------------------------------------------------------------------------------------------------------- -// Other Methods -//---------------------------------------------------------------------------------------------------------------------- + //---------------------------------------------------------------------------------------------------------------------- + // Other Methods + //---------------------------------------------------------------------------------------------------------------------- String one(String value); + String three(String arg1, String arg2); + String two(String value); byte[] byteArray(); + char[] charArray(); + short[] shortArray(); + int[] intArray(); + long[] longArray(); + float[] floatArray(); + double[] doubleArray(); + boolean[] booleanArray(); + String[] stringArray(); String arrayParameter(String... strings); @@ -42,5 +52,6 @@ public interface StubInterface void voidMethod(String arg); StubInterface stub(); + StubInterface[] stubs(); }
