Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C3984CA8C for ; Tue, 11 Jun 2013 16:27:10 +0000 (UTC) Received: (qmail 36853 invoked by uid 500); 11 Jun 2013 16:27:09 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 36793 invoked by uid 500); 11 Jun 2013 16:27:08 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 36779 invoked by uid 99); 11 Jun 2013 16:27:07 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 11 Jun 2013 16:27:07 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 11 Jun 2013 16:27:06 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id E3D1023888E4; Tue, 11 Jun 2013 16:26:46 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1491866 - in /cxf/trunk/rt/frontend/jaxrs/src: main/java/org/apache/cxf/jaxrs/utils/ResourceUtils.java test/java/org/apache/cxf/jaxrs/utils/ResourceUtilsTest.java Date: Tue, 11 Jun 2013 16:26:46 -0000 To: commits@cxf.apache.org From: sergeyb@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130611162646.E3D1023888E4@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sergeyb Date: Tue Jun 11 16:26:46 2013 New Revision: 1491866 URL: http://svn.apache.org/r1491866 Log: [CXF-5073] Some more fixes to avoid endless recursions Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ResourceUtils.java cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/ResourceUtilsTest.java Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ResourceUtils.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ResourceUtils.java?rev=1491866&r1=1491865&r2=1491866&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ResourceUtils.java (original) +++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ResourceUtils.java Tue Jun 11 16:26:46 2013 @@ -563,12 +563,22 @@ public final class ResourceUtils { } for (ClassResourceInfo sub : resource.getSubResources()) { - if (resource != sub) { + if (!isRecursiveSubResource(resource, sub)) { getAllTypesForResource(sub, types, jaxbOnly); } } } + private static boolean isRecursiveSubResource(ClassResourceInfo parent, ClassResourceInfo sub) { + if (parent == null) { + return false; + } + if (parent == sub) { + return true; + } + return isRecursiveSubResource(parent.getParent(), sub); + } + private static void checkJaxbType(Class type, Type genericType, ResourceTypes types, Modified: cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/ResourceUtilsTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/ResourceUtilsTest.java?rev=1491866&r1=1491865&r2=1491866&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/ResourceUtilsTest.java (original) +++ cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/ResourceUtilsTest.java Tue Jun 11 16:26:46 2013 @@ -26,6 +26,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; import javax.ws.rs.core.UriInfo; import org.apache.cxf.jaxrs.Customer; @@ -117,4 +120,40 @@ public class ResourceUtilsTest extends A assertTrue(types.containsKey(Book.class)); assertTrue(types.containsKey(Chapter.class)); } + @Test + public void testGetAllJaxbClasses2() { + ClassResourceInfo cri1 = + ResourceUtils.createClassResourceInfo(IProductResource.class, IProductResource.class, true, true); + Map, Type> types = + ResourceUtils.getAllRequestResponseTypes(Collections.singletonList(cri1), true) + .getAllTypes(); + assertEquals(2, types.size()); + assertTrue(types.containsKey(Book.class)); + assertTrue(types.containsKey(Chapter.class)); + } + + public interface IProductResource { + @Path("/parts") + IPartsResource getParts(); + } + + public interface IPartsResource { + @Path("/{i}/") + IPartsResource2 elementAt(@PathParam("i") String i); + @Path("/parts") + IPartsResource getParts(); + @Path("/products") + IProductResource getProducts(); + @Path("chapter") + Chapter get(); + } + + public interface IPartsResource2 { + @Path("/{i}/") + IPartsResource elementAt(@PathParam("i") String i); + @Path("/products") + IProductResource getProducts(); + @GET + Book get(); + } }