This is an automated email from the ASF dual-hosted git repository.
sergeyb pushed a commit to branch 3.1.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/3.1.x-fixes by this push:
new ee17d0f [CXF-7200] Adding wadltojava jaxbClassNameSuffix option
ee17d0f is described below
commit ee17d0fd60a240d15bcc4a564371a24b73454321
Author: Sergey Beryozkin <[email protected]>
AuthorDate: Fri Dec 29 17:38:22 2017 +0000
[CXF-7200] Adding wadltojava jaxbClassNameSuffix option
---
.../apache/cxf/tools/wadlto/WadlToolConstants.java | 1 +
.../cxf/tools/wadlto/jaxrs/JAXRSContainer.java | 3 +-
.../cxf/tools/wadlto/jaxrs/SourceGenerator.java | 24 +++++++++++--
.../cxf/tools/wadlto/jaxrs/jaxrs-toolspec.xml | 10 ++++++
.../cxf/tools/wadlto/jaxrs/JAXRSContainerTest.java | 42 ++++++++++++++++++++--
.../src/test/resources/wadl/jaxbSchemaBindings.xml | 27 ++++++++++++++
6 files changed, 102 insertions(+), 5 deletions(-)
diff --git
a/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/WadlToolConstants.java
b/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/WadlToolConstants.java
index 2cee00d..722ff56 100644
---
a/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/WadlToolConstants.java
+++
b/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/WadlToolConstants.java
@@ -56,6 +56,7 @@ public final class WadlToolConstants {
public static final String CFG_WADL_NAMESPACE = "wadlNamespace";
public static final String CFG_GENERATE_ENUMS = "generateEnums";
public static final String CFG_INHERIT_PARAMS = "inheritResourceParams";
+ public static final String CFG_JAXB_CLASS_NAME_SUFFIX =
"jaxbClassNameSuffix";
public static final String CFG_CREATE_JAVA_DOCS = "javaDocs";
public static final String CFG_GENERATE_RESPONSE_IF_HEADERS_SET =
"generateResponseIfHeadersSet";
public static final String CFG_GENERATE_RESPONSE_FOR_METHODS =
"generateResponseForMethods";
diff --git
a/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainer.java
b/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainer.java
index 854720f..084429c 100644
---
a/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainer.java
+++
b/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainer.java
@@ -134,7 +134,8 @@ public class JAXRSContainer extends
AbstractCXFToolContainer {
if (wadlNs != null) {
sg.setWadlNamespace(wadlNs);
}
-
+
sg.setJaxbClassNameSuffix((String)context.get(WadlToolConstants.CFG_JAXB_CLASS_NAME_SUFFIX));
+
sg.setSupportMultipleXmlReps(context.optionSet(WadlToolConstants.CFG_MULTIPLE_XML_REPS));
sg.setSupportBeanValidation(context.optionSet(WadlToolConstants.CFG_BEAN_VALIDATION));
sg.setCreateJavaDocs(context.optionSet(WadlToolConstants.CFG_CREATE_JAVA_DOCS));
diff --git
a/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
b/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
index abf34ff..2023148 100644
---
a/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
+++
b/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
@@ -227,7 +227,8 @@ public class SourceGenerator {
private String encoding;
private String authentication;
private boolean createJavaDocs;
-
+ private String jaxbClassNameSuffix;
+
public SourceGenerator() {
this(Collections.<String, String>emptyMap());
}
@@ -1621,14 +1622,29 @@ public class SourceGenerator {
String[] pair = prefixedElementTypeName.split(":");
String elementTypeName = pair.length == 2 ? pair[1] : pair[0];
clsName = matchClassName(typeClassNames, packageName,
elementTypeName);
+ if (clsName == null && jaxbClassNameSuffix != null) {
+ clsName = matchClassName(typeClassNames, packageName,
+ elementTypeName +
jaxbClassNameSuffix);
+ }
if (clsName == null && elementTypeName.contains("_")) {
- clsName = matchClassName(typeClassNames, packageName,
elementTypeName.replaceAll("_", ""));
+ String elementTypeNameWithoutUnderscore =
elementTypeName.replaceAll("_", "");
+ clsName = matchClassName(typeClassNames, packageName,
elementTypeNameWithoutUnderscore);
+ if (clsName == null && jaxbClassNameSuffix != null) {
+ clsName = matchClassName(typeClassNames, packageName,
+
elementTypeNameWithoutUnderscore + jaxbClassNameSuffix);
+ }
}
if (clsName == null && pair.length == 2) {
String namespace = gInfo.getNsMap().get(pair[0]);
if (namespace != null) {
packageName = getPackageFromNamespace(namespace);
clsName = matchClassName(typeClassNames, packageName,
elementTypeName);
+ //CHECKSTYLE:OFF
+ if (clsName == null && jaxbClassNameSuffix != null) {
+ clsName = matchClassName(typeClassNames,
packageName,
+ elementTypeName +
jaxbClassNameSuffix);
+ }
+ //CHECKSTYLE:ON
}
}
@@ -2036,6 +2052,10 @@ public class SourceGenerator {
this.authentication = authentication;
}
+ public void setJaxbClassNameSuffix(String jaxbClassNameSuffix) {
+ this.jaxbClassNameSuffix = jaxbClassNameSuffix;
+ }
+
private static class GrammarInfo {
private Map<String, String> nsMap = new HashMap<String, String>();
private Map<String, String> elementTypeMap = new HashMap<String,
String>();
diff --git
a/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/jaxrs-toolspec.xml
b/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/jaxrs-toolspec.xml
index 7476251..463434e 100644
---
a/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/jaxrs-toolspec.xml
+++
b/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/jaxrs-toolspec.xml
@@ -58,6 +58,16 @@ Examples:
<annotation>[schema-namespace =]package-name</annotation>
</associatedArgument>
</option>
+ <option id="jaxbClassNameSuffix">
+ <annotation>
+ Specify the JAXB class name suffix which will be used to
modify
+ the method signatures where schema-generated types are used
+ </annotation>
+ <switch>jaxbClassNameSuffix</switch>
+ <associatedArgument placement="afterSpace">
+ <annotation>jaxb-class-name-suffix</annotation>
+ </associatedArgument>
+ </option>
<option id="schemaTypeMap" maxOccurs="unbounded">
<annotation>
Specifies the optional mapping between WADL parameter
diff --git
a/tools/wadlto/jaxrs/src/test/java/org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainerTest.java
b/tools/wadlto/jaxrs/src/test/java/org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainerTest.java
index 2e7581f..c72ebc2 100644
---
a/tools/wadlto/jaxrs/src/test/java/org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainerTest.java
+++
b/tools/wadlto/jaxrs/src/test/java/org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainerTest.java
@@ -181,7 +181,37 @@ public class JAXRSContainerTest extends ProcessorTestBase {
}
}
- @Test
+ @Test
+ public void testCodeGenInterfacesWithJaxbClassNameSuffix() {
+ try {
+ JAXRSContainer container = new JAXRSContainer(null);
+
+ ToolContext context = new ToolContext();
+ context.put(WadlToolConstants.CFG_OUTPUTDIR,
output.getCanonicalPath());
+ context.put(WadlToolConstants.CFG_WADLURL,
getLocation("/wadl/bookstore.xml"));
+ context.put(WadlToolConstants.CFG_JAXB_CLASS_NAME_SUFFIX, "DTO");
+ context.put(WadlToolConstants.CFG_BINDING,
getLocation("/wadl/jaxbSchemaBindings.xml"));
+ context.put(WadlToolConstants.CFG_COMPILE, "true");
+
+ container.setContext(context);
+ container.execute();
+
+ assertNotNull(output.list());
+ List<File> schemafiles = FileUtils.getFilesRecurse(output, ".+\\."
+ "java" + "$");
+ assertEquals(10, schemafiles.size());
+ doVerifyTypesWithSuffix(schemafiles, "superbooks", "java");
+
+ List<File> classfiles = FileUtils.getFilesRecurse(output, ".+\\."
+ "class" + "$");
+ assertEquals(10, classfiles.size());
+ doVerifyTypesWithSuffix(classfiles, "superbooks", "class");
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ fail();
+ }
+ }
+
+ @Test
public void testCodeGenWithImportedSchema() {
try {
JAXRSContainer container = new JAXRSContainer(null);
@@ -905,7 +935,15 @@ public class JAXRSContainerTest extends ProcessorTestBase {
assertTrue(checkContains(files, schemaPackage + ".ObjectFactory." +
ext));
assertTrue(checkContains(files, schemaPackage + ".package-info." +
ext));
}
-
+
+ private void doVerifyTypesWithSuffix(List<File> files, String
schemaPackage, String ext) {
+ assertTrue(checkContains(files, schemaPackage + ".BookDTO." + ext));
+ assertTrue(checkContains(files, schemaPackage + ".TheBook2DTO." +
ext));
+ assertTrue(checkContains(files, schemaPackage + ".ChapterDTO." + ext));
+ assertTrue(checkContains(files, schemaPackage + ".ObjectFactory." +
ext));
+ assertTrue(checkContains(files, schemaPackage + ".package-info." +
ext));
+ }
+
private boolean checkContains(List<File> clsFiles, String name) {
for (File f : clsFiles) {
if (f.getAbsolutePath().replace(File.separatorChar,
'.').endsWith(name)) {
diff --git a/tools/wadlto/jaxrs/src/test/resources/wadl/jaxbSchemaBindings.xml
b/tools/wadlto/jaxrs/src/test/resources/wadl/jaxbSchemaBindings.xml
new file mode 100644
index 0000000..eb77026
--- /dev/null
+++ b/tools/wadlto/jaxrs/src/test/resources/wadl/jaxbSchemaBindings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<!--
+ 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.
+-->
+<jaxb:bindings xmlns:jaxb="http://java.sun.com/xml/ns/jaxb";
xmlns:xs="http://www.w3.org/2001/XMLSchema"; version="2.0">
+ <jaxb:schemaBindings>
+ <jaxb:nameXmlTransform>
+ <jaxb:elementName suffix="DTO" />
+ <jaxb:typeName suffix="DTO" />
+ </jaxb:nameXmlTransform>
+ </jaxb:schemaBindings>
+</jaxb:bindings>
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
