Author: rmannibucau Date: Sat Apr 27 20:41:02 2013 New Revision: 1476665 URL: http://svn.apache.org/r1476665 Log: TOMEE-919 TOMEE-918 fixing method signature of localbeanproxies (exceptions) + exception mapper of checked exceptions in jaxrs integration
Added: tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CheckedExceptionMapperTest.java Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyFactory.java tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/OpenEJBEJBInvoker.java Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyFactory.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyFactory.java?rev=1476665&r1=1476664&r2=1476665&view=diff ============================================================================== --- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyFactory.java (original) +++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyFactory.java Sat Apr 27 20:41:02 2013 @@ -401,7 +401,7 @@ public class LocalBeanProxyFactory imple for (int i = 0; i < exceptionTypes.length; i++) { final Class<?> exceptionType = exceptionTypes[i]; - mv.visitLdcInsn(Type.getType("L" + exceptionType.getCanonicalName().replace('.', '/') + ";")); + mv.visitLdcInsn(Type.getType("L" + exceptionType.getName().replace('.', '/') + ";")); mv.visitVarInsn(ALOAD, length); mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/reflect/InvocationTargetException", "getCause", "()Ljava/lang/Throwable;"); mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/Object", "getClass", "()Ljava/lang/Class;"); @@ -415,7 +415,7 @@ public class LocalBeanProxyFactory imple mv.visitVarInsn(ALOAD, length); mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/reflect/InvocationTargetException", "getCause", "()Ljava/lang/Throwable;"); - mv.visitTypeInsn(CHECKCAST, exceptionType.getCanonicalName().replace('.', '/')); + mv.visitTypeInsn(CHECKCAST, exceptionType.getName().replace('.', '/')); mv.visitInsn(ATHROW); mv.visitLabel(l6); Modified: tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/OpenEJBEJBInvoker.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/OpenEJBEJBInvoker.java?rev=1476665&r1=1476664&r2=1476665&view=diff ============================================================================== --- tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/OpenEJBEJBInvoker.java (original) +++ tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/OpenEJBEJBInvoker.java Sat Apr 27 20:41:02 2013 @@ -18,6 +18,7 @@ package org.apache.openejb.server.cxf.rs import org.apache.cxf.jaxrs.JAXRSInvoker; import org.apache.cxf.message.Exchange; +import org.apache.openejb.ApplicationException; import org.apache.openejb.BeanContext; import org.apache.openejb.InvalidateReferenceException; import org.apache.openejb.core.interceptor.InterceptorData; @@ -99,6 +100,11 @@ public class OpenEJBEJBInvoker extends J cause = cause.getCause(); } } + + if (ApplicationException.class.isInstance(cause) && Exception.class.isInstance(cause.getCause())) { + throw Exception.class.cast(ApplicationException.class.cast(cause).getCause()); + } + if (cause instanceof Exception) { throw (Exception) cause; } Added: tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CheckedExceptionMapperTest.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CheckedExceptionMapperTest.java?rev=1476665&view=auto ============================================================================== --- tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CheckedExceptionMapperTest.java (added) +++ tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CheckedExceptionMapperTest.java Sat Apr 27 20:41:02 2013 @@ -0,0 +1,94 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.openejb.server.cxf.rs; + +import org.apache.openejb.config.EjbModule; +import org.apache.openejb.jee.EjbJar; +import org.apache.openejb.jee.SingletonBean; +import org.apache.openejb.jee.oejb3.EjbDeployment; +import org.apache.openejb.jee.oejb3.OpenejbJar; +import org.apache.openejb.junit.ApplicationComposer; +import org.apache.openejb.loader.IO; +import org.apache.openejb.testing.Classes; +import org.apache.openejb.testing.EnableServices; +import org.apache.openejb.testing.Module; +import org.junit.Test; +import org.junit.runner.RunWith; + +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.core.Response; +import javax.ws.rs.ext.ExceptionMapper; +import javax.ws.rs.ext.Provider; +import java.io.IOException; +import java.net.URL; +import java.util.Properties; + +import static org.junit.Assert.assertEquals; + +@EnableServices("jaxrs") +@RunWith(ApplicationComposer.class) +public class CheckedExceptionMapperTest { + @Module + @Classes({ ExampleExceptionMapper.class }) + public EjbModule module() { + final SingletonBean bean = new SingletonBean(ExampleRest.class); + bean.setRestService(true); + + final EjbJar ejbJar = new EjbJar("beans"); + ejbJar.addEnterpriseBean(bean); + + final OpenejbJar openejbJar = new OpenejbJar(); + openejbJar.addEjbDeployment(new EjbDeployment(bean)); + + final Properties properties = openejbJar.getEjbDeployment().iterator().next().getProperties(); + properties.setProperty("cxf.jaxrs.providers", "org.apache.openejb.server.cxf.rs.CheckedExceptionMapperTest$ExampleExceptionMapper"); + + final EjbModule module = new EjbModule(ejbJar); + module.setOpenejbJar(openejbJar); + + return module; + } + + @Test + public void testThrowException() throws IOException { + assertEquals("Exception!", IO.slurp(new URL("http://localhost:4204/CheckedExceptionMapperTest/example/throw/"))); + } + + public static class ExampleException extends Exception { + public ExampleException(String message) { + super(message); + } + } + + @Provider + public static class ExampleExceptionMapper implements ExceptionMapper<ExampleException> { + @Override + public Response toResponse(ExampleException ex) { + return Response.ok("Exception!").build(); + } + } + + @Path("/example") + public static class ExampleRest { + @GET + @Path(value = "/throw") + public String throwException() throws ExampleException { + throw new ExampleException("exception"); + } + } +}