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 F205F932B for ; Tue, 8 May 2012 12:34:55 +0000 (UTC) Received: (qmail 35471 invoked by uid 500); 8 May 2012 12:34:55 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 35367 invoked by uid 500); 8 May 2012 12:34:55 -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 35359 invoked by uid 99); 8 May 2012 12:34:55 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 08 May 2012 12:34:55 +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, 08 May 2012 12:33:39 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 3C78E23888EA; Tue, 8 May 2012 12:33:18 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1335468 - in /cxf/branches/2.5.x-fixes: ./ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/codegen/ tools/wadlto/jaxrs/src/test/java/org/apache/cxf/tools/wadlto/jaxrs/ tools/wadlto/jaxrs/src/test/resources/wadl/ Date: Tue, 08 May 2012 12:33:18 -0000 To: commits@cxf.apache.org From: sergeyb@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120508123318.3C78E23888EA@eris.apache.org> Author: sergeyb Date: Tue May 8 12:33:17 2012 New Revision: 1335468 URL: http://svn.apache.org/viewvc?rev=1335468&view=rev Log: Merged revisions 1335462 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1335462 | sergeyb | 2012-05-08 13:25:44 +0100 (Tue, 08 May 2012) | 1 line [CXF-4292] Defaulting to String when WADL Generator can not determine a class name of the primitive type ........ Modified: cxf/branches/2.5.x-fixes/ (props changed) cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/codegen/SourceGenerator.java cxf/branches/2.5.x-fixes/tools/wadlto/jaxrs/src/test/java/org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainerTest.java cxf/branches/2.5.x-fixes/tools/wadlto/jaxrs/src/test/java/org/apache/cxf/tools/wadlto/jaxrs/WADLToJavaTest.java cxf/branches/2.5.x-fixes/tools/wadlto/jaxrs/src/test/resources/wadl/bookstore.xml Propchange: cxf/branches/2.5.x-fixes/ ------------------------------------------------------------------------------ Merged /cxf/trunk:r1335462 Propchange: cxf/branches/2.5.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/codegen/SourceGenerator.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/codegen/SourceGenerator.java?rev=1335468&r1=1335467&r2=1335468&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/codegen/SourceGenerator.java (original) +++ cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/codegen/SourceGenerator.java Tue May 8 12:33:17 2012 @@ -1004,8 +1004,8 @@ public class SourceGenerator { return XSD_SPECIFIC_TYPE_MAP.get(value); } else { String actualValue = value.replaceAll("[\\-\\_]", ""); - if (!actualValue.equals(value) && pair.length > 1) { - actualValue = convertRefToClassName(pair[0], actualValue, actualValue, info, imports); + if (pair.length > 1) { + actualValue = convertRefToClassName(pair[0], actualValue, "String", info, imports); } return actualValue; } @@ -1027,16 +1027,13 @@ public class SourceGenerator { addImport(imports, clsName); int index = clsName.lastIndexOf("."); if (index != -1) { - actualValue = clsName.substring(index + 1); - } else { - actualValue = clsName; - } + clsName = clsName.substring(index + 1); + } + return clsName; } - } else { - actualValue = defaultValue; } } - return actualValue; + return defaultValue; } private String getElementRefName(Element repElement, Modified: cxf/branches/2.5.x-fixes/tools/wadlto/jaxrs/src/test/java/org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainerTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/tools/wadlto/jaxrs/src/test/java/org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainerTest.java?rev=1335468&r1=1335467&r2=1335468&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/tools/wadlto/jaxrs/src/test/java/org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainerTest.java (original) +++ cxf/branches/2.5.x-fixes/tools/wadlto/jaxrs/src/test/java/org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainerTest.java Tue May 8 12:33:17 2012 @@ -47,8 +47,8 @@ public class JAXRSContainerTest extends assertNotNull(output.list()); - verifyFiles("java", true, false, "superbooks", "org.apache.cxf.jaxrs.model.wadl", 10); - verifyFiles("class", true, false, "superbooks", "org.apache.cxf.jaxrs.model.wadl", 10); + verifyFiles("java", true, false, "superbooks", "org.apache.cxf.jaxrs.model.wadl", 10, true); + verifyFiles("class", true, false, "superbooks", "org.apache.cxf.jaxrs.model.wadl", 10, true); } catch (Exception e) { e.printStackTrace(); @@ -72,8 +72,8 @@ public class JAXRSContainerTest extends assertNotNull(output.list()); - verifyFiles("java", true, false, "superbooks", "org.apache.cxf.jaxrs.model.wadl", 10); - verifyFiles("class", true, false, "superbooks", "org.apache.cxf.jaxrs.model.wadl", 10); + verifyFiles("java", true, false, "superbooks", "org.apache.cxf.jaxrs.model.wadl", 10, true); + verifyFiles("class", true, false, "superbooks", "org.apache.cxf.jaxrs.model.wadl", 10, true); } catch (Exception e) { e.printStackTrace(); @@ -97,8 +97,8 @@ public class JAXRSContainerTest extends assertNotNull(output.list()); - verifyFiles("java", true, false, "superbooks", "org.apache.cxf.jaxrs.model.wadl", 10); - verifyFiles("class", true, false, "superbooks", "org.apache.cxf.jaxrs.model.wadl", 10); + verifyFiles("java", true, false, "superbooks", "org.apache.cxf.jaxrs.model.wadl", 10, true); + verifyFiles("class", true, false, "superbooks", "org.apache.cxf.jaxrs.model.wadl", 10, true); } catch (Exception e) { e.printStackTrace(); @@ -376,8 +376,8 @@ public class JAXRSContainerTest extends assertNotNull(output.list()); - verifyFiles("java", true, false, "superbooks", "custom.books", 10); - verifyFiles("class", true, false, "superbooks", "custom.books", 10); + verifyFiles("java", true, false, "superbooks", "custom.books", 10, true); + verifyFiles("class", true, false, "superbooks", "custom.books", 10, true); } catch (Exception e) { e.printStackTrace(); @@ -402,8 +402,8 @@ public class JAXRSContainerTest extends assertNotNull(output.list()); - verifyFiles("java", true, false, "custom.books.schema", "custom.books.service", 10); - verifyFiles("class", true, false, "custom.books.schema", "custom.books.service", 10); + verifyFiles("java", true, false, "custom.books.schema", "custom.books.service", 10, true); + verifyFiles("class", true, false, "custom.books.schema", "custom.books.service", 10, true); } catch (Exception e) { e.printStackTrace(); @@ -427,8 +427,8 @@ public class JAXRSContainerTest extends assertNotNull(output.list()); - verifyFiles("java", true, false, "superbooks", "org.apache.cxf.jaxrs.model.wadl", 10); - verifyFiles("class", true, false, "superbooks", "org.apache.cxf.jaxrs.model.wadl", 10); + verifyFiles("java", true, false, "superbooks", "org.apache.cxf.jaxrs.model.wadl", 10, true); + verifyFiles("class", true, false, "superbooks", "org.apache.cxf.jaxrs.model.wadl", 10, true); } catch (Exception e) { fail(); e.printStackTrace(); @@ -452,8 +452,8 @@ public class JAXRSContainerTest extends assertNotNull(output.list()); - verifyFiles("java", true, true, "superbooks", "org.apache.cxf.jaxrs.model.wadl", 11); - verifyFiles("class", true, true, "superbooks", "org.apache.cxf.jaxrs.model.wadl", 11); + verifyFiles("java", true, true, "superbooks", "org.apache.cxf.jaxrs.model.wadl", 12, true); + verifyFiles("class", true, true, "superbooks", "org.apache.cxf.jaxrs.model.wadl", 12, true); } catch (Exception e) { fail(); e.printStackTrace(); @@ -475,7 +475,7 @@ public class JAXRSContainerTest extends assertNotNull(output.list()); - verifyTypes("superbooks", "java"); + verifyTypes("superbooks", "java", true); } catch (Exception e) { fail(); @@ -484,9 +484,17 @@ public class JAXRSContainerTest extends } private void verifyFiles(String ext, boolean subresourceExpected, boolean interfacesAndImpl, - String schemaPackage, String resourcePackage, int expectedCount) { + String schemaPackage, String resourcePackage, int expectedCount) { + verifyFiles(ext, subresourceExpected, interfacesAndImpl, schemaPackage, resourcePackage, + expectedCount, false); + } + + private void verifyFiles(String ext, boolean subresourceExpected, boolean interfacesAndImpl, + String schemaPackage, String resourcePackage, int expectedCount, + boolean enumTypeExpected) { List files = FileUtils.getFilesRecurse(output, ".+\\." + ext + "$"); - int size = interfacesAndImpl ? expectedCount : expectedCount - 2; + int offset = enumTypeExpected ? 1 : 2; + int size = interfacesAndImpl ? expectedCount : expectedCount - offset; if (!subresourceExpected) { size--; } @@ -506,9 +514,9 @@ public class JAXRSContainerTest extends } } - private void verifyTypes(String schemaPackage, String ext) { + private void verifyTypes(String schemaPackage, String ext, boolean enumTypeExpected) { List files = FileUtils.getFilesRecurse(output, ".+\\." + ext + "$"); - assertEquals(5, files.size()); + assertEquals(enumTypeExpected ? 6 : 5, files.size()); doVerifyTypes(files, schemaPackage, ext); } Modified: cxf/branches/2.5.x-fixes/tools/wadlto/jaxrs/src/test/java/org/apache/cxf/tools/wadlto/jaxrs/WADLToJavaTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/tools/wadlto/jaxrs/src/test/java/org/apache/cxf/tools/wadlto/jaxrs/WADLToJavaTest.java?rev=1335468&r1=1335467&r2=1335468&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/tools/wadlto/jaxrs/src/test/java/org/apache/cxf/tools/wadlto/jaxrs/WADLToJavaTest.java (original) +++ cxf/branches/2.5.x-fixes/tools/wadlto/jaxrs/src/test/java/org/apache/cxf/tools/wadlto/jaxrs/WADLToJavaTest.java Tue May 8 12:33:17 2012 @@ -59,7 +59,7 @@ public class WADLToJavaTest extends Proc private void verifyFiles(String ext, boolean subresourceExpected, boolean interfacesAndImpl, String schemaPackage, String resourcePackage) { List files = FileUtils.getFilesRecurse(output, ".+\\." + ext + "$"); - int size = interfacesAndImpl ? 10 : 8; + int size = interfacesAndImpl ? 11 : 9; if (!subresourceExpected) { size--; } @@ -78,6 +78,7 @@ public class WADLToJavaTest extends Proc } private void doVerifyTypes(List files, String schemaPackage, String ext) { + assertTrue(checkContains(files, schemaPackage + ".EnumType." + ext)); assertTrue(checkContains(files, schemaPackage + ".Book." + ext)); assertTrue(checkContains(files, schemaPackage + ".TheBook2." + ext)); assertTrue(checkContains(files, schemaPackage + ".Chapter." + ext)); Modified: cxf/branches/2.5.x-fixes/tools/wadlto/jaxrs/src/test/resources/wadl/bookstore.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/tools/wadlto/jaxrs/src/test/resources/wadl/bookstore.xml?rev=1335468&r1=1335467&r2=1335468&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/tools/wadlto/jaxrs/src/test/resources/wadl/bookstore.xml (original) +++ cxf/branches/2.5.x-fixes/tools/wadlto/jaxrs/src/test/resources/wadl/bookstore.xml Tue May 8 12:33:17 2012 @@ -43,15 +43,32 @@ + + + + + + + + + + + + + + + super resource + +