Updated Branches: refs/heads/master 1174e704a -> 5b3d81aa9
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5b3d81aa/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/DefaultRequestExceptionHandlerTest.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/DefaultRequestExceptionHandlerTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/DefaultRequestExceptionHandlerTest.java index d458e1c..4370020 100644 --- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/DefaultRequestExceptionHandlerTest.java +++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/DefaultRequestExceptionHandlerTest.java @@ -44,25 +44,25 @@ public class DefaultRequestExceptionHandlerTest extends InternalBaseTestCase { ComponentClassResolver componentClassResolver; LinkSource linkSource; ServiceResources serviceResources; - private DefaultRequestExceptionHandler exceptionHandler; + private DefaultRequestExceptionHandler exceptionHandler; - private static class MyContextAwareException extends Throwable implements ContextAwareException { - private Object[] context; + private static class MyContextAwareException extends Throwable implements ContextAwareException { + private Object[] context; - public MyContextAwareException(Object[] context) { - this.context = context; - } + public MyContextAwareException(Object[] context) { + this.context = context; + } - public Object[] getContext() { - return context; - } + public Object[] getContext() { + return context; + } - } - - private static class MyPage { - - } - + } + + private static class MyPage { + + } + @BeforeMethod public void setup_tests() throws Exception { @@ -75,66 +75,66 @@ public class DefaultRequestExceptionHandlerTest extends InternalBaseTestCase { componentClassResolver = mockComponentClassResolver(); linkSource = mockLinkSource(); serviceResources = mockServiceResources(); - mockConfiguration.put(AccessControlException.class, MyPage.class); + mockConfiguration.put(AccessControlException.class, MyPage.class); mockConfiguration.put(MyContextAwareException.class, new ExceptionHandlerAssistant() { - public Object handleRequestException(Throwable exception, List<Object> exceptionContext) - throws IOException { - return null; - } - }); + public Object handleRequestException(Throwable exception, List<Object> exceptionContext) + throws IOException { + return null; + } + }); exceptionHandler = new DefaultRequestExceptionHandler(pageCache, renderer, logger, "exceptionpage", request, response, componentClassResolver, linkSource, serviceResources, mockConfiguration); } - + - @Test - public void noContextWhenExceptionDoesntContainMessage() { - Object[] context = exceptionHandler.formExceptionContext(new RuntimeException() { - }); - assertEquals(context.length, 0); - } + @Test + public void noContextWhenExceptionDoesntContainMessage() { + Object[] context = exceptionHandler.formExceptionContext(new RuntimeException() { + }); + assertEquals(context.length, 0); + } - @Test - public void contextIsExceptionMessage() { - Object[] context = exceptionHandler.formExceptionContext(new RuntimeException() { - public String getMessage() { - return "HelloWorld"; - } - }); - assertEquals(context.length, 1); - assertTrue("helloworld".equals(context[0])); - } + @Test + public void contextIsExceptionMessage() { + Object[] context = exceptionHandler.formExceptionContext(new RuntimeException() { + public String getMessage() { + return "HelloWorld"; + } + }); + assertEquals(context.length, 1); + assertTrue("helloworld".equals(context[0])); + } - @Test - public void contextIsExceptionType() { - Object[] context = exceptionHandler.formExceptionContext(new IllegalArgumentException("Value not allowed")); - assertEquals(context.length, 1); - assertTrue(context[0] instanceof String); - assertTrue("illegalargument".equals(context[0])); - } + @Test + public void contextIsExceptionType() { + Object[] context = exceptionHandler.formExceptionContext(new IllegalArgumentException("Value not allowed")); + assertEquals(context.length, 1); + assertTrue(context[0] instanceof String); + assertTrue("illegalargument".equals(context[0])); + } - @Test - public void contextIsProvidedByContextAwareException() { - Object[] sourceContext = new Object[] { new Integer(10), this }; + @Test + public void contextIsProvidedByContextAwareException() { + Object[] sourceContext = new Object[] { new Integer(10), this }; - Object[] context = exceptionHandler.formExceptionContext(new MyContextAwareException(sourceContext) { - }); - assertEquals(context, sourceContext); + Object[] context = exceptionHandler.formExceptionContext(new MyContextAwareException(sourceContext) { + }); + assertEquals(context, sourceContext); - } - - @Test - public void handleRequestExceptionWithConfiguredPage() throws IOException { - train_resolvePageClassNameToPageName(componentClassResolver, MyPage.class.getName(), "mypage" ); - Link link = mockLink(); + } + + @Test + public void handleRequestExceptionWithConfiguredPage() throws IOException { + train_resolvePageClassNameToPageName(componentClassResolver, MyPage.class.getName(), "mypage" ); + Link link = mockLink(); expect(linkSource.createPageRenderLink("mypage", false, new Object[]{"accesscontrol"})).andReturn(link); expect(request.isXHR()).andReturn(false); response.sendRedirect(link); EasyMock.expectLastCall(); replay(); - - exceptionHandler.handleRequestException(new AccessControlException("No permission")); - } - + + exceptionHandler.handleRequestException(new AccessControlException("No permission")); + } + @Test public void handleRequestExceptionWithConfiguredAssistant() throws IOException { ExceptionHandlerAssistant assistant = new ExceptionHandlerAssistant() { @@ -150,5 +150,5 @@ public class DefaultRequestExceptionHandlerTest extends InternalBaseTestCase { exceptionHandler.handleRequestException(new MyContextAwareException(new Object[]{})); } - + } http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5b3d81aa/tapestry-core/src/test/java/org/apache/tapestry5/internal/structure/ComponentPageElementImplTest.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/structure/ComponentPageElementImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/structure/ComponentPageElementImplTest.java index 33cebfd..cfd1494 100644 --- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/structure/ComponentPageElementImplTest.java +++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/structure/ComponentPageElementImplTest.java @@ -14,59 +14,59 @@ import org.apache.tapestry5.services.Request; import org.testng.annotations.Test; public class ComponentPageElementImplTest extends TestBase { - /** TAP5-742 */ - @Test public void component_render_tracing() { - Request request = newMock(Request.class); - SymbolSource symbolSource = newMock(SymbolSource.class); - - Page page = getMocksControl().createMock(Page.class); - Instantiator instantiator = newMock(Instantiator.class); - Location location = newMock(Location.class); - ComponentPageElementResources elementResources = newMock(ComponentPageElementResources.class); - ComponentModel model = newMock(ComponentModel.class); - MetaDataLocator locator = newMock(MetaDataLocator.class); - - getMocksControl().resetToNice(); + /** TAP5-742 */ + @Test public void component_render_tracing() { + Request request = newMock(Request.class); + SymbolSource symbolSource = newMock(SymbolSource.class); + + Page page = getMocksControl().createMock(Page.class); + Instantiator instantiator = newMock(Instantiator.class); + Location location = newMock(Location.class); + ComponentPageElementResources elementResources = newMock(ComponentPageElementResources.class); + ComponentModel model = newMock(ComponentModel.class); + MetaDataLocator locator = newMock(MetaDataLocator.class); + + getMocksControl().resetToNice(); - expect(instantiator.getModel()).andReturn(model).anyTimes(); + expect(instantiator.getModel()).andReturn(model).anyTimes(); - // off by default - expect(symbolSource.valueForSymbol(PRODUCTION_MODE)).andReturn("false"); - expect(symbolSource.valueForSymbol(COMPONENT_RENDER_TRACING_ENABLED)).andReturn("false"); - expect(request.getParameter("t:component-trace")).andReturn("false"); - - // enable by query parameter - expect(symbolSource.valueForSymbol(PRODUCTION_MODE)).andReturn("false"); - expect(symbolSource.valueForSymbol(COMPONENT_RENDER_TRACING_ENABLED)).andReturn("false"); - expect(request.getParameter("t:component-trace")).andReturn("true"); - - // enable by symbol - expect(symbolSource.valueForSymbol(PRODUCTION_MODE)).andReturn("false"); - expect(symbolSource.valueForSymbol(COMPONENT_RENDER_TRACING_ENABLED)).andReturn("true"); - expect(request.getParameter("t:component-trace")).andReturn("false"); - - // off no matter what in production mode - expect(symbolSource.valueForSymbol(PRODUCTION_MODE)).andReturn("true"); - expect(symbolSource.valueForSymbol(COMPONENT_RENDER_TRACING_ENABLED)).andReturn("true"); - expect(request.getParameter("t:component-trace")).andReturn("false"); + // off by default + expect(symbolSource.valueForSymbol(PRODUCTION_MODE)).andReturn("false"); + expect(symbolSource.valueForSymbol(COMPONENT_RENDER_TRACING_ENABLED)).andReturn("false"); + expect(request.getParameter("t:component-trace")).andReturn("false"); + + // enable by query parameter + expect(symbolSource.valueForSymbol(PRODUCTION_MODE)).andReturn("false"); + expect(symbolSource.valueForSymbol(COMPONENT_RENDER_TRACING_ENABLED)).andReturn("false"); + expect(request.getParameter("t:component-trace")).andReturn("true"); + + // enable by symbol + expect(symbolSource.valueForSymbol(PRODUCTION_MODE)).andReturn("false"); + expect(symbolSource.valueForSymbol(COMPONENT_RENDER_TRACING_ENABLED)).andReturn("true"); + expect(request.getParameter("t:component-trace")).andReturn("false"); + + // off no matter what in production mode + expect(symbolSource.valueForSymbol(PRODUCTION_MODE)).andReturn("true"); + expect(symbolSource.valueForSymbol(COMPONENT_RENDER_TRACING_ENABLED)).andReturn("true"); + expect(request.getParameter("t:component-trace")).andReturn("false"); - expect(page.getName()).andReturn("pageName").anyTimes(); - expect(locator.findMeta(MetaDataConstants.UNKNOWN_ACTIVATION_CONTEXT_CHECK, "pageName", Boolean.class)) - .andReturn(false).anyTimes(); + expect(page.getName()).andReturn("pageName").anyTimes(); + expect(locator.findMeta(MetaDataConstants.UNKNOWN_ACTIVATION_CONTEXT_CHECK, "pageName", Boolean.class)) + .andReturn(false).anyTimes(); - replay(); - ComponentPageElementImpl c; // need to create every time because of changing symbols - - c = new ComponentPageElementImpl(page, null, "id", "nestedId", "completeid", "elementname", instantiator, location, elementResources, request, symbolSource, locator); - assertFalse(c.isRenderTracingEnabled()); - - c = new ComponentPageElementImpl(page, null, "id", "nestedId", "completeid", "elementname", instantiator, location, elementResources, request, symbolSource, locator); - assertTrue(c.isRenderTracingEnabled()); + replay(); + ComponentPageElementImpl c; // need to create every time because of changing symbols + + c = new ComponentPageElementImpl(page, null, "id", "nestedId", "completeid", "elementname", instantiator, location, elementResources, request, symbolSource, locator); + assertFalse(c.isRenderTracingEnabled()); + + c = new ComponentPageElementImpl(page, null, "id", "nestedId", "completeid", "elementname", instantiator, location, elementResources, request, symbolSource, locator); + assertTrue(c.isRenderTracingEnabled()); - c = new ComponentPageElementImpl(page, null, "id", "nestedId", "completeid", "elementname", instantiator, location, elementResources, request, symbolSource, locator); - assertTrue(c.isRenderTracingEnabled()); + c = new ComponentPageElementImpl(page, null, "id", "nestedId", "completeid", "elementname", instantiator, location, elementResources, request, symbolSource, locator); + assertTrue(c.isRenderTracingEnabled()); - c = new ComponentPageElementImpl(page, null, "id", "nestedId", "completeid", "elementname", instantiator, location, elementResources, request, symbolSource, locator); - assertFalse(c.isRenderTracingEnabled()); - } + c = new ComponentPageElementImpl(page, null, "id", "nestedId", "completeid", "elementname", instantiator, location, elementResources, request, symbolSource, locator); + assertFalse(c.isRenderTracingEnabled()); + } } http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5b3d81aa/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/def/ServiceDef3.java ---------------------------------------------------------------------- diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/def/ServiceDef3.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/def/ServiceDef3.java index bd7535c..48e3884 100644 --- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/def/ServiceDef3.java +++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/def/ServiceDef3.java @@ -27,14 +27,14 @@ import org.apache.tapestry5.ioc.annotations.IncompatibleChange; */ public interface ServiceDef3 extends ServiceDef2, AnnotationAccess { - + /** * Returns the service implementation associated with this service. When creating the proxies * for the service interface, the implementation of the service interface methods will * receive the annotations of the corresponding method in the service interface. * @since 5.4 */ - @IncompatibleChange(release = "5.4", details = "Added method") + @IncompatibleChange(release = "5.4", details = "Added method") Class getServiceImplementation(); } http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5b3d81aa/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassPropertyAdapterImpl.java ---------------------------------------------------------------------- diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassPropertyAdapterImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassPropertyAdapterImpl.java index 7da0728..a7858cf 100644 --- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassPropertyAdapterImpl.java +++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassPropertyAdapterImpl.java @@ -107,7 +107,7 @@ public class ClassPropertyAdapterImpl implements ClassPropertyAdapter } public Annotation getAnnotation(Object instance, String propertyName, Class<? extends Annotation> annotationClass) { - return adaptorFor(propertyName).getAnnotation(annotationClass); + return adaptorFor(propertyName).getAnnotation(annotationClass); } private PropertyAdapter adaptorFor(String name) http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5b3d81aa/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PropertyAccessImpl.java ---------------------------------------------------------------------- diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PropertyAccessImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PropertyAccessImpl.java index 5eb1b3c..8a4a202 100644 --- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PropertyAccessImpl.java +++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PropertyAccessImpl.java @@ -46,7 +46,7 @@ public class PropertyAccessImpl implements PropertyAccess } public Annotation getAnnotation(Object instance, String propertyName, Class<? extends Annotation> annotationClass) { - return getAdapter(instance).getAnnotation(instance, propertyName, annotationClass); + return getAdapter(instance).getAnnotation(instance, propertyName, annotationClass); } http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5b3d81aa/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/InternalUtils.java ---------------------------------------------------------------------- diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/InternalUtils.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/InternalUtils.java index 1122293..140603c 100644 --- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/InternalUtils.java +++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/InternalUtils.java @@ -899,10 +899,10 @@ public class InternalUtils return toAnnotationProvider(findMethod(getServiceInterface(), methodName, argumentTypes)); } - public Class getServiceImplementation() - { - return null; - } + public Class getServiceImplementation() + { + return null; + } // ServiceDef2 methods: http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5b3d81aa/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AnnotatedServiceInterface.java ---------------------------------------------------------------------- diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AnnotatedServiceInterface.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AnnotatedServiceInterface.java index e2575fe..5934d4a 100644 --- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AnnotatedServiceInterface.java +++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AnnotatedServiceInterface.java @@ -25,6 +25,6 @@ import org.apache.tapestry5.ioc.annotations.IntermediateType; public interface AnnotatedServiceInterface { @Advise(id = "id", serviceInterface = NonAnnotatedServiceInterface.class) - public String execute(@IntermediateType(String.class) int i); - + public String execute(@IntermediateType(String.class) int i); + } http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5b3d81aa/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AnnotatedServiceInterfaceImpl.java ---------------------------------------------------------------------- diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AnnotatedServiceInterfaceImpl.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AnnotatedServiceInterfaceImpl.java index 36db723..ad5ddca 100644 --- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AnnotatedServiceInterfaceImpl.java +++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AnnotatedServiceInterfaceImpl.java @@ -16,8 +16,8 @@ package org.apache.tapestry5.ioc.internal; public class AnnotatedServiceInterfaceImpl implements AnnotatedServiceInterface { - public String execute(int i) { - return null; - } + public String execute(int i) { + return null; + } } http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5b3d81aa/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/NonAnnotatedServiceInterface.java ---------------------------------------------------------------------- diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/NonAnnotatedServiceInterface.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/NonAnnotatedServiceInterface.java index 4270d1e..fc26347 100644 --- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/NonAnnotatedServiceInterface.java +++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/NonAnnotatedServiceInterface.java @@ -19,6 +19,6 @@ package org.apache.tapestry5.ioc.internal; */ public interface NonAnnotatedServiceInterface { - public String execute(int i); - + public String execute(int i); + } http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5b3d81aa/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/TestAdvice.java ---------------------------------------------------------------------- diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/TestAdvice.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/TestAdvice.java index f7ca811..f61944d 100644 --- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/TestAdvice.java +++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/TestAdvice.java @@ -23,33 +23,33 @@ import org.apache.tapestry5.plastic.MethodInvocation; final public class TestAdvice implements MethodAdvice { - public static final String ANNOTATION_FOUND = "Annotation found!"; + public static final String ANNOTATION_FOUND = "Annotation found!"; - public void advise(MethodInvocation invocation) { + public void advise(MethodInvocation invocation) { - final Method method = invocation.getMethod(); + final Method method = invocation.getMethod(); boolean annotationFoundInMethod = checkAnnotation(method.getAnnotation(Advise.class)); - boolean annotationFoundThroughAnnotationProvider = checkAnnotation(invocation.getAnnotation(Advise.class)); - IntermediateType parameterAnnotation = null; - final Annotation[][] parameterAnnotations = method.getParameterAnnotations(); - if (parameterAnnotations.length > 0 && parameterAnnotations[0].length > 0) { - parameterAnnotation = (IntermediateType) parameterAnnotations[0][0]; - } + boolean annotationFoundThroughAnnotationProvider = checkAnnotation(invocation.getAnnotation(Advise.class)); + IntermediateType parameterAnnotation = null; + final Annotation[][] parameterAnnotations = method.getParameterAnnotations(); + if (parameterAnnotations.length > 0 && parameterAnnotations[0].length > 0) { + parameterAnnotation = (IntermediateType) parameterAnnotations[0][0]; + } boolean annotationParameter = parameterAnnotation != null && parameterAnnotation.value() == String.class; - - if (annotationFoundInMethod && annotationFoundThroughAnnotationProvider && annotationParameter) - { - invocation.setReturnValue(ANNOTATION_FOUND); - } - else { - invocation.proceed(); - } - - } + + if (annotationFoundInMethod && annotationFoundThroughAnnotationProvider && annotationParameter) + { + invocation.setReturnValue(ANNOTATION_FOUND); + } + else { + invocation.proceed(); + } + + } private boolean checkAnnotation(Advise annotation) { return annotation != null && "id".equals(annotation.id()) && NonAnnotatedServiceInterface.class.equals(annotation.serviceInterface()); } - + } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5b3d81aa/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/FieldInjectionViaJavaxNamed.java ---------------------------------------------------------------------- diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/FieldInjectionViaJavaxNamed.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/FieldInjectionViaJavaxNamed.java index 207333f..359c945 100644 --- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/FieldInjectionViaJavaxNamed.java +++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/FieldInjectionViaJavaxNamed.java @@ -19,7 +19,7 @@ import javax.inject.Named; public class FieldInjectionViaJavaxNamed { - @Inject + @Inject @Named("BarneyService") private Runnable fred;
